diff --git a/.config/suppress.json b/.config/suppress.json
new file mode 100644
index 00000000000..9be220b291e
--- /dev/null
+++ b/.config/suppress.json
@@ -0,0 +1,17 @@
+{
+  "tool": "Credential Scanner",
+  "suppressions": [
+    {
+      "file": "\\test\\tools\\Modules\\WebListener\\ClientCert.pfx",
+      "_justification": "Test certificate with private key"
+    },
+    {
+      "file": "\\test\\tools\\Modules\\WebListener\\ServerCert.pfx",
+      "_justification": "Test certificate with private key"
+    },
+    {
+      "file": "\\test\\powershell\\Modules\\Microsoft.PowerShell.Security\\certificateCommon.psm1",
+      "_justification": "Test certificate with private key and inline suppression isn't working"
+    }
+  ]
+}
diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
new file mode 100644
index 00000000000..786ef4331a2
--- /dev/null
+++ b/.config/tsaoptions.json
@@ -0,0 +1,12 @@
+{
+    "codebaseName": "TFSMSAzure_PowerShell",
+    "instanceUrl": "https://msazure.visualstudio.com",
+    "projectName": "One",
+    "areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell\\PowerShell Core\\pwsh",
+    "notificationAliases": [
+        "adityap@microsoft.com",
+        "dongbow@microsoft.com",
+        "pmeinecke@microsoft.com",
+        "tplunk@microsoft.com"
+    ]
+}
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index af18c5ffe6f..c849a9f78e5 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,13 +3,14 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
+FROM mcr.microsoft.com/powershell/test-deps:ubuntu-20.04@sha256:d1609c57d2426b9cfffa3a3ab7bda5ebc4448700f8ba8ef377692c4a70e64b8c
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Configure apt and install packages
 RUN apt-get update \
+    && apt-get -y upgrade \
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     #
     # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c7b3de62eef..eded2d1bdec 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,16 +1,23 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-	"name": ".NET Core 6.0, including pwsh (Ubuntu 18.04)",
-	"dockerFile": "Dockerfile",
+  "name": ".NET Core 6.0, including pwsh (Ubuntu 18.04)",
+  "dockerFile": "Dockerfile",
 
-	// Uncomment the next line to run commands after the container is created.
-	"postCreateCommand": "cd src/powershell-unix && dotnet restore",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/PowerShell,type=bind",
+  "workspaceFolder": "/PowerShell",
 
-	"extensions": [
-		"ms-azure-devops.azure-pipelines",
-		"ms-dotnettools.csharp",
-		"ms-vscode.powershell",
-		"DavidAnson.vscode-markdownlint",
-		"vitaliymaz.vscode-svg-previewer"
-	]
+  // Uncomment the next line to run commands after the container is created.
+  "postCreateCommand": "cd src/powershell-unix && dotnet restore",
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azure-devops.azure-pipelines",
+        "ms-dotnettools.csharp",
+        "ms-vscode.powershell",
+        "DavidAnson.vscode-markdownlint",
+        "vitaliymaz.vscode-svg-previewer"
+      ]
+    }
+  }
 }
diff --git a/.devcontainer/fedora30/Dockerfile b/.devcontainer/fedora30/Dockerfile
deleted file mode 100644
index ae8d15ebd54..00000000000
--- a/.devcontainer/fedora30/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/powershell:preview-fedora-30
-
-# Configure apt and install packages
-RUN dnf install -y git procps wget findutils \
-    && dnf clean all
diff --git a/.devcontainer/fedora30/devcontainer.json b/.devcontainer/fedora30/devcontainer.json
deleted file mode 100644
index d9ef8ef5312..00000000000
--- a/.devcontainer/fedora30/devcontainer.json
+++ /dev/null
@@ -1,16 +0,0 @@
-// See https://aka.ms/vscode-remote/devcontainer.json for format details.
-{
-	"name": "Fedora 30",
-	"dockerFile": "Dockerfile",
-
-	// Uncomment the next line to run commands after the container is created.
-	"postCreateCommand": "pwsh -c 'import-module ./build.psm1;start-psbootstrap'",
-
-	"extensions": [
-		"ms-azure-devops.azure-pipelines",
-		"ms-dotnettools.csharp",
-		"ms-vscode.powershell",
-		"DavidAnson.vscode-markdownlint",
-		"vitaliymaz.vscode-svg-previewer"
-	]
-}
diff --git a/.editorconfig b/.editorconfig
index efe9133c8ff..57d2f6c6c3e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -103,6 +103,8 @@ dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 # Suggest more modern language features when available
 dotnet_style_object_initializer = true:suggestion
 dotnet_style_collection_initializer = true:suggestion
+# Background Info: https://github.com/dotnet/runtime/pull/100250
+dotnet_style_prefer_collection_expression = when_types_exactly_match
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
@@ -117,6 +119,17 @@ csharp_prefer_simple_default_expression = true:suggestion
 
 dotnet_code_quality_unused_parameters = non_public:suggestion
 
+# Dotnet diagnostic settings:
+[*.cs]
+
+# CA1859: Use concrete types when possible for improved performance
+# https://learn.microsoft.com/en-gb/dotnet/fundamentals/code-analysis/quality-rules/ca1859
+dotnet_diagnostic.CA1859.severity = suggestion
+
+# Disable SA1600 (ElementsMustBeDocumented) for test directory only
+[test/**/*.cs]
+dotnet_diagnostic.SA1600.severity = none
+
 # CSharp code style settings:
 [*.cs]
 
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 26e01101693..14569b81924 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,75 +3,66 @@
 # Areas are not limited to the filters defined in this file
 # First, let's start with areas with no filters or paths
 
+# Default
+* @PowerShell/powershell-maintainers
+
 # Area: Performance
 # @adityapatwardhan 
 
-# Area: Portability
-# @JamesWTruher
-
 # Area: Security
-# @TravisEz13 @PaulHigin
-src/System.Management.Automation/security/wldpNativeMethods.cs @TravisEz13 @PaulHigin
-
-# Area: Documentation
-.github/    @joeyaiello @TravisEz13
+src/System.Management.Automation/security/wldpNativeMethods.cs @TravisEz13 @seeminglyscience
 
-# Area: Test
-# @JamesWTruher @TravisEz13 @adityapatwardhan
-
-# Area: Cmdlets Core
-# @JamesWTruher @SteveL-MSFT @anmenaga
+# Area: CI Build
+.github/workflows    @PowerShell/powershell-maintainers @jshigetomi
+.github/actions      @PowerShell/powershell-maintainers @jshigetomi 
 
 # Now, areas that should have paths or filters, although we might not have them defined
 # According to the docs, order here must be by precedence of the filter, with later rules overwritting
 # but the feature seems to make taking a union of all the matching rules.
 
 # Area: Cmdlets Management
-src/Microsoft.PowerShell.Commands.Management/      @daxian-dbw @adityapatwardhan
+# src/Microsoft.PowerShell.Commands.Management/      @daxian-dbw @adityapatwardhan
 
 # Area: Utility Cmdlets
-src/Microsoft.PowerShell.Commands.Utility/         @JamesWTruher @PaulHigin
+# src/Microsoft.PowerShell.Commands.Utility/         
 
 # Area: Console
-src/Microsoft.PowerShell.ConsoleHost/              @daxian-dbw @anmenaga @TylerLeonhardt
-
-# Area: Demos
-demos/                                             @joeyaiello @SteveL-MSFT @HemantMahawar
+# src/Microsoft.PowerShell.ConsoleHost/              @daxian-dbw
 
 # Area: DSC
-src/System.Management.Automation/DscSupport        @TravisEz13 @SteveL-MSFT
+# src/System.Management.Automation/DscSupport        @TravisEz13 @SteveL-MSFT
 
 # Area: Engine
 # src/System.Management.Automation/engine            @daxian-dbw
 
 # Area: Debugging
 # Must be below engine to override
-src/System.Management.Automation/engine/debugger/  @PaulHigin
+# src/System.Management.Automation/engine/debugger/  
 
 # Area: Help
-src/System.Management.Automation/help              @adityapatwardhan
+src/System.Management.Automation/help              @adityapatwardhan @daxian-dbw
 
 # Area: Intellisense
 # @daxian-dbw
 
 # Area: Language
-src/System.Management.Automation/engine/parser     @daxian-dbw
+src/System.Management.Automation/engine/parser     @daxian-dbw @seeminglyscience
 
 # Area: Providers
-src/System.Management.Automation/namespaces        @anmenaga
+# src/System.Management.Automation/namespaces        
 
 # Area: Remoting
-src/System.Management.Automation/engine/remoting    @PaulHigin
+src/System.Management.Automation/engine/remoting    @daxian-dbw @TravisEz13
 
 # Areas: Build
 # Must be last
-*.config   @daxian-dbw @TravisEz13 @adityapatwardhan @anmenaga @PaulHigin
-*.props    @daxian-dbw @TravisEz13 @adityapatwardhan @anmenaga @PaulHigin
-*.yml      @daxian-dbw @TravisEz13 @adityapatwardhan @anmenaga @PaulHigin
-*.csproj   @daxian-dbw @TravisEz13 @adityapatwardhan @anmenaga @PaulHigin
-build.*    @daxian-dbw @TravisEz13 @adityapatwardhan @anmenaga @PaulHigin
-tools/     @daxian-dbw @TravisEz13 @adityapatwardhan @anmenaga @PaulHigin
-docker/    @daxian-dbw @TravisEz13 @adityapatwardhan @anmenaga @PaulHigin
+*.config   @PowerShell/powershell-maintainers @jshigetomi
+*.props    @PowerShell/powershell-maintainers @jshigetomi
+*.yml      @PowerShell/powershell-maintainers @jshigetomi
+*.csproj   @PowerShell/powershell-maintainers @jshigetomi
+build.*    @PowerShell/powershell-maintainers @jshigetomi
+tools/     @PowerShell/powershell-maintainers @jshigetomi
+# docker/    @PowerShell/powershell-maintainers @jshigetomi
 
 # Area: Compliance
 tools/terms    @TravisEz13
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2515c32efa4..35eab8c9b5b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,47 +1,24 @@
 # Contributing to PowerShell
 
-We welcome and appreciate contributions from the community.
-There are many ways to become involved with PowerShell:
-including filing issues,
-joining in design conversations,
-writing and improving documentation,
-and contributing to the code.
-Please read the rest of this document to ensure a smooth contribution process.
-
-## Intro to Git and GitHub
-
-* Make sure you have a [GitHub account](https://github.com/signup/free).
-* Learning Git:
-  * GitHub Help: [Good Resources for Learning Git and GitHub][good-git-resources]
-  * [Git Basics](../docs/git/basics.md): install and getting started
-* [GitHub Flow Guide](https://guides.github.com/introduction/flow/):
-  step-by-step instructions of GitHub Flow
-
-## Quick Start Checklist
+We welcome and appreciate contributions from the community!
 
-* Review the [Contributor License Agreement][CLA] requirement.
-* Get familiar with the [PowerShell repository](../docs/git).
+There are many ways to become involved with PowerShell including:
 
-## Contributing to Issues
+- [Contributing to Documentation](#contributing-to-documentation)
+- [Contributing to Issues](#contributing-to-issues)
+- [Contributing to Code](#contributing-to-code)
 
-* Review [Issue Management][issue-management].
-* Check if the issue you are going to file already exists in our [GitHub issues][open-issue].
-* If you can't find your issue already,
-  [open a new issue](https://github.com/PowerShell/PowerShell/issues/new/choose),
-  making sure to follow the directions as best you can.
-* If the issue is marked as [`Up-for-Grabs`][up-for-grabs],
-  the PowerShell Maintainers are looking for help with the issue.
-* Issues marked as [`First-Time-Issue`][first-time-issue],
-  are identified as being easy and a great way to learn about this project and making
-  contributions.
+Please read the rest of this document to ensure a smooth contribution process.
 
 ## Contributing to Documentation
 
-### Contributing to documentation related to PowerShell
+Contributing to the docs is an excellent way to get started with the process of making open source contributions with minimal technical skill required.
 
-Please see the [Contributor Guide in `MicrosoftDocs/PowerShell-Docs`](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/CONTRIBUTING.md).
+Please see the [Contributor Guide in `MicrosoftDocs/PowerShell-Docs`](https://aka.ms/PSDocsContributor).
 
-#### Quick steps if you're changing an existing cmdlet
+Learn how to [Contribute to Docs like a Microsoft Insider](https://www.youtube.com/watch?v=ZQODV8krq1Q) (by @sdwheeler)
+
+### Updating Documentation for an existing cmdlet
 
 If you made a change to an existing cmdlet and would like to update the documentation using PlatyPS,
 here are the quick steps:
@@ -67,19 +44,19 @@ which will update the documentation for you.
 made.
 1. Link your Docs PR to your original change PR.
 
-### Contributing to documentation related to maintaining or contributing to the PowerShell project
+### Style notes for documentation related to maintaining or contributing to the PowerShell project
 
 * When writing Markdown documentation, use [semantic linefeeds][].
   In most cases, it means "one clause/idea per line".
 * Otherwise, these issues should be treated like any other issue in this repository.
 
-#### Spellchecking documentation
+### Spell checking documentation
 
 Documentation is spellchecked. We use the
 [textlint](https://github.com/textlint/textlint/wiki/Collection-of-textlint-rule) command-line tool,
 which can be run in interactive mode to correct typos.
 
-To run the spellchecker, follow these steps:
+To run the spell checker, follow these steps:
 
 * install [Node.js](https://nodejs.org/en/) (v10 or up)
 * install [textlint](https://github.com/textlint/textlint/wiki/Collection-of-textlint-rule) by
@@ -89,7 +66,7 @@ To run the spellchecker, follow these steps:
 
 If you need to add a term or disable checking part of a file see the [configuration sections of the rule](https://github.com/sapegin/textlint-rule-terminology).
 
-#### Checking links in documentation
+### Checking links in documentation
 
 Documentation is link-checked. We make use of the
 `markdown-link-check` command-line tool,
@@ -102,21 +79,18 @@ To run the link-checker, follow these steps:
   `npm install -g markdown-link-check@3.8.5`
 * run `find . \*.md -exec markdown-link-check {} \;`
 
-## Contributing to Code
-
-### Code Editor
-
-You should use the multi-platform [Visual Studio Code (VS Code)][use-vscode-editor].
-
-### Building and testing
-
-#### Building PowerShell
-
-Please see [Building PowerShell](../README.md#building-the-repository).
-
-#### Testing PowerShell
+## Contributing to Issues
 
-Please see PowerShell [Testing Guidelines - Running Tests Outside of CI][running-tests-outside-of-ci] on how to test your build locally.
+1. Review [Issue Management][issue-management].
+1. Check if the issue you are going to file already exists in our [GitHub issues][open-issue].
+1. If you can't find your issue already,
+  [open a new issue](https://github.com/PowerShell/PowerShell/issues/new/choose),
+  making sure to follow the directions as best you can.
+1. If the issue is marked as [`Up-for-Grabs`][up-for-grabs],
+  the PowerShell Maintainers are looking for help with the issue.
+1. Issues marked as [`First-Time-Issue`][first-time-issue],
+  are identified as being easy and a great way to learn about this project and making
+  contributions.
 
 ### Finding or creating an issue
 
@@ -137,6 +111,59 @@ Additional references:
 * GitHub's guide on [Contributing to Open Source](https://guides.github.com/activities/contributing-to-open-source/#pull-request)
 * GitHub's guide on [Understanding the GitHub Flow](https://guides.github.com/introduction/flow/)
 
+## Contributing to Code
+
+### Quick Start Checklist
+
+* Review the [Contributor License Agreement][CLA] requirement.
+* Get familiar with the [PowerShell Repository Git Concepts](../docs/git/README.md).
+* Start a [GitHub Codespace](#Dev Container) and start exploring the repository.
+* Consider if what you want to do might be implementable as a [PowerShell Binary Module](https://learn.microsoft.com/powershell/scripting/developer/module/how-to-write-a-powershell-binary-module?view=powershell-7.5).
+  The PowerShell repository has a rigorous acceptance process due to its huge popularity and emphasis on stability and long term support, and with a binary module you can contribute to the community much more quickly.
+* Pick an existing issue to work on! For instance, clarifying a confusing or unclear error message is a great starting point.
+
+### Intro to Git and GitHub
+
+1. Sign up for a [GitHub account](https://github.com/signup/free).
+1. Learning Git and GitHub:
+    - [Git Basics](../docs/git/basics.md): install and getting started
+    - [Good Resources for Learning Git and GitHub][good-git-resources]
+1. The PowerShell repository uses GitHub Flow as the primary branching strategy. [Learn about GitHub Flow](https://guides.github.com/introduction/flow/)
+
+### Code Editing
+
+PowerShell is primarily written in [C#](https://learn.microsoft.com/dotnet/csharp/tour-of-csharp/overview). While you can use any C# development environment you prefer, [Visual Studio Code][use-vscode-editor] is recommended.
+
+### Dev Container
+
+There is a PowerShell [Dev Container](https://code.visualstudio.com/docs/devcontainers/containers) which enables you get up and running quickly with a prepared Visual Studio Code environment with all the required prerequisites already installed.
+
+[GitHub Codespaces](https://github.com/features/codespaces) is the fastest way to get started.
+Codespaces allows you to start a Github-hosted devcontainer from anywhere and contribute from your browser or via Visual Studio Code remoting.
+All GitHub users get 15 hours per month of a 4-core codespace for free.
+
+To start a codespace for the PowerShell repository:
+
+1. Go to https://github.com/PowerShell/PowerShell
+1. Click the green button on the right and choose to create a codespace
+
+   ![alt text](Images/Codespaces.png)
+1. Alternatively, just hit the comma `,` key on your keyboard which should instantly start a codespace as well.
+
+Once the codespace starts, you can press `ctrl+shift+b` (`cmd+shift+b` on Mac) to run the default build task. If you would like to interactivey test your changes, you can press `F5` to start debugging, add breakpoints, etc.
+
+[Learn more about how to get started with C# in Visual Studio Code](https://code.visualstudio.com/docs/csharp/get-started)
+
+### Building and Testing
+
+#### Building PowerShell
+
+[Building PowerShell](../README.md#Building-Powershell) has instructions for various platforms.
+
+#### Testing PowerShell
+
+Please see PowerShell [Testing Guidelines - Running Tests Outside of CI][running-tests-outside-of-ci] on how to test your build locally.
+
 ### Lifecycle of a pull request
 
 #### Before submitting
@@ -161,7 +188,7 @@ Additional references:
   In such case, it's better to split the PR to multiple smaller ones.
   For large features, try to approach it in an incremental way, so that each PR won't be too big.
 * If you're contributing in a way that changes the user or developer experience, you are expected to document those changes.
-  See [Contributing to documentation related to PowerShell](#contributing-to-documentation-related-to-powershell).
+  See [Contributing to documentation related to PowerShell](#contributing-to-documentation).
 * Add a meaningful title of the PR describing what change you want to check in.
   Don't simply put: "Fix issue #5".
   Also don't directly use the issue title as the PR title.
@@ -169,7 +196,7 @@ Additional references:
   A better example is: "Add Ensure parameter to New-Item cmdlet", with "Fix #5" in the PR's body.
 * When you create a pull request,
   include a summary about your changes in the PR description.
-  The description is used to create change logs,
+  The description is used to create changelogs,
   so try to have the first sentence explain the benefit to end users.
   If the changes are related to an existing GitHub issue,
   please reference the issue in the PR description (e.g. ```Fix #11```).
@@ -191,10 +218,10 @@ Additional references:
   As an example, this requirement includes any changes to cmdlets (including cmdlet parameters) and features which have associated about_* topics.
   While not required, we appreciate any contributors who add this label and create the issue themselves.
   Even better, all contributors are free to contribute the documentation themselves.
-  (See [Contributing to documentation related to PowerShell](#contributing-to-documentation-related-to-powershell) for more info.)
+  (See [Contributing to documentation related to PowerShell](#contributing-to-documentation) for more info.)
 * If your change adds a new source file, ensure the appropriate copyright and license headers is on top.
   It is standard practice to have both a copyright and license notice for each source file.
-  * For `.h`, `.cpp`, and `.cs` files use the copyright header with empty line after it:
+  * For `.cs` files use the copyright header with empty line after it:
 
     ```c#
         // Copyright (c) Microsoft Corporation.
@@ -234,21 +261,13 @@ Additional references:
 * After submitting your pull request,
   our [CI system (Azure DevOps Pipelines)][ci-system]
   will run a suite of tests and automatically update the status of the pull request.
-* Our CI contains automated spellchecking and link checking for Markdown files. If there is any false-positive,
-  [run the spellchecker command-line tool in interactive mode](#spellchecking-documentation)
+* Our CI contains automated spell checking and link checking for Markdown files. If there is any false-positive,
+  [run the spell checker command-line tool in interactive mode](#spell-checking-documentation)
   to add words to the `.spelling` file.
-* Our packaging test may not pass and ask you to update `files.wxs` file if you add/remove/update nuget package references or add/remove assert files.
-
-  You could update the file manually in accordance with messages in the test log file. Or you can use automatically generated file. To get the file you should build the msi package locally:
-
-  ```powershell
-  Import-Module .\build.psm1
-  Start-PSBuild -Clean -CrossGen -PSModuleRestore -Runtime win7-x64 -Configuration Release -ReleaseTag <release tag>
-  Import-Module .\tools\packaging
-  Start-PSPackage -Type msi -ReleaseTag <release tag> -WindowsRuntime 'win7-x64' -SkipReleaseChecks
-  ```
 
-  Last command will report where new file is located.
+  You could update the `.spelling` file manually in accordance with messages in the test log file, or
+  [run the spell checker command-line tool in interactive mode](#spell-checking-documentation)
+  to add the false-positive words directly.
 
 #### Pull Request - Workflow
 
@@ -266,7 +285,7 @@ Additional references:
 
 #### Pull Request - Roles and Responsibilities
 
-1. The PR *author* is responsible for moving the PR forward to get it Approved.
+1. The PR *author* is responsible for moving the PR forward to get it approved.
    This includes addressing feedback within a timely period and indicating feedback has been addressed by adding a comment and mentioning the specific *reviewers*.
    When updating your pull request, please **create new commits** and **don't rewrite the commits history**.
    This way it's very easy for the reviewers to see diff between iterations.
@@ -300,7 +319,7 @@ In these cases:
    Mention the original pull request ID in the description of the new issue and close the abandoned pull request.
    - If the changes in an abandoned pull request are no longer needed (e.g. due to refactoring of the codebase or a design change), *assignee* will simply close the pull request.
 
-## Making Breaking Changes
+### Making Breaking Changes
 
 When you make code changes,
 please pay attention to these that can affect the [Public Contract][breaking-changes-contract].
@@ -309,12 +328,12 @@ Before making changes to the code,
 first review the [breaking changes contract][breaking-changes-contract]
 and follow the guidelines to keep PowerShell backward compatible.
 
-## Making Design Changes
+### Making Design Changes
 
 To add new features such as cmdlets or making design changes,
 please follow the [PowerShell Request for Comments (RFC)][rfc-process] process.
 
-## Common Engineering Practices
+### Common Engineering Practices
 
 Other than the guidelines for [coding][coding-guidelines],
 the [RFC process][rfc-process] for design,
@@ -366,7 +385,7 @@ is also appropriate, as is using Markdown syntax.
   Before you invest a large amount of time,
   file an issue and start a discussion with the community.
 
-## Contributor License Agreement (CLA)
+### Contributor License Agreement (CLA)
 
 To speed up the acceptance of any contribution to any PowerShell repositories,
 you should sign the Microsoft [Contributor License Agreement (CLA)](https://cla.microsoft.com/) ahead of time.
@@ -382,8 +401,8 @@ Once you sign a CLA, all your existing and future pull requests will have the st
 
 ## Code of Conduct Enforcement
 
-Reports of abuse will be reviewed by the PS-Committee and if it has been determined that violations of the
-Code of Conduct has occurred, then a temporary ban may be imposed.
+Reports of abuse will be reviewed by the [PowerShell Committee][ps-committee] and if it has been determined that violations of the
+[Code of Conduct](../CODE_OF_CONDUCT.md) has occurred, then a temporary ban may be imposed.
 The duration of the temporary ban will depend on the impact and/or severity of the infraction.
 This can vary from 1 day, a few days, a week, and up to 30 days.
 Repeat offenses may result in a permanent ban from the PowerShell org.
@@ -404,8 +423,9 @@ Repeat offenses may result in a permanent ban from the PowerShell org.
 [PowerShell-Docs]: https://github.com/powershell/powershell-docs/
 [use-vscode-editor]: https://learn.microsoft.com/dotnet/core/tutorials/with-visual-studio-code
 [repository-maintainer]: ../docs/community/governance.md#repository-maintainers
-[area-expert]: ../docs/community/governance.md#area-experts
+[area-expert]: ../.github/CODEOWNERS
 [first-time-issue]: https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AFirst-Time-Issue
 [coding-guidelines]: ../docs/dev-process/coding-guidelines.md
 [breaking-changes-contract]: ../docs/dev-process/breaking-change-contract.md
 [rfc-process]: https://github.com/PowerShell/PowerShell-RFC
+[ps-committee]: ../docs/community/governance.md#powershell-committee
diff --git a/.github/ISSUE_TEMPLATE/Distribution_Request.yaml b/.github/ISSUE_TEMPLATE/Distribution_Request.yaml
deleted file mode 100644
index de15814cb3b..00000000000
--- a/.github/ISSUE_TEMPLATE/Distribution_Request.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Distribution Support Request
-description: Requests support for a new distribution
-title: Distribution Support Request
-labels: [Distribution-Request, Needs-Triage]
-body:
-- type: input
-  attributes:
-    label: Name of the Distribution
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Version of the Distribution
-  validations:
-    required: true
-- type: checkboxes
-  attributes:
-    label: Package Types
-    options:
-    - label: Deb
-    - label: RPM
-    - label: Tar.gz
-    - label: Snap - Stop! Please file your issue in [PowerShell-Snap](https://github.com/powershell/powershell-snap) instead.
-- type: input
-  attributes:
-    label: Processor Architecture
-    description: One per request!
-  validations:
-    required: true
-- type: checkboxes
-  attributes:
-    label: .NET Core Support
-    description: The following is a requirement for supporting a distribution **without exception.**
-    options:
-    - label: The version and architecture of the Distribution is [supported by .NET Core](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md#linux).
-      required: true
-- type: checkboxes
-  attributes:
-    label: Distribution Requirements
-    description: The following are requirements for supporting a distribution.
-    options:
-    - label: The version of the Distribution is supported for at least one year.
-    - label: The version of the Distribution is not an [interim release](https://ubuntu.com/about/release-cycle) or equivalent.
-- type: input
-  attributes:
-    label: Exemption Justification
-    description: |
-      Please write a justification for any exception where the above criteria
-      are not met. The PowerShell committee will review the request.
-- type: checkboxes
-  attributes:
-    label: Progress
-    options:
-    - label: An issue has been filed to create a Docker image in [PowerShell-Docker](https://github.com/powershell/powershell-docker)
-- type: checkboxes
-  attributes:
-    label: For PowerShell Team **ONLY**
-    options:
-    - label: Docker image created
-    - label: Docker image published
-    - label: Distribution tested
-    - label: Update `packages.microsoft.com` deployment
-    - label: "[Lifecycle](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/reference/docs-conceptual/PowerShell-Support-Lifecycle.md) updated"
-    - label: Documentation Updated
diff --git a/.github/ISSUE_TEMPLATE/WG_member_request.yaml b/.github/ISSUE_TEMPLATE/WG_member_request.yaml
new file mode 100644
index 00000000000..1d7f0e9ba53
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/WG_member_request.yaml
@@ -0,0 +1,66 @@
+name: Working Group Member Request
+description: Request membership to serve on a PowerShell Working Group
+title: Working Group Member Request
+labels: [WG-NeedsReview, WG-Cmdlets, WG-Engine, WG-Interactive-Console, WG-Remoting, Needs-Triage]
+body:
+- type: markdown
+  attributes:
+    value: |
+      ## Thank you for your interest in joining a PowerShell Working Group. 
+
+      ### Please complete the following public form to request membership to a PowerShell Working Group. 
+      
+      > [!NOTE]
+      > Not all Working Groups are accepting new members at this time.
+- type : dropdown
+  id : request_type
+  validations:
+    required: true
+  attributes:
+    label: Name of Working Group you are requesting to join? 
+    description: >-
+      Please select the name of the working group you are requesting to join. (Select one)
+    options:
+      - "Cmdlets and Modules"
+      - "Engine"
+      - "Interactive UX"
+      - "Remoting"
+- type: dropdown  
+  id: time
+  validations:
+    required: true
+  attributes:
+    label: Can you provide at least 1 hour per week to the Working Group? Note that time commitments will vary per Working Group and decided by its members.
+    description: >-
+      Please select Yes or No.     
+    options:
+      - "Yes"
+      - "No"
+- type: markdown  
+  attributes:
+    value: |
+      ## ⚠️ This form is public. Do not provide any private or proprietary information. ⚠️   
+- type: textarea
+  attributes:
+    label: Why do you want to join this working group?
+    description: Please provide a brief description of why you want to join this working group.
+    placeholder: >
+      I want to join this working group because...
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: What skills do you bring to this working group?
+    description: Please provide a brief description of what skills you bring to this working group.
+    placeholder: >
+      I bring the following skills to this working group...
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Public links to articles, code, or other resources that demonstrate your skills.
+    description: Please provide public links to articles, code, or other resources that demonstrate your skills.
+    placeholder: >
+      I have the following public links to articles, code, or other resources that demonstrate my skills...
+  validations:
+    required: true
diff --git a/.github/Images/Codespaces.png b/.github/Images/Codespaces.png
new file mode 100644
index 00000000000..f37792f5c9f
Binary files /dev/null and b/.github/Images/Codespaces.png differ
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6ad155756b5..27089847987 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,35 +11,21 @@
 ## PR Checklist
 
 - [ ] [PR has a meaningful title](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
-    - Use the present tense and imperative mood when describing your changes
+  - Use the present tense and imperative mood when describing your changes
 - [ ] [Summarized changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
 - [ ] [Make sure all `.h`, `.cpp`, `.cs`, `.ps1` and `.psm1` files have the correct copyright header](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
-- [ ] This PR is ready to merge and is not [Work in Progress](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---work-in-progress).
-    - If the PR is work in progress, please add the prefix `WIP:` or `[ WIP ]` to the beginning of the title (the `WIP` bot will keep its status check at `Pending` while the prefix is present) and remove the prefix when the PR is ready.
+- [ ] This PR is ready to merge. If this PR is a work in progress, please open this as a [Draft Pull Request and mark it as Ready to Review when it is ready to merge](https://docs.github.com/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests).
 - **[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/main/reference/7.3/Microsoft.PowerShell.Core/About/about_Experimental_Features.md)
-        - [ ] Experimental feature name(s): <!-- Experimental feature name(s) here -->
+  - [ ] None
+  - **OR**
+  - [ ] [Experimental feature(s) needed](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/main/reference/7.5/Microsoft.PowerShell.Core/About/about_Experimental_Features.md)
+    - [ ] Experimental feature name(s): <!-- Experimental feature name(s) here -->
 - **User-facing changes**
-    - [ ] Not Applicable
-    - **OR**
-    - [ ] [Documentation needed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
-        - [ ] Issue filed: <!-- Number/link of that issue here -->
+  - [ ] Not Applicable
+  - **OR**
+  - [ ] [Documentation needed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
+    - [ ] Issue filed: <!-- Number/link of that issue here -->
 - **Testing - New and feature**
-    - [ ] N/A or can only be tested interactively
-    - **OR**
-    - [ ] [Make sure you've added a new test if existing tests do not effectively test the code changed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#before-submitting)
-- **Tooling**
-    - [ ] I have considered the user experience from a tooling perspective and don't believe tooling will be impacted.
-    - **OR**
-    - [ ] I have considered the user experience from a tooling perspective and opened an issue in the relevant tool repository. This may include:
-        - [ ] Impact on [PowerShell Editor Services](https://github.com/PowerShell/PowerShellEditorServices) which is used in the [PowerShell extension](https://github.com/PowerShell/vscode-powershell) for VSCode
-        (which runs in a different PS Host).
-            - [ ] Issue filed: <!-- Number/link of that issue here -->
-        - [ ] Impact on Completions (both in the console and in editors) - one of PowerShell's most powerful features.
-            - [ ] Issue filed: <!-- Number/link of that issue here -->
-        - [ ] Impact on [PSScriptAnalyzer](https://github.com/PowerShell/PSScriptAnalyzer) (which provides linting & formatting in the editor extensions).
-            - [ ] Issue filed: <!-- Number/link of that issue here -->
-        - [ ] Impact on [EditorSyntax](https://github.com/PowerShell/EditorSyntax) (which provides syntax highlighting with in VSCode, GitHub, and many other editors).
-            - [ ] Issue filed: <!-- Number/link of that issue here -->
+  - [ ] N/A or can only be tested interactively
+  - **OR**
+  - [ ] [Make sure you've added a new test if existing tests do not effectively test the code changed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#before-submitting)
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 6241b2c57b5..797f7003851 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -1,12 +1,39 @@
-# Security Vulnerabilities
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
 
-Security issues are treated very seriously and will, by default,
-takes precedence over other considerations including usability, performance,
-etc...  Best effort will be used to mitigate side effects of a security
-change, but PowerShell must be secure by default.
+## Security
 
-## Reporting a security vulnerability
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin) and [PowerShell](https://github.com/PowerShell).
 
-If you believe that there is a security vulnerability in PowerShell,
-it **must** be reported using [https://aka.ms/secure-at](https://aka.ms/secure-at) to allow for [Coordinated Vulnerability Disclosure](https://technet.microsoft.com/security/dn467923).
-**Only** file an issue, if [MSRC](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue?rtc=1) has confirmed filing an issue is appropriate.
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
+
+You should receive a response within 24 hours. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->
diff --git a/.github/action-filters.yml b/.github/action-filters.yml
new file mode 100644
index 00000000000..9a61bc1947b
--- /dev/null
+++ b/.github/action-filters.yml
@@ -0,0 +1,23 @@
+github: &github
+  - .github/actions/**
+  - .github/workflows/**-ci.yml
+tools: &tools
+  - tools/buildCommon/**
+  - tools/ci.psm1
+props: &props
+  - '**.props'
+tests: &tests
+  - test/powershell/**
+  - test/tools/**
+  - test/xUnit/**
+mainSource: &mainSource
+  - src/**
+buildModule: &buildModule
+  - build.psm1
+source:
+  - *github
+  - *tools
+  - *props
+  - *buildModule
+  - *mainSource
+  - *tests
diff --git a/.github/actions/build/ci/action.yml b/.github/actions/build/ci/action.yml
new file mode 100644
index 00000000000..65331fb3185
--- /dev/null
+++ b/.github/actions/build/ci/action.yml
@@ -0,0 +1,40 @@
+name: CI Build
+description: 'Builds PowerShell'
+runs:
+  using: composite
+  steps:
+  - name: Capture Environment
+    if: success() || failure()
+    run: |-
+      Import-Module .\tools\ci.psm1
+      Show-Environment
+    shell: pwsh
+  - name: Set Build Name for Non-PR
+    if: github.event_name != 'PullRequest'
+    run: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
+    shell: pwsh
+  - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+    with:
+      global-json-file: ./global.json
+  - name: Bootstrap
+    if: success()
+    run: |-
+      Write-Verbose -Verbose "Running Bootstrap..."
+      Import-Module .\tools\ci.psm1
+      Invoke-CIInstall -SkipUser
+      Write-Verbose -Verbose "Start Sync-PSTags"
+      Sync-PSTags -AddRemoteIfMissing
+      Write-Verbose -Verbose "End Sync-PSTags"
+    shell: pwsh
+  - name: Build
+    if: success()
+    run: |-
+      Write-Verbose -Verbose "Running Build..."
+      Import-Module .\tools\ci.psm1
+      Invoke-CIBuild
+    shell: pwsh
+  - name: Upload build artifact
+    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    with:
+      name: build
+      path: ${{ runner.workspace }}/build
diff --git a/.github/actions/infrastructure/get-changed-files/README.md b/.github/actions/infrastructure/get-changed-files/README.md
new file mode 100644
index 00000000000..277b28c0674
--- /dev/null
+++ b/.github/actions/infrastructure/get-changed-files/README.md
@@ -0,0 +1,122 @@
+# Get Changed Files Action
+
+A reusable composite action that retrieves the list of files changed in a pull request or push event.
+
+## Features
+
+- Supports both `pull_request` and `push` events
+- Optional filtering by file pattern
+- Returns files as JSON array for easy consumption
+- Filters out deleted files (only returns added, modified, or renamed files)
+- Handles up to 100 changed files per request
+
+## Usage
+
+### Basic Usage (Pull Requests Only)
+
+```yaml
+- name: Get changed files
+  id: changed-files
+  uses: "./.github/actions/infrastructure/get-changed-files"
+
+- name: Process files
+  run: |
+    echo "Changed files: ${{ steps.changed-files.outputs.files }}"
+    echo "Count: ${{ steps.changed-files.outputs.count }}"
+```
+
+### With Filtering
+
+```yaml
+# Get only markdown files
+- name: Get changed markdown files
+  id: changed-md
+  uses: "./.github/actions/infrastructure/get-changed-files"
+  with:
+    filter: '*.md'
+
+# Get only GitHub workflow/action files
+- name: Get changed GitHub files
+  id: changed-github
+  uses: "./.github/actions/infrastructure/get-changed-files"
+  with:
+    filter: '.github/'
+```
+
+### Support Both PR and Push Events
+
+```yaml
+- name: Get changed files
+  id: changed-files
+  uses: "./.github/actions/infrastructure/get-changed-files"
+  with:
+    event-types: 'pull_request,push'
+```
+
+## Inputs
+
+| Name | Description | Required | Default |
+|------|-------------|----------|---------|
+| `filter` | Optional filter pattern (e.g., `*.md` for markdown files, `.github/` for GitHub files) | No | `''` |
+| `event-types` | Comma-separated list of event types to support (`pull_request`, `push`) | No | `pull_request` |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| `files` | JSON array of changed file paths |
+| `count` | Number of changed files |
+
+## Filter Patterns
+
+The action supports simple filter patterns:
+
+- **Extension matching**: Use `*.ext` to match files with a specific extension
+  - Example: `*.md` matches all markdown files
+  - Example: `*.yml` matches all YAML files
+
+- **Path prefix matching**: Use a path prefix to match files in a directory
+  - Example: `.github/` matches all files in the `.github` directory
+  - Example: `tools/` matches all files in the `tools` directory
+
+## Example: Processing Changed Files
+
+```yaml
+- name: Get changed files
+  id: changed-files
+  uses: "./.github/actions/infrastructure/get-changed-files"
+
+- name: Process each file
+  shell: pwsh
+  env:
+    CHANGED_FILES: ${{ steps.changed-files.outputs.files }}
+  run: |
+    $changedFilesJson = $env:CHANGED_FILES
+    $changedFiles = $changedFilesJson | ConvertFrom-Json
+    
+    foreach ($file in $changedFiles) {
+      Write-Host "Processing: $file"
+      # Your processing logic here
+    }
+```
+
+## Limitations
+
+- Simple filter patterns only (no complex glob or regex patterns)
+
+## Pagination
+
+The action automatically handles pagination to fetch **all** changed files in a PR, regardless of how many files were changed:
+
+- Fetches files in batches of 100 per page
+- Continues fetching until all files are retrieved
+- Logs a note when pagination occurs, showing the total file count
+- **No file limit** - all changed files will be processed, even in very large PRs
+
+This ensures that critical workflows (such as merge conflict checking, link validation, etc.) don't miss files due to pagination limits.
+
+## Related Actions
+
+- **markdownlinks**: Uses this pattern to get changed markdown files
+- **merge-conflict-checker**: Uses this pattern to get changed files for conflict detection
+- **path-filters**: Similar functionality but with more complex filtering logic
diff --git a/.github/actions/infrastructure/get-changed-files/action.yml b/.github/actions/infrastructure/get-changed-files/action.yml
new file mode 100644
index 00000000000..51631cfe141
--- /dev/null
+++ b/.github/actions/infrastructure/get-changed-files/action.yml
@@ -0,0 +1,117 @@
+name: 'Get Changed Files'
+description: 'Gets the list of files changed in a pull request or push event'
+inputs:
+  filter:
+    description: 'Optional filter pattern (e.g., "*.md" for markdown files, ".github/" for GitHub files)'
+    required: false
+    default: ''
+  event-types:
+    description: 'Comma-separated list of event types to support (pull_request, push)'
+    required: false
+    default: 'pull_request'
+outputs:
+  files:
+    description: 'JSON array of changed file paths'
+    value: ${{ steps.get-files.outputs.files }}
+  count:
+    description: 'Number of changed files'
+    value: ${{ steps.get-files.outputs.count }}
+runs:
+  using: 'composite'
+  steps:
+    - name: Get changed files
+      id: get-files
+      uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
+      with:
+        script: |
+          const eventTypes = '${{ inputs.event-types }}'.split(',').map(t => t.trim());
+          const filter = '${{ inputs.filter }}';
+          let changedFiles = [];
+
+          if (eventTypes.includes('pull_request') && context.eventName === 'pull_request') {
+            console.log(`Getting files changed in PR #${context.payload.pull_request.number}`);
+
+            // Fetch all files changed in the PR with pagination
+            let allFiles = [];
+            let page = 1;
+            let fetchedCount;
+
+            do {
+              const { data: files } = await github.rest.pulls.listFiles({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number,
+                per_page: 100,
+                page: page
+              });
+
+              allFiles = allFiles.concat(files);
+              fetchedCount = files.length;
+              page++;
+            } while (fetchedCount === 100);
+
+            if (allFiles.length >= 100) {
+              console.log(`Note: This PR has ${allFiles.length} changed files. All files fetched using pagination.`);
+            }
+
+            changedFiles = allFiles
+              .filter(file => file.status === 'added' || file.status === 'modified' || file.status === 'renamed')
+              .map(file => file.filename);
+
+          } else if (eventTypes.includes('push') && context.eventName === 'push') {
+            console.log(`Getting files changed in push to ${context.ref}`);
+
+            const { data: comparison } = await github.rest.repos.compareCommits({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              base: context.payload.before,
+              head: context.payload.after,
+            });
+
+            changedFiles = comparison.files
+              .filter(file => file.status === 'added' || file.status === 'modified' || file.status === 'renamed')
+              .map(file => file.filename);
+
+          } else {
+            core.setFailed(`Unsupported event type: ${context.eventName}. Supported types: ${eventTypes.join(', ')}`);
+            return;
+          }
+
+          // Apply filter if provided
+          if (filter) {
+            const filterLower = filter.toLowerCase();
+            const beforeFilter = changedFiles.length;
+            changedFiles = changedFiles.filter(file => {
+              const fileLower = file.toLowerCase();
+              // Support simple patterns like "*.md" or ".github/"
+              if (filterLower.startsWith('*.')) {
+                const ext = filterLower.substring(1);
+                return fileLower.endsWith(ext);
+              } else {
+                return fileLower.startsWith(filterLower);
+              }
+            });
+            console.log(`Filter '${filter}' applied: ${beforeFilter} → ${changedFiles.length} files`);
+          }
+
+          // Calculate simple hash for verification
+          const crypto = require('crypto');
+          const filesJson = JSON.stringify(changedFiles.sort());
+          const hash = crypto.createHash('sha256').update(filesJson).digest('hex').substring(0, 8);
+
+          // Log changed files in a collapsible group
+          core.startGroup(`Changed Files (${changedFiles.length} total, hash: ${hash})`);
+          if (changedFiles.length > 0) {
+            changedFiles.forEach(file => console.log(`  - ${file}`));
+          } else {
+            console.log('  (no files changed)');
+          }
+          core.endGroup();
+
+          console.log(`Found ${changedFiles.length} changed files`);
+          core.setOutput('files', JSON.stringify(changedFiles));
+          core.setOutput('count', changedFiles.length);
+
+branding:
+  icon: 'file-text'
+  color: 'blue'
diff --git a/.github/actions/infrastructure/markdownlinks/Parse-MarkdownLink.ps1 b/.github/actions/infrastructure/markdownlinks/Parse-MarkdownLink.ps1
new file mode 100644
index 00000000000..a56d696eb6e
--- /dev/null
+++ b/.github/actions/infrastructure/markdownlinks/Parse-MarkdownLink.ps1
@@ -0,0 +1,182 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+#requires -version 7
+# Markdig is always available in PowerShell 7
+<#
+.SYNOPSIS
+    Parse CHANGELOG files using Markdig to extract links.
+
+.DESCRIPTION
+    This script uses Markdig.Markdown.Parse to parse all markdown files in the CHANGELOG directory
+    and extract different types of links (inline links, reference links, etc.).
+
+.PARAMETER ChangelogPath
+    Path to the CHANGELOG directory. Defaults to ./CHANGELOG
+
+.PARAMETER LinkType
+    Filter by link type: All, Inline, Reference, AutoLink. Defaults to All.
+
+.EXAMPLE
+    .\Parse-MarkdownLink.ps1
+
+.EXAMPLE
+    .\Parse-MarkdownLink.ps1 -LinkType Reference
+#>
+
+param(
+    [string]$ChangelogPath = "./CHANGELOG",
+    [ValidateSet("All", "Inline", "Reference", "AutoLink")]
+    [string]$LinkType = "All"
+)
+
+Write-Verbose "Using built-in Markdig functionality to parse markdown files"
+
+function Get-LinksFromMarkdownAst {
+    param(
+        [Parameter(Mandatory)]
+        [object]$Node,
+        [Parameter(Mandatory)]
+        [string]$FileName,
+        [System.Collections.ArrayList]$Links
+    )
+
+    if ($null -eq $Links) {
+        return
+    }
+
+    # Check if current node is a link
+    if ($Node -is [Markdig.Syntax.Inlines.LinkInline]) {
+        $linkInfo = [PSCustomObject]@{
+            Path = $FileName
+            Line = $Node.Line + 1  # Convert to 1-based line numbering
+            Column = $Node.Column + 1  # Convert to 1-based column numbering
+            Url = $Node.Url ?? ""
+            Text = $Node.FirstChild?.ToString() ?? ""
+            Type = "Inline"
+            IsImage = $Node.IsImage
+        }
+        [void]$Links.Add($linkInfo)
+    }
+    elseif ($Node -is [Markdig.Syntax.Inlines.AutolinkInline]) {
+        $linkInfo = [PSCustomObject]@{
+            Path = $FileName
+            Line = $Node.Line + 1
+            Column = $Node.Column + 1
+            Url = $Node.Url ?? ""
+            Text = $Node.Url ?? ""
+            Type = "AutoLink"
+            IsImage = $false
+        }
+        [void]$Links.Add($linkInfo)
+    }
+    elseif ($Node -is [Markdig.Syntax.LinkReferenceDefinitionGroup]) {
+        foreach ($refDef in $Node) {
+            $linkInfo = [PSCustomObject]@{
+                Path = $FileName
+                Line = $refDef.Line + 1
+                Column = $refDef.Column + 1
+                Url = $refDef.Url ?? ""
+                Text = $refDef.Label ?? ""
+                Type = "Reference"
+                IsImage = $false
+            }
+            [void]$Links.Add($linkInfo)
+        }
+    }
+    elseif ($Node -is [Markdig.Syntax.LinkReferenceDefinition]) {
+        $linkInfo = [PSCustomObject]@{
+            Path = $FileName
+            Line = $Node.Line + 1
+            Column = $Node.Column + 1
+            Url = $Node.Url ?? ""
+            Text = $Node.Label ?? ""
+            Type = "Reference"
+            IsImage = $false
+        }
+        [void]$Links.Add($linkInfo)
+    }
+
+    # For MarkdownDocument (root), iterate through all blocks
+    if ($Node -is [Markdig.Syntax.MarkdownDocument]) {
+        foreach ($block in $Node) {
+            Get-LinksFromMarkdownAst -Node $block -FileName $FileName -Links $Links
+        }
+    }
+    # For block containers, iterate through children
+    elseif ($Node -is [Markdig.Syntax.ContainerBlock]) {
+        foreach ($child in $Node) {
+            Get-LinksFromMarkdownAst -Node $child -FileName $FileName -Links $Links
+        }
+    }
+    # For leaf blocks with inlines, process the inline content
+    elseif ($Node -is [Markdig.Syntax.LeafBlock] -and $Node.Inline) {
+        Get-LinksFromMarkdownAst -Node $Node.Inline -FileName $FileName -Links $Links
+    }
+    # For inline containers, process all child inlines
+    elseif ($Node -is [Markdig.Syntax.Inlines.ContainerInline]) {
+        $child = $Node.FirstChild
+        while ($child) {
+            Get-LinksFromMarkdownAst -Node $child -FileName $FileName -Links $Links
+            $child = $child.NextSibling
+        }
+    }
+    # For other inline elements that might have children
+    elseif ($Node.PSObject.Properties.Name -contains "FirstChild" -and $Node.FirstChild) {
+        $child = $Node.FirstChild
+        while ($child) {
+            Get-LinksFromMarkdownAst -Node $child -FileName $FileName -Links $Links
+            $child = $child.NextSibling
+        }
+    }
+}
+
+function Parse-ChangelogFiles {
+    param(
+        [string]$Path
+    )
+
+    if (-not (Test-Path $Path)) {
+        Write-Error "CHANGELOG directory not found: $Path"
+        return
+    }
+
+    $markdownFiles = Get-ChildItem -Path $Path -Filter "*.md" -File
+
+    if ($markdownFiles.Count -eq 0) {
+        Write-Warning "No markdown files found in $Path"
+        return
+    }
+
+    $allLinks = [System.Collections.ArrayList]::new()
+
+    foreach ($file in $markdownFiles) {
+        Write-Verbose "Processing file: $($file.Name)"
+
+        try {
+            $content = Get-Content -Path $file.FullName -Raw -Encoding UTF8
+
+            # Parse the markdown content using Markdig
+            $document = [Markdig.Markdown]::Parse($content, [Markdig.MarkdownPipelineBuilder]::new())
+
+            # Extract links from the AST
+            Get-LinksFromMarkdownAst -Node $document -FileName $file.FullName -Links $allLinks
+
+        } catch {
+            Write-Warning "Error processing file $($file.Name): $($_.Exception.Message)"
+        }
+    }   
+    
+    # Filter by link type if specified
+    if ($LinkType -ne "All") {
+        $allLinks = $allLinks | Where-Object { $_.Type -eq $LinkType }
+    }
+
+    return $allLinks
+}
+
+# Main execution
+$links = Parse-ChangelogFiles -Path $ChangelogPath
+
+# Output PowerShell objects
+$links
diff --git a/.github/actions/infrastructure/markdownlinks/README.md b/.github/actions/infrastructure/markdownlinks/README.md
new file mode 100644
index 00000000000..e566ec2bcc3
--- /dev/null
+++ b/.github/actions/infrastructure/markdownlinks/README.md
@@ -0,0 +1,177 @@
+# Verify Markdown Links Action
+
+A GitHub composite action that verifies all links in markdown files using PowerShell and Markdig.
+
+## Features
+
+- ✅ Parses markdown files using Markdig (built into PowerShell 7)
+- ✅ Extracts all link types: inline links, reference links, and autolinks
+- ✅ Verifies HTTP/HTTPS links with configurable timeouts and retries
+- ✅ Validates local file references
+- ✅ Supports excluding specific URL patterns
+- ✅ Provides detailed error reporting with file locations
+- ✅ Outputs metrics for CI/CD integration
+
+## Usage
+
+### Basic Usage
+
+```yaml
+- name: Verify Markdown Links
+  uses: ./.github/actions/infrastructure/markdownlinks
+  with:
+    path: './CHANGELOG'
+```
+
+### Advanced Usage
+
+```yaml
+- name: Verify Markdown Links
+  uses: ./.github/actions/infrastructure/markdownlinks
+  with:
+    path: './docs'
+    fail-on-error: 'true'
+    timeout: 30
+    max-retries: 2
+    exclude-patterns: '*.example.com/*,*://localhost/*'
+```
+
+### With Outputs
+
+```yaml
+- name: Verify Markdown Links
+  id: verify-links
+  uses: ./.github/actions/infrastructure/markdownlinks
+  with:
+    path: './CHANGELOG'
+    fail-on-error: 'false'
+
+- name: Display Results
+  run: |
+    echo "Total links: ${{ steps.verify-links.outputs.total-links }}"
+    echo "Passed: ${{ steps.verify-links.outputs.passed-links }}"
+    echo "Failed: ${{ steps.verify-links.outputs.failed-links }}"
+    echo "Skipped: ${{ steps.verify-links.outputs.skipped-links }}"
+```
+
+## Inputs
+
+| Input | Description | Required | Default |
+|-------|-------------|----------|---------|
+| `path` | Path to the directory containing markdown files to verify | No | `./CHANGELOG` |
+| `exclude-patterns` | Comma-separated list of URL patterns to exclude from verification | No | `''` |
+| `fail-on-error` | Whether to fail the action if any links are broken | No | `true` |
+| `timeout` | Timeout in seconds for HTTP requests | No | `30` |
+| `max-retries` | Maximum number of retries for failed requests | No | `2` |
+
+## Outputs
+
+| Output | Description |
+|--------|-------------|
+| `total-links` | Total number of unique links checked |
+| `passed-links` | Number of links that passed verification |
+| `failed-links` | Number of links that failed verification |
+| `skipped-links` | Number of links that were skipped |
+
+## Excluded Link Types
+
+The action automatically skips the following link types:
+
+- **Anchor links** (`#section-name`) - Would require full markdown parsing
+- **Email links** (`mailto:user@example.com`) - Cannot be verified without sending email
+
+## GitHub Workflow Test
+
+This section provides a workflow example and instructions for testing the link verification action.
+
+### Testing the Workflow
+
+To test that the workflow properly detects broken links:
+
+1. Make change to this file (e.g., this README.md file already contains one in the [Broken Link Test](#broken-link-test) section)
+1. The workflow will run and should fail, reporting the broken link(s)
+1. Revert your change to this file
+1. Push again to verify the workflow passes
+
+### Example Workflow Configuration
+
+```yaml
+name: Verify Links
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - '**/*.md'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - '**/*.md'
+  schedule:
+    # Run weekly to catch external link rot
+    - cron: '0 0 * * 0'
+
+jobs:
+  verify-links:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Verify CHANGELOG Links
+        uses: ./.github/actions/infrastructure/markdownlinks
+        with:
+          path: './CHANGELOG'
+          fail-on-error: 'true'
+
+      - name: Verify Documentation Links
+        uses: ./.github/actions/infrastructure/markdownlinks
+        with:
+          path: './docs'
+          fail-on-error: 'false'
+          exclude-patterns: '*.internal.example.com/*'
+```
+
+## How It Works
+
+1. **Parse Markdown**: Uses `Parse-MarkdownLink.ps1` to extract all links from markdown files using Markdig
+2. **Deduplicate**: Groups links by URL to avoid checking the same link multiple times
+3. **Verify Links**:
+   - HTTP/HTTPS links: Makes HEAD/GET requests with configurable timeout and retries
+   - Local file references: Checks if the file exists relative to the markdown file
+   - Excluded patterns: Skips links matching the exclude patterns
+4. **Report Results**: Displays detailed results with file locations for failed links
+5. **Set Outputs**: Provides metrics for downstream steps
+
+## Error Output Example
+
+```
+✗ FAILED: https://example.com/broken-link - HTTP 404
+    Found in: /path/to/file.md:42:15
+    Found in: /path/to/other.md:100:20
+
+Link Verification Summary
+============================================================
+Total URLs checked: 150
+Passed: 145
+Failed: 2
+Skipped: 3
+
+Failed Links:
+  • https://example.com/broken-link
+    Error: HTTP 404
+    Occurrences: 2
+```
+
+## Requirements
+
+- PowerShell 7+ (includes Markdig)
+- Runs on: `ubuntu-latest`, `windows-latest`, `macos-latest`
+
+## Broken Link Test
+
+- [Broken Link](https://github.com/PowerShell/PowerShell/wiki/NonExistentPage404)
+
+## License
+
+Same as the PowerShell repository.
diff --git a/.github/actions/infrastructure/markdownlinks/Verify-MarkdownLinks.ps1 b/.github/actions/infrastructure/markdownlinks/Verify-MarkdownLinks.ps1
new file mode 100644
index 00000000000..f50ab1590b9
--- /dev/null
+++ b/.github/actions/infrastructure/markdownlinks/Verify-MarkdownLinks.ps1
@@ -0,0 +1,317 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+#Requires -Version 7.0
+
+<#
+.SYNOPSIS
+    Verify all links in markdown files.
+
+.DESCRIPTION
+    This script parses markdown files to extract links and verifies their accessibility.
+    It supports HTTP/HTTPS links and local file references.
+
+.PARAMETER Path
+    Path to the directory containing markdown files. Defaults to current directory.
+
+.PARAMETER File
+    Array of specific markdown files to verify. If provided, Path parameter is ignored.
+
+.PARAMETER TimeoutSec
+    Timeout in seconds for HTTP requests. Defaults to 30.
+
+.PARAMETER MaximumRetryCount
+    Maximum number of retries for failed requests. Defaults to 2.
+
+.PARAMETER RetryIntervalSec
+    Interval in seconds between retry attempts. Defaults to 2.
+
+.EXAMPLE
+    .\Verify-MarkdownLinks.ps1 -Path ./CHANGELOG
+
+.EXAMPLE
+    .\Verify-MarkdownLinks.ps1 -Path ./docs -FailOnError
+
+.EXAMPLE
+    .\Verify-MarkdownLinks.ps1 -File @('CHANGELOG/7.5.md', 'README.md')
+#>
+
+param(
+    [Parameter(ParameterSetName = 'ByPath', Mandatory)]
+    [string]$Path = "Q:\src\git\powershell\docs\git",
+    [Parameter(ParameterSetName = 'ByFile', Mandatory)]
+    [string[]]$File = @(),
+    [int]$TimeoutSec = 30,
+    [int]$MaximumRetryCount = 2,
+    [int]$RetryIntervalSec = 2
+)
+
+$ErrorActionPreference = 'Stop'
+
+# Get the script directory
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+
+# Determine what to process: specific files or directory
+if ($File.Count -gt 0) {
+    Write-Host "Extracting links from $($File.Count) specified markdown file(s)" -ForegroundColor Cyan
+
+    # Process each file individually
+    $allLinks = @()
+    $parseScriptPath = Join-Path $scriptDir "Parse-MarkdownLink.ps1"
+
+    foreach ($filePath in $File) {
+        if (Test-Path $filePath) {
+            Write-Verbose "Processing: $filePath"
+            $fileLinks = & $parseScriptPath -ChangelogPath $filePath
+            $allLinks += $fileLinks
+        }
+        else {
+            Write-Warning "File not found: $filePath"
+        }
+    }
+}
+else {
+    Write-Host "Extracting links from markdown files in: $Path" -ForegroundColor Cyan
+
+    # Get all links from markdown files using the Parse-ChangelogLinks script
+    $parseScriptPath = Join-Path $scriptDir "Parse-MarkdownLink.ps1"
+    $allLinks = & $parseScriptPath -ChangelogPath $Path
+}
+
+if ($allLinks.Count -eq 0) {
+    Write-Host "No links found in markdown files." -ForegroundColor Yellow
+    exit 0
+}
+
+Write-Host "Found $($allLinks.Count) links to verify" -ForegroundColor Green
+
+# Group links by URL to avoid duplicate checks
+$uniqueLinks = $allLinks | Group-Object -Property Url
+
+Write-Host "Unique URLs to verify: $($uniqueLinks.Count)" -ForegroundColor Cyan
+
+$results = @{
+    Total = $uniqueLinks.Count
+    Passed = 0
+    Failed = 0
+    Skipped = 0
+    Errors = [System.Collections.ArrayList]::new()
+}
+
+function Test-HttpLink {
+    param(
+        [string]$Url
+    )
+
+    try {
+        # Try HEAD request first (faster, doesn't download content)
+        $response = Invoke-WebRequest -Uri $Url `
+            -Method Head `
+            -TimeoutSec $TimeoutSec `
+            -MaximumRetryCount $MaximumRetryCount `
+            -RetryIntervalSec $RetryIntervalSec `
+            -UserAgent "Mozilla/5.0 (compatible; GitHubActions/1.0; +https://github.com/PowerShell/PowerShell)" `
+            -SkipHttpErrorCheck
+
+        # If HEAD fails with 404 or 405, retry with GET (some servers don't support HEAD)
+        if ($response.StatusCode -eq 404 -or $response.StatusCode -eq 405) {
+            Write-Verbose "HEAD request failed with $($response.StatusCode), retrying with GET for: $Url"
+            $response = Invoke-WebRequest -Uri $Url `
+                -Method Get `
+                -TimeoutSec $TimeoutSec `
+                -MaximumRetryCount $MaximumRetryCount `
+                -RetryIntervalSec $RetryIntervalSec `
+                -UserAgent "Mozilla/5.0 (compatible; GitHubActions/1.0; +https://github.com)" `
+                -SkipHttpErrorCheck
+        }
+
+        if ($response.StatusCode -ge 200 -and $response.StatusCode -lt 400) {
+            return @{ Success = $true; StatusCode = $response.StatusCode }
+        }
+        else {
+            return @{ Success = $false; StatusCode = $response.StatusCode; Error = "HTTP $($response.StatusCode)" }
+        }
+    }
+    catch {
+        return @{ Success = $false; StatusCode = 0; Error = $_.Exception.Message }
+    }
+}
+
+function Test-LocalLink {
+    param(
+        [string]$Url,
+        [string]$BasePath
+    )
+
+    # Strip query parameters (e.g., ?sanitize=true) and anchors (e.g., #section)
+    $cleanUrl = $Url -replace '\?.*$', '' -replace '#.*$', ''
+
+    # Handle relative paths
+    $targetPath = Join-Path $BasePath $cleanUrl
+
+    if (Test-Path $targetPath) {
+        return @{ Success = $true }
+    }
+    else {
+        return @{ Success = $false; Error = "File not found: $targetPath" }
+    }
+}
+
+# Verify each unique link
+$progressCount = 0
+foreach ($linkGroup in $uniqueLinks) {
+    $progressCount++
+    $url = $linkGroup.Name
+    $occurrences = $linkGroup.Group
+    Write-Verbose -Verbose "[$progressCount/$($uniqueLinks.Count)] Checking: $url"
+
+    # Determine link type and verify
+        $verifyResult = $null
+        if ($url -match '^https?://') {
+            $verifyResult = Test-HttpLink -Url $url
+        }
+        elseif ($url -match '^#') {
+            Write-Verbose -Verbose "Skipping anchor link: $url"
+            $results.Skipped++
+            continue
+        }
+        elseif ($url -match '^mailto:') {
+            Write-Verbose -Verbose "Skipping mailto link: $url"
+            $results.Skipped++
+            continue
+        }
+        else {
+            $basePath = Split-Path -Parent $occurrences[0].Path
+            $verifyResult = Test-LocalLink -Url $url -BasePath $basePath
+        }
+        if ($verifyResult.Success) {
+            Write-Host "✓ OK: $url" -ForegroundColor Green
+            $results.Passed++
+        }
+        else {
+            $errorMsg = if ($verifyResult.StatusCode) {
+                "HTTP $($verifyResult.StatusCode)"
+            }
+            else {
+                $verifyResult.Error
+            }
+
+            # Determine if this status code should be ignored or treated as failure
+            # Ignore: 401 (Unauthorized), 403 (Forbidden), 429 (Too Many Requests - already retried)
+            # Fail: 404 (Not Found), 410 (Gone), 406 (Not Acceptable) - these indicate broken links
+            $shouldIgnore = $false
+            $ignoreReason = ""
+
+            switch ($verifyResult.StatusCode) {
+                401 {
+                    $shouldIgnore = $true
+                    $ignoreReason = "authentication required"
+                }
+                403 {
+                    $shouldIgnore = $true
+                    $ignoreReason = "access forbidden"
+                }
+                429 {
+                    $shouldIgnore = $true
+                    $ignoreReason = "rate limited (already retried)"
+                }
+            }
+
+            if ($shouldIgnore) {
+                Write-Host "⊘ IGNORED: $url - $errorMsg ($ignoreReason)" -ForegroundColor Yellow
+                Write-Verbose -Verbose "Ignored error details for $url - Status: $($verifyResult.StatusCode) - $ignoreReason"
+                foreach ($occurrence in $occurrences) {
+                    Write-Verbose -Verbose "    Found in: $($occurrence.Path):$($occurrence.Line):$($occurrence.Column)"
+                }
+                $results.Skipped++
+            }
+            else {
+                Write-Host "✗ FAILED: $url - $errorMsg" -ForegroundColor Red
+                foreach ($occurrence in $occurrences) {
+                    Write-Host "    Found in: $($occurrence.Path):$($occurrence.Line):$($occurrence.Column)" -ForegroundColor DarkGray
+                }
+                $results.Failed++
+                [void]$results.Errors.Add(@{
+                    Url = $url
+                    Error = $errorMsg
+                    Occurrences = $occurrences
+                })
+            }
+        }
+    }
+
+# Print summary
+Write-Host "`n" + ("=" * 60) -ForegroundColor Cyan
+Write-Host "Link Verification Summary" -ForegroundColor Cyan
+Write-Host ("=" * 60) -ForegroundColor Cyan
+Write-Host "Total URLs checked: $($results.Total)" -ForegroundColor White
+Write-Host "Passed: $($results.Passed)" -ForegroundColor Green
+Write-Host "Failed: $($results.Failed)" -ForegroundColor $(if ($results.Failed -gt 0) { "Red" } else { "Green" })
+Write-Host "Skipped: $($results.Skipped)" -ForegroundColor Gray
+
+if ($results.Failed -gt 0) {
+    Write-Host "`nFailed Links:" -ForegroundColor Red
+    foreach ($failedLink in $results.Errors) {
+        Write-Host "  • $($failedLink.Url)" -ForegroundColor Red
+        Write-Host "    Error: $($failedLink.Error)" -ForegroundColor DarkGray
+        Write-Host "    Occurrences: $($failedLink.Occurrences.Count)" -ForegroundColor DarkGray
+    }
+
+    Write-Host "`n❌ Link verification failed!" -ForegroundColor Red
+    exit 1
+}
+else {
+    Write-Host "`n✅ All links verified successfully!" -ForegroundColor Green
+}
+
+# Write to GitHub Actions step summary if running in a workflow
+if ($env:GITHUB_STEP_SUMMARY) {
+    $summaryContent = @"
+
+# Markdown Link Verification Results
+
+## Summary
+- **Total URLs checked:** $($results.Total)
+- **Passed:** ✅ $($results.Passed)
+- **Failed:** $(if ($results.Failed -gt 0) { "❌" } else { "✅" }) $($results.Failed)
+- **Skipped:** $($results.Skipped)
+
+"@
+
+    if ($results.Failed -gt 0) {
+        $summaryContent += @"
+
+## Failed Links
+
+| URL | Error | Occurrences |
+|-----|-------|-------------|
+
+"@
+        foreach ($failedLink in $results.Errors) {
+            $summaryContent += "| $($failedLink.Url) | $($failedLink.Error) | $($failedLink.Occurrences.Count) |`n"
+        }
+
+        $summaryContent += @"
+
+<details>
+<summary>Click to see all failed link locations</summary>
+
+"@
+        foreach ($failedLink in $results.Errors) {
+            $summaryContent += "`n### $($failedLink.Url)`n"
+            $summaryContent += "**Error:** $($failedLink.Error)`n`n"
+            foreach ($occurrence in $failedLink.Occurrences) {
+                $summaryContent += "- `$($occurrence.Path):$($occurrence.Line):$($occurrence.Column)`n"
+            }
+        }
+        $summaryContent += "`n</details>`n"
+    }
+    else {
+        $summaryContent += "`n## ✅ All links verified successfully!`n"
+    }
+
+    Write-Verbose -Verbose "Writing `n $summaryContent `n to ${env:GITHUB_STEP_SUMMARY}"
+    $summaryContent | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append
+    Write-Verbose -Verbose "Summary written to GitHub Actions step summary"
+}
+
diff --git a/.github/actions/infrastructure/markdownlinks/action.yml b/.github/actions/infrastructure/markdownlinks/action.yml
new file mode 100644
index 00000000000..de2952252d4
--- /dev/null
+++ b/.github/actions/infrastructure/markdownlinks/action.yml
@@ -0,0 +1,110 @@
+name: 'Verify Markdown Links'
+description: 'Verify all links in markdown files using PowerShell and Markdig'
+author: 'PowerShell Team'
+
+inputs:
+  timeout-sec:
+    description: 'Timeout in seconds for HTTP requests'
+    required: false
+    default: '30'
+  maximum-retry-count:
+    description: 'Maximum number of retries for failed requests'
+    required: false
+    default: '2'
+
+outputs:
+  total-links:
+    description: 'Total number of unique links checked'
+    value: ${{ steps.verify.outputs.total }}
+  passed-links:
+    description: 'Number of links that passed verification'
+    value: ${{ steps.verify.outputs.passed }}
+  failed-links:
+    description: 'Number of links that failed verification'
+    value: ${{ steps.verify.outputs.failed }}
+  skipped-links:
+    description: 'Number of links that were skipped'
+    value: ${{ steps.verify.outputs.skipped }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Get changed markdown files
+      id: changed-files
+      uses: "./.github/actions/infrastructure/get-changed-files"
+      with:
+        filter: '*.md'
+        event-types: 'pull_request,push'
+
+    - name: Verify markdown links
+      id: verify
+      shell: pwsh
+      env:
+        CHANGED_FILES_JSON: ${{ steps.changed-files.outputs.files }}
+      run: |
+        Write-Host "Starting markdown link verification..." -ForegroundColor Cyan
+
+        # Get changed markdown files from environment variable (secure against injection)
+        $changedFilesJson = $env:CHANGED_FILES_JSON
+        $changedFiles = $changedFilesJson | ConvertFrom-Json
+
+        if ($changedFiles.Count -eq 0) {
+          Write-Host "No markdown files changed, skipping verification" -ForegroundColor Yellow
+          "total=0" >> $env:GITHUB_OUTPUT
+          "passed=0" >> $env:GITHUB_OUTPUT
+          "failed=0" >> $env:GITHUB_OUTPUT
+          "skipped=0" >> $env:GITHUB_OUTPUT
+          exit 0
+        }
+
+        Write-Host "Changed markdown files: $($changedFiles.Count)" -ForegroundColor Cyan
+        $changedFiles | ForEach-Object { Write-Host "  - $_" -ForegroundColor Gray }
+
+        # Build parameters for each file
+        $params = @{
+          File = $changedFiles
+          TimeoutSec = [int]'${{ inputs.timeout-sec }}'
+          MaximumRetryCount = [int]'${{ inputs.maximum-retry-count }}'
+        }
+
+        # Run the verification script
+        $scriptPath = Join-Path '${{ github.action_path }}' 'Verify-MarkdownLinks.ps1'
+
+        # Capture output and parse results
+        $output = & $scriptPath @params 2>&1 | Tee-Object -Variable capturedOutput
+
+        # Try to extract metrics from output
+        $totalLinks = 0
+        $passedLinks = 0
+        $failedLinks = 0
+        $skippedLinks = 0
+
+        foreach ($line in $capturedOutput) {
+          if ($line -match 'Total URLs checked: (\d+)') {
+            $totalLinks = $Matches[1]
+          }
+          elseif ($line -match 'Passed: (\d+)') {
+            $passedLinks = $Matches[1]
+          }
+          elseif ($line -match 'Failed: (\d+)') {
+            $failedLinks = $Matches[1]
+          }
+          elseif ($line -match 'Skipped: (\d+)') {
+            $skippedLinks = $Matches[1]
+          }
+        }
+
+        # Set outputs
+        "total=$totalLinks" >> $env:GITHUB_OUTPUT
+        "passed=$passedLinks" >> $env:GITHUB_OUTPUT
+        "failed=$failedLinks" >> $env:GITHUB_OUTPUT
+        "skipped=$skippedLinks" >> $env:GITHUB_OUTPUT
+
+        Write-Host "Action completed" -ForegroundColor Cyan
+
+        # Exit with the same code as the verification script
+        exit $LASTEXITCODE
+
+branding:
+  icon: 'link'
+  color: 'blue'
diff --git a/.github/actions/infrastructure/merge-conflict-checker/README.md b/.github/actions/infrastructure/merge-conflict-checker/README.md
new file mode 100644
index 00000000000..b53d6f99964
--- /dev/null
+++ b/.github/actions/infrastructure/merge-conflict-checker/README.md
@@ -0,0 +1,86 @@
+# Merge Conflict Checker
+
+This composite GitHub Action checks for Git merge conflict markers in files changed in pull requests.
+
+## Purpose
+
+Automatically detects leftover merge conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) in pull request files to prevent them from being merged into the codebase.
+
+## Usage
+
+### In a Workflow
+
+```yaml
+- name: Check for merge conflict markers
+  uses: "./.github/actions/infrastructure/merge-conflict-checker"
+```
+
+### Complete Example
+
+```yaml
+jobs:
+  merge_conflict_check:
+    name: Check for Merge Conflict Markers
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    permissions:
+      pull-requests: read
+      contents: read
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+
+      - name: Check for merge conflict markers
+        uses: "./.github/actions/infrastructure/merge-conflict-checker"
+```
+
+## How It Works
+
+1. **File Detection**: Uses GitHub's API to get the list of files changed in the pull request
+2. **Marker Scanning**: Reads each changed file and searches for the following markers:
+   - `<<<<<<<` (conflict start marker)
+   - `=======` (conflict separator)
+   - `>>>>>>>` (conflict end marker)
+3. **Result Reporting**: 
+   - If markers are found, the action fails and lists all affected files
+   - If no markers are found, the action succeeds
+
+## Outputs
+
+- `files-checked`: Number of files that were checked
+- `conflicts-found`: Number of files containing merge conflict markers
+
+## Behavior
+
+- **Event Support**: Only works with `pull_request` events
+- **File Handling**:
+  - Checks only files that were added, modified, or renamed
+  - Skips deleted files
+  - **Filters out `*.cs` files** (C# files are excluded from merge conflict checking)
+  - Skips binary/unreadable files
+  - Skips directories
+- **Empty File List**: Gracefully handles cases where no files need checking (e.g., PRs that only delete files)
+
+## Example Output
+
+When conflict markers are detected:
+
+```
+❌ Merge conflict markers detected in the following files:
+  - src/example.cs
+    Markers found: <<<<<<<, =======, >>>>>>>
+  - README.md
+    Markers found: <<<<<<<, =======, >>>>>>>
+
+Please resolve these conflicts before merging.
+```
+
+When no markers are found:
+
+```
+✅ No merge conflict markers found
+```
+
+## Integration
+
+This action is integrated into the `linux-ci.yml` workflow and runs automatically on all pull requests to ensure code quality before merging.
diff --git a/.github/actions/infrastructure/merge-conflict-checker/action.yml b/.github/actions/infrastructure/merge-conflict-checker/action.yml
new file mode 100644
index 00000000000..41c7d2ad941
--- /dev/null
+++ b/.github/actions/infrastructure/merge-conflict-checker/action.yml
@@ -0,0 +1,37 @@
+name: 'Check for Merge Conflict Markers'
+description: 'Checks for Git merge conflict markers in changed files for pull requests'
+author: 'PowerShell Team'
+
+outputs:
+  files-checked:
+    description: 'Number of files checked for merge conflict markers'
+    value: ${{ steps.check.outputs.files-checked }}
+  conflicts-found:
+    description: 'Number of files with merge conflict markers'
+    value: ${{ steps.check.outputs.conflicts-found }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Get changed files
+      id: changed-files
+      uses: "./.github/actions/infrastructure/get-changed-files"
+
+    - name: Check for merge conflict markers
+      id: check
+      shell: pwsh
+      env:
+        CHANGED_FILES_JSON: ${{ steps.changed-files.outputs.files }}
+      run: |
+        # Get changed files from environment variable (secure against injection)
+        $changedFilesJson = $env:CHANGED_FILES_JSON
+        # Ensure we always have an array (ConvertFrom-Json returns null for empty JSON arrays)
+        $changedFiles = @($changedFilesJson | ConvertFrom-Json)
+
+        # Import ci.psm1 and run the check
+        Import-Module "$env:GITHUB_WORKSPACE/tools/ci.psm1" -Force
+        Test-MergeConflictMarker -File $changedFiles -WorkspacePath $env:GITHUB_WORKSPACE
+
+branding:
+  icon: 'alert-triangle'
+  color: 'red'
diff --git a/.github/actions/infrastructure/path-filters/action.yml b/.github/actions/infrastructure/path-filters/action.yml
new file mode 100644
index 00000000000..af23540256d
--- /dev/null
+++ b/.github/actions/infrastructure/path-filters/action.yml
@@ -0,0 +1,137 @@
+name: Path Filters
+description: 'Path Filters'
+inputs:
+  GITHUB_TOKEN:
+    description: 'GitHub token'
+    required: true
+outputs:
+  source:
+    description: 'Source code changes (composite of all changes)'
+    value: ${{ steps.filter.outputs.source }}
+  githubChanged:
+    description: 'GitHub workflow changes'
+    value: ${{ steps.filter.outputs.githubChanged }}
+  toolsChanged:
+    description: 'Tools changes'
+    value: ${{ steps.filter.outputs.toolsChanged }}
+  propsChanged:
+    description: 'Props changes'
+    value: ${{ steps.filter.outputs.propsChanged }}
+  testsChanged:
+    description: 'Tests changes'
+    value: ${{ steps.filter.outputs.testsChanged }}
+  mainSourceChanged:
+    description: 'Main source code changes (any changes in src/)'
+    value: ${{ steps.filter.outputs.mainSourceChanged }}
+  buildModuleChanged:
+    description: 'Build module changes'
+    value: ${{ steps.filter.outputs.buildModuleChanged }}
+  packagingChanged:
+    description: 'Packaging related changes'
+    value: ${{ steps.filter.outputs.packagingChanged }}
+runs:
+  using: composite
+  steps:
+    - name: Get changed files
+      id: get-files
+      if: github.event_name == 'pull_request'
+      uses: "./.github/actions/infrastructure/get-changed-files"
+
+    - name: Check if GitHubWorkflowChanges is present
+      id: filter
+      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      env:
+        FILES_JSON: ${{ steps.get-files.outputs.files }}
+      with:
+        github-token: ${{ inputs.GITHUB_TOKEN }}
+        script: |
+          console.log(`Event Name: ${context.eventName}`);
+
+          // Just say everything changed if this is not a PR
+          if (context.eventName !== 'pull_request') {
+            console.log('Not a pull request, setting all outputs to true');
+            core.setOutput('toolsChanged', true);
+            core.setOutput('githubChanged', true);
+            core.setOutput('propsChanged', true);
+            core.setOutput('testsChanged', true);
+            core.setOutput('mainSourceChanged', true);
+            core.setOutput('buildModuleChanged', true);
+            core.setOutput('source', true);
+            return;
+          }
+
+          // Get files from environment variable (secure against injection)
+          const files = JSON.parse(process.env.FILES_JSON || '[]');
+
+          // Calculate hash for verification (matches get-changed-files action)
+          const crypto = require('crypto');
+          const filesJson = JSON.stringify(files.sort());
+          const hash = crypto.createHash('sha256').update(filesJson).digest('hex').substring(0, 8);
+          console.log(`Received ${files.length} files (hash: ${hash})`);
+
+          // Analyze changes with detailed logging
+          core.startGroup('Path Filter Analysis');
+
+          const actionsChanged = files.some(file => file.startsWith('.github/actions'));
+          console.log(`✓ Actions changed: ${actionsChanged}`);
+
+          const workflowsChanged = files.some(file => file.startsWith('.github/workflows'));
+          console.log(`✓ Workflows changed: ${workflowsChanged}`);
+
+          const githubChanged = actionsChanged || workflowsChanged;
+          console.log(`→ GitHub changed (actions OR workflows): ${githubChanged}`);
+
+          const toolsCiPsm1Changed = files.some(file => file === 'tools/ci.psm1');
+          console.log(`✓ tools/ci.psm1 changed: ${toolsCiPsm1Changed}`);
+
+          const toolsBuildCommonChanged = files.some(file => file.startsWith('tools/buildCommon/'));
+          console.log(`✓ tools/buildCommon/ changed: ${toolsBuildCommonChanged}`);
+
+          const toolsChanged = toolsCiPsm1Changed || toolsBuildCommonChanged;
+          console.log(`→ Tools changed: ${toolsChanged}`);
+
+          const propsChanged = files.some(file => file.endsWith('.props'));
+          console.log(`✓ Props files changed: ${propsChanged}`);
+
+          const testsChanged = files.some(file => file.startsWith('test/powershell/') || file.startsWith('test/tools/') || file.startsWith('test/xUnit/'));
+          console.log(`✓ Tests changed: ${testsChanged}`);
+
+          const mainSourceChanged = files.some(file => file.startsWith('src/'));
+          console.log(`✓ Main source (src/) changed: ${mainSourceChanged}`);
+
+          const buildModuleChanged = files.some(file => file === 'build.psm1');
+          console.log(`✓ build.psm1 changed: ${buildModuleChanged}`);
+
+          const globalConfigChanged = files.some(file => file === '.globalconfig' || file === 'nuget.config' || file === 'global.json');
+          console.log(`✓ Global config changed: ${globalConfigChanged}`);
+
+          const packagingChanged = files.some(file =>
+            file === '.github/workflows/windows-ci.yml' ||
+            file === '.github/workflows/linux-ci.yml' ||
+            file.startsWith('assets/wix/') ||
+            file === 'PowerShell.Common.props' ||
+            file.match(/^src\/.*\.csproj$/) ||
+            file.startsWith('test/packaging/windows/') ||
+            file.startsWith('test/packaging/linux/') ||
+            file.startsWith('tools/packaging/') ||
+            file.startsWith('tools/wix/')
+          ) ||
+            buildModuleChanged ||
+            globalConfigChanged ||
+            toolsCiPsm1Changed;
+          console.log(`→ Packaging changed: ${packagingChanged}`);
+
+          const source = mainSourceChanged || toolsChanged || githubChanged || propsChanged || testsChanged || globalConfigChanged;
+          console.log(`→ Source (composite): ${source}`);
+
+          core.endGroup();
+
+          core.setOutput('toolsChanged', toolsChanged);
+          core.setOutput('githubChanged', githubChanged);
+          core.setOutput('propsChanged', propsChanged);
+          core.setOutput('testsChanged', testsChanged);
+          core.setOutput('mainSourceChanged', mainSourceChanged);
+          core.setOutput('buildModuleChanged', buildModuleChanged);
+          core.setOutput('globalConfigChanged', globalConfigChanged);
+          core.setOutput('packagingChanged', packagingChanged);
+          core.setOutput('source', source);
diff --git a/.github/actions/test/linux-packaging/action.yml b/.github/actions/test/linux-packaging/action.yml
new file mode 100644
index 00000000000..ce37a38c8b7
--- /dev/null
+++ b/.github/actions/test/linux-packaging/action.yml
@@ -0,0 +1,69 @@
+name: linux_packaging
+description: 'Linux packaging for PowerShell'
+
+runs:
+  using: composite
+  steps:
+  - name: Capture Environment
+    if: success() || failure()
+    run: |-
+      Import-Module ./tools/ci.psm1
+      Show-Environment
+    shell: pwsh
+
+  - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+    with:
+      global-json-file: ./global.json
+
+  - name: Bootstrap
+    run: |-
+      Import-Module ./build.psm1
+      Start-PSBootstrap -Scenario Package
+      Import-Module ./tools/ci.psm1
+      Invoke-CIInstall -SkipUser
+    shell: pwsh
+
+  - name: Build and Package
+    run: |-
+      Import-Module ./tools/ci.psm1
+      $releaseTag = Get-ReleaseTag
+      Start-PSBuild -Configuration 'Release' -ReleaseTag $releaseTag
+      Invoke-CIFinish
+    shell: pwsh
+
+  - name: Install Pester
+    run: |-
+      Import-Module ./tools/ci.psm1
+      Install-CIPester
+    shell: pwsh
+
+  - name: Validate Package Names
+    run: |-
+      # Run Pester tests to validate package names
+      Import-Module Pester -Force
+      $testResults = Invoke-Pester -Path ./test/packaging/linux/package-validation.tests.ps1 -PassThru
+      if ($testResults.FailedCount -gt 0) {
+          throw "Package validation tests failed"
+      }
+    shell: pwsh
+
+  - name: Upload deb packages
+    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    with:
+      name: packages-deb
+      path: ${{ runner.workspace }}/packages/*.deb
+      if-no-files-found: ignore
+
+  - name: Upload rpm packages
+    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    with:
+      name: packages-rpm
+      path: ${{ runner.workspace }}/packages/*.rpm
+      if-no-files-found: ignore
+
+  - name: Upload tar.gz packages
+    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    with:
+      name: packages-tar
+      path: ${{ runner.workspace }}/packages/*.tar.gz
+      if-no-files-found: ignore
diff --git a/.github/actions/test/nix/action.yml b/.github/actions/test/nix/action.yml
new file mode 100644
index 00000000000..ab30e0d9ce6
--- /dev/null
+++ b/.github/actions/test/nix/action.yml
@@ -0,0 +1,158 @@
+name: nix_test
+description: 'Test PowerShell on non-Windows platforms'
+
+inputs:
+  purpose:
+    required: false
+    default: ''
+    type: string
+  tagSet:
+    required: false
+    default: CI
+    type: string
+  ctrfFolder:
+    required: false
+    default: ctrf
+    type: string
+  GITHUB_TOKEN:
+    description: 'GitHub token for API authentication'
+    required: true
+
+runs:
+  using: composite
+  steps:
+  - name: Capture Environment
+    if: success() || failure()
+    run: |-
+      Import-Module ./tools/ci.psm1
+      Show-Environment
+    shell: pwsh
+
+  - name: Download Build Artifacts
+    uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+    with:
+      path: "${{ github.workspace }}"
+
+  - name: Capture Artifacts Directory
+    continue-on-error: true
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Artifacts Directory'
+      Get-ChildItem "${{ github.workspace }}/build/*" -Recurse
+      Write-LogGroupEnd -Title 'Artifacts Directory'
+    shell: pwsh
+
+  - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+    with:
+      global-json-file: ./global.json
+
+  - name: Set Package Name by Platform
+    id: set_package_name
+    shell: pwsh
+    run: |-
+      Import-Module ./.github/workflows/GHWorkflowHelper/GHWorkflowHelper.psm1
+      $platform = $env:RUNNER_OS
+      Write-Host "Runner platform: $platform"
+      if ($platform -eq 'Linux') {
+        $packageName = 'DSC-*-x86_64-linux.tar.gz'
+      } elseif ($platform -eq 'macOS') {
+        $packageName = 'DSC-*-x86_64-apple-darwin.tar.gz'
+      } else {
+        throw "Unsupported platform: $platform"
+      }
+
+      Set-GWVariable -Name "DSC_PACKAGE_NAME" -Value $packageName
+
+  - name: Get Latest DSC Package Version
+    shell: pwsh
+    run: |-
+      Import-Module ./.github/workflows/GHWorkflowHelper/GHWorkflowHelper.psm1
+      $headers = @{
+        Authorization = "Bearer ${{ inputs.GITHUB_TOKEN }}"
+      }
+      $releases = Invoke-RestMethod -Uri "https://api.github.com/repos/PowerShell/Dsc/releases" -Headers $headers
+      $latestRelease = $releases | Where-Object { $v = $_.name.trim("v"); $semVer = [System.Management.Automation.SemanticVersion]::new($v); if ($semVer.Major -eq 3 -and $semVer.Minor -ge 2) { $_ } } | Select-Object -First 1
+      $latestVersion = $latestRelease.tag_name.TrimStart("v")
+      Write-Host "Latest DSC Version: $latestVersion"
+
+      $packageName = "$env:DSC_PACKAGE_NAME"
+
+      Write-Host "Package Name: $packageName"
+
+      $downloadUrl = $latestRelease.assets | Where-Object { $_.name -like "*$packageName*" } | Select-Object -First 1 | Select-Object -ExpandProperty browser_download_url
+      Write-Host "Download URL: $downloadUrl"
+
+      $tempPath = Get-GWTempPath
+
+      Invoke-RestMethod -Uri $downloadUrl -OutFile "$tempPath/DSC.tar.gz" -Verbose -Headers $headers
+      New-Item -ItemType Directory -Path "$tempPath/DSC" -Force -Verbose
+      tar xvf "$tempPath/DSC.tar.gz" -C "$tempPath/DSC"
+      $dscRoot = "$tempPath/DSC"
+      Write-Host "DSC Root: $dscRoot"
+      Set-GWVariable -Name "DSC_ROOT" -Value $dscRoot
+
+  - name: Bootstrap
+    shell: pwsh
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Bootstrap'
+      Import-Module ./tools/ci.psm1
+      Invoke-CIInstall -SkipUser
+      Write-LogGroupEnd -Title 'Bootstrap'
+
+  - name: Extract Files
+    uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
+    env:
+      DESTINATION_FOLDER: "${{ github.workspace }}/bins"
+      ARCHIVE_FILE_PATTERNS: "${{ github.workspace }}/build/build.zip"
+    with:
+      script: |-
+        const fs = require('fs').promises
+        const path = require('path')
+        const target = path.resolve(process.env.DESTINATION_FOLDER)
+        const patterns = process.env.ARCHIVE_FILE_PATTERNS
+        const globber = await glob.create(patterns)
+        await io.mkdirP(path.dirname(target))
+        for await (const file of globber.globGenerator()) {
+          if ((await fs.lstat(file)).isDirectory()) continue
+          await exec.exec(`7z x ${file} -o${target} -aoa`)
+        }
+
+  - name: Fix permissions
+    continue-on-error: true
+    run: |-
+      find "${{ github.workspace }}/bins" -type d -exec chmod +rwx {} \;
+      find "${{ github.workspace }}/bins" -type f -exec chmod +rw {} \;
+    shell: bash
+
+  - name: Capture Extracted Build ZIP
+    continue-on-error: true
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Extracted Build ZIP'
+      Get-ChildItem "${{ github.workspace }}/bins/*" -Recurse -ErrorAction SilentlyContinue
+      Write-LogGroupEnd -Title 'Extracted Build ZIP'
+    shell: pwsh
+
+  - name: Test
+    if: success()
+    run: |-
+      Import-Module ./tools/ci.psm1
+      Restore-PSOptions -PSOptionsPath '${{ github.workspace }}/build/psoptions.json'
+      $options = (Get-PSOptions)
+      $rootPath = '${{ github.workspace }}/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 '${{ inputs.purpose }}' -TagSet '${{ inputs.tagSet }}' -TitlePrefix '${{ inputs.buildName }}' -OutputFormat NUnitXml
+    shell: pwsh
+
+  - name: Convert, Publish, and Upload Pester Test Results
+    uses: "./.github/actions/test/process-pester-results"
+    with:
+      name: "${{ inputs.purpose }}-${{ inputs.tagSet }}"
+      testResultsFolder: "${{ runner.workspace }}/testResults"
+      ctrfFolder: "${{ inputs.ctrfFolder }}"
diff --git a/.github/actions/test/process-pester-results/action.yml b/.github/actions/test/process-pester-results/action.yml
new file mode 100644
index 00000000000..44f2037626f
--- /dev/null
+++ b/.github/actions/test/process-pester-results/action.yml
@@ -0,0 +1,27 @@
+name: process-pester-test-results
+description: 'Process Pester test results'
+
+inputs:
+  name:
+    required: true
+    default: ''
+    type: string
+  testResultsFolder:
+    required: false
+    default: "${{ runner.workspace }}/testResults"
+    type: string
+
+runs:
+  using: composite
+  steps:
+  - name: Log Summary
+    run: |-
+      & "$env:GITHUB_ACTION_PATH/process-pester-results.ps1" -Name '${{ inputs.name }}' -TestResultsFolder '${{ inputs.testResultsFolder }}'
+    shell: pwsh
+
+  - name: Upload testResults artifact
+    if: always()
+    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    with:
+      name: junit-pester-${{ inputs.name }}
+      path: ${{ runner.workspace }}/testResults
diff --git a/.github/actions/test/process-pester-results/process-pester-results.ps1 b/.github/actions/test/process-pester-results/process-pester-results.ps1
new file mode 100644
index 00000000000..5804bec9a94
--- /dev/null
+++ b/.github/actions/test/process-pester-results/process-pester-results.ps1
@@ -0,0 +1,124 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+param(
+    [parameter(Mandatory)]
+    [string]$Name,
+    [parameter(Mandatory)]
+    [string]$TestResultsFolder
+)
+
+Import-Module "$PSScriptRoot/../../../../build.psm1"
+
+if (-not $env:GITHUB_STEP_SUMMARY) {
+    Write-Error "GITHUB_STEP_SUMMARY is not set. Ensure this workflow is running in a GitHub Actions environment."
+    exit 1
+}
+
+$testCaseCount = 0
+$testErrorCount = 0
+$testFailureCount = 0
+$testNotRunCount = 0
+$testInconclusiveCount = 0
+$testIgnoredCount = 0
+$testSkippedCount = 0
+$testInvalidCount = 0
+
+# Process test results and generate annotations for failures
+Get-ChildItem -Path "${TestResultsFolder}/*.xml" -Recurse | ForEach-Object {
+    $results = [xml] (get-content $_.FullName)
+
+    $testCaseCount += [int]$results.'test-results'.total
+    $testErrorCount += [int]$results.'test-results'.errors
+    $testFailureCount += [int]$results.'test-results'.failures
+    $testNotRunCount += [int]$results.'test-results'.'not-run'
+    $testInconclusiveCount += [int]$results.'test-results'.inconclusive
+    $testIgnoredCount += [int]$results.'test-results'.ignored
+    $testSkippedCount += [int]$results.'test-results'.skipped
+    $testInvalidCount += [int]$results.'test-results'.invalid
+
+    # Generate GitHub Actions annotations for test failures
+    # Select failed test cases
+    if ("System.Xml.XmlDocumentXPathExtensions" -as [Type]) {
+        $failures = [System.Xml.XmlDocumentXPathExtensions]::SelectNodes($results.'test-results', './/test-case[@result = "Failure"]')
+    }
+    else {
+        $failures = $results.SelectNodes('.//test-case[@result = "Failure"]')
+    }
+
+    foreach ($testfail in $failures) {
+        $description = $testfail.description
+        $testName = $testfail.name
+        $message = $testfail.failure.message
+        $stack_trace = $testfail.failure.'stack-trace'
+
+        # Parse stack trace to get file and line info
+        $fileInfo = Get-PesterFailureFileInfo -StackTraceString $stack_trace
+
+        if ($fileInfo.File) {
+            # Convert absolute path to relative path for GitHub Actions
+            $filePath = $fileInfo.File
+
+            # GitHub Actions expects paths relative to the workspace root
+            if ($env:GITHUB_WORKSPACE) {
+                $workspacePath = $env:GITHUB_WORKSPACE
+                if ($filePath.StartsWith($workspacePath)) {
+                    $filePath = $filePath.Substring($workspacePath.Length).TrimStart('/', '\')
+                    # Normalize to forward slashes for consistency
+                    $filePath = $filePath -replace '\\', '/'
+                }
+            }
+
+            # Create annotation title
+            $annotationTitle = "Test Failure: $description / $testName"
+
+            # Build the annotation message
+            $annotationMessage = $message -replace "`n", "%0A" -replace "`r"
+
+            # Build and output the workflow command
+            $workflowCommand = "::error file=$filePath"
+            if ($fileInfo.Line) {
+                $workflowCommand += ",line=$($fileInfo.Line)"
+            }
+            $workflowCommand += ",title=$annotationTitle::$annotationMessage"
+
+            Write-Host $workflowCommand
+
+            # Output a link to the test run
+            if ($env:GITHUB_SERVER_URL -and $env:GITHUB_REPOSITORY -and $env:GITHUB_RUN_ID) {
+                $logUrl = "$($env:GITHUB_SERVER_URL)/$($env:GITHUB_REPOSITORY)/actions/runs/$($env:GITHUB_RUN_ID)"
+                Write-Host "Test logs: $logUrl"
+            }
+        }
+    }
+}
+
+@"
+
+# Summary of $Name
+
+- Total Tests: $testCaseCount
+- Total Errors: $testErrorCount
+- Total Failures: $testFailureCount
+- Total Not Run: $testNotRunCount
+- Total Inconclusive: $testInconclusiveCount
+- Total Ignored: $testIgnoredCount
+- Total Skipped: $testSkippedCount
+- Total Invalid: $testInvalidCount
+
+"@ | Out-File -FilePath $ENV:GITHUB_STEP_SUMMARY -Append
+
+Write-Log "Summary written to $ENV:GITHUB_STEP_SUMMARY"
+
+Write-LogGroupStart -Title 'Test Results'
+Get-Content $ENV:GITHUB_STEP_SUMMARY
+Write-LogGroupEnd -Title 'Test Results'
+
+if ($testErrorCount -gt 0 -or $testFailureCount -gt 0) {
+    Write-Error "There were $testErrorCount/$testFailureCount errors/failures in the test results."
+    exit 1
+}
+if ($testCaseCount -eq 0) {
+    Write-Error "No test cases were run."
+    exit 1
+}
diff --git a/.github/actions/test/windows/action.yml b/.github/actions/test/windows/action.yml
new file mode 100644
index 00000000000..ddc5da4d664
--- /dev/null
+++ b/.github/actions/test/windows/action.yml
@@ -0,0 +1,107 @@
+name: windows_test
+description: 'Test PowerShell on Windows'
+
+inputs:
+  purpose:
+    required: false
+    default: ''
+    type: string
+  tagSet:
+    required: false
+    default: CI
+    type: string
+  ctrfFolder:
+    required: false
+    default: ctrf
+    type: string
+  GITHUB_TOKEN:
+    description: 'GitHub token for API authentication'
+    required: true
+
+runs:
+  using: composite
+  steps:
+  - name: Capture Environment
+    if: success() || failure()
+    run: |-
+      Import-Module ./tools/ci.psm1
+      Show-Environment
+    shell: pwsh
+
+  - name: Download Build Artifacts
+    uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+    with:
+      path: "${{ github.workspace }}"
+
+  - name: Capture Artifacts Directory
+    continue-on-error: true
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Artifacts Directory'
+      Get-ChildItem "${{ github.workspace }}/build/*" -Recurse
+      Write-LogGroupEnd -Title 'Artifacts Directory'
+    shell: pwsh
+
+  - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+    with:
+      global-json-file: .\global.json
+
+  - name: Get Latest DSC Package Version
+    shell: pwsh
+    run: |-
+      Import-Module .\.github\workflows\GHWorkflowHelper\GHWorkflowHelper.psm1
+      $headers = @{
+        Authorization = "Bearer ${{ inputs.GITHUB_TOKEN }}"
+      }
+      $releases = Invoke-RestMethod -Uri "https://api.github.com/repos/PowerShell/Dsc/releases" -Headers $headers
+      $latestRelease = $releases | Where-Object { $v = $_.name.trim("v"); $semVer = [System.Management.Automation.SemanticVersion]::new($v); if ($semVer.Major -eq 3 -and $semVer.Minor -ge 2) { $_ } } | Select-Object -First 1
+      $latestVersion = $latestRelease.tag_name.TrimStart("v")
+      Write-Host "Latest DSC Version: $latestVersion"
+
+      $downloadUrl = $latestRelease.assets | Where-Object { $_.name -like "DSC-*-x86_64-pc-windows-msvc.zip" } | Select-Object -First 1 | Select-Object -ExpandProperty browser_download_url
+      Write-Host "Download URL: $downloadUrl"
+      $tempPath = Get-GWTempPath
+      Invoke-RestMethod -Uri $downloadUrl -OutFile "$tempPath\DSC.zip" -Headers $headers
+
+      $null = New-Item -ItemType Directory -Path "$tempPath\DSC" -Force
+      Expand-Archive -Path "$tempPath\DSC.zip" -DestinationPath "$tempPath\DSC" -Force
+      $dscRoot = "$tempPath\DSC"
+      Write-Host "DSC Root: $dscRoot"
+      Set-GWVariable -Name "DSC_ROOT" -Value $dscRoot
+
+  - name: Bootstrap
+    shell: powershell
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Bootstrap'
+      Write-Host "Old Path:"
+      Write-Host $env:Path
+      $dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet'
+      $paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) }
+      $env:Path = $paths -join ";"
+      Write-Host "New Path:"
+      Write-Host $env:Path
+      # Bootstrap
+      Import-Module .\tools\ci.psm1
+      Invoke-CIInstall
+      Write-LogGroupEnd -Title 'Bootstrap'
+
+  - name: Test
+    if: success()
+    run: |-
+      Import-Module .\build.psm1 -force
+      Import-Module .\tools\ci.psm1
+      Restore-PSOptions -PSOptionsPath '${{ github.workspace }}\build\psoptions.json'
+      $options = (Get-PSOptions)
+      $path = split-path -path $options.Output
+      $rootPath = split-Path -path $path
+      Expand-Archive -Path '${{ github.workspace }}\build\build.zip' -DestinationPath $rootPath -Force
+      Invoke-CITest -Purpose '${{ inputs.purpose }}' -TagSet '${{ inputs.tagSet }}' -OutputFormat NUnitXml
+    shell: pwsh
+
+  - name: Convert, Publish, and Upload Pester Test Results
+    uses: "./.github/actions/test/process-pester-results"
+    with:
+      name: "${{ inputs.purpose }}-${{ inputs.tagSet }}"
+      testResultsFolder: ${{ runner.workspace }}\testResults
+      ctrfFolder: "${{ inputs.ctrfFolder }}"
diff --git a/.github/agents/SplitADOPipelines.agent.md b/.github/agents/SplitADOPipelines.agent.md
new file mode 100644
index 00000000000..9454670061f
--- /dev/null
+++ b/.github/agents/SplitADOPipelines.agent.md
@@ -0,0 +1,180 @@
+---
+name: SplitADOPipelines
+description: This agent will implement and restructure the repository's existing ADO pipelines into Official and NonOfficial pipelines.
+tools: ['vscode', 'execute', 'read', 'agent', 'edit', 'search', 'todo']
+---
+
+This agent will implement and restructure the repository's existing ADO pipelines into Official and NonOfficial pipelines. 
+
+A repository will have under the .pipelines directory a series of yaml files that define the ADO pipelines for the repository.
+
+First confirm if the pipelines are using a toggle switch for Official and NonOfficial. This will look something like this
+
+```yaml
+parameters:
+  - name: templateFile
+    value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
+```
+
+Followed by:
+
+```yaml
+extends:
+  template: ${{ variables.templateFile }}
+```
+
+This is an indicator that this work needs to be done. This toggle switch is no longer allowed and the templates need to be hard coded.
+
+## Template Reference Convention (MUST follow)
+
+All `- template:` references to files **inside this repo** must use the **absolute** form anchored at the repo root, with the `@self` suffix:
+
+```yaml
+- template: /.pipelines/templates/<path>/<file>.yml@self
+```
+
+Do **not** use relative paths such as `templates/...`, `../templates/...`, or bare filenames. Rationale:
+
+- Absolute paths resolve identically regardless of where the referring file lives, so moving a pipeline file between directories (for example, into `.pipelines/NonOfficial/`) does not silently break includes.
+- Relative paths are resolved by Azure DevOps against the directory of the referring file, which has caused real outages in this repo when a relative include was composed into a nonexistent nested path like `.pipelines/templates/stages/.pipelines/templates/...`.
+- The majority of existing includes already use the absolute form; keeping new work consistent reduces review burden.
+
+The only acceptable non-absolute references are to external repositories resolved via the `resources.repositories` block, for example `v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates`.
+
+## Refactoring Steps
+
+### Step 1: Extract Shared Templates
+
+For each pipeline file that uses the toggle switch pattern (e.g., `PowerShell-Packages-Official.yml`):
+
+1. Create the `.pipelines/templates/variables` and `.pipelines/templates/stages` directories if they don't exist
+2. Extract the **variables section** into `.pipelines/templates/variables/PowerShell-Packages-Variables.yml`
+3. Extract the **stages section** into `.pipelines/templates/stages/PowerShell-Packages-Stages.yml`
+
+**IMPORTANT**: Only extract the `variables:` and `stages:` sections. All other sections (parameters, resources, extends, etc.) remain in the pipeline files.
+
+### Step 2: Create Official Pipeline (In-Place Refactoring)
+
+The original toggle-based file becomes the Official pipeline:
+
+1. **Keep the file in its original location** (e.g., `.pipelines/PowerShell-Packages-Official.yml` stays where it is)
+2. Remove the toggle switch parameter (`templateFile` parameter)
+3. Hard-code the Official template reference:
+   ```yaml
+   extends:
+     template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
+   ```
+4. Replace the `variables:` section with a template reference:
+   ```yaml
+   variables:
+     - template: /.pipelines/templates/variables/PowerShell-Packages-Variables.yml@self
+   ```
+5. Replace the `stages:` section with a template reference:
+   ```yaml
+   stages:
+     - template: /.pipelines/templates/stages/PowerShell-Packages-Stages.yml@self
+   ```
+
+### Step 3: Create NonOfficial Pipeline
+
+1. Create `.pipelines/NonOfficial` directory if it doesn't exist
+2. Create the NonOfficial pipeline file (e.g., `.pipelines/NonOfficial/PowerShell-Packages-NonOfficial.yml`)
+3. Copy the structure from the refactored Official pipeline
+4. Hard-code the NonOfficial template reference:
+   ```yaml
+   extends:
+     template: v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates
+   ```
+5. Reference the same shared templates:
+   ```yaml
+   variables:
+     - template: /.pipelines/templates/variables/PowerShell-Packages-Variables.yml@self
+   
+   stages:
+     - template: /.pipelines/templates/stages/PowerShell-Packages-Stages.yml@self
+   ```
+
+**Note**: Always use **absolute** template paths of the form `/.pipelines/templates/...@self`. Do not use relative paths like `templates/...` or `../templates/...`. Absolute paths are anchored at the repo root and resolve consistently from any referring file, preventing breakage when files are moved between directories.
+
+### Step 4: Link NonOfficial Pipelines to NonOfficial Dependencies
+
+After creating NonOfficial pipelines, ensure they consume artifacts from other **NonOfficial** pipelines, not Official ones.
+
+1. **Check the `resources:` section** in each NonOfficial pipeline for `pipelines:` dependencies
+2. **Identify Official pipeline references** that need to be changed to NonOfficial
+3. **Update the `source:` field** to point to the NonOfficial version
+
+**Example Problem:** NonOfficial pipeline pointing to Official dependency
+```yaml
+resources:
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated Binaries-Official'  # ❌ Wrong - Official!
+```
+
+**Solution:** Update to NonOfficial dependency
+```yaml
+resources:
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated Binaries-NonOfficial'  # ✅ Correct - NonOfficial!
+```
+
+**IMPORTANT**: The `source:` field must match the **exact ADO pipeline definition name** as it appears in Azure DevOps, not necessarily the file name.
+
+### Step 5: Configure Release Environment Parameters (NonAzure Only)
+
+**This step only applies if the pipeline uses `category: NonAzure` in the release configuration.**
+
+If you detect this pattern in the original pipeline:
+
+```yaml
+extends:
+  template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates  # or NonOfficial
+  parameters:
+    release:
+      category: NonAzure
+```
+
+Then you must configure the `ob_release_environment` parameter when referencing the stages template.
+
+#### Official Pipeline Configuration
+
+In the Official pipeline (e.g., `.pipelines/PowerShell-Packages-Official.yml`):
+
+```yaml
+stages:
+  - template: /.pipelines/templates/stages/PowerShell-Packages-Stages.yml@self
+    parameters:
+      ob_release_environment: Production
+```
+
+#### NonOfficial Pipeline Configuration
+
+In the NonOfficial pipeline (e.g., `.pipelines/NonOfficial/PowerShell-Packages-NonOfficial.yml`):
+
+```yaml
+stages:
+  - template: /.pipelines/templates/stages/PowerShell-Packages-Stages.yml@self
+    parameters:
+      ob_release_environment: Test
+```
+
+#### Update Stages Template to Accept Parameter
+
+The extracted stages template (e.g., `.pipelines/templates/stages/PowerShell-Packages-Stages.yml`) must declare the parameter at the top:
+
+```yaml
+parameters:
+  - name: ob_release_environment
+    type: string
+
+stages:
+  # ... rest of stages configuration using ${{ parameters.ob_release_environment }}
+```
+
+**IMPORTANT**: 
+- Only configure this for pipelines with `category: NonAzure`
+- Official pipelines always use `ob_release_environment: Production`
+- NonOfficial pipelines always use `ob_release_environment: Test`
+- The stages template must accept this parameter and use it in the appropriate stage configurations
diff --git a/.github/chatmodes/cherry-pick-commits.chatmode.md b/.github/chatmodes/cherry-pick-commits.chatmode.md
new file mode 100644
index 00000000000..826ab11d56c
--- /dev/null
+++ b/.github/chatmodes/cherry-pick-commits.chatmode.md
@@ -0,0 +1,78 @@
+# Cherry-Pick Commits Between Branches
+
+Cherry-pick recent commits from a source branch to a target branch without switching branches.
+
+## Instructions for Copilot
+
+1. **Confirm branches with the user**
+   - Ask the user to confirm the source and target branches
+   - If different branches are needed, update the configuration
+
+2. **Identify unique commits**
+   - Run: `git log <target-branch>..<source-branch> --oneline --reverse`
+   - **IMPORTANT**: The commit count may be misleading if branches diverged from different base commits
+   - Compare the LAST few commits from each branch to identify actual missing commits:
+     - `git log <source-branch> --oneline -10`
+     - `git log <target-branch> --oneline -10`
+   - Look for commits with the same message but different SHAs (rebased commits)
+   - Show the user ONLY the truly missing commits (usually just the most recent ones)
+
+3. **Confirm with user before proceeding**
+   - If the commit count seems unusually high (e.g., 400+), STOP and verify semantically
+   - Ask: "I found X commits to cherry-pick. Shall I proceed?"
+   - If there are many commits, warn that this may take time
+
+4. **Execute the cherry-pick**
+   - Ensure the target branch is checked out first
+   - Run: `git cherry-pick <sha1>` for single commits
+   - Or: `git cherry-pick <sha1> <sha2> <sha3>` for multiple commits
+   - Apply commits in chronological order (oldest first)
+
+5. **Handle any issues**
+   - If conflicts occur, pause and ask user for guidance
+   - If empty commits occur, automatically skip with `git cherry-pick --skip`
+
+6. **Verify and report results**
+   - Run: `git log <target-branch> -<number-of-commits> --oneline`
+   - Show the user the newly applied commits
+   - Confirm the branch is now ahead by X commits
+
+## Key Git Commands
+
+```bash
+# Find unique commits (may show full divergence if branches were rebased)
+git log <target>..<source> --oneline --reverse
+
+# Compare recent commits on each branch (more reliable for rebased branches)
+git log <source-branch> --oneline -10
+git log <target-branch> --oneline -10
+
+# Cherry-pick specific commits (when target is checked out)
+git cherry-pick <sha1>
+git cherry-pick <sha1> <sha2> <sha3>
+
+# Skip empty commits
+git cherry-pick --skip
+
+# Verify result
+git log <target-branch> -<count> --oneline
+```
+
+## Common Scenarios
+
+- **Empty commits**: Automatically skip with `git cherry-pick --skip`
+- **Conflicts**: Stop, show files with conflicts, ask user to resolve
+- **Many commits**: Warn user and confirm before proceeding
+- **Already applied**: These will result in empty commits that should be skipped
+- **Diverged branches**: If branches diverged (rebased), `git log` may show the entire history difference
+  - The actual missing commits are usually only the most recent ones
+  - Compare commit messages from recent history on both branches
+  - Cherry-pick only commits that are semantically missing
+
+## Workflow Style
+
+Use an interactive, step-by-step approach:
+- Show output from each command
+- Ask for confirmation before major actions
+- Provide clear status updates
+- Handle errors gracefully with user guidance
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 37c0fc6ca7c..45d2e8fe928 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,60 +1,32 @@
 version: 2
 
 updates:
-  - package-ecosystem: "nuget"
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
     labels:
       - "CL-BuildPackaging"
-    ignore:
-      - dependency-name: "System.*"
-      - dependency-name: "Microsoft.Win32.Registry.AccessControl"
-      - dependency-name: "Microsoft.Windows.Compatibility"
-
-  - package-ecosystem: "nuget"
-    directory: "/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility"
-    schedule:
-      interval: "daily"
-    labels:
-      - "CL-BuildPackaging"
-    ignore:
-      - dependency-name: "System.*"
-      - dependency-name: "Microsoft.Win32.Registry.AccessControl"
-      - dependency-name: "Microsoft.Windows.Compatibility"
-
-  - package-ecosystem: "nuget"
-    directory: "/tools/packaging/projects/reference/System.Management.Automation"
-    schedule:
-      interval: "daily"
-    labels:
-      - "CL-BuildPackaging"
-    ignore:
-      - dependency-name: "System.*"
-      - dependency-name: "Microsoft.Win32.Registry.AccessControl"
-      - dependency-name: "Microsoft.Windows.Compatibility"
 
-  - package-ecosystem: "nuget"
-    directory: "/test/tools/Modules"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "release/*"
     schedule:
       interval: "daily"
     labels:
       - "CL-BuildPackaging"
-    ignore:
-      - dependency-name: "System.*"
-      - dependency-name: "Microsoft.Win32.Registry.AccessControl"
-      - dependency-name: "Microsoft.Windows.Compatibility"
 
-  - package-ecosystem: "nuget"
-    directory: "/src/Modules"
+  - package-ecosystem: "docker"
+    directory: /
     schedule:
-      interval: "daily"
+      interval: daily
     labels:
       - "CL-BuildPackaging"
 
-  - package-ecosystem: "github-actions"
+  - package-ecosystem: "docker"
     directory: "/"
+    target-branch: "release/*"
     schedule:
-      interval: "daily"
+      interval: daily
     labels:
       - "CL-BuildPackaging"
diff --git a/.github/instructions/build-and-packaging-steps.instructions.md b/.github/instructions/build-and-packaging-steps.instructions.md
new file mode 100644
index 00000000000..934b1539593
--- /dev/null
+++ b/.github/instructions/build-and-packaging-steps.instructions.md
@@ -0,0 +1,127 @@
+---
+applyTo:
+  - ".github/actions/**/*.yml"
+  - ".github/workflows/**/*.yml"
+---
+
+# Build and Packaging Steps Pattern
+
+## Important Rule
+
+**Build and packaging must run in the same step OR you must save and restore PSOptions between steps.**
+
+## Why This Matters
+
+When `Start-PSBuild` runs, it creates PSOptions that contain build configuration details (runtime, configuration, output path, etc.). The packaging functions like `Start-PSPackage` and `Invoke-CIFinish` rely on these PSOptions to know where the build output is located and how it was built.
+
+GitHub Actions steps run in separate PowerShell sessions. This means PSOptions from one step are not available in the next step.
+
+## Pattern 1: Combined Build and Package (Recommended)
+
+Run build and packaging in the same step to keep PSOptions in memory:
+
+```yaml
+- name: Build and Package
+  run: |-
+    Import-Module ./tools/ci.psm1
+    $releaseTag = Get-ReleaseTag
+    Start-PSBuild -Configuration 'Release' -ReleaseTag $releaseTag
+    Invoke-CIFinish
+  shell: pwsh
+```
+
+**Benefits:**
+- Simpler code
+- No need for intermediate files
+- PSOptions automatically available to packaging
+
+## Pattern 2: Separate Steps with Save/Restore
+
+If you must separate build and packaging into different steps:
+
+```yaml
+- name: Build PowerShell
+  run: |-
+    Import-Module ./tools/ci.psm1
+    $releaseTag = Get-ReleaseTag
+    Start-PSBuild -Configuration 'Release' -ReleaseTag $releaseTag
+    Save-PSOptions -PSOptionsPath "${{ runner.workspace }}/psoptions.json"
+  shell: pwsh
+
+- name: Create Packages
+  run: |-
+    Import-Module ./tools/ci.psm1
+    Restore-PSOptions -PSOptionsPath "${{ runner.workspace }}/psoptions.json"
+    Invoke-CIFinish
+  shell: pwsh
+```
+
+**When to use:**
+- When you need to run other steps between build and packaging
+- When build and packaging require different permissions or environments
+
+## Common Mistakes
+
+### ❌ Incorrect: Separate steps without save/restore
+
+```yaml
+- name: Build PowerShell
+  run: |-
+    Start-PSBuild -Configuration 'Release'
+  shell: pwsh
+
+- name: Create Packages
+  run: |-
+    Invoke-CIFinish  # ❌ FAILS: PSOptions not available
+  shell: pwsh
+```
+
+### ❌ Incorrect: Using artifacts without PSOptions
+
+```yaml
+- name: Download Build Artifacts
+  uses: actions/download-artifact@v4
+  with:
+    name: build
+
+- name: Create Packages
+  run: |-
+    Invoke-CIFinish  # ❌ FAILS: PSOptions not restored
+  shell: pwsh
+```
+
+## Related Functions
+
+- `Start-PSBuild` - Builds PowerShell and sets PSOptions
+- `Save-PSOptions` - Saves PSOptions to a JSON file
+- `Restore-PSOptions` - Loads PSOptions from a JSON file
+- `Get-PSOptions` - Gets current PSOptions
+- `Set-PSOptions` - Sets PSOptions
+- `Start-PSPackage` - Creates packages (requires PSOptions)
+- `Invoke-CIFinish` - Calls packaging (requires PSOptions on Linux/macOS)
+
+## Examples
+
+### Linux Packaging Action
+
+```yaml
+- name: Build and Package
+  run: |-
+    Import-Module ./tools/ci.psm1
+    $releaseTag = Get-ReleaseTag
+    Start-PSBuild -Configuration 'Release' -ReleaseTag $releaseTag
+    Invoke-CIFinish
+  shell: pwsh
+```
+
+### Windows Packaging Workflow
+
+```yaml
+- name: Build and Package
+  run: |
+    Import-Module .\tools\ci.psm1
+    Invoke-CIFinish -Runtime ${{ matrix.runtimePrefix }}-${{ matrix.architecture }} -channel ${{ matrix.channel }}
+  shell: pwsh
+```
+
+Note: `Invoke-CIFinish` for Windows includes both build and packaging in its logic when `Stage` contains 'Build'.
diff --git a/.github/instructions/build-checkout-prerequisites.instructions.md b/.github/instructions/build-checkout-prerequisites.instructions.md
new file mode 100644
index 00000000000..717aa6faa36
--- /dev/null
+++ b/.github/instructions/build-checkout-prerequisites.instructions.md
@@ -0,0 +1,148 @@
+---
+applyTo:
+  - ".github/**/*.yml"
+  - ".github/**/*.yaml"
+---
+
+# Build and Checkout Prerequisites for PowerShell CI
+
+This document describes the checkout and build prerequisites used in PowerShell's CI workflows. It is intended for GitHub Copilot sessions working with the build system.
+
+## Overview
+
+The PowerShell repository uses a standardized build process across Linux, Windows, and macOS CI workflows. Understanding the checkout configuration and the `Sync-PSTags` operation is crucial for working with the build system.
+
+## Checkout Configuration
+
+### Fetch Depth
+
+All CI workflows that build or test PowerShell use `fetch-depth: 1000` in the checkout step:
+
+```yaml
+- name: checkout
+  uses: actions/checkout@v5
+  with:
+    fetch-depth: 1000
+```
+
+**Why 1000 commits?**
+- The build system needs access to Git history to determine version information
+- `Sync-PSTags` requires sufficient history to fetch and work with tags
+- 1000 commits provides a reasonable balance between clone speed and having enough history for version calculation
+- Shallow clones (fetch-depth: 1) would break versioning logic
+
+**Exceptions:**
+- The `changes` job uses default fetch depth (no explicit `fetch-depth`) since it only needs to detect file changes
+- The `analyze` job (CodeQL) uses `fetch-depth: '0'` (full history) for comprehensive security analysis
+- Linux packaging uses `fetch-depth: 0` to ensure all tags are available for package version metadata
+
+### Workflows Using fetch-depth: 1000
+
+- **Linux CI** (`.github/workflows/linux-ci.yml`): All build and test jobs
+- **Windows CI** (`.github/workflows/windows-ci.yml`): All build and test jobs  
+- **macOS CI** (`.github/workflows/macos-ci.yml`): All build and test jobs
+
+## Sync-PSTags Operation
+
+### What is Sync-PSTags?
+
+`Sync-PSTags` is a PowerShell function defined in `build.psm1` that ensures Git tags from the upstream PowerShell repository are synchronized to the local clone.
+
+### Location
+
+- **Function Definition**: `build.psm1` (line 36-76)
+- **Called From**: 
+  - `.github/actions/build/ci/action.yml` (Bootstrap step, line 24)
+  - `tools/ci.psm1` (Invoke-CIInstall function, line 146)
+
+### How It Works
+
+```powershell
+Sync-PSTags -AddRemoteIfMissing
+```
+
+The function:
+1. Searches for a Git remote pointing to the official PowerShell repository:
+   - `https://github.com/PowerShell/PowerShell`
+   - `git@github.com:PowerShell/PowerShell`
+
+2. If no upstream remote exists and `-AddRemoteIfMissing` is specified:
+   - Adds a remote named `upstream` pointing to `https://github.com/PowerShell/PowerShell.git`
+
+3. Fetches all tags from the upstream remote:
+   ```bash
+   git fetch --tags --quiet upstream
+   ```
+
+4. Sets `$script:tagsUpToDate = $true` to indicate tags are synchronized
+
+### Why Sync-PSTags is Required
+
+Tags are critical for:
+- **Version Calculation**: `Get-PSVersion` uses `git describe --abbrev=0` to find the latest tag
+- **Build Numbering**: CI builds use tag-based versioning for artifacts
+- **Changelog Generation**: Release notes are generated based on tags
+- **Package Metadata**: Package versions are derived from Git tags
+
+Without synchronized tags:
+- Version detection would fail or return incorrect versions
+- Builds might have inconsistent version numbers
+- The build process would error when trying to determine the version
+
+### Bootstrap Step in CI Action
+
+The `.github/actions/build/ci/action.yml` includes this in the Bootstrap step:
+
+```yaml
+- name: Bootstrap
+  if: success()
+  run: |-
+    Write-Verbose -Verbose "Running Bootstrap..."
+    Import-Module .\tools\ci.psm1
+    Invoke-CIInstall -SkipUser
+    Write-Verbose -Verbose "Start Sync-PSTags"
+    Sync-PSTags -AddRemoteIfMissing
+    Write-Verbose -Verbose "End Sync-PSTags"
+  shell: pwsh
+```
+
+**Note**: `Sync-PSTags` is called twice:
+1. Once by `Invoke-CIInstall` (in `tools/ci.psm1`)
+2. Explicitly again in the Bootstrap step
+
+This redundancy ensures tags are available even if the first call encounters issues.
+
+## Best Practices for Copilot Sessions
+
+When working with the PowerShell CI system:
+
+1. **Always use `fetch-depth: 1000` or greater** when checking out code for build or test operations
+2. **Understand that `Sync-PSTags` requires network access** to fetch tags from the upstream repository
+3. **Don't modify the fetch-depth without understanding the impact** on version calculation
+4. **If adding new CI workflows**, follow the existing pattern:
+   - Use `fetch-depth: 1000` for build/test jobs
+   - Call `Sync-PSTags -AddRemoteIfMissing` during bootstrap
+   - Ensure the upstream remote is properly configured
+
+5. **For local development**, developers should:
+   - Have the upstream remote configured
+   - Run `Sync-PSTags -AddRemoteIfMissing` before building
+   - Or use `Start-PSBuild` which handles this automatically
+
+## Related Files
+
+- `.github/actions/build/ci/action.yml` - Main CI build action
+- `.github/workflows/linux-ci.yml` - Linux CI workflow
+- `.github/workflows/windows-ci.yml` - Windows CI workflow
+- `.github/workflows/macos-ci.yml` - macOS CI workflow
+- `build.psm1` - Contains Sync-PSTags function definition
+- `tools/ci.psm1` - CI-specific build functions that call Sync-PSTags
+
+## Summary
+
+The PowerShell CI system depends on:
+1. **Adequate Git history** (fetch-depth: 1000) for version calculation
+2. **Synchronized Git tags** via `Sync-PSTags` for accurate versioning
+3. **Upstream remote access** to fetch official repository tags
+
+These prerequisites ensure consistent, accurate build versioning across all CI platforms.
diff --git a/.github/instructions/build-configuration-guide.instructions.md b/.github/instructions/build-configuration-guide.instructions.md
new file mode 100644
index 00000000000..d0384f4f307
--- /dev/null
+++ b/.github/instructions/build-configuration-guide.instructions.md
@@ -0,0 +1,150 @@
+---
+applyTo:
+  - "build.psm1"
+  - "tools/ci.psm1"
+  - ".github/**/*.yml"
+  - ".github/**/*.yaml"
+  - ".pipelines/**/*.yml"
+---
+
+# Build Configuration Guide
+
+## Choosing the Right Configuration
+
+### For Testing
+
+**Use: Default (Debug)**
+
+```yaml
+- name: Build for Testing
+  shell: pwsh
+  run: |
+    Import-Module ./tools/ci.psm1
+    Start-PSBuild
+```
+
+**Why Debug:**
+- Includes debugging symbols
+- Better error messages
+- Faster build times
+- Suitable for xUnit and Pester tests
+
+**Do NOT use:**
+- `-Configuration 'Release'` (unnecessary for tests)
+- `-ReleaseTag` (not needed for tests)
+- `-CI` (unless you specifically need Pester module)
+
+### For Release/Packaging
+
+**Use: Release with version tag and public NuGet feeds**
+
+```yaml
+- name: Build for Release
+  shell: pwsh
+  run: |
+    Import-Module ./build.psm1
+    Import-Module ./tools/ci.psm1
+    Switch-PSNugetConfig -Source Public
+    $releaseTag = Get-ReleaseTag
+    Start-PSBuild -Configuration 'Release' -ReleaseTag $releaseTag
+```
+
+**Why Release:**
+- Optimized binaries
+- No debug symbols (smaller size)
+- Production-ready
+
+**Why Switch-PSNugetConfig -Source Public:**
+- Switches NuGet package sources to public feeds (nuget.org and public Azure DevOps feeds)
+- Required for CI/CD environments that don't have access to private feeds
+- Uses publicly available packages instead of Microsoft internal feeds
+
+### For Code Coverage
+
+**Use: CodeCoverage configuration**
+
+```yaml
+- name: Build with Coverage
+  shell: pwsh
+  run: |
+    Import-Module ./tools/ci.psm1
+    Start-PSBuild -Configuration 'CodeCoverage'
+```
+
+## Platform Considerations
+
+### All Platforms
+
+Same commands work across Linux, Windows, and macOS:
+
+```yaml
+strategy:
+  matrix:
+    os: [ubuntu-latest, windows-latest, macos-latest]
+runs-on: ${{ matrix.os }}
+steps:
+  - name: Build PowerShell
+    shell: pwsh
+    run: |
+      Import-Module ./tools/ci.psm1
+      Start-PSBuild
+```
+
+### Output Locations
+
+**Linux/macOS:**
+```
+src/powershell-unix/bin/Debug/<netversion>/<runtime>/publish/
+```
+
+**Windows:**
+```
+src/powershell-win-core/bin/Debug/<netversion>/<runtime>/publish/
+```
+
+## Best Practices
+
+1. Use default configuration for testing
+2. Avoid redundant parameters
+3. Match configuration to purpose
+4. Use `-CI` only when needed
+5. Always specify `-ReleaseTag` for release or packaging builds
+6. Use `Switch-PSNugetConfig -Source Public` in CI/CD for release builds
+
+## NuGet Feed Configuration
+
+### Switch-PSNugetConfig
+
+The `Switch-PSNugetConfig` function in `build.psm1` manages NuGet package source configuration.
+
+**Available Sources:**
+
+- **Public**: Uses public feeds (nuget.org and public Azure DevOps feeds)
+  - Required for: CI/CD environments, public builds, packaging
+  - Does not require authentication
+
+- **Private**: Uses internal PowerShell team feeds
+  - Required for: Internal development with preview packages
+  - Requires authentication credentials
+
+- **NuGetOnly**: Uses only nuget.org
+  - Required for: Minimal dependency scenarios
+
+**Usage:**
+
+```powershell
+# Switch to public feeds (most common for CI/CD)
+Switch-PSNugetConfig -Source Public
+
+# Switch to private feeds with authentication
+Switch-PSNugetConfig -Source Private -UserName $userName -ClearTextPAT $pat
+
+# Switch to nuget.org only
+Switch-PSNugetConfig -Source NuGetOnly
+```
+
+**When to Use:**
+
+- **Always use `-Source Public`** before building in CI/CD workflows
+- Use before any build that will create packages for distribution
+- Use in forks or environments without access to Microsoft internal feeds
diff --git a/.github/instructions/code-review-branch-strategy.instructions.md b/.github/instructions/code-review-branch-strategy.instructions.md
new file mode 100644
index 00000000000..191a677b912
--- /dev/null
+++ b/.github/instructions/code-review-branch-strategy.instructions.md
@@ -0,0 +1,230 @@
+---
+applyTo: "**/*"
+---
+
+# Code Review Branch Strategy Guide
+
+This guide helps GitHub Copilot provide appropriate feedback when reviewing code changes, particularly distinguishing between issues that should be fixed in the current branch versus the default branch.
+
+## Purpose
+
+When reviewing pull requests, especially those targeting release branches, it's important to identify whether an issue should be fixed in:
+- **The current PR/branch** - Release-specific fixes or backports
+- **The default branch first** - General bugs that exist in the main codebase
+
+## Branch Types and Fix Strategy
+
+### Release Branches (e.g., `release/v7.5`, `release/v7.4`)
+
+**Purpose:** Contain release-specific changes and critical backports
+
+**Should contain:**
+- Release-specific configuration changes
+- Critical bug fixes that are backported from the default branch
+- Release packaging/versioning adjustments
+
+**Should NOT contain:**
+- New general bug fixes that haven't been fixed in the default branch
+- Refactoring or improvements that apply to the main codebase
+- Workarounds for issues that exist in the default branch
+
+### Default/Main Branch (e.g., `master`, `main`)
+
+**Purpose:** Primary development branch for all ongoing work
+
+**Should contain:**
+- All general bug fixes
+- New features and improvements
+- Refactoring and code quality improvements
+- Fixes that will later be backported to release branches
+
+## Identifying Issues That Belong in the Default Branch
+
+When reviewing a PR targeting a release branch, look for these indicators that suggest the fix should be in the default branch first:
+
+### 1. The Root Cause Exists in Default Branch
+
+If the underlying issue exists in the default branch's code, it should be fixed there first.
+
+**Example:**
+```yaml
+# PR changes this in release/v7.5:
+- $metadata = Get-Content "$repoRoot/tools/metadata.json" -Raw | ConvertFrom-Json
++ $metadata = Get-Content "$(Build.SourcesDirectory)/PowerShell/tools/metadata.json" -Raw | ConvertFrom-Json
+```
+
+**Analysis:** If `$repoRoot` is undefined because the template doesn't include its dependencies in BOTH the release branch AND the default branch, the fix should address the root cause in the default branch first.
+
+### 2. The Fix is a Workaround Rather Than a Proper Solution
+
+If the change introduces a workaround (hardcoded paths, special cases) rather than fixing the underlying design issue, it likely belongs in the default branch as a proper fix.
+
+**Example:**
+- Using hardcoded paths instead of fixing variable initialization
+- Adding special cases instead of fixing the logic
+- Duplicating code instead of fixing shared dependencies
+
+### 3. The Issue Affects General Functionality
+
+If the issue affects general functionality not specific to a release, it should be fixed in the default branch.
+
+**Example:**
+- Template dependencies that affect all pipelines
+- Shared utility functions
+- Common configuration issues
+
+## Providing Code Review Feedback
+
+### For Issues in the Current Branch
+
+When an issue is specific to the current branch or is a legitimate fix for the branch being targeted, **use the default code review feedback format** without any special branch-strategy commentary.
+
+### For Issues That Belong in the Default Branch
+
+1. **Provide the code review feedback**
+2. **Explain why it should be fixed in the default branch**
+3. **Provide an issue template** in markdown format
+
+**Example:**
+
+```markdown
+The `channelSelection.yml` template relies on `$repoRoot` being set by `SetVersionVariables.yml`, but doesn't declare this dependency. This issue exists in both the release branch and the default branch.
+
+**This should be fixed in the default branch first**, then backported if needed. The proper fix is to ensure template dependencies are correctly declared, rather than using hardcoded paths as a workaround.
+
+---
+
+**Suggested Issue for Default Branch:**
+
+### Issue Title
+`channelSelection.yml` template missing dependency on `SetVersionVariables.yml`
+
+### Description
+The `channelSelection.yml` template uses the `$repoRoot` variable but doesn't ensure it's set beforehand by including `SetVersionVariables.yml`.
+
+**Current State:**
+- `channelSelection.yml` expects `$repoRoot` to be available
+- Not all pipelines that use `channelSelection.yml` include `SetVersionVariables.yml` first
+- This creates an implicit dependency that's not enforced
+
+**Expected State:**
+Either:
+1. `channelSelection.yml` should include `SetVersionVariables.yml` as a dependency, OR
+2. `channelSelection.yml` should be refactored to not depend on `$repoRoot`, OR
+3. Pipelines using `channelSelection.yml` should explicitly include `SetVersionVariables.yml` first
+
+**Files Affected:**
+- `.pipelines/templates/channelSelection.yml`
+- `.pipelines/templates/package-create-msix.yml`
+- `.pipelines/templates/release-SetTagAndChangelog.yml`
+
+**Priority:** Medium
+**Labels:** `Issue-Bug`, `Area-Build`, `Area-Pipeline`
+```
+
+## Issue Template Format
+
+When creating an issue template for the default branch, use this structure:
+
+```markdown
+### Issue Title
+[Clear, concise description of the problem]
+
+### Description
+[Detailed explanation of the issue]
+
+**Current State:**
+- [What's happening now]
+- [Why it's problematic]
+
+**Expected State:**
+- [What should happen]
+- [Proposed solution(s)]
+
+**Files Affected:**
+- [List of files]
+
+**Priority:** [Low/Medium/High/Critical]
+**Labels:** [Suggested labels like `Issue-Bug`, `Area-*`]
+
+**Additional Context:**
+[Any additional information, links to related issues, etc.]
+```
+
+## Common Scenarios
+
+### Scenario 1: Template Dependency Issues
+
+**Indicators:**
+- Missing template includes
+- Undefined variables from other templates
+- Assumptions about pipeline execution order
+
+**Action:** Suggest fixing template dependencies in the default branch.
+
+### Scenario 2: Hardcoded Values
+
+**Indicators:**
+- Hardcoded paths replacing variables
+- Environment-specific values in shared code
+- Magic strings or numbers
+
+**Action:** Suggest proper variable/parameter usage in the default branch.
+
+### Scenario 3: Logic Errors
+
+**Indicators:**
+- Incorrect conditional logic
+- Missing error handling
+- Race conditions
+
+**Action:** Suggest fixing the logic in the default branch unless it's release-specific.
+
+### Scenario 4: Legitimate Release Branch Fixes
+
+**Indicators:**
+- Version-specific configuration
+- Release packaging changes
+- Backport of already-fixed default branch issue
+
+**Action:** Provide normal code review feedback for the current PR.
+
+## Best Practices
+
+1. **Always check if the issue exists in the default branch** before suggesting a release-branch-only fix
+2. **Prefer fixing root causes over workarounds**
+3. **Provide clear rationale** for why a fix belongs in the default branch
+4. **Include actionable issue templates** so users can easily create issues
+5. **Be helpful, not blocking** - provide the feedback even if you can't enforce where it's fixed
+
+## Examples of Good vs. Bad Approaches
+
+### ❌ Bad: Workaround in Release Branch Only
+
+```yaml
+# In release/v7.5 only
+- pwsh: |
+    $metadata = Get-Content "$(Build.SourcesDirectory)/PowerShell/tools/metadata.json" -Raw
+```
+
+**Why bad:** Hardcodes path to work around missing `$repoRoot`, doesn't fix the default branch.
+
+### ✅ Good: Fix in Default Branch, Then Backport
+
+```yaml
+# In default branch first
+- template: SetVersionVariables.yml@self  # Ensures $repoRoot is set
+- template: channelSelection.yml@self     # Now can use $repoRoot
+```
+
+**Why good:** Fixes the root cause by ensuring dependencies are declared, then backport to release if needed.
+
+## When in Doubt
+
+If you're unsure whether an issue should be fixed in the current branch or the default branch, ask yourself:
+
+1. Does this issue exist in the default branch?
+2. Is this a workaround or a proper fix?
+3. Will other branches/releases benefit from this fix?
+
+If the answer to any of these is "yes," suggest fixing it in the default branch first.
diff --git a/.github/instructions/instruction-file-format.instructions.md b/.github/instructions/instruction-file-format.instructions.md
new file mode 100644
index 00000000000..7c4e0bdd13d
--- /dev/null
+++ b/.github/instructions/instruction-file-format.instructions.md
@@ -0,0 +1,220 @@
+---
+applyTo:
+  - ".github/instructions/**/*.instructions.md"
+---
+
+# Instruction File Format Guide
+
+This document describes the format and guidelines for creating custom instruction files for GitHub Copilot in the PowerShell repository.
+
+## File Naming Convention
+
+All instruction files must use the `.instructions.md` suffix:
+- ✅ Correct: `build-checkout-prerequisites.instructions.md`
+- ✅ Correct: `start-psbuild-basics.instructions.md`
+- ❌ Incorrect: `build-guide.md`
+- ❌ Incorrect: `instructions.md`
+
+## Required Frontmatter
+
+Every instruction file must start with YAML frontmatter containing an `applyTo` section:
+
+```yaml
+---
+applyTo:
+  - "path/to/files/**/*.ext"
+  - "specific-file.ext"
+---
+```
+
+### applyTo Patterns
+
+Specify which files or directories these instructions apply to:
+
+**For workflow files:**
+```yaml
+applyTo:
+  - ".github/**/*.yml"
+  - ".github/**/*.yaml"
+```
+
+**For build scripts:**
+```yaml
+applyTo:
+  - "build.psm1"
+  - "tools/ci.psm1"
+```
+
+**For multiple contexts:**
+```yaml
+applyTo:
+  - "build.psm1"
+  - "tools/**/*.psm1"
+  - ".github/**/*.yml"
+```
+
+## Content Structure
+
+### 1. Clear Title
+
+Use a descriptive H1 heading after the frontmatter:
+
+```markdown
+# Build Configuration Guide
+```
+
+### 2. Purpose or Overview
+
+Start with a brief explanation of what the instructions cover:
+
+```markdown
+## Purpose
+
+This guide explains how to configure PowerShell builds for different scenarios.
+```
+
+### 3. Actionable Content
+
+Provide clear, actionable guidance:
+
+**✅ Good - Specific and actionable:**
+```markdown
+## Default Usage
+
+Use `Start-PSBuild` with no parameters for testing:
+
+```powershell
+Import-Module ./tools/ci.psm1
+Start-PSBuild
+```
+```
+
+**❌ Bad - Vague and unclear:**
+```markdown
+## Usage
+
+You can use Start-PSBuild to build stuff.
+```
+
+### 4. Code Examples
+
+Include working code examples with proper syntax highlighting:
+
+```markdown
+```yaml
+- name: Build PowerShell
+  shell: pwsh
+  run: |
+    Import-Module ./tools/ci.psm1
+    Start-PSBuild
+```
+```
+
+### 5. Context and Rationale
+
+Explain why things are done a certain way:
+
+```markdown
+**Why fetch-depth: 1000?**
+- The build system needs Git history for version calculation
+- Shallow clones would break versioning logic
+```
+
+## Best Practices
+
+### Be Concise
+
+- Focus on essential information
+- Remove redundant explanations
+- Use bullet points for lists
+
+### Be Specific
+
+- Provide exact commands and parameters
+- Include file paths and line numbers when relevant
+- Show concrete examples, not abstract concepts
+
+### Avoid Duplication
+
+- Don't repeat information from other instruction files
+- Reference other files when appropriate
+- Keep each file focused on one topic
+
+### Use Proper Formatting
+
+**Headers:**
+- Use H1 (`#`) for the main title
+- Use H2 (`##`) for major sections
+- Use H3 (`###`) for subsections
+
+**Code blocks:**
+- Always specify the language: ` ```yaml `, ` ```powershell `, ` ```bash `
+- Keep examples short and focused
+- Test examples before including them
+
+**Lists:**
+- Use `-` for unordered lists
+- Use `1.` for ordered lists
+- Keep list items concise
+
+## Example Structure
+
+```markdown
+---
+applyTo:
+  - "relevant/files/**/*.ext"
+---
+
+# Title of Instructions
+
+Brief description of what these instructions cover.
+
+## Section 1
+
+Content with examples.
+
+```language
+code example
+```
+
+## Section 2
+
+More specific guidance.
+
+### Subsection
+
+Detailed information when needed.
+
+## Best Practices
+
+- Actionable tip 1
+- Actionable tip 2
+```
+
+## Maintaining Instructions
+
+### When to Create a New File
+
+Create a new instruction file when:
+- Covering a distinct topic not addressed elsewhere
+- The content is substantial enough to warrant its own file
+- The `applyTo` scope is different from existing files
+
+### When to Update an Existing File
+
+Update an existing file when:
+- Information is outdated
+- New best practices emerge
+- Examples need correction
+
+### When to Merge or Delete
+
+Merge or delete files when:
+- Content is duplicated across multiple files
+- A file is too small to be useful standalone
+- Information is no longer relevant
+
+## Reference
+
+For more details, see:
+- [GitHub Copilot Custom Instructions Documentation](https://docs.github.com/en/copilot/how-tos/configure-custom-instructions/add-repository-instructions)
diff --git a/.github/instructions/log-grouping-guidelines.instructions.md b/.github/instructions/log-grouping-guidelines.instructions.md
new file mode 100644
index 00000000000..ff845db4e4b
--- /dev/null
+++ b/.github/instructions/log-grouping-guidelines.instructions.md
@@ -0,0 +1,181 @@
+---
+applyTo:
+  - "build.psm1"
+  - "tools/ci.psm1"
+  - ".github/**/*.yml"
+  - ".github/**/*.yaml"
+---
+
+# Log Grouping Guidelines for GitHub Actions
+
+## Purpose
+
+Guidelines for using `Write-LogGroupStart` and `Write-LogGroupEnd` to create collapsible log sections in GitHub Actions CI/CD runs.
+
+## Key Principles
+
+### 1. Groups Cannot Be Nested
+
+GitHub Actions does not support nested groups. Only use one level of grouping.
+
+**❌ Don't:**
+```powershell
+Write-LogGroupStart -Title "Outer Group"
+Write-LogGroupStart -Title "Inner Group"
+# ... operations ...
+Write-LogGroupEnd -Title "Inner Group"
+Write-LogGroupEnd -Title "Outer Group"
+```
+
+**✅ Do:**
+```powershell
+Write-LogGroupStart -Title "Operation A"
+# ... operations ...
+Write-LogGroupEnd -Title "Operation A"
+
+Write-LogGroupStart -Title "Operation B"
+# ... operations ...
+Write-LogGroupEnd -Title "Operation B"
+```
+
+### 2. Groups Should Be Substantial
+
+Only create groups for operations that generate substantial output (5+ lines). Small groups add clutter without benefit.
+
+**❌ Don't:**
+```powershell
+Write-LogGroupStart -Title "Generate Resource Files"
+Write-Log -message "Run ResGen"
+Start-ResGen
+Write-LogGroupEnd -Title "Generate Resource Files"
+```
+
+**✅ Do:**
+```powershell
+Write-Log -message "Run ResGen (generating C# bindings for resx files)"
+Start-ResGen
+```
+
+### 3. Groups Should Represent Independent Operations
+
+Each group should be a logically independent operation that users might want to expand/collapse separately.
+
+**✅ Good examples:**
+- Install Native Dependencies
+- Install .NET SDK
+- Build PowerShell
+- Restore NuGet Packages
+
+**❌ Bad examples:**
+- Individual project restores (too granular)
+- Small code generation steps (too small)
+- Sub-steps of a larger operation (would require nesting)
+
+### 4. One Group Per Iteration Is Excessive
+
+Avoid putting log groups inside loops where each iteration creates a separate group.  This would probably cause nesting.
+
+**❌ Don't:**
+```powershell
+$projects | ForEach-Object {
+    Write-LogGroupStart -Title "Restore Project: $_"
+    dotnet restore $_
+    Write-LogGroupEnd -Title "Restore Project: $_"
+}
+```
+
+**✅ Do:**
+```powershell
+Write-LogGroupStart -Title "Restore All Projects"
+$projects | ForEach-Object {
+    Write-Log -message "Restoring $_"
+    dotnet restore $_
+}
+Write-LogGroupEnd -Title "Restore All Projects"
+```
+
+## Usage Pattern
+
+```powershell
+Write-LogGroupStart -Title "Descriptive Operation Name"
+try {
+    # ... operation code ...
+    Write-Log -message "Status updates"
+}
+finally {
+    # Ensure group is always closed
+}
+Write-LogGroupEnd -Title "Descriptive Operation Name"
+```
+
+## When to Use Log Groups
+
+Use log groups for:
+- Major build phases (bootstrap, restore, build, test, package)
+- Installation operations (dependencies, SDKs, tools)
+- Operations that produce 5+ lines of output
+- Operations where users might want to collapse verbose output
+
+Don't use log groups for:
+- Single-line operations
+- Code that's already inside another group
+- Loop iterations with minimal output per iteration
+- Diagnostic or debug output that should always be visible
+
+## Examples from build.psm1
+
+### Good Usage
+
+```powershell
+function Start-PSBootstrap {
+    # Multiple independent operations, each with substantial output
+    Write-LogGroupStart -Title "Install Native Dependencies"
+    # ... apt-get/yum/brew install commands ...
+    Write-LogGroupEnd -Title "Install Native Dependencies"
+
+    Write-LogGroupStart -Title "Install .NET SDK"
+    # ... dotnet installation ...
+    Write-LogGroupEnd -Title "Install .NET SDK"
+}
+```
+
+### Avoid
+
+```powershell
+# Too small - just 2-3 lines
+Write-LogGroupStart -Title "Generate Resource Files (ResGen)"
+Write-Log -message "Run ResGen"
+Start-ResGen
+Write-LogGroupEnd -Title "Generate Resource Files (ResGen)"
+```
+
+## GitHub Actions Syntax
+
+These functions emit GitHub Actions workflow commands:
+- `Write-LogGroupStart` → `::group::Title`
+- `Write-LogGroupEnd` → `::endgroup::`
+
+In the GitHub Actions UI, this renders as collapsible sections with the specified title.
+
+## Testing
+
+Test log grouping locally:
+```powershell
+$env:GITHUB_ACTIONS = 'true'
+Import-Module ./build.psm1
+Write-LogGroupStart -Title "Test"
+Write-Log -Message "Content"
+Write-LogGroupEnd -Title "Test"
+```
+
+Output should show:
+```
+::group::Test
+Content
+::endgroup::
+```
+
+## References
+
+- [GitHub Actions: Grouping log lines](https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#grouping-log-lines)
+- `build.psm1`: `Write-LogGroupStart` and `Write-LogGroupEnd` function definitions
diff --git a/.github/instructions/onebranch-condition-syntax.instructions.md b/.github/instructions/onebranch-condition-syntax.instructions.md
new file mode 100644
index 00000000000..19bf331d9c3
--- /dev/null
+++ b/.github/instructions/onebranch-condition-syntax.instructions.md
@@ -0,0 +1,223 @@
+---
+applyTo: ".pipelines/**/*.{yml,yaml}"
+---
+
+# OneBranch Pipeline Condition Syntax
+
+## Overview
+Azure Pipelines (OneBranch) uses specific syntax for referencing variables and parameters in condition expressions. Using the wrong syntax will cause conditions to fail silently or behave unexpectedly.
+
+## Variable Reference Patterns
+
+### In Condition Expressions
+
+**✅ Correct Pattern:**
+```yaml
+condition: eq(variables['VariableName'], 'value')
+condition: or(eq(variables['VAR1'], 'true'), eq(variables['VAR2'], 'true'))
+condition: and(succeeded(), eq(variables['Architecture'], 'fxdependent'))
+```
+
+**❌ Incorrect Patterns:**
+```yaml
+# Don't use $(VAR) string expansion in conditions
+condition: eq('$(VariableName)', 'value')
+
+# Don't use direct variable references
+condition: eq($VariableName, 'value')
+```
+
+### In Script Content (pwsh, bash, etc.)
+
+**✅ Correct Pattern:**
+```yaml
+- pwsh: |
+    $value = '$(VariableName)'
+    Write-Host "Value: $(VariableName)"
+```
+
+### In Input Fields
+
+**✅ Correct Pattern:**
+```yaml
+inputs:
+  serviceEndpoint: '$(ServiceEndpoint)'
+  sbConfigPath: '$(SBConfigPath)'
+```
+
+## Parameter References
+
+### Template Parameters (Compile-Time)
+
+**✅ Correct Pattern:**
+```yaml
+parameters:
+  - name: OfficialBuild
+    type: boolean
+    default: false
+
+steps:
+  - task: SomeTask@1
+    condition: eq('${{ parameters.OfficialBuild }}', 'true')
+```
+
+Note: Parameters use `${{ parameters.Name }}` because they're evaluated at template compile-time.
+
+### Runtime Variables (Execution-Time)
+
+**✅ Correct Pattern:**
+```yaml
+steps:
+  - pwsh: |
+      Write-Host "##vso[task.setvariable variable=MyVar]somevalue"
+    displayName: Set Variable
+
+  - task: SomeTask@1
+    condition: eq(variables['MyVar'], 'somevalue')
+```
+
+## Common Scenarios
+
+### Scenario 1: Check if Variable Equals Value
+
+```yaml
+- task: DoSomething@1
+  condition: eq(variables['PREVIEW'], 'true')
+```
+
+### Scenario 2: Multiple Variable Conditions (OR)
+
+```yaml
+- task: DoSomething@1
+  condition: or(eq(variables['STABLE'], 'true'), eq(variables['LTS'], 'true'))
+```
+
+### Scenario 3: Multiple Variable Conditions (AND)
+
+```yaml
+- task: DoSomething@1
+  condition: and(succeeded(), eq(variables['Architecture'], 'fxdependent'))
+```
+
+### Scenario 4: Complex Conditions
+
+```yaml
+- task: DoSomething@1
+  condition: and(
+    succeededOrFailed(),
+    ne(variables['UseAzDevOpsFeed'], ''),
+    eq(variables['Build.SourceBranch'], 'refs/heads/master')
+  )
+```
+
+### Scenario 5: Built-in Variables
+
+```yaml
+- task: CodeQL3000Init@0
+  condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+- step: finalize
+  condition: eq(variables['Agent.JobStatus'], 'SucceededWithIssues')
+```
+
+### Scenario 6: Parameter vs Variable
+
+```yaml
+parameters:
+  - name: OfficialBuild
+    type: boolean
+
+steps:
+  # Parameter condition (compile-time)
+  - task: SignFiles@1
+    condition: eq('${{ parameters.OfficialBuild }}', 'true')
+
+  # Variable condition (runtime)
+  - task: PublishArtifact@1
+    condition: eq(variables['PUBLISH_ENABLED'], 'true')
+```
+
+## Why This Matters
+
+**String Expansion `$(VAR)` in Conditions:**
+- When you use `'$(VAR)'` in a condition, Azure Pipelines attempts to expand it as a string
+- If the variable is undefined or empty, it becomes an empty string `''`
+- The condition `eq('', 'true')` will always be false
+- This makes debugging difficult because there's no error message
+
+**Variables Array Syntax `variables['VAR']`:**
+- This is the proper way to reference runtime variables in conditions
+- Azure Pipelines correctly evaluates the variable's value
+- Undefined variables are handled properly by the condition evaluator
+- This is the standard pattern used throughout Azure Pipelines
+
+## Reference Examples
+
+Working examples can be found in:
+- `.pipelines/templates/linux.yml` - Build.SourceBranch conditions
+- `.pipelines/templates/windows-hosted-build.yml` - Architecture conditions
+- `.pipelines/templates/compliance/apiscan.yml` - CODEQL_ENABLED conditions
+- `.pipelines/templates/insert-nuget-config-azfeed.yml` - Complex AND/OR conditions
+
+## Quick Reference Table
+
+| Context | Syntax | Example |
+|---------|--------|---------|
+| Condition expression | `variables['Name']` | `condition: eq(variables['PREVIEW'], 'true')` |
+| Script content | `$(Name)` | `pwsh: Write-Host "$(PREVIEW)"` |
+| Task input | `$(Name)` | `inputs: path: '$(Build.SourcesDirectory)'` |
+| Template parameter | `${{ parameters.Name }}` | `condition: eq('${{ parameters.Official }}', 'true')` |
+
+## Troubleshooting
+
+### Condition Always False
+If your condition is always evaluating to false:
+1. Check if you're using `'$(VAR)'` instead of `variables['VAR']`
+2. Verify the variable is actually set (add a debug step to print the variable)
+3. Check the variable value is exactly what you expect (case-sensitive)
+
+### Variable Not Found
+If you get errors about variables not being found:
+1. Ensure the variable is set before the condition is evaluated
+2. Check that the variable name is spelled correctly
+3. Verify the variable is in scope (job vs. stage vs. pipeline level)
+
+## Best Practices
+
+1. **Always use `variables['Name']` in conditions** - This is the correct Azure Pipelines pattern
+2. **Use `$(Name)` for string expansion** in scripts and inputs
+3. **Use `${{ parameters.Name }}` for template parameters** (compile-time)
+4. **Add debug steps** to verify variable values when troubleshooting conditions
+5. **Follow existing patterns** in the repository - grep for `condition:` to see examples
+
+## Common Mistakes
+
+❌ **Mistake 1: String expansion in condition**
+```yaml
+condition: eq('$(PREVIEW)', 'true')  # WRONG
+```
+
+✅ **Fix:**
+```yaml
+condition: eq(variables['PREVIEW'], 'true')  # CORRECT
+```
+
+❌ **Mistake 2: Missing quotes around parameter**
+```yaml
+condition: eq(${{ parameters.Official }}, true)  # WRONG
+```
+
+✅ **Fix:**
+```yaml
+condition: eq('${{ parameters.Official }}', 'true')  # CORRECT
+```
+
+❌ **Mistake 3: Mixing syntax**
+```yaml
+condition: or(eq('$(STABLE)', 'true'), eq(variables['LTS'], 'true'))  # INCONSISTENT
+```
+
+✅ **Fix:**
+```yaml
+condition: or(eq(variables['STABLE'], 'true'), eq(variables['LTS'], 'true'))  # CORRECT
+```
diff --git a/.github/instructions/onebranch-restore-phase-pattern.instructions.md b/.github/instructions/onebranch-restore-phase-pattern.instructions.md
new file mode 100644
index 00000000000..0945bb47c0b
--- /dev/null
+++ b/.github/instructions/onebranch-restore-phase-pattern.instructions.md
@@ -0,0 +1,83 @@
+---
+applyTo: ".pipelines/**/*.{yml,yaml}"
+---
+
+# OneBranch Restore Phase Pattern
+
+## Overview
+When steps need to run in the OneBranch restore phase (before the main build phase), the `ob_restore_phase` environment variable must be set in the `env:` block of **each individual step**.
+
+## Pattern
+
+### ✅ Correct (Working Pattern)
+```yaml
+parameters:
+- name: "ob_restore_phase"
+  type: boolean
+  default: true  # or false if you don't want restore phase
+
+steps:
+- powershell: |
+    # script content
+  displayName: 'Step Name'
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
+```
+
+The key is to:
+1. Define `ob_restore_phase` as a **boolean** parameter
+2. Set `ob_restore_phase: ${{ parameters.ob_restore_phase }}` directly in each step's `env:` block
+3. Pass `true` to run in restore phase, `false` to run in normal build phase
+
+### ❌ Incorrect (Does Not Work)
+```yaml
+steps:
+- powershell: |
+    # script content
+  displayName: 'Step Name'
+  ${{ if eq(parameters.useRestorePhase, 'yes') }}:
+    env:
+      ob_restore_phase: true
+```
+
+Using conditionals at the same indentation level as `env:` causes only the first step to execute in restore phase.
+
+## Parameters
+
+Templates using this pattern should accept an `ob_restore_phase` boolean parameter:
+
+```yaml
+parameters:
+- name: "ob_restore_phase"
+  type: boolean
+  default: true  # Set to true to run in restore phase by default
+```
+
+## Reference Examples
+
+Working examples of this pattern can be found in:
+- `.pipelines/templates/insert-nuget-config-azfeed.yml` - Demonstrates the correct pattern
+- `.pipelines/templates/SetVersionVariables.yml` - Updated to use this pattern
+
+## Why This Matters
+
+The restore phase in OneBranch pipelines runs before signing and other build operations. Steps that need to:
+- Set environment variables for the entire build
+- Configure authentication
+- Prepare the repository structure
+
+Must run in the restore phase to be available when subsequent stages execute.
+
+## Common Use Cases
+
+- Setting `REPOROOT` variable
+- Configuring NuGet feeds with authentication
+- Setting version variables
+- Repository preparation and validation
+
+## Troubleshooting
+
+If only the first step in your template is running in restore phase:
+1. Check that `env:` block exists for **each step**
+2. Verify the conditional `${{ if ... }}:` is **inside** the `env:` block
+3. Confirm indentation is correct (conditional is indented under `env:`)
diff --git a/.github/instructions/onebranch-signing-configuration.instructions.md b/.github/instructions/onebranch-signing-configuration.instructions.md
new file mode 100644
index 00000000000..747fcaffdd6
--- /dev/null
+++ b/.github/instructions/onebranch-signing-configuration.instructions.md
@@ -0,0 +1,195 @@
+---
+applyTo:
+  - ".pipelines/**/*.yml"
+  - ".pipelines/**/*.yaml"
+---
+
+# OneBranch Signing Configuration
+
+This guide explains how to configure OneBranch signing variables in Azure Pipeline jobs, particularly when signing is not required.
+
+## Purpose
+
+OneBranch pipelines include signing infrastructure by default. For build-only jobs where signing happens in a separate stage, you should disable signing setup to improve performance and avoid unnecessary overhead.
+
+## Disable Signing for Build-Only Jobs
+
+When a job does not perform signing (e.g., it only builds artifacts that will be signed in a later stage), disable both signing setup and code sign validation:
+
+```yaml
+variables:
+  - name: ob_signing_setup_enabled
+    value: false  # Disable signing setup - this is a build-only stage
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false  # Skip signing validation in build-only stage
+```
+
+### Why Disable These Variables?
+
+**`ob_signing_setup_enabled: false`**
+- Prevents OneBranch from setting up the signing infrastructure
+- Reduces job startup time
+- Avoids unnecessary credential validation
+- Only disable when the job will NOT sign any artifacts
+
+**`ob_sdl_codeSignValidation_enabled: false`**
+- Skips validation that checks if files are properly signed
+- Appropriate for build stages where artifacts are unsigned
+- Must be enabled in signing/release stages to validate signatures
+
+## Common Patterns
+
+### Build-Only Job (No Signing)
+
+```yaml
+jobs:
+- job: build_artifacts
+  variables:
+    - name: ob_signing_setup_enabled
+      value: false
+    - name: ob_sdl_codeSignValidation_enabled
+      value: false
+  steps:
+    - checkout: self
+    - pwsh: |
+        # Build unsigned artifacts
+        Start-PSBuild
+```
+
+### Signing Job
+
+```yaml
+jobs:
+- job: sign_artifacts
+  variables:
+    - name: ob_signing_setup_enabled
+      value: true
+    - name: ob_sdl_codeSignValidation_enabled
+      value: true
+  steps:
+    - checkout: self
+      env:
+        ob_restore_phase: true  # Steps before first signing operation
+    - pwsh: |
+        # Prepare artifacts for signing
+      env:
+        ob_restore_phase: true  # Steps before first signing operation
+    - task: onebranch.pipeline.signing@1
+      displayName: 'Sign artifacts'
+      # Signing step runs in build phase (no ob_restore_phase)
+    - pwsh: |
+        # Post-signing validation
+      # Post-signing steps run in build phase (no ob_restore_phase)
+```
+
+## Restore Phase Usage with Signing
+
+**The restore phase (`ob_restore_phase: true`) should only be used in jobs that perform signing operations.** It separates preparation steps from the actual signing and build steps.
+
+### When to Use Restore Phase
+
+Use `ob_restore_phase: true` **only** in jobs where `ob_signing_setup_enabled: true`:
+
+```yaml
+jobs:
+- job: sign_artifacts
+  variables:
+    - name: ob_signing_setup_enabled
+      value: true  # Signing enabled
+  steps:
+    # Steps BEFORE first signing operation: use restore phase
+    - checkout: self
+      env:
+        ob_restore_phase: true
+    - template: prepare-for-signing.yml
+      parameters:
+        ob_restore_phase: true
+
+    # SIGNING STEP: runs in build phase (no ob_restore_phase)
+    - task: onebranch.pipeline.signing@1
+      displayName: 'Sign artifacts'
+
+    # Steps AFTER signing: run in build phase (no ob_restore_phase)
+    - pwsh: |
+        # Validation or packaging
+```
+
+### When NOT to Use Restore Phase
+
+**Do not use restore phase in build-only jobs** where `ob_signing_setup_enabled: false`:
+
+```yaml
+jobs:
+- job: build_artifacts
+  variables:
+    - name: ob_signing_setup_enabled
+      value: false  # No signing
+    - name: ob_sdl_codeSignValidation_enabled
+      value: false
+  steps:
+    - checkout: self
+      # NO ob_restore_phase - not needed without signing
+    - pwsh: |
+        Start-PSBuild
+```
+
+**Why?** The restore phase is part of OneBranch's signing infrastructure. Using it without signing enabled adds unnecessary overhead without benefit.
+
+## Related Variables
+
+Other OneBranch signing-related variables:
+
+- `ob_sdl_binskim_enabled`: Controls BinSkim security analysis (can be false in build-only, true in signing stages)
+
+## Best Practices
+
+1. **Separate build and signing stages**: Build artifacts in one job, sign in another
+2. **Disable signing in build stages**: Improves performance and clarifies intent
+3. **Only use restore phase with signing**: The restore phase should only be used in jobs where signing is enabled (`ob_signing_setup_enabled: true`)
+4. **Restore phase before first signing step**: All steps before the first signing operation should use `ob_restore_phase: true`
+5. **Always validate after signing**: Enable validation in signing stages to catch issues
+6. **Document the reason**: Add comments explaining why signing is disabled or why restore phase is used
+
+## Example: Split Build and Sign Pipeline
+
+```yaml
+stages:
+  - stage: Build
+    jobs:
+    - job: build_windows
+      variables:
+        - name: ob_signing_setup_enabled
+          value: false  # Build-only, no signing
+        - name: ob_sdl_codeSignValidation_enabled
+          value: false  # Artifacts are unsigned
+      steps:
+        - template: templates/build-unsigned.yml
+
+  - stage: Sign
+    dependsOn: Build
+    jobs:
+    - job: sign_windows
+      variables:
+        - name: ob_signing_setup_enabled
+          value: true   # Enable signing infrastructure
+        - name: ob_sdl_codeSignValidation_enabled
+          value: true   # Validate signatures
+      steps:
+        - template: templates/sign-artifacts.yml
+```
+
+## Troubleshooting
+
+**Job fails with signing-related errors but signing is disabled:**
+- Verify `ob_signing_setup_enabled: false` is set in variables
+- Check that no template is overriding the setting
+- Ensure `ob_sdl_codeSignValidation_enabled: false` is also set
+
+**Signed artifacts fail validation:**
+- Confirm `ob_sdl_codeSignValidation_enabled: true` in signing job
+- Verify signing actually occurred
+- Check certificate configuration
+
+## Reference
+
+- PowerShell signing templates: `.pipelines/templates/packaging/windows/sign.yml`
diff --git a/.github/instructions/pester-set-itresult-pattern.instructions.md b/.github/instructions/pester-set-itresult-pattern.instructions.md
new file mode 100644
index 00000000000..33a73ca081d
--- /dev/null
+++ b/.github/instructions/pester-set-itresult-pattern.instructions.md
@@ -0,0 +1,198 @@
+---
+applyTo:
+  - "**/*.Tests.ps1"
+---
+
+# Pester Set-ItResult Pattern for Pending and Skipped Tests
+
+## Purpose
+
+This instruction explains when and how to use `Set-ItResult` in Pester tests to mark tests as Pending or Skipped dynamically within test execution.
+
+## When to Use Set-ItResult
+
+Use `Set-ItResult` when you need to conditionally mark a test as Pending or Skipped based on runtime conditions that can't be determined at test definition time.
+
+### Pending vs Skipped
+
+**Pending**: Use for tests that should be enabled but temporarily can't run due to:
+- Intermittent external service failures (network, APIs)
+- Known bugs being fixed
+- Missing features being implemented
+- Environmental issues that are being resolved
+
+**Skipped**: Use for tests that aren't applicable to the current environment:
+- Platform-specific tests running on wrong platform
+- Tests requiring specific hardware/configuration not present
+- Tests requiring elevated permissions when not available
+- Feature-specific tests when feature is disabled
+
+## Pattern
+
+### Basic Usage
+
+```powershell
+It "Test description" {
+    if ($shouldBePending) {
+        Set-ItResult -Pending -Because "Explanation of why test is pending"
+        return
+    }
+    
+    if ($shouldBeSkipped) {
+        Set-ItResult -Skipped -Because "Explanation of why test is skipped"
+        return
+    }
+    
+    # Test code here
+}
+```
+
+### Important: Always Return After Set-ItResult
+
+After calling `Set-ItResult`, you **must** return from the test to prevent further execution:
+
+```powershell
+It "Test that checks environment" {
+    if ($env:SKIP_TESTS -eq 'true') {
+        Set-ItResult -Skipped -Because "SKIP_TESTS environment variable is set"
+        return  # This is required!
+    }
+    
+    # Test assertions
+    $result | Should -Be $expected
+}
+```
+
+**Why?** Without `return`, the test continues executing and may fail with errors unrelated to the pending/skipped condition.
+
+## Examples from the Codebase
+
+### Example 1: Pending for Intermittent Network Issues
+
+```powershell
+It "Validate Update-Help for module" {
+    if ($markAsPending) {
+        Set-ItResult -Pending -Because "Update-Help from the web has intermittent connectivity issues. See issues #2807 and #6541."
+        return
+    }
+    
+    Update-Help -Module $moduleName -Force
+    # validation code...
+}
+```
+
+### Example 2: Skipped for Missing Environment
+
+```powershell
+It "Test requires CI environment" {
+    if (-not $env:CI) {
+        Set-ItResult -Skipped -Because "Test requires CI environment to safely install Pester"
+        return
+    }
+    
+    Install-CIPester -ErrorAction Stop
+}
+```
+
+### Example 3: Pending for Platform-Specific Issue
+
+```powershell
+It "Clear-Host works correctly" {
+    if ($IsARM64) {
+        Set-ItResult -Pending -Because "ARM64 runs in non-interactively mode and Clear-Host does not work."
+        return
+    }
+    
+    & { Clear-Host; 'hi' } | Should -BeExactly 'hi'
+}
+```
+
+### Example 4: Skipped for Missing Feature
+
+```powershell
+It "Test ACR authentication" {
+    if ($env:ACRTESTS -ne 'true') {
+        Set-ItResult -Skipped -Because "The tests require the ACRTESTS environment variable to be set to 'true' for ACR authentication."
+        return
+    }
+    
+    $psgetModuleInfo = Find-PSResource -Name $ACRTestModule -Repository $ACRRepositoryName
+    # test assertions...
+}
+```
+
+## Alternative: Static -Skip and -Pending Parameters
+
+For conditions that can be determined at test definition time, use the static parameters instead:
+
+```powershell
+# Static skip - condition known at definition time
+It "Windows-only test" -Skip:(-not $IsWindows) {
+    # test code
+}
+
+# Static pending - always pending
+It "Test for feature being implemented" -Pending {
+    # test code that will fail until feature is done
+}
+```
+
+**Use Set-ItResult when**:
+- Condition depends on runtime state
+- Condition is determined inside a helper function
+- Need to check multiple conditions sequentially
+
+**Use static parameters when**:
+- Condition is known at test definition
+- Condition doesn't change during test run
+- Want Pester to show the condition in test discovery
+
+## Best Practices
+
+1. **Always include -Because parameter** with a clear explanation
+2. **Always return after Set-ItResult** to prevent further execution
+3. **Reference issues or documentation** when relevant (e.g., "See issue #1234")
+4. **Be specific in the reason** - explain what's wrong and what's needed
+5. **Use Pending sparingly** - it indicates a problem that should be fixed
+6. **Prefer Skipped over Pending** when test truly isn't applicable
+
+## Common Mistakes
+
+### ❌ Mistake 1: Forgetting to Return
+
+```powershell
+It "Test" {
+    if ($condition) {
+        Set-ItResult -Pending -Because "Reason"
+        # Missing return - test code will still execute!
+    }
+    $value | Should -Be $expected  # This runs and fails
+}
+```
+
+### ❌ Mistake 2: Vague Reason
+
+```powershell
+Set-ItResult -Pending -Because "Doesn't work"  # Too vague
+```
+
+### ✅ Correct:
+
+```powershell
+It "Test" {
+    if ($condition) {
+        Set-ItResult -Pending -Because "Update-Help has intermittent network timeouts. See issue #2807."
+        return
+    }
+    $value | Should -Be $expected
+}
+```
+
+## See Also
+
+- [Pester Documentation: Set-ItResult](https://pester.dev/docs/commands/Set-ItResult)
+- [Pester Documentation: It](https://pester.dev/docs/commands/It)
+- Examples in the codebase:
+  - `test/powershell/Host/ConsoleHost.Tests.ps1`
+  - `test/infrastructure/ciModule.Tests.ps1`
+  - `tools/packaging/releaseTests/sbom.tests.ps1`
diff --git a/.github/instructions/pester-test-status-and-working-meaning.instructions.md b/.github/instructions/pester-test-status-and-working-meaning.instructions.md
new file mode 100644
index 00000000000..d2b28a05f18
--- /dev/null
+++ b/.github/instructions/pester-test-status-and-working-meaning.instructions.md
@@ -0,0 +1,299 @@
+---
+applyTo: "**/*.Tests.ps1"
+---
+
+# Pester Test Status Meanings and Working Tests
+
+## Purpose
+
+This guide clarifies Pester test outcomes and what it means for a test to be "working" - which requires both **passing** AND **actually validating functionality**.
+
+## Test Statuses in Pester
+
+### Passed ✓
+**Status Code**: `Passed` 
+**Exit Result**: Test ran successfully, all assertions passed
+
+**What it means**:
+- Test executed without errors
+- All `Should` statements evaluated to true
+- Test setup and teardown completed without issues
+- Test is **validating** the intended functionality
+
+**What it does NOT mean**:
+- The feature is working (assertions could be wrong)
+- The test is meaningful (could be testing wrong thing)
+- The test exercises all code paths
+
+### Failed ✗
+**Status Code**: `Failed`
+**Exit Result**: Test ran but assertions failed
+
+**What it means**:
+- Test executed but an assertion returned false
+- Expected value did not match actual value
+- Test detected a problem with the functionality
+
+**Examples**:
+```
+Expected $true but got $false
+Expected 5 items but got 3
+Expected no error but got: Cannot find parameter
+```
+
+### Error ⚠
+**Status Code**: `Error`
+**Exit Result**: Test crashed with an exception
+
+**What it means**:
+- Test failed to complete
+- An exception was thrown during test execution
+- Could be in test setup, test body, or test cleanup
+- Often indicates environmental issue, not code functional issue
+
+**Examples**:
+```
+Cannot bind argument to parameter 'Path' because it is null
+File not found: C:\expected\config.json
+Access denied writing to registry
+```
+
+### Pending ⏳
+**Status Code**: `Pending`
+**Exit Result**: Test ran but never completed assertions
+
+**What it means**:
+- Test was explicitly marked as not ready to run
+- `Set-ItResult -Pending` was called
+- Used to indicate: known bugs, missing features, environmental issues
+
+**When to use Pending**:
+- Test for feature in development
+- Test disabled due to known bug (issue #1234)
+- Test disabled due to intermittent failures being fixed
+- Platform-specific issues being resolved
+
+**⚠️ WARNING**: Pending tests are NOT validating functionality. They hide problems.
+
+### Skipped ⊘
+**Status Code**: `Skipped`  
+**Exit Result**: Test did not run (detected at start)
+
+**What it means**:
+- Test was intentionally not executed
+- `-Skip` parameter or `It -Skip:$condition` was used
+- Environment doesn't support this test
+
+**When to use Skip**:
+- Test not applicable to current platform (Windows-only test on Linux)
+- Test requires feature that's not available (admin privileges)
+- Test requires specific configuration not present
+
+**Difference from Pending**:
+- **Skip**: "This test shouldn't run here" (known upfront)
+- **Pending**: "This test should eventually run but can't now"
+
+### Ignored ✛
+**Status Code**: `Ignored`
+**Exit Result**: Test marked as not applicable
+
+**What it means**:
+- Test has `[Ignore("reason")]` attribute
+- Test is permanently disabled in this location
+- Not the same as Skipped (which is conditional)
+
+**When to use Ignore**:
+- Test for deprecated feature
+- Test for bug that won't be fixed
+- Test moved to different test file
+
+---
+
+## What Does "Working" Actually Mean?
+
+A test is **working** when it meets BOTH criteria:
+
+### 1. **Test Status is PASSED** ✓
+```powershell
+It "Test name" {
+    # Test executes
+    # All assertions pass
+    # Returns Passed status
+}
+```
+
+### 2. **Test Actually Validates Functionality**
+```powershell
+# ✓ GOOD: Tests actual functionality
+It "Get-Item returns files from directory" -Tags @('Unit') {
+    $testDir = New-Item -ItemType Directory -Force
+    New-Item -Path $testDir -Name "file.txt" -ItemType File | Out-Null
+    
+    $result = Get-Item -Path "$testDir\file.txt"
+    
+    $result.Name | Should -Be "file.txt"
+    $result | Should -Exist
+    
+    Remove-Item $testDir -Recurse -Force
+}
+
+# ✗ BAD: Returns Passed but doesn't validate functionality
+It "Get-Item returns files from directory" -Tags @('Unit') {
+    $result = Get-Item -Path somepath  # May not exist, may not actually test
+    $result | Should -Not -BeNullOrEmpty  # Too vague
+}
+
+# ✗ BAD: Test marked Pending - validation is hidden
+It "Get-Item returns files from directory" -Tags @('Unit') {
+    Set-ItResult -Pending -Because "File system not working"
+    return
+    # No validation happens at all
+}
+```
+
+---
+
+## The Problem with Pending Tests
+
+### Why Pending Tests Hide Problems
+
+```powershell
+# BAD: Test marked Pending - looks like "working" status but validation is skipped
+It "Download help from web" {
+    Set-ItResult -Pending -Because "Web connectivity issues"
+    return
+    
+    # This code never runs:
+    Update-Help -Module PackageManagement -Force -ErrorAction Stop
+    Get-Help Get-Package | Should -Not -BeNullOrEmpty
+}
+```
+
+**Result**:
+- ✗ Feature is broken (Update-Help fails)
+- ✓ Test shows "Pending" (looks acceptable)
+- ✗ Problem is hidden and never fixed
+
+### The Right Approach
+
+**Option A: Fix the root cause**
+```powershell
+It "Download help from web" {
+    # Use local assets that are guaranteed to work
+    Update-Help -Module PackageManagement -SourcePath ./assets -Force -ErrorAction Stop
+    
+    Get-Help Get-Package | Should -Not -BeNullOrEmpty
+}
+```
+
+**Option B: Gracefully skip when unavailable**
+```powershell
+It "Download help from web" -Skip:$(-not $hasInternet) {
+    Update-Help -Module PackageManagement -Force -ErrorAction Stop
+    Get-Help Get-Package | Should -Not -BeNullOrEmpty
+}
+```
+
+**Option C: Add retry logic for intermittent issues**
+```powershell
+It "Download help from web" {
+    $maxRetries = 3
+    $attempt = 0
+    
+    while ($attempt -lt $maxRetries) {
+        try {
+            Update-Help -Module PackageManagement -Force -ErrorAction Stop
+            break
+        }
+        catch {
+            $attempt++
+            if ($attempt -ge $maxRetries) { throw }
+            Start-Sleep -Seconds 2
+        }
+    }
+    
+    Get-Help Get-Package | Should -Not -BeNullOrEmpty
+}
+```
+
+---
+
+## Test Status Summary Table
+
+| Status | Passed? | Validates? | Counts as "Working"? | Use When |
+|--------|---------|------------|----------------------|----------|
+| **Passed** | ✓ | ✓ | **YES** | Feature is working and test proves it |
+| **Failed** | ✗ | ✓ | NO | Feature is broken or test has wrong expectation |
+| **Error** | ✗ | ✗ | NO | Test infrastructure broken, can't validate |
+| **Pending** | - | ✗ | **NO** ⚠️ | Temporary - test should eventually pass |
+| **Skipped** | - | ✗ | NO | Test not applicable to this environment |
+| **Ignored** | - | ✗ | NO | Test permanently disabled |
+
+---
+
+## Recommended Patterns
+
+### Pattern 1: Resilient Test with Fallback
+```powershell
+It "Feature works with web or local source" {
+    $useLocal = $false
+    
+    try {
+        Update-Help -Module Package -Force -ErrorAction Stop
+    }
+    catch {
+        $useLocal = $true
+        Update-Help -Module Package -SourcePath ./assets -Force -ErrorAction Stop
+    }
+    
+    # Validate functionality regardless of source
+    Get-Help Get-Package | Should -Not -BeNullOrEmpty
+}
+```
+
+### Pattern 2: Conditional Skip with Clear Reason
+```powershell
+Describe "Update-Help from Web" -Skip $(-not (Test-InternetConnectivity)) {
+    It "Downloads help successfully" {
+        Update-Help -Module PackageManagement -Force -ErrorAction Stop
+        Get-Help Get-Package | Should -Not -BeNullOrEmpty
+    }
+}
+```
+
+### Pattern 3: Separate Suites by Dependency
+```powershell
+Describe "Help Content Tests - Web" {
+    # Tests that require internet - can be skipped if unavailable
+    It "Downloads from web" { ... }
+}
+
+Describe "Help Content Tests - Local" {
+    # Tests with local assets - should always pass
+    It "Loads from local assets" {
+        Update-Help -Module Package -SourcePath ./assets -Force
+        Get-Help Get-Package | Should -Not -BeNullOrEmpty
+    }
+}
+```
+
+---
+
+## Checklist: Is Your Test "Working"?
+
+- [ ] Test status is **Passed** (not Pending, not Skipped, not Failed)
+- [ ] Test actually **executes** the feature being tested
+- [ ] Test has **specific assertions** (not just `Should -Not -BeNullOrEmpty`)
+- [ ] Test includes **cleanup** (removes temp files, restores state)
+- [ ] Test can run **multiple times** without side effects
+- [ ] Test failure **indicates a real problem** (not flaky assertions)
+- [ ] Test success **proves the feature works** (not just "didn't crash")
+
+If any of these is false, your test may be passing but not "working" properly.
+
+---
+
+## See Also
+
+- [Pester Documentation](https://pester.dev/)
+- [Set-ItResult Documentation](https://pester.dev/docs/commands/Set-ItResult)
diff --git a/.github/instructions/powershell-automatic-variables.instructions.md b/.github/instructions/powershell-automatic-variables.instructions.md
new file mode 100644
index 00000000000..5015847f41f
--- /dev/null
+++ b/.github/instructions/powershell-automatic-variables.instructions.md
@@ -0,0 +1,159 @@
+---
+applyTo:
+  - "**/*.ps1"
+  - "**/*.psm1"
+---
+
+# PowerShell Automatic Variables - Naming Guidelines
+
+## Purpose
+
+This instruction provides guidelines for avoiding conflicts with PowerShell's automatic variables when writing PowerShell scripts and modules.
+
+## What Are Automatic Variables?
+
+PowerShell has built-in automatic variables that are created and maintained by PowerShell itself. Assigning values to these variables can cause unexpected behavior and side effects.
+
+## Common Automatic Variables to Avoid
+
+### Critical Variables (Never Use)
+
+- **`$matches`** - Contains the results of regular expression matches. Overwriting this can break regex operations.
+- **`$_`** - Represents the current object in the pipeline. Only use within pipeline blocks.
+- **`$PSItem`** - Alias for `$_`. Same rules apply.
+- **`$args`** - Contains an array of undeclared parameters. Don't use as a regular variable.
+- **`$input`** - Contains an enumerator of all input passed to a function. Don't reassign.
+- **`$LastExitCode`** - Exit code of the last native command. Don't overwrite unless intentional.
+- **`$?`** - Success status of the last command. Don't use as a variable name.
+- **`$$`** - Last token in the last line received by the session. Don't use.
+- **`$^`** - First token in the last line received by the session. Don't use.
+
+### Context Variables (Use with Caution)
+
+- **`$Error`** - Array of error objects. Don't replace, but can modify (e.g., `$Error.Clear()`).
+- **`$PSBoundParameters`** - Parameters passed to the current function. Read-only.
+- **`$MyInvocation`** - Information about the current command. Read-only.
+- **`$PSCmdlet`** - Cmdlet object for advanced functions. Read-only.
+
+### Other Common Automatic Variables
+
+- `$true`, `$false`, `$null` - Boolean and null constants
+- `$HOME`, `$PSHome`, `$PWD` - Path-related variables
+- `$PID` - Process ID of the current PowerShell session
+- `$Host` - Host application object
+- `$PSVersionTable` - PowerShell version information
+
+For a complete list, see: https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_automatic_variables
+
+## Best Practices
+
+### ❌ Bad - Using Automatic Variable Names
+
+```powershell
+# Bad: $matches is an automatic variable used for regex capture groups
+$matches = Select-String -Path $file -Pattern $pattern
+
+# Bad: $args is an automatic variable for undeclared parameters
+$args = Get-ChildItem
+
+# Bad: $input is an automatic variable for pipeline input
+$input = Read-Host "Enter value"
+```
+
+### ✅ Good - Using Descriptive Alternative Names
+
+```powershell
+# Good: Use descriptive names that avoid conflicts
+$matchedLines = Select-String -Path $file -Pattern $pattern
+
+# Good: Use specific names for arguments
+$arguments = Get-ChildItem
+
+# Good: Use specific names for user input
+$userInput = Read-Host "Enter value"
+```
+
+## Naming Alternatives
+
+When you encounter a situation where you might use an automatic variable name, use these alternatives:
+
+| Avoid | Use Instead |
+|-------|-------------|
+| `$matches` | `$matchedLines`, `$matchResults`, `$regexMatches` |
+| `$args` | `$arguments`, `$parameters`, `$commandArgs` |
+| `$input` | `$userInput`, `$inputValue`, `$inputData` |
+| `$_` (outside pipeline) | Use a named parameter or explicit variable |
+| `$Error` (reassignment) | Don't reassign; use `$Error.Clear()` if needed |
+
+## How to Check
+
+### PSScriptAnalyzer Rule
+
+PSScriptAnalyzer has a built-in rule that detects assignments to automatic variables:
+
+```powershell
+# This will trigger PSAvoidAssignmentToAutomaticVariable
+$matches = Get-Something
+```
+
+**Rule ID**: PSAvoidAssignmentToAutomaticVariable
+
+### Manual Review
+
+When writing PowerShell code, always:
+1. Avoid variable names that match PowerShell keywords or automatic variables
+2. Use descriptive, specific names that clearly indicate the variable's purpose
+3. Run PSScriptAnalyzer on your code before committing
+4. Review code for variable naming during PR reviews
+
+## Examples from the Codebase
+
+### Example 1: Regex Matching
+
+```powershell
+# ❌ Bad - Overwrites automatic $matches variable
+$matches = [regex]::Matches($content, $pattern)
+
+# ✅ Good - Uses descriptive name
+$regexMatches = [regex]::Matches($content, $pattern)
+```
+
+### Example 2: Select-String Results
+
+```powershell
+# ❌ Bad - Conflicts with automatic $matches
+$matches = Select-String -Path $file -Pattern $pattern
+
+# ✅ Good - Clear and specific
+$matchedLines = Select-String -Path $file -Pattern $pattern
+```
+
+### Example 3: Collecting Arguments
+
+```powershell
+# ❌ Bad - Conflicts with automatic $args
+function Process-Items {
+    $args = $MyItems
+    # ... process items
+}
+
+# ✅ Good - Descriptive parameter name
+function Process-Items {
+    [CmdletBinding()]
+    param(
+        [Parameter(ValueFromRemainingArguments)]
+        [string[]]$Items
+    )
+    # ... process items
+}
+```
+
+## References
+
+- [PowerShell Automatic Variables Documentation](https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_automatic_variables)
+- [PSScriptAnalyzer Rules](https://github.com/PowerShell/PSScriptAnalyzer/blob/master/docs/Rules/README.md)
+- [PowerShell Best Practices](https://learn.microsoft.com/powershell/scripting/developer/cmdlet/strongly-encouraged-development-guidelines)
+
+## Summary
+
+**Key Takeaway**: Always use descriptive, specific variable names that clearly indicate their purpose and avoid conflicts with PowerShell's automatic variables. When in doubt, choose a longer, more descriptive name over a short one that might conflict.
diff --git a/.github/instructions/powershell-module-organization.instructions.md b/.github/instructions/powershell-module-organization.instructions.md
new file mode 100644
index 00000000000..9cdba06c364
--- /dev/null
+++ b/.github/instructions/powershell-module-organization.instructions.md
@@ -0,0 +1,201 @@
+---
+applyTo:
+  - "tools/ci.psm1"
+  - "build.psm1"
+  - "tools/packaging/**/*.psm1"
+  - ".github/**/*.yml"
+  - ".github/**/*.yaml"
+---
+
+# Guidelines for PowerShell Code Organization
+
+## When to Move Code from YAML to PowerShell Modules
+
+PowerShell code in GitHub Actions YAML files should be kept minimal. Move code to a module when:
+
+### Size Threshold
+- **More than ~30 lines** of PowerShell in a YAML file step
+- **Any use of .NET types** like `[regex]`, `[System.IO.Path]`, etc.
+- **Complex logic** requiring multiple nested loops or conditionals
+- **Reusable functionality** that might be needed elsewhere
+
+### Indicators to Move Code
+1. Using .NET type accelerators (`[regex]`, `[PSCustomObject]`, etc.)
+2. Complex string manipulation or parsing
+3. File system operations beyond basic reads/writes
+4. Logic that would benefit from unit testing
+5. Code that's difficult to read/maintain in YAML format
+
+## Which Module to Use
+
+### ci.psm1 (`tools/ci.psm1`)
+**Purpose**: CI/CD-specific operations and workflows
+
+**Use for**:
+- Build orchestration (invoking builds, tests, packaging)
+- CI environment setup and configuration
+- Test execution and result processing
+- Artifact handling and publishing
+- CI-specific validations and checks
+- Environment variable management for CI
+
+**Examples**:
+- `Invoke-CIBuild` - Orchestrates build process
+- `Invoke-CITest` - Runs Pester tests
+- `Test-MergeConflictMarker` - Validates files for conflicts
+- `Set-BuildVariable` - Manages CI variables
+
+**When NOT to use**:
+- Core build operations (use build.psm1)
+- Package creation logic (use packaging.psm1)
+- Platform-specific build steps
+
+### build.psm1 (`build.psm1`)
+**Purpose**: Core build operations and utilities
+
+**Use for**:
+- Compiling source code
+- Resource generation
+- Build configuration management
+- Core build utilities (New-PSOptions, Get-PSOutput, etc.)
+- Bootstrap operations
+- Cross-platform build helpers
+
+**Examples**:
+- `Start-PSBuild` - Main build function
+- `Start-PSBootstrap` - Bootstrap dependencies
+- `New-PSOptions` - Create build configuration
+- `Start-ResGen` - Generate resources
+
+**When NOT to use**:
+- CI workflow orchestration (use ci.psm1)
+- Package creation (use packaging.psm1)
+- Test execution
+
+### packaging.psm1 (`tools/packaging/packaging.psm1`)
+**Purpose**: Package creation and distribution
+
+**Use for**:
+- Creating distribution packages (MSI, RPM, DEB, etc.)
+- Package-specific metadata generation
+- Package signing operations
+- Platform-specific packaging logic
+
+**Examples**:
+- `Start-PSPackage` - Create packages
+- `New-MSIXPackage` - Create Windows MSIX
+- `New-DotnetSdkContainerFxdPackage` - Create container packages
+
+**When NOT to use**:
+- Building binaries (use build.psm1)
+- Running tests (use ci.psm1)
+- General utilities
+
+## Best Practices
+
+### Keep YAML Minimal
+```yaml
+# ❌ Bad - too much logic in YAML
+- name: Check files
+  shell: pwsh
+  run: |
+    $files = Get-ChildItem -Recurse
+    foreach ($file in $files) {
+      $content = Get-Content $file -Raw
+      if ($content -match $pattern) {
+        # ... complex processing ...
+      }
+    }
+
+# ✅ Good - call function from module
+- name: Check files
+  shell: pwsh
+  run: |
+    Import-Module ./tools/ci.psm1
+    Test-SomeCondition -Path ${{ github.workspace }}
+```
+
+### Document Functions
+Always include comment-based help for functions:
+```powershell
+function Test-MyFunction
+{
+    <#
+    .SYNOPSIS
+        Brief description
+    .DESCRIPTION
+        Detailed description
+    .PARAMETER ParameterName
+        Parameter description
+    .EXAMPLE
+        Test-MyFunction -ParameterName Value
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)]
+        [string] $ParameterName
+    )
+    # Implementation
+}
+```
+
+### Error Handling
+Use proper error handling in modules:
+```powershell
+try {
+    # Operation
+}
+catch {
+    Write-Error "Detailed error message: $_"
+    throw
+}
+```
+
+### Verbose Output
+Use `Write-Verbose` for debugging information:
+```powershell
+Write-Verbose "Processing file: $filePath"
+```
+
+## Module Dependencies
+
+- **ci.psm1** imports both `build.psm1` and `packaging.psm1`
+- **build.psm1** is standalone (minimal dependencies)
+- **packaging.psm1** imports `build.psm1`
+
+When adding new functions, consider these import relationships to avoid circular dependencies.
+
+## Testing Modules
+
+Functions in modules should be testable:
+```powershell
+# Test locally
+Import-Module ./tools/ci.psm1 -Force
+Test-MyFunction -Parameter Value
+
+# Can be unit tested with Pester
+Describe "Test-MyFunction" {
+    It "Should return expected result" {
+        # Test implementation
+    }
+}
+```
+
+## Migration Checklist
+
+When moving code from YAML to a module:
+
+1. ✅ Determine which module is appropriate (ci, build, or packaging)
+2. ✅ Create function with proper parameter validation
+3. ✅ Add comment-based help documentation
+4. ✅ Use `[CmdletBinding()]` for advanced function features
+5. ✅ Include error handling
+6. ✅ Add verbose output for debugging
+7. ✅ Test the function independently
+8. ✅ Update YAML to call the new function
+9. ✅ Verify the workflow still works end-to-end
+
+## References
+
+- PowerShell Advanced Functions: https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_functions_advanced
+- Comment-Based Help: https://learn.microsoft.com/powershell/scripting/developer/help/writing-help-for-windows-powershell-scripts-and-functions
diff --git a/.github/instructions/powershell-parameter-naming.instructions.md b/.github/instructions/powershell-parameter-naming.instructions.md
new file mode 100644
index 00000000000..155fd1a85c3
--- /dev/null
+++ b/.github/instructions/powershell-parameter-naming.instructions.md
@@ -0,0 +1,69 @@
+---
+applyTo: '**/*.ps1, **/*.psm1'
+description: Naming conventions for PowerShell parameters
+---
+
+# PowerShell Parameter Naming Conventions
+
+## Purpose
+
+This instruction defines the naming conventions for parameters in PowerShell scripts and modules. Consistent parameter naming improves code readability, maintainability, and usability for users of PowerShell cmdlets and functions.
+
+## Parameter Naming Rules
+
+### General Conventions
+- **Singular Nouns**: Use singular nouns for parameter names even if the parameter is expected to handle multiple values (e.g., `File` instead of `Files`).
+- **Use PascalCase**: Parameter names must use PascalCase (e.g., `ParameterName`).
+- **Descriptive Names**: Parameter names should be descriptive and convey their purpose clearly (e.g., `FilePath`, `UserName`).
+- **Avoid Abbreviations**: Avoid using abbreviations unless they are widely recognized (e.g., `ID` for Identifier).
+- **Avoid Reserved Words**: Do not use PowerShell reserved words as parameter names (e.g., `if`, `else`, `function`).
+
+### Units and Precision
+- **Include Units in Parameter Names**: When a parameter represents a value with units, include the unit in the parameter name for clarity:
+  - `TimeoutSec` instead of `Timeout`
+  - `RetryIntervalSec` instead of `RetryInterval`
+  - `MaxSizeBytes` instead of `MaxSize`
+- **Use Full Words for Clarity**: Spell out common terms to match PowerShell conventions:
+  - `MaximumRetryCount` instead of `MaxRetries`
+  - `MinimumLength` instead of `MinLength`
+
+### Alignment with Built-in Cmdlets
+- **Follow Existing PowerShell Conventions**: When your parameter serves a similar purpose to a built-in cmdlet parameter, use the same or similar naming:
+  - Match `Invoke-WebRequest` parameters when making HTTP requests: `TimeoutSec`, `MaximumRetryCount`, `RetryIntervalSec`
+  - Follow common parameter patterns like `Path`, `Force`, `Recurse`, `WhatIf`, `Confirm`
+- **Consistency Within Scripts**: If multiple parameters relate to the same concept, use consistent naming patterns (e.g., `TimeoutSec`, `RetryIntervalSec` both use `Sec` suffix).
+
+## Examples
+
+### Good Parameter Names
+```powershell
+param(
+    [string[]]$File,                    # Singular, even though it accepts arrays
+    [int]$TimeoutSec = 30,              # Unit included
+    [int]$MaximumRetryCount = 2,        # Full word "Maximum"
+    [int]$RetryIntervalSec = 2,         # Consistent with TimeoutSec
+    [string]$Path,                      # Standard PowerShell convention
+    [switch]$Force                      # Common PowerShell parameter
+)
+```
+
+### Names to Avoid
+```powershell
+param(
+    [string[]]$Files,                   # Should be singular: File
+    [int]$Timeout = 30,                 # Missing unit: TimeoutSec
+    [int]$MaxRetries = 2,               # Should be: MaximumRetryCount
+    [int]$RetryInterval = 2,            # Missing unit: RetryIntervalSec
+    [string]$FileLoc,                   # Avoid abbreviations: FilePath
+    [int]$Max                           # Ambiguous: MaximumWhat?
+)
+```
+
+## Exceptions
+- **Common Terms**: Some common terms may be used in plural form if they are widely accepted in the context (e.g., `Credentials`, `Permissions`).
+- **Legacy Code**: Existing code that does not follow these conventions may be exempted to avoid breaking changes, but new code should adhere to these guidelines.
+- **Well Established Naming Patterns**: If a naming pattern is well established in the PowerShell community, it may be used even if it does not strictly adhere to these guidelines.
+
+## References
+- [PowerShell Cmdlet Design Guidelines](https://learn.microsoft.com/powershell/scripting/developer/cmdlet/strongly-encouraged-development-guidelines)
+- [About Parameters - PowerShell Documentation](https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_parameters)
diff --git a/.github/instructions/publishing-pester-result.instructions.md b/.github/instructions/publishing-pester-result.instructions.md
new file mode 100644
index 00000000000..49010e65a99
--- /dev/null
+++ b/.github/instructions/publishing-pester-result.instructions.md
@@ -0,0 +1,272 @@
+---
+applyTo: ".github/**/*.{yml,yaml}"
+---
+
+# Publishing Pester Test Results Instructions
+
+This document describes how the PowerShell repository uses GitHub Actions to publish Pester test results.
+
+## Overview
+
+The PowerShell repository uses a custom composite GitHub Action located at `.github/actions/test/process-pester-results` to process and publish Pester test results in CI/CD workflows.
+This action aggregates test results from NUnitXml formatted files, creates a summary in the GitHub Actions job summary, and uploads the results as artifacts.
+
+## How It Works
+
+### Action Location and Structure
+
+**Path**: `.github/actions/test/process-pester-results/`
+
+The action consists of two main files:
+
+1. **action.yml** - The composite action definition
+1. **process-pester-results.ps1** - PowerShell script that processes test results
+
+### Action Inputs
+
+The action accepts the following inputs:
+
+- **name** (required): A descriptive name for the test run (e.g., "UnelevatedPesterTests-CI")
+    - Used for naming the uploaded artifact and in the summary
+    - Format: `junit-pester-{name}`
+
+- **testResultsFolder** (optional): Path to the folder containing test result XML files
+    - Default: `${{ runner.workspace }}/testResults`
+    - The script searches for all `*.xml` files in this folder recursively
+
+### Action Workflow
+
+The action performs the following steps:
+
+1. **Process Test Results**
+    - Runs `process-pester-results.ps1` with the provided name and test results folder
+    - Parses all NUnitXml formatted test result files (`*.xml`)
+    - Aggregates test statistics across all files:
+        - Total test cases
+        - Errors
+        - Failures
+        - Not run tests
+        - Inconclusive tests
+        - Ignored tests
+        - Skipped tests
+        - Invalid tests
+
+1. **Generate Summary**
+    - Creates a markdown summary using the `$GITHUB_STEP_SUMMARY` environment variable
+    - Uses `Write-Log` and `Write-LogGroupStart`/`Write-LogGroupEnd` functions from `build.psm1`
+    - Outputs a formatted summary with all test statistics
+    - Example format:
+
+    ```markdown
+    # Summary of {Name}
+
+    - Total Tests: X
+    - Total Errors: X
+    - Total Failures: X
+    - Total Not Run: X
+    - Total Inconclusive: X
+    - Total Ignored: X
+    - Total Skipped: X
+    - Total Invalid: X
+    ```
+
+1. **Upload Artifacts**
+    - Uses `actions/upload-artifact@v4` to upload test results
+    - Artifact name: `junit-pester-{name}`
+    - Always runs (even if previous steps fail) via `if: always()`
+    - Uploads the entire test results folder
+
+1. **Exit Status**
+    - Fails the job (exit 1) if:
+        - Any test errors occurred (`$testErrorCount -gt 0`)
+        - Any test failures occurred (`$testFailureCount -gt 0`)
+        - No test cases were run (`$testCaseCount -eq 0`)
+
+## Usage in Test Actions
+
+The `process-pester-results` action is called by two platform-specific composite test actions:
+
+### Linux/macOS Tests: `.github/actions/test/nix`
+
+Used in:
+
+- `.github/workflows/linux-ci.yml`
+- `.github/workflows/macos-ci.yml`
+
+Example usage (lines 99-104 in `nix/action.yml`):
+
+```yaml
+- name: Convert, Publish, and Upload Pester Test Results
+  uses: "./.github/actions/test/process-pester-results"
+  with:
+    name: "${{ inputs.purpose }}-${{ inputs.tagSet }}"
+    testResultsFolder: "${{ runner.workspace }}/testResults"
+```
+
+### Windows Tests: `.github/actions/test/windows`
+
+Used in:
+
+- `.github/workflows/windows-ci.yml`
+
+Example usage (line 78-83 in `windows/action.yml`):
+
+```yaml
+- name: Convert, Publish, and Upload Pester Test Results
+  uses: "./.github/actions/test/process-pester-results"
+  with:
+    name: "${{ inputs.purpose }}-${{ inputs.tagSet }}"
+    testResultsFolder: ${{ runner.workspace }}\testResults
+```
+
+## Workflow Integration
+
+The process-pester-results action is integrated into the CI workflows through a multi-level hierarchy:
+
+### Level 1: Main CI Workflows
+
+- `linux-ci.yml`
+- `macos-ci.yml`
+- `windows-ci.yml`
+
+### Level 2: Test Jobs
+
+Each workflow contains multiple test jobs with different purposes and tag sets:
+
+- `UnelevatedPesterTests` with tagSet `CI`
+- `ElevatedPesterTests` with tagSet `CI`
+- `UnelevatedPesterTests` with tagSet `Others`
+- `ElevatedPesterTests` with tagSet `Others`
+
+### Level 3: Platform Test Actions
+
+Test jobs use platform-specific actions:
+
+- `nix` for Linux and macOS
+- `windows` for Windows
+
+### Level 4: Process Results Action
+
+Platform actions call `process-pester-results` to publish results
+
+## Test Execution Flow
+
+1. **Build Phase**: Source code is built (e.g., in `ci_build` job)
+1. **Test Preparation**:
+    - Build artifacts are downloaded
+    - PowerShell is bootstrapped
+    - Test binaries are extracted
+1. **Test Execution**:
+    - `Invoke-CITest` is called with:
+        - `-Purpose`: Test purpose (e.g., "UnelevatedPesterTests")
+        - `-TagSet`: Test category (e.g., "CI", "Others")
+        - `-OutputFormat NUnitXml`: Results format
+    - Results are written to `${{ runner.workspace }}/testResults`
+1. **Results Processing**:
+    - `process-pester-results` action runs
+    - Results are aggregated and summarized
+    - Artifacts are uploaded
+    - Job fails if any tests failed or errored
+
+## Key Dependencies
+
+### PowerShell Modules
+
+- **build.psm1**: Provides utility functions
+    - `Write-Log`: Logging function with GitHub Actions support
+    - `Write-LogGroupStart`: Creates collapsible log groups
+    - `Write-LogGroupEnd`: Closes collapsible log groups
+
+### GitHub Actions Features
+
+- **GITHUB_STEP_SUMMARY**: Environment variable for job summary
+- **actions/upload-artifact@v4**: For uploading test results
+- **Composite Actions**: For reusable workflow steps
+
+### Test Result Format
+
+- **NUnitXml**: XML format for test results
+- Expected XML structure with `test-results` root element containing:
+    - `total`: Total number of tests
+    - `errors`: Number of errors
+    - `failures`: Number of failures
+    - `not-run`: Number of tests not run
+    - `inconclusive`: Number of inconclusive tests
+    - `ignored`: Number of ignored tests
+    - `skipped`: Number of skipped tests
+    - `invalid`: Number of invalid tests
+
+## Best Practices
+
+1. **Naming Convention**: Use descriptive names that include both purpose and tagSet:
+    - Format: `{purpose}-{tagSet}`
+    - Example: `UnelevatedPesterTests-CI`
+
+1. **Test Results Location**:
+    - Default location: `${{ runner.workspace }}/testResults`
+    - Use platform-appropriate path separators (Windows: `\`, Unix: `/`)
+
+1. **Always Upload**: The artifact upload step uses `if: always()` to ensure results are uploaded even when tests fail
+
+1. **Error Handling**: The action will fail the job if:
+    - Tests have errors or failures (intentional fail-fast behavior)
+    - No tests were executed (potential configuration issue)
+    - `GITHUB_STEP_SUMMARY` is not set (environment issue)
+
+## Customizing for Your Repository
+
+To use this pattern in another repository:
+
+1. **Copy the Action Files**:
+    - Copy `.github/actions/test/process-pester-results/` directory
+    - Ensure the PowerShell script has proper permissions
+
+1. **Adjust Dependencies**:
+    - Modify or remove the `Import-Module "$PSScriptRoot/../../../../build.psm1"` line
+    - Implement equivalent `Write-Log` and `Write-LogGroup*` functions if needed
+
+1. **Customize Summary Format**:
+    - Modify the here-string in `process-pester-results.ps1` to change summary format
+    - Add additional metrics or formatting as needed
+
+1. **Call from Your Workflows**:
+
+    ```yaml
+    - name: Process Test Results
+      uses: "./.github/actions/test/process-pester-results"
+      with:
+        name: "my-test-run"
+        testResultsFolder: "path/to/results"
+    ```
+
+## Related Documentation
+
+- [GitHub Actions: Creating composite actions](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action)
+- [GitHub Actions: Job summaries](https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary)
+- [GitHub Actions: Uploading artifacts](https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts)
+- [Pester: PowerShell testing framework](https://pester.dev/)
+- [NUnit XML Format](https://docs.nunit.org/articles/nunit/technical-notes/usage/Test-Result-XML-Format.html)
+
+## Troubleshooting
+
+### No Test Results Found
+
+- Verify `testResultsFolder` path is correct
+- Ensure tests are generating NUnitXml formatted output
+- Check that `*.xml` files exist in the specified folder
+
+### Action Fails with "GITHUB_STEP_SUMMARY is not set"
+
+- Ensure the action runs within a GitHub Actions environment
+- Cannot be run locally without mocking this environment variable
+
+### All Tests Pass but Job Fails
+
+- Check if any tests are marked as errors (different from failures)
+- Verify that at least some tests executed (`$testCaseCount -eq 0`)
+
+### Artifact Upload Fails
+
+- Check artifact name for invalid characters
+- Ensure the test results folder exists
+- Verify actions/upload-artifact version compatibility
diff --git a/.github/instructions/start-native-execution.instructions.md b/.github/instructions/start-native-execution.instructions.md
new file mode 100644
index 00000000000..347e496b3bf
--- /dev/null
+++ b/.github/instructions/start-native-execution.instructions.md
@@ -0,0 +1,149 @@
+---
+applyTo:
+  - "**/*.ps1"
+  - "**/*.psm1"
+---
+
+# Using Start-NativeExecution for Native Command Execution
+
+## Purpose
+
+`Start-NativeExecution` is the standard function for executing native commands (external executables) in PowerShell scripts within this repository. It provides consistent error handling and better diagnostics when native commands fail.
+
+## When to Use
+
+Use `Start-NativeExecution` whenever you need to:
+- Execute external commands (e.g., `git`, `dotnet`, `pkgbuild`, `productbuild`, `fpm`, `rpmbuild`)
+- Ensure proper exit code checking
+- Get better error messages with caller information
+- Handle verbose output on error
+
+## Basic Usage
+
+```powershell
+Start-NativeExecution {
+    git clone https://github.com/PowerShell/PowerShell.git
+}
+```
+
+## With Parameters
+
+Use backticks for line continuation within the script block:
+
+```powershell
+Start-NativeExecution {
+    pkgbuild --root $pkgRoot `
+        --identifier $pkgIdentifier `
+        --version $Version `
+        --scripts $scriptsDir `
+        $outputPath
+}
+```
+
+## Common Parameters
+
+### -VerboseOutputOnError
+
+Captures command output and displays it only if the command fails:
+
+```powershell
+Start-NativeExecution -VerboseOutputOnError {
+    dotnet build --configuration Release
+}
+```
+
+### -IgnoreExitcode
+
+Allows the command to fail without throwing an exception:
+
+```powershell
+Start-NativeExecution -IgnoreExitcode {
+    git diff --exit-code  # Returns 1 if differences exist
+}
+```
+
+## Availability
+
+The function is defined in `tools/buildCommon/startNativeExecution.ps1` and is available in:
+- `build.psm1` (dot-sourced automatically)
+- `tools/packaging/packaging.psm1` (dot-sourced automatically)
+- Test modules that include `HelpersCommon.psm1`
+
+To use in other scripts, dot-source the function:
+
+```powershell
+. "$PSScriptRoot/../buildCommon/startNativeExecution.ps1"
+```
+
+## Error Handling
+
+When a native command fails (non-zero exit code), `Start-NativeExecution`:
+1. Captures the exit code
+2. Identifies the calling location (file and line number)
+3. Throws a descriptive error with full context
+
+Example error message:
+```
+Execution of {git clone ...} by /path/to/script.ps1: line 42 failed with exit code 1
+```
+
+## Examples from the Codebase
+
+### Git Operations
+```powershell
+Start-NativeExecution {
+    git fetch --tags --quiet upstream
+}
+```
+
+### Build Operations
+```powershell
+Start-NativeExecution -VerboseOutputOnError {
+    dotnet publish --configuration Release
+}
+```
+
+### Packaging Operations
+```powershell
+Start-NativeExecution -VerboseOutputOnError {
+    pkgbuild --root $pkgRoot --identifier $pkgId --version $version $outputPath
+}
+```
+
+### Permission Changes
+```powershell
+Start-NativeExecution {
+    find $staging -type d | xargs chmod 755
+    find $staging -type f | xargs chmod 644
+}
+```
+
+## Anti-Patterns
+
+**Don't do this:**
+```powershell
+& somecommand $args
+if ($LASTEXITCODE -ne 0) {
+    throw "Command failed"
+}
+```
+
+**Do this instead:**
+```powershell
+Start-NativeExecution {
+    somecommand $args
+}
+```
+
+## Best Practices
+
+1. **Always use Start-NativeExecution** for native commands to ensure consistent error handling
+2. **Use -VerboseOutputOnError** for commands with useful diagnostic output
+3. **Use backticks for readability** when commands have multiple arguments
+4. **Don't capture output unnecessarily** - let the function handle it
+5. **Use -IgnoreExitcode sparingly** - only when non-zero exit codes are expected and acceptable
+
+## Related Documentation
+
+- Source: `tools/buildCommon/startNativeExecution.ps1`
+- Blog post: https://mnaoumov.wordpress.com/2015/01/11/execution-of-external-commands-in-powershell-done-right/
diff --git a/.github/instructions/start-psbuild-basics.instructions.md b/.github/instructions/start-psbuild-basics.instructions.md
new file mode 100644
index 00000000000..18a0026eb2d
--- /dev/null
+++ b/.github/instructions/start-psbuild-basics.instructions.md
@@ -0,0 +1,100 @@
+---
+applyTo:
+  - "build.psm1"
+  - "tools/ci.psm1"
+  - ".github/**/*.yml"
+  - ".github/**/*.yaml"
+---
+
+# Start-PSBuild Basics
+
+## Purpose
+
+`Start-PSBuild` builds PowerShell from source. It's defined in `build.psm1` and used in CI/CD workflows.
+
+## Default Usage
+
+For most scenarios, use with no parameters:
+
+```powershell
+Import-Module ./tools/ci.psm1
+Start-PSBuild
+```
+
+**Default behavior:**
+- Configuration: `Debug`
+- PSModuleRestore: Enabled
+- Runtime: Auto-detected for platform
+
+## Common Configurations
+
+### Debug Build (Default)
+
+```powershell
+Start-PSBuild
+```
+
+Use for:
+- Testing (xUnit, Pester)
+- Development
+- Debugging
+
+### Release Build
+
+```powershell
+Start-PSBuild -Configuration 'Release'
+```
+
+Use for:
+- Production packages
+- Distribution
+- Performance testing
+
+### Code Coverage Build
+
+```powershell
+Start-PSBuild -Configuration 'CodeCoverage'
+```
+
+Use for:
+- Code coverage analysis
+- Test coverage reports
+
+## Common Parameters
+
+### -Configuration
+
+Values: `Debug`, `Release`, `CodeCoverage`, `StaticAnalysis`
+
+Default: `Debug`
+
+### -CI
+
+Restores Pester module for CI environments.
+
+```powershell
+Start-PSBuild -CI
+```
+
+### -PSModuleRestore
+
+Now enabled by default. Use `-NoPSModuleRestore` to skip.
+
+### -ReleaseTag
+
+Specifies version tag for release builds:
+
+```powershell
+$releaseTag = Get-ReleaseTag
+Start-PSBuild -Configuration 'Release' -ReleaseTag $releaseTag
+```
+
+## Workflow Example
+
+```yaml
+- name: Build PowerShell
+  shell: pwsh
+  run: |
+    Import-Module ./tools/ci.psm1
+    Start-PSBuild
+```
diff --git a/.github/instructions/troubleshooting-builds.instructions.md b/.github/instructions/troubleshooting-builds.instructions.md
new file mode 100644
index 00000000000..e9b60cb8c80
--- /dev/null
+++ b/.github/instructions/troubleshooting-builds.instructions.md
@@ -0,0 +1,100 @@
+---
+applyTo:
+  - "build.psm1"
+  - "tools/ci.psm1"
+  - ".github/**/*.yml"
+  - ".github/**/*.yaml"
+---
+
+# Troubleshooting Build Issues
+
+## Git Describe Error
+
+**Error:**
+```
+error MSB3073: The command "git describe --abbrev=60 --long" exited with code 128.
+```
+
+**Cause:** Insufficient git history (shallow clone)
+
+**Solution:** Add `fetch-depth: 1000` to checkout step
+
+```yaml
+- name: Checkout
+  uses: actions/checkout@v4
+  with:
+    fetch-depth: 1000
+```
+
+## Version Information Incorrect
+
+**Symptom:** Build produces wrong version numbers
+
+**Cause:** Git tags not synchronized
+
+**Solution:** Run `Sync-PSTags -AddRemoteIfMissing`:
+
+```yaml
+- name: Bootstrap
+  shell: pwsh
+  run: |
+    Import-Module ./tools/ci.psm1
+    Invoke-CIInstall -SkipUser
+    Sync-PSTags -AddRemoteIfMissing
+```
+
+## PowerShell Binary Not Built
+
+**Error:**
+```
+Exception: CoreCLR pwsh.exe was not built
+```
+
+**Causes:**
+1. Build failed (check logs)
+2. Wrong configuration used
+3. Build output location incorrect
+
+**Solutions:**
+1. Check build logs for errors
+2. Verify correct configuration for use case
+3. Use default parameters: `Start-PSBuild`
+
+## Module Restore Issues
+
+**Symptom:** Slow build or module restore failures
+
+**Causes:**
+- Network issues
+- Module cache problems
+- Package source unavailable
+
+**Solutions:**
+1. Retry the build
+2. Check network connectivity
+3. Use `-NoPSModuleRestore` if modules not needed
+4. Clear package cache if persistent
+
+## .NET SDK Not Found
+
+**Symptom:** Build can't find .NET SDK
+
+**Solution:** Ensure .NET setup step runs first:
+
+```yaml
+- name: Setup .NET
+  uses: actions/setup-dotnet@v4
+  with:
+    global-json-file: ./global.json
+```
+
+## Bootstrap Failures
+
+**Symptom:** Invoke-CIInstall fails
+
+**Causes:**
+- Missing dependencies
+- Network issues
+- Platform-specific requirements not met
+
+**Solution:** Check prerequisites for your platform in build system docs
diff --git a/.github/policies/IssueManagement.CloseResolutions.yml b/.github/policies/IssueManagement.CloseResolutions.yml
new file mode 100644
index 00000000000..23ab9422e1a
--- /dev/null
+++ b/.github/policies/IssueManagement.CloseResolutions.yml
@@ -0,0 +1,137 @@
+id: CloseResolutionTags
+name: GitOps.PullRequestIssueManagement
+description: Closing issues with Resolution* 
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: Close if marked as Resolution-Declined after one day of no activity
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Declined
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as declined and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+    
+    - description: Close if marked as Resolution-By Design after one day of no activity
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-By Design
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as by-design and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+    
+    - description: Close if marked as Resolution-Won't Fix after one day of no activity
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Won't Fix
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: 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.
+      - closeIssue
+    
+    - description: Close if marked as Resolution-No Activity after seven day of no activity, no reply 
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isOpen
+      - isIssue
+      - hasLabel:
+          label: Resolution-No Activity
+      - noActivitySince:
+          days: 7
+      actions:
+      - closeIssue
+    
+    - description: Close if marked as Resolution-Duplicate after one day of no activity
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Duplicate
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+    
+    - description: Close if marked as Resolution-External after one day of no activity
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-External
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as external and has not had any activity for **1 day**. It has been be closed for housekeeping purposes.
+      - closeIssue
+    
+    - description: Close if marked as Resolution-Answered after one day of no activity
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Answered
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as answered and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+    
+    - description: Close if marked as Resolution-Fixed after one day of no activity
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Fixed
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as fixed and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+onFailure:
+onSuccess:
diff --git a/.github/policies/IssueManagement.ResolveStale.yml b/.github/policies/IssueManagement.ResolveStale.yml
new file mode 100644
index 00000000000..fd254715ea9
--- /dev/null
+++ b/.github/policies/IssueManagement.ResolveStale.yml
@@ -0,0 +1,109 @@
+id: IssueManagement.ResolveStale
+name: GitOps.PullRequestIssueManagement
+description: Other issue management rules for closing stale and waiting on author requests
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: Close if marked as Waiting on Author and no activity in 7 days
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isOpen
+      - isIssue
+      - hasLabel:
+          label: Waiting on Author
+      - noActivitySince:
+          days: 7
+      actions:
+      - addReply:
+          reply: 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.
+      - closeIssue
+    
+    - description: Label as Resolution-No Activity if not labeled with KeepOpen and no activity in 6 months
+      frequencies:
+      - hourly:
+          hour: 24
+      filters:
+      - isIssue
+      - isOpen
+      - isNotLabeledWith:
+          label: KeepOpen
+      - isNotLabeledWith:
+          label: In-PR
+      - isNotLabeledWith:
+          label: Needs-Triage
+      - isNotLabeledWith:
+          label: Resolution-No Activity
+      - isNotLabeledWith:
+          label: Issue-Meta
+      - isNotLabeledWith:
+          label: Review - Needed
+      - isNotLabeledWith:
+          label: Review - Committee
+      - isNotLabeledWith:
+          label: Review - Maintainer
+      - isNotLabeledWith:
+          label: WG-NeedsReview
+     # Up for grabs labeled issues will get closed after a 6 months of no activity unless KeepOpen label is included
+      - noActivitySince:
+          days: 180
+      actions:
+      - addLabel:
+          label: Resolution-No Activity
+      - addReply:
+          reply: "This issue has not had any activity in 6 months, if there is no further activity in 7 days, the issue will be closed automatically.\n\nActivity in this case refers only to comments on the issue. If the issue is closed and you are the author, you can re-open the issue using the button below. Please add more information to be considered during retriage. If you are not the author but the issue is impacting you after it has been closed, please submit a new issue with updated details and a link to this issue and the original."
+    eventResponderTasks:
+    - description: Remove no resolution label if anyone comments while in 7 day window
+      if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: Resolution-No Activity
+      - isOpen
+      then:
+      - removeLabel:
+          label: Resolution-No Activity
+    
+    - description: If new issue comment is author then remove waiting on author
+      if:
+      - payloadType: Issue_Comment
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: Waiting on Author
+      then:
+      - removeLabel:
+          label: Waiting on Author
+    
+    - description: Remove Stale label if issue comment 
+      if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: Stale
+      then:
+      - removeLabel:
+          label: Stale
+    
+    - description: Remove Needs-Triage label if issue is closed
+      if:
+      - payloadType: Issues
+      - isAction:
+          action: Closed
+      then:
+      - removeLabel:
+          label: Needs-Triage
+    
+    - description: Remove Keep Open label if closed by someone 
+      if:
+      - payloadType: Issues
+      - isAction:
+          action: Closed
+      then:
+      - removeLabel:
+          label: KeepOpen
+onFailure:
+onSuccess:
diff --git a/.github/policies/PRManagement.yml b/.github/policies/PRManagement.yml
new file mode 100644
index 00000000000..9deaf0262bb
--- /dev/null
+++ b/.github/policies/PRManagement.yml
@@ -0,0 +1,226 @@
+id: PRManagement
+name: GitOps.PullRequestIssueManagement
+description: Collection of PR bot triaging behaviors
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: If Stale label and waiting on author and no activity since 10 days then close the PR
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: Waiting on Author
+      - hasLabel:
+          label: Stale
+      - noActivitySince:
+          days: 10
+      actions:
+      - closeIssue
+
+    - description: If PR has Waiting on Author label and no activity in 15 days label as stale.
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: Waiting on Author
+      - noActivitySince:
+          days: 15
+      - isNotLabeledWith:
+          label: Stale
+      actions:
+      - addLabel:
+          label: Stale
+      - addReply:
+          reply: 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**.
+    
+    - description: Label Review - Needed if PR is opened an no activity in 7 days but no other labels on it
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isPullRequest
+      - isOpen
+      - isNotLabeledWith:
+          label: Waiting on Author
+      - noActivitySince:
+          days: 7
+      - isNotLabeledWith:
+          label: Stale
+      - isNotLabeledWith:
+          label: Review - Needed
+      - isNotLabeledWith:
+          label: Review - Committee
+      - isNotDraftPullRequest
+      actions:
+      - addLabel:
+          label: Review - Needed
+      - addReply:
+          reply: >-
+            This pull request has been automatically marked as Review Needed because it has been there has not been any activity for **7 days**.
+
+            Maintainer, please provide feedback and/or mark it as `Waiting on Author`
+    
+    - description: Add waiting on Author label if is draft PR, if no activity label
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isOpen
+      - isDraftPullRequest
+      - isNotLabeledWith:
+          label: Review - Committee
+      - isNotLabeledWith:
+          label: Waiting on Author
+      - isNotLabeledWith:
+          label: Stale
+      - noActivitySince:
+          days: 3
+      actions:
+      - addLabel:
+          label: Waiting on Author
+    eventResponderTasks:
+    
+    - description: If PR has AutoMerge Label then enable Automerge to squash
+      if:
+      - payloadType: Pull_Request
+      - hasLabel:
+          label: AutoMerge
+      then:
+      - enableAutoMerge:
+          mergeMethod: Squash
+    
+    - description: If PR has label AutoMerge Removed then disable Automerge
+      if:
+      - payloadType: Pull_Request
+      - labelRemoved:
+          label: AutoMerge
+      then:
+      - disableAutoMerge
+    
+    - description: If PR review requests changes then add label waiting on Author and remove review needed
+      if: 
+      - payloadType: Pull_Request_Review
+      - isAction:
+          action: Submitted
+      - isReviewState:
+          reviewState: Changes_requested
+      then:
+      - addLabel:
+          label: Waiting on Author
+      - removeLabel:
+          label: Review - Needed
+    
+    - description: Remove Waiting on author if has label and activity from author
+      if:
+      - payloadType: Pull_Request
+      - isActivitySender:
+          issueAuthor: True
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: Waiting on Author
+      - not:
+          titleContains:
+            pattern: "(WIP|Work in progress|\U0001F6A7)"
+            isRegex: True
+      then:
+      - removeLabel:
+          label: Waiting on Author
+    
+    - description: remove waiting on author if review by author and has waiting on author
+      if:
+      - payloadType: Pull_Request_Review
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: Waiting on Author
+      then:
+      - removeLabel:
+          label: Waiting on Author
+    
+    - description: Remove Stale label if PR has activity from author which is not closure
+      if:
+      - payloadType: Pull_Request
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: Stale
+      - isActivitySender:
+          issueAuthor: True
+      then:
+      - removeLabel:
+          label: Stale
+    
+    - description: Remove Stale label if PR is reviewed
+      if:
+      - payloadType: Pull_Request_Review
+      - hasLabel:
+          label: Stale
+      then:
+      - removeLabel:
+          label: Stale
+    
+    - description: Remove Review Needed if PR is created or done any action by Admins and iSazonov
+      if:
+      - payloadType: Pull_Request
+      - hasLabel:
+          label: Review - Needed
+      - or:
+        - isAction:
+            action: Null
+        - isAction:
+            action: Closed
+        - isAction:
+            action: Reopened
+        - isAction:
+            action: Assigned
+        - isAction:
+            action: Unassigned
+        - isAction:
+            action: Unlabeled
+      - or:
+        - activitySenderHasPermission:
+            permission: Admin
+        - isActivitySender:
+            user: iSazonov
+            issueAuthor: False
+      then:
+      - removeLabel:
+          label: Review - Needed
+    
+    - description: Remove Review - Needed if issue comment is by admin or iSazonov
+      if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: Review - Needed
+      - or:
+        - activitySenderHasPermission:
+            permission: Admin
+        - isActivitySender:
+            user: iSazonov
+            issueAuthor: False
+      then:
+      - removeLabel:
+          label: Review - Needed
+    
+    - description: If inPRLabel then label in PR
+      if:
+      - payloadType: Pull_Request
+      then:
+      - inPrLabel:
+          label: In-PR
+    
+onFailure:
+onSuccess:
diff --git a/.github/policies/labelAdded.approvedLowRisk.yml b/.github/policies/labelAdded.approvedLowRisk.yml
new file mode 100644
index 00000000000..bdeea5265a0
--- /dev/null
+++ b/.github/policies/labelAdded.approvedLowRisk.yml
@@ -0,0 +1,48 @@
+id: labelAdded.approvedLowRisk
+name: GitOps.PullRequestIssueManagement
+description: Remove Approved-LowRisk if applied by an unauthorized user
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: Remove Approved-LowRisk if label was added by someone not authorized
+        if:
+          - payloadType: Pull_Request
+          - isOpen
+          - labelAdded:
+              label: Approved-LowRisk
+          # Unauthorized = NOT admin AND NOT in explicit allowlist
+          - not:
+              or:
+                - activitySenderHasPermission:
+                    permission: Admin
+
+                # Allowlist (enabled)
+                - isActivitySender:
+                    user: iSazonov
+                    issueAuthor: False
+                - isActivitySender:
+                    user: daxian-dbw
+                    issueAuthor: False
+
+                # Allowlist (commented out for now)
+                # - isActivitySender:
+                #     user: TravisEz13
+                #     issueAuthor: False
+                # - isActivitySender:
+                #     user: adityapatwardhan
+                #     issueAuthor: False
+                # - isActivitySender:
+                #     user: jshigetomi
+                #     issueAuthor: False
+        then:
+          - removeLabel:
+              label: Approved-LowRisk
+          - addReply:
+              reply: >-
+                The `Approved-LowRisk` label is restricted to authorized maintainers and was removed.
+onFailure:
+onSuccess:
diff --git a/.github/policies/labelAdded.clBuildPackaging.addBackportConsider.yml b/.github/policies/labelAdded.clBuildPackaging.addBackportConsider.yml
new file mode 100644
index 00000000000..78edc18cb1a
--- /dev/null
+++ b/.github/policies/labelAdded.clBuildPackaging.addBackportConsider.yml
@@ -0,0 +1,56 @@
+id: labelAdded.clBuildPackaging.addBackportConsider
+name: GitOps.PullRequestIssueManagement
+description: Add backport consideration labels when CL-BuildPackaging is added to an open PR targeting master
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: Add BackPort-7.4.x-Consider when CL-BuildPackaging is added to open PR targeting master
+        if:
+          - payloadType: Pull_Request
+          - isOpen
+          - labelAdded:
+              label: CL-BuildPackaging
+          - targetsBranch:
+              branch: master
+          - not:
+              hasLabel:
+                label: BackPort-7.4.x-Consider
+        then:
+          - addLabel:
+              label: BackPort-7.4.x-Consider
+
+      - description: Add BackPort-7.5.x-Consider when CL-BuildPackaging is added to open PR targeting master
+        if:
+          - payloadType: Pull_Request
+          - isOpen
+          - labelAdded:
+              label: CL-BuildPackaging
+          - targetsBranch:
+              branch: master
+          - not:
+              hasLabel:
+                label: BackPort-7.5.x-Consider
+        then:
+          - addLabel:
+              label: BackPort-7.5.x-Consider
+
+      - description: Add BackPort-7.6.x-Consider when CL-BuildPackaging is added to open PR targeting master
+        if:
+          - payloadType: Pull_Request
+          - isOpen
+          - labelAdded:
+              label: CL-BuildPackaging
+          - targetsBranch:
+              branch: master
+          - not:
+              hasLabel:
+                label: BackPort-7.6.x-Consider
+        then:
+          - addLabel:
+              label: BackPort-7.6.x-Consider
+onFailure:
+onSuccess:
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
deleted file mode 100644
index 0387fb7189e..00000000000
--- a/.github/policies/resourceManagement.yml
+++ /dev/null
@@ -1,422 +0,0 @@
-id:
-name: GitOps.PullRequestIssueManagement
-description: GitOps.PullRequestIssueManagement primitive
-owner:
-resource: repository
-disabled: false
-where:
-configuration:
-  resourceManagementConfiguration:
-    scheduledSearches:
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isPullRequest
-      - isOpen
-      - hasLabel:
-          label: Waiting on Author
-      - hasLabel:
-          label: Stale
-      - noActivitySince:
-          days: 10
-      actions:
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isPullRequest
-      - isOpen
-      - hasLabel:
-          label: Waiting on Author
-      - noActivitySince:
-          days: 15
-      - isNotLabeledWith:
-          label: Stale
-      actions:
-      - addLabel:
-          label: Stale
-      - addReply:
-          reply: 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**.
-    - description:
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-Duplicate
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 3
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-External
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as external and has not had any activity for **1 day**. It has been be closed for housekeeping purposes.
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-Answered
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as answered and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-Fixed
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as fixed and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isPullRequest
-      - isOpen
-      - isNotLabeledWith:
-          label: Waiting on Author
-      - noActivitySince:
-          days: 7
-      - isNotLabeledWith:
-          label: Stale
-      - isNotLabeledWith:
-          label: Review - Needed
-      - isNotLabeledWith:
-          label: Review - Committee
-      - isNotDraftPullRequest
-      actions:
-      - addLabel:
-          label: Review - Needed
-      - addReply:
-          reply: >-
-            This pull request has been automatically marked as Review Needed because it has been there has not been any activity for **7 days**.
-
-            Maintainer, please provide feedback and/or mark it as `Waiting on Author`
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isOpen
-      - isDraftPullRequest
-      - isNotLabeledWith:
-          label: Review - Committee
-      - isNotLabeledWith:
-          label: Waiting on Author
-      - isNotLabeledWith:
-          label: Stale
-      - noActivitySince:
-          days: 3
-      actions:
-      - addLabel:
-          label: Waiting on Author
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-Declined
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as declined and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-By Design
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as by-design and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Resolution-Won't Fix
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: 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.
-      - closeIssue
-    - description:
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isOpen
-      - isIssue
-      - hasLabel:
-          label: Waiting on Author
-      - noActivitySince:
-          days: 7
-      actions:
-      - addReply:
-          reply: 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.
-      - closeIssue
-    - description: Resolution no activity 
-      frequencies:
-      - hourly:
-          hour: 12
-      filters:
-      - isOpen
-      - isIssue
-      - hasLabel:
-          label: Resolution-No Activity
-      - noActivitySince:
-          days: 7
-      actions:
-      - addReply:
-          reply: This issue has been marked as "No Activity" as there has been no activity for 6 months. It has been closed for housekeeping purposes.
-
-      - closeIssue
-    - description: This is for closing issues that have no activity for 6 months.
-      frequencies:
-      - hourly:
-          hour: 24
-      filters:
-      - isIssue
-      - isOpen
-      - isNotLabeledWith:
-          label: KeepOpen
-      - noActivitySince:
-          days: 180
-      actions:
-      - addReply:
-          reply: This issue has not had any activity in 6 months, if this is a bug please try to reproduce on the latest version of PowerShell and reopen a new issue and reference this issue if this is still a blocker for you. 
-      - addLabel:
-            label: Resolution-No Activity
-    eventResponderTasks:
-    - if:
-      - payloadType: Issue_Comment
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Resolution-No Activity
-      then:
-      - removeLabel:
-          label: Resolution-No Activity
-      description: Reopen issues with no activity if its the author who has commented
-    - if:
-      - payloadType: Pull_Request
-      - hasLabel:
-          label: AutoMerge
-      then:
-      - enableAutoMerge:
-          mergeMethod: Squash
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - labelRemoved:
-          label: AutoMerge
-      then:
-      - disableAutoMerge
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - isAction:
-          action: Submitted
-      - isReviewState:
-          reviewState: Changes_requested
-      then:
-      - addLabel:
-          label: Waiting on Author
-      - removeLabel:
-          label: Review - Needed
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - isActivitySender:
-          issueAuthor: True
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: Waiting on Author
-      - not:
-          titleContains:
-            pattern: "(WIP|Work in progress|\U0001F6A7)"
-            isRegex: True
-      then:
-      - removeLabel:
-          label: Waiting on Author
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Waiting on Author
-      then:
-      - removeLabel:
-          label: Waiting on Author
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Waiting on Author
-      then:
-      - removeLabel:
-          label: Waiting on Author
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: Stale
-      - isActivitySender:
-          issueAuthor: True
-      then:
-      - removeLabel:
-          label: Stale
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - hasLabel:
-          label: Stale
-      then:
-      - removeLabel:
-          label: Stale
-      description: 
-    - if:
-      - payloadType: Pull_Request_Review
-      - hasLabel:
-          label: Stale
-      then:
-      - removeLabel:
-          label: Stale
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      then:
-      - cleanEmailReply
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      - hasLabel:
-          label: Review - Needed
-      - or:
-        - isAction:
-            action: Null
-        - isAction:
-            action: Closed
-        - isAction:
-            action: Reopened
-        - isAction:
-            action: Assigned
-        - isAction:
-            action: Unassigned
-        - isAction:
-            action: Unlabeled
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - isActivitySender:
-            user: iSazonov
-            issueAuthor: False
-      then:
-      - removeLabel:
-          label: Review - Needed
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - hasLabel:
-          label: Review - Needed
-      - or:
-        - activitySenderHasPermission:
-            permission: Admin
-        - isActivitySender:
-            user: iSazonov
-            issueAuthor: False
-      then:
-      - removeLabel:
-          label: Review - Needed
-      description: 
-    - if:
-      - payloadType: Issues
-      - isAction:
-          action: Closed
-      then:
-      - removeLabel:
-          label: Needs-Triage
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - inPrLabel:
-          label: In-PR
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: Waiting on Author
-      then:
-      - removeLabel:
-          label: Waiting on Author
-      description: Automatically commenting for feedback when an issue is closed
-      triggerOnOwnActions: true
-    - if: 
-        - isAction: 
-            action: Closed
-      then:
-        - addReply:
-            reply: " 📣 Hey @${issueAuthor}, how did we do? We would love to hear your feedback with the link below! 🗣️ \n\n🔗 https://forms.office.com/r/P926k48jRJ "
-onFailure:
-onSuccess:
diff --git a/.github/prompts/backport-pr-to-release-branch.prompt.md b/.github/prompts/backport-pr-to-release-branch.prompt.md
new file mode 100644
index 00000000000..32bff10bd5e
--- /dev/null
+++ b/.github/prompts/backport-pr-to-release-branch.prompt.md
@@ -0,0 +1,567 @@
+---
+description: Guide for backporting changes to PowerShell release branches
+---
+
+# Backport a Change to a PowerShell Release Branch
+
+## 1 — Goal
+
+Create a backport PR that applies changes from a merged PR to a release branch (e.g., `release/v7.4`, `release/v7.5`). The backport must follow the repository's established format and include proper references to the original PR.
+
+## 2 — Prerequisites for the model
+
+- You have full repository access
+- You can run git commands
+- You can read PR information from the repository
+- Ask clarifying questions if the target release branch or original PR number is unclear
+
+## 3 — Required user inputs
+
+If the user hasn't specified a PR number, help them find one:
+
+### Finding PRs that need backporting
+
+1. Ask the user which release version they want to backport to (e.g., `7.4`, `7.5`)
+2. Search for PRs with the appropriate label using GitHub CLI:
+
+```powershell
+$Owner = "PowerShell"
+$Repo = "PowerShell"
+$version = "7.4"  # or user-specified version
+$considerLabel = "Backport-$version.x-Consider"
+
+$prsJson = gh pr list --repo "$Owner/$Repo" --label $considerLabel --state merged --json number,title,url,labels,mergedAt --limit 100 2>&1
+$prs = $prsJson | ConvertFrom-Json
+# Sort PRs from oldest merged to newest merged
+$prs = $prs | Sort-Object mergedAt
+```
+
+3. Present the list of PRs to the user with:
+   - PR number
+   - PR title
+   - Merged date
+   - URL
+
+4. Ask the user: "Which PR would you like to backport?" (provide the PR number)
+
+### After selecting a PR
+
+Once the user selects a PR (or if they provided one initially), confirm:
+- **Original PR number**: The PR number that was merged to the main branch (e.g., 26193)
+- **Target release**: The release number (e.g., `7.4`, `7.5`, `7.5.1`)
+
+Example: "Backport PR 26193 to release/v7.4"
+
+## 4 — Implementation steps (must be completed in order)
+
+### Step 1: Verify the original PR exists and is merged
+
+1. Fetch the original PR information using the PR number
+2. Confirm the PR state is `MERGED`
+3. Extract the following information:
+   - Merge commit SHA
+   - Original PR title
+   - Original PR author
+   - Original CL label (if present, typically starts with `CL-`)
+
+If the PR is not merged, stop and inform the user.
+
+4. Check if backport already exists or has been attempted:
+   ```powershell
+   gh pr list --repo PowerShell/PowerShell --search "in:title [release/v7.4] <original-title>" --state all
+   ```
+
+   If a backport PR already exists, inform the user and ask if they want to continue.
+
+5. Check backport labels to understand status:
+   - `Backport-7.4.x-Migrated`: Indicates previous backport attempt (may have failed or had issues)
+   - `Backport-7.4.x-Done`: Already backported successfully
+   - `Backport-7.4.x-Approved`: Ready for backporting
+   - `Backport-7.4.x-Consider`: Under consideration for backporting
+
+   If status is "Done", inform the user that backport may already be complete.
+
+### Step 2: Create the backport branch
+
+1. Identify the correct remote to fetch from:
+   ```bash
+   git remote -v
+   ```
+
+   Look for the remote that points to `https://github.com/PowerShell/PowerShell` (typically named `upstream` or `origin`). Use this remote name in subsequent commands.
+
+2. Ensure you have the latest changes from the target release branch:
+   ```bash
+   git fetch <remote-name> <target-release-branch>
+   ```
+
+   Example: `git fetch upstream release/v7.4`
+
+3. Create a new branch from the target release branch:
+   ```bash
+   git checkout -b backport-<pr-number> <remote-name>/<target-release-branch>
+   ```
+
+   Example: `git checkout -b backport-26193 upstream/release/v7.4`
+
+### Step 3: Cherry-pick the merge commit
+
+1. Cherry-pick the merge commit from the original PR:
+   ```bash
+   git cherry-pick <merge-commit-sha>
+   ```
+
+2. If conflicts occur:
+   - Inform the user about the conflicts
+   - List the conflicting files
+   - Fetch the original PR diff to understand the changes:
+     ```bash
+     gh pr diff <pr-number> --repo PowerShell/PowerShell | Out-File pr-diff.txt
+     ```
+   - Review the diff to understand what the PR changed
+   - Figure out why there is a conflict and resolve it
+   - Create a summary of the conflict resolution:
+     * Which files had conflicts
+     * Nature of each conflict (parameter changes, code removal, etc.)
+     * How you resolved it
+     * Whether any manual adjustments were needed beyond accepting one side
+   - Ask the user to review your conflict resolution summary before continuing
+   - After conflicts are resolved, continue with:
+     ```bash
+     git add <resolved-files>
+     git cherry-pick --continue
+     ```
+
+### Step 4: Push the backport branch
+
+Push to your fork (typically the remote that you have write access to):
+
+```bash
+git push <your-fork-remote> backport-<pr-number>
+```
+
+Example: `git push origin backport-26193`
+
+Note: If you're pushing to the official PowerShell repository and have permissions, you may push to `upstream` or the appropriate remote.
+
+### Step 5: Create the backport PR
+
+Create a new PR with the following format:
+
+**Title:**
+```
+[<target-release-branch>] <original-pr-title>
+```
+
+Example: `[release/v7.4] GitHub Workflow cleanup`
+
+**Body:**
+```
+Backport of #<original-pr-number> to <target-release-branch>
+
+<!--
+DO NOT MODIFY THIS COMMENT. IT IS AUTO-GENERATED.
+$$$originalprnumber:<original-pr-number>$$$
+-->
+
+Triggered by @<current-user> on behalf of @<original-author>
+
+Original CL Label: <original-cl-label>
+
+/cc @PowerShell/powershell-maintainers
+
+## Impact
+
+Choose either tooling or Customer impact.
+### Tooling Impact
+
+- [ ] Required tooling change
+- [ ] Optional tooling change (include reasoning)
+
+### Customer Impact
+
+- [ ] Customer reported
+- [ ] Found internally
+
+[Select one or both of the boxes. Describe how this issue impacts customers, citing the expected and actual behaviors and scope of the issue. If customer-reported, provide the issue number.]
+
+## Regression
+
+- [ ] Yes
+- [ ] No
+
+[If yes, specify when the regression was introduced. Provide the PR or commit if known.]
+
+## Testing
+
+[How was the fix verified? How was the issue missed previously? What tests were added?]
+
+## Risk
+
+- [ ] High
+- [ ] Medium
+- [ ] Low
+
+[High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.]
+```
+
+**Base branch:** `<target-release-branch>` (e.g., `release/v7.4`)
+
+**Head branch:** `backport-<pr-number>` (e.g., `backport-26193`)
+
+#### Guidelines for Filling Out the PR Body
+
+**For Impact Section**:
+- If the original PR changed build/tooling/packaging, select "Tooling Impact"
+- If it fixes a user-facing bug or changes user-visible behavior, select "Customer Impact"
+- Copy relevant context from the original PR description
+- Be specific about what changed and why
+
+**For Regression Section**:
+- Mark "Yes" only if the original PR fixed a regression
+- Include when the regression was introduced if known
+
+**For Testing Section**:
+- Reference the original PR's testing approach
+- Note any additional backport-specific testing needed
+- Mention if manual testing was done to verify the backport
+
+**For Risk Assessment**:
+- **High**: Changes core functionality, packaging, build systems, or security-related code
+- **Medium**: Changes non-critical features, adds new functionality, or modifies existing behavior
+- **Low**: Documentation, test-only changes, minor refactoring, or fixes with narrow scope
+- Justify your assessment based on the scope of changes and potential impact
+- **For CI/CD changes**: When backporting CI/CD infrastructure changes (workflows, build scripts, packaging), note in your justification that not taking these changes may create technical debt and make it difficult to apply future CI/CD changes that build on top of them. This doesn't change the risk level itself, but provides important context for why the change should be taken despite potentially higher risk
+
+**If there were merge conflicts**:
+Add a note in the PR description after the Risk section describing what conflicts occurred and how they were resolved.
+
+### Step 6: Add the CL label to the backport PR
+
+After creating the backport PR, add the same changelog label (CL-*) from the original PR to the backport PR:
+
+```bash
+gh pr edit <backport-pr-number> --repo PowerShell/PowerShell --add-label "<original-cl-label>"
+```
+
+Example: `gh pr edit 26389 --repo PowerShell/PowerShell --add-label "CL-BuildPackaging"`
+
+This ensures the backport is properly categorized in the changelog for the release branch.
+
+### Step 7: Update the original PR's backport labels
+
+After successfully creating the backport PR, update the original PR to reflect that it has been backported:
+
+```bash
+gh pr edit <original-pr-number> --repo PowerShell/PowerShell --add-label "Backport-<version>.x-Migrated" --remove-label "Backport-<version>.x-Consider"
+```
+
+Example: `gh pr edit 26193 --repo PowerShell/PowerShell --add-label "Backport-7.5.x-Migrated" --remove-label "Backport-7.5.x-Consider"`
+
+Notes:
+- If the original PR had `Backport-<version>.x-Approved` instead of `Consider`, remove that label
+- This step helps track which PRs have been successfully backported
+- The `Migrated` label indicates the backport PR has been created (not necessarily merged)
+- The `Done` label should only be added once the backport PR is merged
+
+### Step 8: Clean up temporary files
+
+After successful PR creation and labeling, clean up any temporary files created during the process:
+
+```powershell
+Remove-Item pr*.diff -ErrorAction SilentlyContinue
+```
+
+## 5 — Definition of Done (self-check list)
+
+- [ ] Original PR is verified as merged
+- [ ] Checked for existing backport PRs
+- [ ] Reviewed backport labels to understand status
+- [ ] Backport branch created from correct release branch
+- [ ] Merge commit cherry-picked successfully (or conflicts resolved)
+- [ ] If conflicts occurred, provided resolution summary to user
+- [ ] Branch pushed to origin
+- [ ] PR created with correct title format: `[<release-branch>] <original-title>`
+- [ ] CL label added to backport PR (matching original PR's CL label)
+- [ ] Original PR labels updated (added Migrated, removed Consider/Approved)
+- [ ] Temporary files cleaned up (pr*.diff)
+- [ ] PR body includes:
+  - [ ] Backport reference: `Backport of (PR-number) to <release-branch>`
+  - [ ] Auto-generated comment with original PR number
+  - [ ] Triggered by and original author attribution
+  - [ ] Original CL label (if available)
+  - [ ] CC to PowerShell maintainers
+  - [ ] Impact section filled out
+  - [ ] Regression section filled out
+  - [ ] Testing section filled out
+  - [ ] Risk section filled out
+- [ ] Base branch set to target release branch
+- [ ] No unrelated changes included
+
+## 6 — Branch naming convention
+
+**Format:** `backport/release/<version>/pr/<pr-number>`
+
+Examples:
+- `backport/release/v7.5/pr/26193`
+- `backport/release/v7.4.1/pr/26334`
+
+Note: Automated bot uses format `backport/release/v<version>/<pr-number>-<commit-hash>`, but manual backports should use the format `backport/release/<version>/pr/<pr-number>` as shown above.
+
+## 7 — Example backport PR
+
+Reference PR 26334 as the canonical example of a correct backport:
+
+**Original PR**: PR 26193 "GitHub Workflow cleanup"
+
+**Backport PR**: PR 26334 "[release/v7.4] GitHub Workflow cleanup"
+- **Title**: `[release/v7.4] GitHub Workflow cleanup`
+- **Body**: Started with backport reference to original PR and release branch
+- **Branch**: `backport/release/v7.4/26193-4aff02475` (bot-created)
+- **Base**: `release/v7.4`
+- **Includes**: Auto-generated metadata, impact assessment, regression info, testing details, and risk level
+
+## 8 — Backport label system (for context)
+
+Backport labels follow pattern: `Backport-<version>.x-<state>`
+
+**Triage states:**
+- `Consider` - Under review for backporting
+- `Approved` - Approved and ready to be backported
+- `Done` - Backport completed
+
+**Examples:** `Backport-7.4.x-Approved`, `Backport-7.5.x-Consider`, `Backport-7.3.x-Done`
+
+Note: The PowerShell repository has an automated bot (pwshBot) that creates backport PRs automatically when a merged PR has a backport approval label. Manual backports follow the same format.
+
+## Manual Backport Using PowerShell Tools
+
+For situations where automated backports fail or manual intervention is needed, use the `Invoke-PRBackport` function from `tools/releaseTools.psm1`.
+
+### Prerequisites
+
+1. **GitHub CLI**: Install from https://cli.github.com/
+   - Required version: 2.17 or later
+   - Authenticate with `gh auth login`
+
+2. **Upstream Remote**: Configure a Git remote named `upstream` pointing to `PowerShell/PowerShell`:
+   ```powershell
+   git remote add upstream https://github.com/PowerShell/PowerShell.git
+   ```
+
+### Using Invoke-PRBackport
+
+```powershell
+# Import the release tools module
+Import-Module ./tools/releaseTools.psm1
+
+# Backport a single PR
+Invoke-PRBackport -PrNumber 26193 -Target release/v7.4.1
+
+# Backport with custom branch postfix
+Invoke-PRBackport -PrNumber 26193 -Target release/v7.4.1 -BranchPostFix "retry"
+
+# Overwrite existing local branch if it exists
+Invoke-PRBackport -PrNumber 26193 -Target release/v7.4.1 -Overwrite
+```
+
+### Parameters
+
+- **PrNumber** (Required): The PR number to backport
+- **Target** (Required): Target release branch (must match pattern `release/v\d+\.\d+(\.\d+)?`)
+- **Overwrite**: Switch to overwrite local branch if it already exists
+- **BranchPostFix**: Add a postfix to the branch name (e.g., for retry attempts)
+- **UpstreamRemote**: Name of the upstream remote (default: `upstream`)
+
+### How It Works
+
+1. Verifies the PR is merged
+2. Fetches the target release branch from upstream
+3. Creates a new branch: `backport-<pr-number>[-<postfix>]`
+4. Cherry-picks the merge commit
+5. If conflicts occur, prompts you to resolve them
+6. Creates the backport PR using GitHub CLI
+
+## Handling Merge Conflicts
+
+When cherry-picking fails due to conflicts:
+
+1. The script will pause and prompt you to fix conflicts
+2. Resolve conflicts in your editor:
+   ```powershell
+   # Check which files have conflicts
+   git status
+
+   # Edit files to resolve conflicts
+   # After resolving, stage the changes
+   git add <resolved-files>
+
+   # Continue the cherry-pick
+   git cherry-pick --continue
+   ```
+3. Type 'Yes<enter>' when prompted to continue the script
+4. The script will create the PR
+
+### Understanding Conflict Patterns
+
+When resolving conflicts during backports, follow this approach:
+
+1. **Analyze the diff first**: Before resolving conflicts, fetch and review the original PR's diff to understand what changed:
+   ```powershell
+   gh pr diff <pr-number> --repo PowerShell/PowerShell | Out-File pr-diff.txt
+   ```
+
+2. **Identify conflict types**:
+   - **Parameter additions**: New parameters added to functions (e.g., ValidateSet values)
+   - **Code removal**: Features removed in main but still exist in release branch
+   - **Code additions**: New code blocks that don't exist in release branch
+   - **Refactoring conflicts**: Code structure changes between branches
+
+3. **Resolution priorities**:
+   - Preserve the intent of the backported change
+   - Keep release branch-specific code that doesn't conflict with the fix
+   - When in doubt, favor the incoming change from the backport
+   - Document significant manual changes in the PR description
+
+4. **Verification**:
+   - After resolving conflicts, verify the file compiles/runs
+   - Check that the resolved code matches the original PR's intent
+   - Look for orphaned code that references removed functions
+
+5. **Create a conflict resolution summary**:
+   - List which files had conflicts
+   - Briefly explain the nature of each conflict
+   - Describe how you resolved it
+   - Ask user to review the resolution before continuing
+
+### Context-Aware Conflict Resolution
+
+**Key Principle**: The release branch may have different code than main. Your goal is to apply the *change* from the PR, not necessarily make the code identical to main.
+
+**Common Scenarios**:
+1. **Function parameters differ**: If the release branch has fewer parameters than main, and the backport adds functionality unrelated to new parameters, keep the release branch parameters unless the new parameters are part of the fix
+2. **Dependencies removed in main**: If main removed a dependency but the release branch still has it, and the backport is unrelated to that dependency, keep the release branch code
+3. **New features in main**: If main has new features not in the release, focus on backporting only the specific fix, not the new features
+
+## Bulk Backporting Approved PRs
+
+To backport all PRs labeled as approved for a specific version:
+
+```powershell
+Import-Module ./tools/releaseTools.psm1
+
+# Backport all approved PRs for version 7.2.12
+Invoke-PRBackportApproved -Version 7.2.12
+```
+
+This function:
+1. Queries all merged PRs with the `Backport-<version>.x-Approved` label
+2. Attempts to backport each PR in order of merge date
+3. Creates individual backport PRs for each
+
+## Viewing Backport Reports
+
+Get a list of PRs that need backporting:
+
+```powershell
+Import-Module ./tools/releaseTools.psm1
+
+# List all approved backports for 7.4
+Get-PRBackportReport -Version 7.4 -TriageState Approved
+
+# Open all approved backports in browser
+Get-PRBackportReport -Version 7.4 -TriageState Approved -Web
+
+# Check which backports are done
+Get-PRBackportReport -Version 7.4 -TriageState Done
+```
+
+## Branch Naming Conventions
+
+### Automated Bot Branches
+Format: `backport/release/v<version>/<pr-number>-<short-commit-hash>`
+
+Example: `backport/release/v7.4/26193-4aff02475`
+
+### Manual Backport Branches
+Format: `backport-<pr-number>[-<postfix>]`
+
+Examples:
+- `backport-26193`
+- `backport-26193-retry`
+
+## PR Title and Description Format
+
+### Title
+Format: `[release/v<version>] <original-title>`
+
+Example: `[release/v7.4] GitHub Workflow cleanup`
+
+### Description
+The backport PR description includes:
+- Reference to original PR number
+- Target release branch
+- Auto-generated comment with original PR metadata
+- Maintainer information
+- Original CL label
+- CC to PowerShell maintainers team
+
+Example description structure:
+```text
+Backport of (original-pr-number) to release/v<version>
+
+<!--
+DO NOT MODIFY THIS COMMENT. IT IS AUTO-GENERATED.
+$$$originalprnumber:<original-pr-number>$$$
+-->
+
+Triggered by @<maintainer> on behalf of @<original-author>
+
+Original CL Label: <original-label>
+
+/cc @PowerShell/powershell-maintainers
+```
+
+## Best Practices
+
+1. **Verify PR is merged**: Only backport merged PRs
+2. **Test backports**: Ensure backported changes work in the target release context
+3. **Check for conflicts early**: Large PRs are more likely to have conflicts
+4. **Use appropriate labels**: Apply correct version and triage state labels
+5. **Document special cases**: If manual changes were needed, note them in the PR description
+6. **Follow up on CI failures**: Backports should pass all CI checks before merging
+
+## Troubleshooting
+
+### "PR is not merged" Error
+**Cause**: Attempting to backport a PR that hasn't been merged yet
+**Solution**: Wait for the PR to be merged to the main branch first
+
+### "Please create an upstream remote" Error
+**Cause**: No upstream remote configured
+**Solution**:
+```powershell
+git remote add upstream https://github.com/PowerShell/PowerShell.git
+git fetch upstream
+```
+
+### "GitHub CLI is not installed" Error
+**Cause**: gh CLI not found in PATH
+**Solution**: Install from https://cli.github.com/ and restart terminal
+
+### Cherry-pick Conflicts
+**Cause**: Changes conflict with the target branch
+**Solution**: Manually resolve conflicts, stage files, and continue cherry-pick
+
+### "Commit does not exist" Error
+**Cause**: Local Git doesn't have the commit
+**Solution**:
+```powershell
+git fetch upstream
+```
+
+## Related Resources
+
+- **Release Process**: See `docs/maintainers/releasing.md`
+- **Release Tools**: See `tools/releaseTools.psm1`
+- **Issue Management**: See `docs/maintainers/issue-management.md`
diff --git a/.github/skills/analyze-pester-failures/SKILL.md b/.github/skills/analyze-pester-failures/SKILL.md
new file mode 100644
index 00000000000..ec1b0fe82ec
--- /dev/null
+++ b/.github/skills/analyze-pester-failures/SKILL.md
@@ -0,0 +1,524 @@
+---
+name: analyze-pester-failures
+description: Troubleshooting guide for analyzing and investigating Pester test failures in PowerShell CI jobs. Help agents understand why tests are failing, interpret test output, navigate test result artifacts, and provide actionable recommendations for fixing test issues.
+---
+
+# Analyze Pester Test Failures
+
+Investigate and troubleshoot Pester test failures in GitHub Actions workflows. Understand what tests are failing, why they're failing, and provide recommendations for test fixes.
+
+| Skill | When to Use |
+|-------|-----------|
+| analyze-pester-failures | When investigating why Pester tests are failing in a CI job. Use when a test job shows failures and you need to understand what test failed, why it failed, what the error message means, and what might need to be fixed. Also use when asked: "why did this test fail?", "what's the test error?", "test is broken", "test failure analysis", "debug test failure", or given test failure logs and stack traces. |
+
+## When to Use This Skill
+
+Use this skill when you need to:
+
+- Understand why a specific Pester test is failing  
+- Interpret test failure messages and error output
+- Analyze test result data from CI workflow runs (XML, logs, stack traces)
+- Identify the root cause of test failures (test logic, assertion failure, exception, timeout, skip/ignore reason)
+- Provide recommendations for fixing failing tests
+- Compare expected vs. actual test behavior
+- Debug test environment issues (missing dependencies, configuration problems)
+- Understand test skip/ignored/inconclusive status reasons
+
+**Do not use this skill for:**
+- General PowerShell debugging unrelated to tests
+- Test infrastructure/CI setup issues (except as they affect test failure interpretation)
+- Performance analysis or benchmarking (that's a different investigation)
+
+## Quick Start
+
+### ⚠️ CRITICAL: The Workflow Must Be Followed IN ORDER
+
+This skill describes a **sequential 6-step analysis workflow**. Skipping steps or jumping around leads to **incomplete analysis and incorrect conclusions**.
+
+**The Problem**: It's easy to skip to Step 4 or 5 without doing Steps 1-2, resulting in missing data and bad conclusions.
+
+**The Solution**: Use the automated analysis script to enforce the workflow:
+
+```powershell
+# Automatically runs Steps 1-6 in order, preventing skipping
+./.github/skills/analyze-pester-failures/scripts/analyze-pr-test-failures.ps1 -PR <PR_NUMBER>
+
+# Example:
+./.github/skills/analyze-pester-failures/scripts/analyze-pr-test-failures.ps1 -PR 26800
+```
+
+This script:
+1. ✓ Fetches PR status automatically
+2. ✓ Downloads artifacts (can't skip, depends on Step 1)
+3. ✓ Extracts failures (can't skip, depends on Step 2)
+4. ✓ Analyzes error messages
+5. ✓ Documents context
+6. ✓ Generates recommendations
+
+**Only use the manual commands below if you fully understand the workflow.**
+
+### Manual Workflow (for reference)
+
+```powershell
+# Step 1: Identify the failing job
+gh pr view <PR_NUMBER> --json 'statusCheckRollup' | ConvertFrom-Json | Where-Object { $_.conclusion -eq 'FAILURE' }
+
+# Step 2: Download artifacts (extract RUN_ID from Step 1)
+gh run download <RUN_ID> --dir ./artifacts
+gh run view <RUN_ID> --log > test-logs.txt
+
+# Step 3-6: Extract, analyze, and interpret
+# (See Analysis Workflow section below)
+```
+
+## Common Test Failure Analysis Approaches
+
+### 1. **Interpreting Assertion Failures**
+The most common test failure is when an assertion doesn't match expectations.
+
+**Example:**
+```
+Expected $true but got $false at /path/to/test.ps1:42
+Assertion failed: Should -Be "expected" but was "actual"  
+```
+
+**How to analyze:**
+- Read the assertion message: what was expected vs. what was actual?
+- Check the test logic: is the expectation correct?
+- Look for mock/stub issues: are dependencies configured correctly?
+- Check parameter values: what inputs were passed to the function under test?
+
+### 2. **Exception Failures**
+Tests fail when PowerShell throws an exception instead of successful completion.
+
+**Example:**
+```
+Command: Write-Host $null
+Error: Cannot bind argument to parameter 'Object' because it is null.
+```
+
+**How to analyze:**
+- Read the exception message: what operation failed?
+- Check the stack trace: where in the test or tested code did it throw?
+- Verify preconditions: does the test setup provide required values/mocks?
+- Look for environmental issues: missing modules, permissions, file system state?
+
+### 3. **Timeout Failures**
+A test takes longer than the allowed timeout to complete.
+
+**Example:**
+```
+Test 'Should complete in reasonable time' timed out after 30 seconds
+```
+
+**How to analyze:**
+- Is the timeout appropriate for this test type? (network tests need more time)
+- Is there an infinite loop in the test or tested code?
+- Are there resource contention issues on the CI runner?
+- Does the test hang waiting for something (file lock, network, process)?
+
+### 4. **Skip/Ignored Reason Analysis**
+Tests marked as skipped or ignored provide clues about test environment.
+
+**Example:**
+```
+Test marked [Skip("Only runs on Windows")] - running on Linux
+Test marked [Ignore("Known issue #12345")]
+```
+
+**How to analyze:**
+- Read the skip/ignore reason: is it still valid?
+- Check if environment has changed: platform, module versions, etc.
+- Verify issue status: is the known issue still open? Has it been fixed?
+- Determine if skip should be removed or if test needs environment changes
+
+### 5. **Flaky/Intermittent Failures**
+Tests that sometimes pass, sometimes fail indicate race conditions or environment sensitivity.
+
+**Example:**
+- Test passes locally but fails on CI
+- Test passes first run of suite, fails on second run
+- Test passes on Windows but fails on Linux
+
+**How to analyze:**
+- Look for timeout races: is timing involved in the test?
+- Check for test isolation issues: does one test affect another?
+- Verify environment differences: CI vs. local paths, permissions, versions
+- Look for external dependencies: network calls, file I/O, process interactions
+
+## Key Artifacts and Locations
+
+| Item | Purpose | Location |
+|------|---------|----------|
+| Test result XML | Pester output with test cases, failures, errors | Workflow artifacts: `junit-pester-*.xml` |
+| Job logs | Full job output including test execution and errors | GitHub Actions run logs or `gh run download` |
+| Stack traces | Error location information from failed assertions | Within job logs and XML failure messages |
+| Test files | The actual Pester test code (`.ps1` files) | `test/` directory in repository |
+
+## Analysis Workflow
+
+### ⚠️ Important: These Steps MUST Be Followed In Order
+
+Each step depends on the previous one. Skipping or re-ordering steps causes incomplete analysis:
+
+- **Step 1** (identify jobs) → You get the RUN_ID needed for Step 2
+- **Step 2** (download) → You get the artifacts needed for Step 3  
+- **Step 3** (extract) → You discover what failures exist for Step 4
+- **Step 4** (read messages) → You understand the errors to analyze in Step 5
+- **Step 5** (context) → You gather information to make recommendations in Step 6
+- **Step 6** (interpret) → You use all above to recommend fixes
+
+**Real Problem We Had**:
+- ❌ Jumped to Step 3 without Step 1-2
+- ❌ Used random test data from context instead of downloading PR artifacts
+- ❌ Skipped Steps 5-6 entirely
+- ❌ Made recommendations without full context
+
+**Result**: Wrong analysis and recommendations that didn't actually fix the problem.
+
+### Recommended: Use the Automated Script
+
+```powershell
+./.github/skills/analyze-pester-failures/scripts/analyze-pr-test-failures.ps1 -PR <PR_NUMBER>
+```
+
+This enforces the workflow and prevents skipping.
+
+### Step 2: Get Test Results
+
+Fetch the test result artifacts and job logs:
+
+```powershell
+# Download artifacts including test XML results
+gh run download <RUN_ID> --dir ./artifacts
+
+# Get job logs
+gh run view <RUN_ID> --log > test-logs.txt
+
+# Inspect test XML
+$xml = [xml](Get-Content ./artifacts/junit-pester-*.xml)
+$xml.'test-results' | Select-Object total, failures, errors, ignored, inconclusive
+```
+
+### Step 3: Extract Specific Failures
+
+Find the failing test cases in the XML:
+
+```powershell
+# Get all failed test cases
+$xml = [xml](Get-Content ./artifacts/junit-pester-*.xml)
+$failures = $xml.SelectNodes('.//test-case[@result = "Failure"]')
+
+# For each failure, display key info
+$failures | ForEach-Object {
+    [PSCustomObject]@{
+        Name = $_.name
+        Description = $_.description
+        Message = $_.failure.message
+        StackTrace = $_.failure.'stack-trace'
+    }
+}
+```
+
+### Step 4: Read the Error Message
+
+The error message tells you what went wrong:
+
+**Assertion failures:**
+```
+Expected $true but got $false
+Expected "value1" but got "value2"
+Expression should have failed with exception, but didn't
+```
+
+**Exceptions:**
+```
+Cannot find a parameter with name 'Name'
+Property 'Property' does not exist on 'Object'
+Cannot bind argument to parameter because it is null
+```
+
+**Timeouts:**
+```
+Test timed out after 30 seconds
+Test is taking too long to complete
+```
+
+### Step 5: Understand the Context
+
+Look at the test file to understand what was being tested:
+
+```powershell
+# Find the test file mentioned in the stack trace
+# Example: /path/to/test/Feature.Tests.ps1:42
+
+# Read the test code around that line
+code <test-file-path>:<line-number>
+
+# Understand:  
+# - What assertion is on that line?
+# - What is the test trying to verify?
+# - What are the setup/mock/before conditions?
+# - Are there recent changes to the function being tested?
+```
+
+### Step 6: Interpret the Failure
+
+Determine the root cause category:
+
+**Test issue (needs code fix):**
+- Assertion logic is wrong
+- Test expectations don't match actual behavior
+- Test setup is incomplete
+- Mock/stub configuration missing
+
+**Environmental issue (needs environment change):**
+- Test assumes a specific file or registry entry exists
+- Test requires Windows/Linux specifically
+- Test requires specific PowerShell version
+- Test requires specific module version
+- Timing-sensitive test affected by CI load
+
+**Data issue (needs input data change):**
+- Test data no longer valid
+- External API changed format
+- Configuration file has changed structure
+
+**Flakiness (needs test hardening):**
+- Race condition in test
+- Timing assumptions too tight
+- Resource contention on CI runner
+- Non-deterministic behavior in tested code
+
+## Common Test Failure Patterns
+
+| Pattern | What It Means | Example | Next Step |
+|---------|---------------|---------|-----------|
+| `Expected $true but got $false` | Assertion on boolean result failed | Test expects function returns true, but it returns false | Check function logic for bug or test logic for wrong expectation |
+| `Cannot find path` | File or directory doesn't exist | Test tries to read config file that's not present | Verify file path, check test setup, ensure CI environment has file |
+| `Cannot bind argument to parameter 'X'` | Required parameter value is null or wrong type | Function called with $null where object expected | Check test mock setup, verify parameter types |
+| `Test timed out after X seconds` | Test exceeded time limit | Network call or loop takes too long | Increase timeout for slow test, find infinite loop, mock network calls |
+| `Expression should have failed but didn't` | Exception wasn't thrown when expected | Test expects error but function succeeds | Check if function behavior changed, update test expectation |
+| `Could not find parameter 'X'` | Function doesn't have parameter | Test calls function with parameter that doesn't exist | Check PowerShell version, verify function signature, update test |
+| `This platform is not supported` | Test skipped on current OS | Windows-only test running on Linux | Add platform check, update test environment, or mark as platform-specific |
+| `Test marked [Ignore]` | Test explicitly disabled | Test has `[Ignore("reason")]` attribute | Check if reason still valid, remove if issue fixed |
+
+## Interpreting Test Results
+
+### Test Result Counts
+
+Pester test outcomes are categorized as:
+
+| Count | Meaning | Notes |
+|-------|---------|-------|
+| `total` | Total number of test cases executed | Should match: passed + failed + errors + skipped + ignored |
+| `failures` | Test assertions that failed | `Expected X but got Y` type failures |
+| `errors` | Tests that threw exceptions | Unhandled PowerShell exceptions during test |
+| `skipped` | Tests explicitly skipped (marked with `-Skip`) | Test code recognizes condition and skips |
+| `ignored` | Tests marked as ignored (marked with `-Ignore`) | Test disabled intentionally, usually notes reason |
+| `inconclusive` | Tests with unclear result | Rare; usually means test framework issue |
+| `passed` | Tests with passing assertions | `total - failures - errors - skipped - ignored` |
+
+### Stack Trace Interpretation
+
+A stack trace shows where the failure occurred:
+
+```
+at /home/runner/work/PowerShell/test/Feature.Tests.ps1:42
+
+Means:
+- File: /home/runner/work/PowerShell/test/Feature.Tests.ps1
+- Line: 42
+- Look at that line to see which assertion failed
+```
+
+### Understanding Skipped Tests
+
+When XML shows `result="Ignored"` or `result="Skipped"`:
+
+```xml
+<test-case name="Test Name" result="Ignored">
+  <reason>Only runs on Windows</reason>
+</test-case>
+```
+
+The reason explains why test didn't run. Not a failure, but important for understanding test coverage.
+
+## Providing Test Failure Analysis
+
+### Investigation Questions
+
+After gathering test output, ask yourself:
+
+1. **Is the test code correct?**
+   - Does the test assertion match the expected behavior?
+   - Are test expectations still valid?
+   - Has the function being tested changed?
+
+2. **Is the test setup correct?**
+   - Are mocks/stubs configured properly?
+   - Does the test environment have required files/configuration?
+   - Are preconditions (database, files, services) met?
+
+3. **Is this a code bug or test issue?**
+   - Does the tested function have a logic error?
+   - Or does the test have incorrect expectations?
+
+4. **Is this environment-specific?**
+   - Only fails on Windows/Linux?
+   - Only fails on CI but passes locally?
+   - Timing-dependent or resource-dependent?
+
+5. **Is this a known/expected failure?**
+   - Is there already an issue tracking this failure?
+   - Is the test marked as flaky or expected to fail?
+   - Does the skip/ignore reason still apply?
+
+### Recommendation Framework
+
+Based on your analysis:
+
+| Finding | Recommendation |
+|---------|-----------------|
+| Test logic is wrong | "Test assertion on line X is incorrect. Test expects Y but function correctly returns Z. Update test expectation." |
+| Tested code has bug | "Function at file.ps1#L42 has logic error. When X happens, returns Y instead of Z. Fix the condition." |
+| Missing test setup | "Test setup incomplete. Mock for dependency Y is not configured. Add `Mock Get-Y -MockWith { ... }`" |
+| Environment issue | "Test is Windows-specific but running on Linux. Either add platform check or skip on non-Windows." |
+| Flaky test | "Test is timing-sensitive (sleep 1 second). Increase timeout or use better synchronization." |
+| Test should be skipped | "Test is marked Ignored for good reason. Keep it disabled until issue #12345 is fixed." |
+
+### Tone and Structure
+
+Provide analysis as:
+
+1. **Summary** (1 sentence): What test is failing and general category  
+2. **Failure Details** (2-3 sentences): What the test output says  
+3. **Root Cause** (1-2 sentences): Why it's failing (test bug vs. code bug vs. environment)
+4. **Recommendation** (actionable): What should be done to fix it  
+5. **Context** (optional): Link to related code, issues, or recent changes
+
+## Examples
+
+### Example 1: Assertion Failure Due to Code Bug
+
+**Test Output:**
+```
+Expected 5 but got 3 at /path/to/Test.ps1:42
+```
+
+**Investigation:**
+1. Look at line 42: `$result | Should -Be 5`
+2. Check the test: It expects function to return 5 items
+3. Check the function: It returns `$items | Where-Object {$_.Status -eq "Active"}` but the filter is wrong
+4. Root cause: Function has logic error, not test error
+
+**Recommendation:**
+```
+Test failure is due to a code bug:
+
+The test Set-Configuration should return 5 items but returns 3.
+
+Looking at the tested function at [module.ps1#L42](module.ps1#L42):
+  $activeItems = $items | Where-Object {$_.Status -eq "Active"}
+
+The issue is the filter condition. It's currently filtering by "Active" status,
+but should include "Pending" status as well. 
+
+Fix: Change line 42 to:
+  $activeItems = $items | Where-Object {$_.Status -ne "Disabled"}
+
+Then re-run the test to verify it now returns 5 items as expected.
+```
+
+### Example 2: Test Setup Issue
+
+**Test Output:**
+```
+Cannot find path '/expected/config.json' because it does not exist at /path/to/Test.ps1:15
+```
+
+**Investigation:**
+1. Line 15 tries to read a config file
+2. The test setup doesn't create this file
+3. Works locally but fails on CI because CI doesn't have the same file
+
+**Recommendation:**
+```
+Test setup is incomplete:
+
+The test Initialize-Config fails because it expects /expected/config.json but the test doesn't create this file.
+
+The test needs to ensure the config file exists. Currently line 12-14 doesn't set up the file:
+
+  # Before:
+  # (no setup of config file)
+
+  # After:
+  @{ setting1 = "value1"; setting2 = "value2" } | ConvertTo-Json | 
+    Out-File $testConfigPath
+
+Alternatively, the test function should accept a parameter for the config path and use a temporary file:
+  param([string]$ConfigPath = (New-TemporaryFile))
+
+Re-run the test to verify the config file is properly available.
+```
+
+### Example 3: Platform-Specific Test Failure
+
+**Test Output:**
+```
+Test 'should read Windows Registry' failed on Linux runner
+Cannot find path 'HKEY_LOCAL_MACHINE:\...'
+```
+
+**Investigation:**
+1. Test assumes Windows Registry exists (Windows-only)
+2. Running on Linux runner doesn't have Registry
+3. Test should skip on non-Windows platforms
+
+**Recommendation:**
+```
+Test is platform-specific but running on wrong platform:
+
+The test "should read Windows Registry" assumes Windows Registry exists but is running on Linux.
+
+Add a platform check to skip this test on non-Windows systems:
+
+  It "should read Windows Registry" -Skip:$(-not $IsWindows) {
+    # test code here
+  }
+
+Or group Windows-only tests in a separate Describe block with platform check:
+
+  Describe "Windows Registry Tests" -Skip:$(-not $IsWindows) {
+    # all Windows-specific tests here
+  }
+
+This allows the test to be skipped on Linux/Mac while still running on Windows CI.
+```
+
+## References
+
+- [Pester Testing Framework](https://pester.dev/) — Official documentation, best practices for test writing
+- [Test Files](../../../test/) — PowerShell test suite in repository
+- [GitHub Actions Documentation](https://docs.github.com/en/actions) — Understanding workflow runs and logs
+- [PowerShell Documentation](https://learn.microsoft.com/en-us/powershell/) — Language reference for understanding test code
+
+## Tips
+
+1. **Read the error message first:** The error message is usually the most direct clue to the problem
+2. **Check test vs. code blame:** Is the test wrong or is the code wrong? Look at both sides
+3. **Verify test isolation:** Does one test failure affect others? Check for shared state or test ordering dependencies
+4. **Test locally first:** Try running the failing test locally to reproduce and understand it better
+5. **Check for environmental assumptions:** Windows-specific paths, module versions, file locations may differ on CI
+6. **Look for skip/ignore patterns:** If a test is consistently ignored, check if the reason is still valid
+7. **Compare passing vs. failing:** If test passes locally but fails on CI, the difference is usually environment-related
+8. **Check recent changes:** Did a recent PR change the tested code or test itself?
+9. **Understand Pester output format:** Different Pester versions, different `-ErrorAction`, `-WarningAction` produce different test results
+10. **Don't assume CI is wrong:** Failures on CI often reveal real issues that local testing missed (network, file permissions, parallelization, etc.)
+
+## Additional Links
+
+- [PowerShell Repository](https://github.com/PowerShell/PowerShell)
+- [GitHub Actions Documentation](https://docs.github.com/en/actions)
+- [Pester Testing Framework](https://github.com/Pester/Pester)
diff --git a/.github/skills/analyze-pester-failures/references/stack-trace-parsing.md b/.github/skills/analyze-pester-failures/references/stack-trace-parsing.md
new file mode 100644
index 00000000000..707f45560a9
--- /dev/null
+++ b/.github/skills/analyze-pester-failures/references/stack-trace-parsing.md
@@ -0,0 +1,163 @@
+# Understanding Pester Test Failures
+
+This reference explains how to interpret Pester test output and understand failure messages.
+
+## Supported Formats
+
+### Pester 4 Format
+```
+at line: 123 in C:\path\to\file.ps1
+```
+
+**Regex Pattern:**
+```powershell
+if ($StackTraceString -match 'at line:\s*(\d+)\s+in\s+(.+?)(?:\r|\n|$)') {
+    $result.Line = $matches[1]
+    $result.File = $matches[2].Trim()
+    return $result
+}
+```
+
+### Pester 5 Format (Common)
+```
+at 1 | Should -Be 2, C:\path\to\file.ps1:123
+at 1 | Should -Be 2, /home/runner/work/PowerShell/PowerShell/test/file.ps1:123
+```
+
+**Regex Pattern:**
+```powershell
+if ($StackTraceString -match ',\s*((?:[A-Za-z]:)?[\/\\].+?\.ps[m]?1):(\d+)') {
+    $result.File = $matches[1].Trim()
+    $result.Line = $matches[2]
+    return $result
+}
+```
+
+### Alternative Format
+```
+at C:\path\to\file.ps1:123
+at /path/to/file.ps1:123
+```
+
+**Regex Pattern:**
+```powershell
+if ($StackTraceString -match 'at\s+((?:[A-Za-z]:)?[\/\\][^,]+?\.ps[m]?1):(\d+)(?:\r|\n|$)') {
+    $result.File = $matches[1].Trim()
+    $result.Line = $matches[2]
+    return $result
+}
+```
+
+## Troubleshooting Parsing Failures
+
+### Issue: Line Number Extracted But File Path Is Null
+
+**Cause:** Stack trace matches line-with-path pattern but file extraction doesn't work
+
+**Solution:**
+1. Check if file path exists as expected in filesystem
+2. Verify regex doesn't have too-greedy bounds (check use of `.+?` vs `.+`)
+3. Test regex against actual stack trace string:
+   ```powershell
+   $trace = "at line: 42 in C:\path\to\test.ps1"
+   if ($trace -match 'at line:\s*(\d+)\s+in\s+(.+?)(?:\r|\n|$)') {
+       Write-Host "File: $($matches[2])"  # Should be "C:\path\to\test.ps1"
+   }
+   ```
+
+### Issue: Special Characters in File Path Break Regex
+
+**Cause:** Characters like parens `()`, brackets `[]`, pipes `|` have special meaning in regex
+
+**Solution:**
+1. Escape special chars in regex: `[Regex]::Escape($path)`
+2. Use character class `[\/\\]` instead of alternation for path separators
+3. Test with files containing problematic names:
+   ```powershell
+   $traces = @(
+       "at line: 1 in C:\path\(with)\parens\test.ps1",
+       "at /home/user/[brackets]/test.ps1:5",
+       "at C:\path\with spaces\test.ps1:10"
+   )
+   # Test each against all patterns
+   ```
+
+### Issue: Regex Matches But Extracts Wrong Values
+
+**Symptom:** $matches[1] is file instead of line, or vice versa
+
+**Debug Steps:**
+1. Print all captured groups: `$matches.Values | Format-Table -AutoSize`
+2. Verify group order in regex matches expectations
+3. Test with sample Pester output:
+   ```powershell
+   $sampleTrace = @"
+   at 1 | Should -Be 2, /home/runner/work/PowerShell/test/file.ps1:42
+   "@
+   
+   if ($sampleTrace -match ',\s*((?:[A-Za-z]:)?[\/\\].+?\.ps[m]?1):(\d+)') {
+       Write-Host "Match 1: $($matches[1])"  # Should be file path
+       Write-Host "Match 2: $($matches[2])"  # Should be line number
+   }
+   ```
+
+## Testing the Parser
+
+Use this PowerShell script to validate `Get-PesterFailureFileInfo`:
+
+```powershell
+# Import the function
+. ./build.psm1
+
+$testCases = @(
+    @{
+        Input = "at line: 42 in C:\path\to\test.ps1"
+        Expected = @{ File = "C:\path\to\test.ps1"; Line = "42" }
+    },
+    @{
+        Input = "at /home/runner/work/test.ps1:123"
+        Expected = @{ File = "/home/runner/work/test.ps1"; Line = "123" }
+    },
+    @{
+        Input = "at 1 | Should -Be 2, /path/to/file.ps1:99"
+        Expected = @{ File = "/path/to/file.ps1"; Line = "99" }
+    }
+)
+
+foreach ($test in $testCases) {
+    $result = Get-PesterFailureFileInfo -StackTraceString $test.Input
+    
+    $fileMatch = $result.File -eq $test.Expected.File
+    $lineMatch = $result.Line -eq $test.Expected.Line
+    $status = if ($fileMatch -and $lineMatch) { "✓ PASS" } else { "✗ FAIL" }
+    
+    Write-Host "$status : $($test.Input)"
+    if (-not $fileMatch) { Write-Host "  Expected file: $($test.Expected.File), got: $($result.File)" }
+    if (-not $lineMatch) { Write-Host "  Expected line: $($test.Expected.Line), got: $($result.Line)" }
+}
+```
+
+## Adding Support for New Formats
+
+When Pester changes its output format:
+
+1. **Capture sample output** from failing tests
+2. **Identify the pattern** (e.g., "file path always after comma followed by colon")
+3. **Write regex** to match pattern without over-matching
+4. **Add to `Get-PesterFailureFileInfo`** before existing patterns (order matters for fallback)
+5. **Test with samples** containing special characters, long paths, and edge cases
+
+Example: Adding a new format at the top of the function:
+
+```powershell
+# Try pattern: "at <description>, <path>:<line>" (Pester 5.1 hypothetical)
+if ($StackTraceString -match 'at .+?, ((?:[A-Za-z]:)?[\/\\].+?\.ps[m]?1):(\d+)') {
+    $result.File = $matches[1].Trim()
+    $result.Line = $matches[2]
+    return $result
+}
+
+# Try existing patterns...
+```
+
+Place new patterns **first** so they take precedence over fallback patterns.
diff --git a/.github/skills/analyze-pester-failures/scripts/analyze-pr-test-failures.ps1 b/.github/skills/analyze-pester-failures/scripts/analyze-pr-test-failures.ps1
new file mode 100644
index 00000000000..12486596071
--- /dev/null
+++ b/.github/skills/analyze-pester-failures/scripts/analyze-pr-test-failures.ps1
@@ -0,0 +1,456 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+<#
+.SYNOPSIS
+    Automated Pester test failure analysis workflow for GitHub PRs.
+
+.DESCRIPTION
+    This script automates the complete analysis workflow defined in the analyze-pester-failures
+    skill. It performs all steps in order:
+    1. Identify failing test jobs in the PR
+    2. Download test artifacts and logs
+    3. Extract specific test failures
+    4. Parse error messages
+    5. Search logs for error markers and generate recommendations
+
+    By automating the workflow, this ensures analysis steps are followed in order
+    and nothing is skipped.
+
+.PARAMETER PR
+    The GitHub PR number to analyze (e.g., 26800)
+
+.PARAMETER Owner
+    Repository owner (default: PowerShell)
+
+.PARAMETER Repo
+    Repository name (default: PowerShell)
+
+.PARAMETER OutputDir
+    Directory to store analysis results (default: ./pester-analysis-PR<number>)
+
+.PARAMETER Interactive
+    Prompt for recommendations after analysis (default: non-interactive)
+
+.PARAMETER ForceDownload
+    Force re-download of artifacts and logs, even if they already exist
+
+.EXAMPLE
+    .\.github\skills\analyze-pester-failures\scripts\analyze-pr-test-failures.ps1 -PR 26800
+    Analyzes PR #26800 and saves results to ./pester-analysis-PR26800
+
+.EXAMPLE
+    .\.github\skills\analyze-pester-failures\scripts\analyze-pr-test-failures.ps1 -PR 26800 -Interactive
+    Interactive mode: shows failures and prompts for next steps
+
+.EXAMPLE
+    .\.github\skills\analyze-pester-failures\scripts\analyze-pr-test-failures.ps1 -PR 26800 -ForceDownload
+    Re-download all logs and artifacts, skipping the cache
+
+.NOTES
+    Requires: GitHub CLI (gh) configured and authenticated
+    This script enforces the workflow defined in .github/skills/analyze-pester-failures/SKILL.md
+#>
+
+param(
+    [Parameter(Mandatory)]
+    [int]$PR,
+
+    [string]$Owner = 'PowerShell',
+    [string]$Repo = 'PowerShell',
+    [string]$OutputDir,
+    [switch]$Interactive,
+    [switch]$ForceDownload
+)
+
+$ErrorActionPreference = 'Stop'
+
+if (-not $OutputDir) {
+    $OutputDir = "./pester-analysis-PR$PR"
+}
+
+# Colors for output
+$colors = @{
+    Step    = [ConsoleColor]::Cyan
+    Success = [ConsoleColor]::Green
+    Warning = [ConsoleColor]::Yellow
+    Error   = [ConsoleColor]::Red
+    Info    = [ConsoleColor]::Gray
+}
+
+function Write-Step {
+    param([string]$text, [int]$number)
+    Write-Host "`n[$number/6] $text" -ForegroundColor $colors.Step -BackgroundColor Black
+}
+
+function Write-Result {
+    param([string]$text, [ValidateSet('Success','Warning','Error','Info')]$type = 'Info')
+    Write-Host $text -ForegroundColor $colors[$type]
+}
+
+Write-Host "`n=== Pester Test Failure Analysis ===" -ForegroundColor $colors.Step
+Write-Host "PR: $Owner/$Repo#$PR" -ForegroundColor $colors.Info
+Write-Host "Output Directory: $OutputDir" -ForegroundColor $colors.Info
+
+# Ensure output directory exists
+if (-not (Test-Path $OutputDir)) {
+    New-Item -ItemType Directory -Path $OutputDir -Force | Out-Null
+}
+
+# STEP 1: Identify the Failing Test Job
+Write-Step "Identify failing test jobs" 1
+
+Write-Result "Fetching PR status checks..." Info
+$prResponse = gh pr view $PR --repo "$Owner/$Repo" --json 'statusCheckRollup' | ConvertFrom-Json
+$allChecks = $prResponse.statusCheckRollup
+
+$failedJobs = $allChecks | Where-Object { $_.conclusion -eq 'FAILURE' }
+
+if (-not $failedJobs) {
+    Write-Result "✓ No failed jobs found" Success
+    Write-Host "  Total checks: $($allChecks.Count)"
+    $allChecks | Where-Object { $_ } | ForEach-Object {
+        Write-Host "  - $($_.name): $($_.conclusion)" -ForegroundColor $colors.Info
+    }
+    exit 0
+}
+
+Write-Result "✓ Found $($failedJobs.Count) failing job(s)" Warning
+
+$failedJobs | Where-Object { $_.conclusion -eq 'FAILURE' } | ForEach-Object {
+    Write-Host "  ✗ $($_.name) - $($_.conclusion)" -ForegroundColor $colors.Error
+    if ($_.detailsUrl) {
+        Write-Host "    URL: $($_.detailsUrl)" -ForegroundColor $colors.Info
+    }
+}
+
+if ($Interactive) {
+    Write-Host "`nPress Enter to continue to Step 2..."
+    Read-Host | Out-Null
+}
+
+# STEP 2: Get Test Results
+Write-Step "Download test artifacts and logs" 2
+
+# Extract unique run IDs from failing jobs
+$uniqueRuns = @()
+foreach ($failedJob in $failedJobs) {
+    if ($failedJob.detailsUrl -match 'runs/(\d+)') {
+        $runId = $matches[1]
+        if ($runId -notin $uniqueRuns) {
+            $uniqueRuns += $runId
+        }
+    }
+}
+
+if ($uniqueRuns.Count -eq 0) {
+    Write-Result "✗ Could not extract run IDs from failing jobs" Error
+    exit 1
+}
+
+Write-Result "Found $($uniqueRuns.Count) run(s): $($uniqueRuns -join ', ')" Info
+
+$artifactDir = Join-Path $OutputDir artifacts
+
+# Check if artifacts already exist
+$existingArtifacts = Get-ChildItem $artifactDir -Recurse -File -ErrorAction SilentlyContinue
+
+if ($existingArtifacts -and -not $ForceDownload) {
+    Write-Result "✓ Artifacts already downloaded" Success
+    $existingArtifacts | ForEach-Object {
+        Write-Host "  - $($_.FullName)" -ForegroundColor $colors.Info
+    }
+} else {
+    Write-Result "Downloading artifacts from run $($uniqueRuns[0])..." Info
+    gh run download $uniqueRuns[0] --dir $artifactDir --repo "$Owner/$Repo" 2>&1 | Out-Null
+
+    if (Test-Path $artifactDir) {
+        Write-Result "✓ Artifacts downloaded" Success
+        Get-ChildItem $artifactDir -Recurse -File | ForEach-Object {
+            Write-Host "  - $($_.FullName)" -ForegroundColor $colors.Info
+        }
+    } else {
+        Write-Result "✗ Failed to download artifacts" Error
+        exit 1
+    }
+}
+
+# Download individual job logs for failing jobs
+Write-Result "Downloading individual job logs..." Info
+
+$logsDir = Join-Path $OutputDir "logs"
+if (-not (Test-Path $logsDir)) {
+    New-Item -ItemType Directory -Path $logsDir -Force | Out-Null
+}
+
+# Check if logs already exist
+$existingLogs = Get-ChildItem $logsDir -Filter "*.txt" -ErrorAction SilentlyContinue
+
+if ($existingLogs -and -not $ForceDownload) {
+    Write-Result "✓ Job logs already downloaded" Success
+    $existingLogs | ForEach-Object {
+        Write-Host "  - $($_.Name)" -ForegroundColor $colors.Info
+    }
+} else {
+    # Process each run and get its jobs
+    $failedJobIds = @()
+    foreach ($runId in $uniqueRuns) {
+        $runJobs = gh run view $runId --repo "$Owner/$Repo" --json jobs | ConvertFrom-Json
+
+        foreach ($failedJob in $failedJobs) {
+            # Check if this failed job belongs to this run
+            if ($failedJob.detailsUrl -match "runs/$runId/") {
+                $jobMatch = $runJobs.jobs | Where-Object { $_.name -eq $failedJob.name } | Select-Object -First 1
+                if ($jobMatch) {
+                    $failedJobIds += @{
+                        name  = $failedJob.name
+                        id    = $jobMatch.databaseId
+                        runId = $runId
+                    }
+                }
+            }
+        }
+    }
+
+    # Download logs for all failed jobs
+    foreach ($jobInfo in $failedJobIds) {
+        $logFile = Join-Path $logsDir ("log-{0}.txt" -f ($jobInfo.name -replace '[^a-zA-Z0-9-]', '_'))
+        Write-Result "  Downloading: $($jobInfo.name) (Run $($jobInfo.runId))" Info
+        gh run view $jobInfo.runId --log --job $jobInfo.id --repo "$Owner/$Repo" > $logFile 2>&1
+    }
+
+    Write-Result "✓ Job logs downloaded" Success
+    Get-ChildItem $logsDir -Filter "*.txt" | ForEach-Object {
+        Write-Host "  - $($_.Name)" -ForegroundColor $colors.Info
+    }
+}
+
+if ($Interactive) {
+    Write-Host "`nPress Enter to continue to Step 3..."
+    Read-Host | Out-Null
+}
+
+# STEP 3: Extract Specific Failures
+Write-Step "Extract test failures from XML" 3
+
+$xmlFiles = Get-ChildItem $artifactDir -Filter "*.xml" -Recurse
+if (-not $xmlFiles) {
+    Write-Result "✗ No test result XML files found" Error
+    exit 1
+}
+
+Write-Result "✓ Found $($xmlFiles.Count) test result file(s)" Success
+
+$allFailures = @()
+
+foreach ($xmlFile in $xmlFiles) {
+    Write-Result "`nParsing: $($xmlFile.Name)" Info
+
+    try {
+        [xml]$xml = Get-Content $xmlFile
+        $testResults = $xml.'test-results'
+
+        Write-Host "  Total: $($testResults.total)" -ForegroundColor $colors.Info
+        Write-Host "  Passed: $($testResults.passed)" -ForegroundColor $colors.Success
+        if ($testResults.failures -gt 0) {
+            Write-Host "  Failed: $($testResults.failures)" -ForegroundColor $colors.Error
+        }
+        if ($testResults.errors -gt 0) {
+            Write-Host "  Errors: $($testResults.errors)" -ForegroundColor $colors.Error
+        }
+        if ($testResults.skipped -gt 0) {
+            Write-Host "  Skipped: $($testResults.skipped)" -ForegroundColor $colors.Warning
+        }
+        if ($testResults.ignored -gt 0) {
+            Write-Host "  Ignored: $($testResults.ignored)" -ForegroundColor $colors.Warning
+        }
+
+        # Extract failures
+        $failures = $xml.SelectNodes('.//test-case[@result = "Failure"]')
+
+        foreach ($failure in $failures) {
+            $allFailures += @{
+                Name       = $failure.name
+                File       = $xmlFile.Name
+                Message    = $failure.failure.message
+                StackTrace = $failure.failure.'stack-trace'
+            }
+        }
+    } catch {
+        Write-Result "✗ Error parsing XML: $_" Error
+    }
+}
+
+Write-Result "`n✓ Extracted $($allFailures.Count) failures total" Success
+
+# Save failures to JSON for later analysis
+$allFailures | ConvertTo-Json -Depth 10 | Out-File (Join-Path $OutputDir "failures.json")
+
+if ($Interactive) {
+    Write-Host "`nPress Enter to continue to Step 4..."
+    Read-Host | Out-Null
+}
+
+# STEP 4: Read Error Messages
+Write-Step "Analyze error messages" 4
+
+$failuresByType = @{}
+
+foreach ($failure in $allFailures) {
+    $message = $failure.Message -split "`n" | Select-Object -First 1
+
+    # Categorize failure
+    $type = 'Other'
+    if ($message -match 'Expected .* but got') { $type = 'Assertion' }
+    elseif ($message -match 'Cannot (find|bind)') { $type = 'Exception' }
+    elseif ($message -match 'timed out') { $type = 'Timeout' }
+
+    if (-not $failuresByType[$type]) {
+        $failuresByType[$type] = @()
+    }
+    $failuresByType[$type] += $failure
+}
+
+Write-Result "Failure breakdown:" Info
+$failuresByType.GetEnumerator() | ForEach-Object {
+    Write-Host "  $($_.Key): $($_.Value.Count)" -ForegroundColor $colors.Warning
+}
+
+Write-Result "`nTop failure messages:" Info
+$allFailures | Group-Object Message | Sort-Object Count -Descending | Select-Object -First 3 | ForEach-Object {
+    Write-Host "  [$($_.Count)x] $($_.Name -split "`n" | Select-Object -First 1)" -ForegroundColor $colors.Info
+}
+
+# Save analysis
+$analysis = @{
+    FailuresByType = @{}
+    TopMessages    = @()
+}
+
+$failuresByType.GetEnumerator() | ForEach-Object {
+    $analysis.FailuresByType[$_.Key] = $_.Value.Count
+}
+
+$allFailures | Group-Object Message | Sort-Object Count -Descending | Select-Object -First 5 | ForEach-Object {
+    $analysis.TopMessages += @{
+        Count   = $_.Count
+        Message = ($_.Name -split "`n" | Select-Object -First 1)
+    }
+}
+
+$analysis | ConvertTo-Json | Out-File (Join-Path $OutputDir "analysis.json")
+
+if ($Interactive) {
+    Write-Host "`nPress Enter to continue to Step 5..."
+    Read-Host | Out-Null
+}
+
+# STEP 5: Search Logs for Error Markers
+Write-Step "Search logs for error markers" 5
+
+$logsDir = Join-Path $OutputDir "logs"
+if (-not (Test-Path $logsDir)) {
+    Write-Result "⚠ Logs directory not found" Warning
+} else {
+    $logFiles = Get-ChildItem $logsDir -Filter "*.txt" -ErrorAction SilentlyContinue
+    if (-not $logFiles) {
+        Write-Result "⚠ No log files found in logs directory" Warning
+    } else {
+        Write-Result "Searching $($logFiles.Count) job log(s) for error markers ([-])" Info
+        Write-Result "Format: [JobName] [LineNumber] Content" Info
+        Write-Host ""
+
+        $allErrorLines = @()
+
+        foreach ($logFile in $logFiles) {
+            $jobName = $logFile.BaseName -replace '^log-', ''
+            $logLines = @(Get-Content $logFile)
+
+            for ($i = 0; $i -lt $logLines.Count; $i++) {
+                $line = $logLines[$i]
+                if ($line -match '\s\[-\]\s') {
+                    $allErrorLines += @{
+                        JobName    = $jobName
+                        LineNumber = $i + 1
+                        Content    = $line
+                    }
+                }
+            }
+        }
+
+        if ($allErrorLines.Count -gt 0) {
+            Write-Result "✓ Found $($allErrorLines.Count) error marker line(s)" Warning
+
+            $allErrorLines | ForEach-Object {
+                Write-Host "  [$($_.JobName)] [$($_.LineNumber)] $($_.Content)" -ForegroundColor $colors.Error
+            }
+
+            # Save to file
+            $allErrorLines | ConvertTo-Json | Out-File (Join-Path $OutputDir "error-markers.json")
+            Write-Result "✓ Error markers saved to error-markers.json" Success
+        } else {
+            Write-Result "✓ No error markers found in logs" Success
+        }
+    }
+}
+
+if ($Interactive) {
+    Write-Host "`nPress Enter to continue to Step 6..."
+    Read-Host | Out-Null
+}
+
+# STEP 6: Generate Recommendations
+Write-Step "Generate recommendations" 6
+
+$recommendations = @()
+
+# Analyze patterns
+if ($failuresByType['Assertion']) {
+    $recommendations += "Multiple assertion failures detected. These indicate test expectations don't match actual behavior."
+}
+
+if ($failuresByType['Exception']) {
+    $recommendations += "Exception errors found. Check test setup and prerequisites - may indicate missing files, modules, or permissions."
+}
+
+if ($failuresByType['Timeout']) {
+    $recommendations += "Timeout failures suggest slow or hanging operations. Consider network issues or resource constraints on CI."
+}
+
+# Check for patterns in failure messages
+$failureMessages = $allFailures.Message -join "`n"
+if ($failureMessages -match 'PackageManagement') {
+    $recommendations += "PackageManagement module issues detected. Verify module availability and help repository access."
+}
+
+if ($failureMessages -match 'Update-Help') {
+    $recommendations += "Update-Help failures detected. Check network connectivity to help repository and help installation paths."
+}
+
+Write-Result "`n📋 Recommendations:" Info
+if ($recommendations) {
+    $recommendations | ForEach-Object { Write-Host "  • $_" -ForegroundColor $colors.Info }
+} else {
+    Write-Host "  • Review failures in detail" -ForegroundColor $colors.Info
+    Write-Host "  • Check if test changes are needed" -ForegroundColor $colors.Info
+    Write-Host "  • Consider environment-specific issues" -ForegroundColor $colors.Info
+}
+
+$recommendations | Out-File (Join-Path $OutputDir "recommendations.txt")
+
+# Summary
+Write-Host "`n=== Analysis Complete ===" -ForegroundColor $colors.Step
+Write-Host "Results saved to: $OutputDir" -ForegroundColor $colors.Info
+Write-Host "  - failures.json (detailed failure data)" -ForegroundColor $colors.Info
+Write-Host "  - analysis.json (summary analysis)" -ForegroundColor $colors.Info
+Write-Host "  - recommendations.txt (suggested fixes)" -ForegroundColor $colors.Info
+Write-Host "  - error-markers.json (error markers from logs)" -ForegroundColor $colors.Info
+Write-Host "  - logs/ (individual job log files)" -ForegroundColor $colors.Info
+Write-Host "  - artifacts/ (downloaded test artifacts)" -ForegroundColor $colors.Info
+
+Write-Host "`nNext steps:" -ForegroundColor $colors.Step
+Write-Host "1. Review recommendations.txt for analysis" -ForegroundColor $colors.Info
+Write-Host "2. Examine failures.json for detailed error messages" -ForegroundColor $colors.Info
+Write-Host "3. Check error-markers.json for specific test failures in logs" -ForegroundColor $colors.Info
+Write-Host "4. Review individual job logs in logs/ directory for contextual details" -ForegroundColor $colors.Info
+Write-Host "`n"
diff --git a/.github/workflows/AssignPrs.yml b/.github/workflows/AssignPrs.yml
deleted file mode 100644
index b2a7610d60c..00000000000
--- a/.github/workflows/AssignPrs.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Auto Assign PR Maintainer
-on:
-  pull_request:
-    types: [opened, edited]
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - uses: wow-actions/auto-assign@v3
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # using the `org/team_slug` or `/team_slug` syntax to add git team as reviewers
-          assignees: |
-            TravisEz13
-            daxian-dbw
-            adityapatwardhan
-            iSazonov
-            SeeminglyScience
-          skipDraft: true
-          skipKeywords: wip, draft
-          addReviewers: false
-          numberOfAssignees: 1
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/analyze-reusable.yml
similarity index 52%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/analyze-reusable.yml
index a18163af84d..bb90de8e264 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/analyze-reusable.yml
@@ -1,30 +1,30 @@
-name: "CodeQL"
+name: CodeQL Analysis (Reusable)
 
 on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
+  workflow_call:
+    inputs:
+      runner_os:
+        description: 'Runner OS for CodeQL analysis'
+        type: string
+        required: false
+        default: ubuntu-latest
 
-defaults:
-  run:
-    shell: pwsh
+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
 
 env:
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-
-permissions:
-  contents: read
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  __SuppressAnsiEscapeSequences: 1
+  nugetMultiFeedWarnLevel: none
 
 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-latest
+    runs-on: ${{ inputs.runner_os }}
 
     strategy:
       fail-fast: false
@@ -37,13 +37,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         fetch-depth: '0'
 
+    - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+      with:
+        global-json-file: ./global.json
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,18 +56,22 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - run: |
-        Get-ChildItem -Path env:
+        Import-Module .\tools\ci.psm1
+        Show-Environment
       name: Capture Environment
+      shell: pwsh
 
     - run: |
         Import-Module .\tools\ci.psm1
         Invoke-CIInstall -SkipUser
       name: Bootstrap
+      shell: pwsh
 
     - run: |
         Import-Module .\tools\ci.psm1
-        Invoke-CIBuild
+        Invoke-CIBuild -Configuration 'StaticAnalysis'
       name: Build
+      shell: pwsh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
new file mode 100644
index 00000000000..d78e745a4a9
--- /dev/null
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -0,0 +1,64 @@
+name: "Copilot Setup Steps"
+
+# Allow testing of the setup steps from your repository's "Actions" tab.
+on:
+  workflow_dispatch:
+
+  pull_request:
+    branches:
+      - master
+    paths:
+      - ".github/workflows/copilot-setup-steps.yml"
+
+permissions:
+  contents: read
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  # See https://docs.github.com/en/copilot/customizing-copilot/customizing-the-development-environment-for-copilot-coding-agent
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    # You can define any steps you want, and they will run before the agent starts.
+    # If you do not check out your code, Copilot will do this for you.
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+
+      - name: Bootstrap
+        if: success()
+        run: |-
+          $title = 'Import Build.psm1'
+          Write-Host "::group::$title"
+          Import-Module ./build.psm1 -Verbose -ErrorAction Stop
+          Write-LogGroupEnd -Title $title
+
+          $title = 'Switch to public feed'
+          Write-LogGroupStart -Title $title
+          Switch-PSNugetConfig -Source Public
+          Write-LogGroupEnd -Title $title
+
+          $title = 'Bootstrap'
+          Write-LogGroupStart -Title $title
+          Start-PSBootstrap -Scenario DotNet
+          Write-LogGroupEnd -Title $title
+
+          $title = 'Install .NET Tools'
+          Write-LogGroupStart -Title $title
+          Start-PSBootstrap -Scenario Tools
+          Write-LogGroupEnd -Title $title
+
+          $title = 'Sync Tags'
+          Write-LogGroupStart -Title $title
+          Sync-PSTags -AddRemoteIfMissing
+          Write-LogGroupEnd -Title $title
+
+          $title = 'Setup .NET environment variables'
+          Write-LogGroupStart -Title $title
+          Find-DotNet -SetDotnetRoot
+          Write-LogGroupEnd -Title $title
+        shell: pwsh
diff --git a/.github/workflows/createReminders.yml b/.github/workflows/createReminders.yml
deleted file mode 100644
index 290141703d7..00000000000
--- a/.github/workflows/createReminders.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: 'Create reminder'
-
-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:
-      - name: check for reminder
-        uses: agrc/create-reminder-action@v1
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 00000000000..3b610326e44
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,22 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required,
+# PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
new file mode 100644
index 00000000000..27ceac59bbd
--- /dev/null
+++ b/.github/workflows/labels.yml
@@ -0,0 +1,31 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+name: Verify PR Labels
+
+on:
+  pull_request:
+    types: [opened, reopened, edited, labeled, unlabeled, synchronize]
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  verify-labels:
+    if: github.repository_owner == 'PowerShell'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repository
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+    - name: Verify PR has label starting with 'cl-'
+      id: verify-labels
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      with:
+        script: |
+          const labels = context.payload.pull_request.labels.map(label => label.name.toLowerCase());
+          if (!labels.some(label => label.startsWith('cl-'))) {
+            core.setFailed("Every PR must have at least one label starting with 'cl-'.");
+          }
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
new file mode 100644
index 00000000000..77186125a9c
--- /dev/null
+++ b/.github/workflows/linux-ci.yml
@@ -0,0 +1,262 @@
+name: Linux-CI
+
+run-name: "${{ github.ref_name }} - ${{ github.run_number }}"
+
+on:
+  workflow_dispatch:
+
+  push:
+    branches:
+      - master
+      - release/**
+      - github-mirror
+    paths:
+      - "**"
+      - "*"
+      - ".globalconfig"
+      - "!.github/ISSUE_TEMPLATE/**"
+      - "!.dependabot/config.yml"
+      - "!.pipelines/**"
+      - "!test/perf/**"
+  pull_request:
+    branches:
+      - master
+      - release/**
+      - github-mirror
+      - "*-feature"
+# Path filters for PRs need to go into the changes job
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ contains(github.ref, 'merge')}}
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  FORCE_FEATURE: 'False'
+  FORCE_PACKAGE: 'False'
+  NUGET_KEY: none
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  __SuppressAnsiEscapeSequences: 1
+  nugetMultiFeedWarnLevel: none
+  system_debug: 'false'
+jobs:
+  changes:
+    if: startsWith(github.repository_owner, 'azure') || github.repository_owner == 'PowerShell'
+    name: Change Detection
+    runs-on: ubuntu-latest
+    # Required permissions
+    permissions:
+      pull-requests: read
+      contents: read
+
+    # Set job outputs to values from filter step
+    outputs:
+      source: ${{ steps.filter.outputs.source }}
+      buildModuleChanged: ${{ steps.filter.outputs.buildModuleChanged }}
+      packagingChanged: ${{ steps.filter.outputs.packagingChanged }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Change Detection
+        id: filter
+        uses: "./.github/actions/infrastructure/path-filters"
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  merge_conflict_check:
+    name: Check for Merge Conflict Markers
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' && (startsWith(github.repository_owner, 'azure') || github.repository_owner == 'PowerShell')
+    permissions:
+      pull-requests: read
+      contents: read
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Check for merge conflict markers
+        uses: "./.github/actions/infrastructure/merge-conflict-checker"
+
+  ci_build:
+    name: Build PowerShell
+    runs-on: ubuntu-latest
+    needs: changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+
+      - name: Build
+        uses: "./.github/actions/build/ci"
+  linux_test_unelevated_ci:
+    name: Linux Unelevated CI
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Linux Unelevated CI
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: UnelevatedPesterTests
+          tagSet: CI
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  linux_test_elevated_ci:
+    name: Linux Elevated CI
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Linux Elevated CI
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: ElevatedPesterTests
+          tagSet: CI
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  linux_test_unelevated_others:
+    name: Linux Unelevated Others
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Linux Unelevated Others
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: UnelevatedPesterTests
+          tagSet: Others
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  linux_test_elevated_others:
+    name: Linux Elevated Others
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Linux Elevated Others
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: ElevatedPesterTests
+          tagSet: Others
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  xunit_tests:
+    name: xUnit Tests
+    needs:
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    uses: ./.github/workflows/xunit-tests.yml
+    with:
+      runner_os: ubuntu-latest
+      test_results_artifact_name: testResults-xunit
+
+  infrastructure_tests:
+    name: Infrastructure Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1
+
+      - name: Install Pester
+        shell: pwsh
+        run: |
+          Import-Module ./tools/ci.psm1
+          Install-CIPester
+
+      - name: Run Infrastructure Tests
+        shell: pwsh
+        run: |
+          $testResultsFolder = Join-Path $PWD "testResults"
+          New-Item -ItemType Directory -Path $testResultsFolder -Force | Out-Null
+
+          $config = New-PesterConfiguration
+          $config.Run.Path = './test/infrastructure/'
+          $config.Run.PassThru = $true
+          $config.TestResult.Enabled = $true
+          $config.TestResult.OutputFormat = 'NUnitXml'
+          $config.TestResult.OutputPath = "$testResultsFolder/InfrastructureTests.xml"
+          $config.Output.Verbosity = 'Detailed'
+
+          $result = Invoke-Pester -Configuration $config
+
+          if ($result.FailedCount -gt 0 -or $result.Result -eq 'Failed') {
+            throw "Infrastructure tests failed"
+          }
+
+      - name: Publish Test Results
+        uses: "./.github/actions/test/process-pester-results"
+        if: always()
+        with:
+          name: "InfrastructureTests"
+          testResultsFolder: "${{ github.workspace }}/testResults"
+
+  ## Temporarily disable the CodeQL analysis on Linux as it doesn't work for .NET SDK 10-rc.2.
+  # analyze:
+  #   name: CodeQL Analysis
+  #   needs: changes
+  #   if: ${{ needs.changes.outputs.source == 'true' }}
+  #   uses: ./.github/workflows/analyze-reusable.yml
+  #   permissions:
+  #     actions: read
+  #     contents: read
+  #     security-events: write
+  #   with:
+  #     runner_os: ubuntu-latest
+
+  ready_to_merge:
+    name: Linux ready to merge
+    needs:
+      - xunit_tests
+      - linux_test_elevated_ci
+      - linux_test_elevated_others
+      - linux_test_unelevated_ci
+      - linux_test_unelevated_others
+      - linux_packaging
+      - merge_conflict_check
+      - infrastructure_tests
+      # - analyze
+    if: always()
+    uses: PowerShell/compliance/.github/workflows/ready-to-merge.yml@c8b3ad5819ad7078f3e375519b4f8c6232d1cbdf # v1.0.0
+    with:
+      needs_context: ${{ toJson(needs) }}
+  linux_packaging:
+    name: Linux Packaging
+    needs:
+      - changes
+    if: ${{ needs.changes.outputs.packagingChanged == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+      - name: Linux Packaging
+        uses: "./.github/actions/test/linux-packaging"
diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
new file mode 100644
index 00000000000..55d852bb68a
--- /dev/null
+++ b/.github/workflows/macos-ci.yml
@@ -0,0 +1,248 @@
+name: macOS-CI
+
+run-name: "${{ github.ref_name }} - ${{ github.run_number }}"
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+      - github-mirror
+    paths:
+      - "**"
+      - "*"
+      - ".globalconfig"
+      - "!.github/ISSUE_TEMPLATE/**"
+      - "!.dependabot/config.yml"
+      - "!.pipelines/**"
+      - "!test/perf/**"
+  pull_request:
+    branches:
+      - master
+      - release/**
+      - github-mirror
+      - "*-feature"
+# Path filters for PRs need to go into the changes job
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ contains(github.ref, 'merge')}}
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  FORCE_FEATURE: 'False'
+  FORCE_PACKAGE: 'False'
+  HOMEBREW_NO_ANALYTICS: 1
+  NUGET_KEY: none
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  __SuppressAnsiEscapeSequences: 1
+  nugetMultiFeedWarnLevel: none
+  system_debug: 'false'
+
+jobs:
+  changes:
+    name: Change Detection
+    runs-on: ubuntu-latest
+    if: startsWith(github.repository_owner, 'azure') || github.repository_owner == 'PowerShell'
+    # Required permissions
+    permissions:
+      pull-requests: read
+      contents: read
+
+    # Set job outputs to values from filter step
+    outputs:
+      source: ${{ steps.filter.outputs.source }}
+      buildModuleChanged: ${{ steps.filter.outputs.buildModuleChanged }}
+      packagingChanged: ${{ steps.filter.outputs.packagingChanged }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Change Detection
+        id: filter
+        uses: "./.github/actions/infrastructure/path-filters"
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  ci_build:
+    name: Build PowerShell
+    runs-on: macos-15-large
+    needs: changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Build
+        uses: "./.github/actions/build/ci"
+  macos_test_unelevated_ci:
+    name: macos Unelevated CI
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: macos-15-large
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: macOS Unelevated CI
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: UnelevatedPesterTests
+          tagSet: CI
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  macos_test_elevated_ci:
+    name: macOS Elevated CI
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: macos-15-large
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: macOS Elevated CI
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: ElevatedPesterTests
+          tagSet: CI
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  macos_test_unelevated_others:
+    name: macOS Unelevated Others
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: macos-15-large
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: macOS Unelevated Others
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: UnelevatedPesterTests
+          tagSet: Others
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  macos_test_elevated_others:
+    name: macOS Elevated Others
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: macos-15-large
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: macOS Elevated Others
+        uses: "./.github/actions/test/nix"
+        with:
+          purpose: ElevatedPesterTests
+          tagSet: Others
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  xunit_tests:
+    name: xUnit Tests
+    needs:
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    uses: ./.github/workflows/xunit-tests.yml
+    with:
+      runner_os: macos-15-large
+      test_results_artifact_name: testResults-xunit
+  PackageMac-macos_packaging:
+    name: macOS packaging and testing
+    needs:
+      - changes
+    if: ${{ needs.changes.outputs.packagingChanged == 'true' }}
+    runs-on:
+      - macos-15-large
+    steps:
+    - name: checkout
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      with:
+        fetch-depth: 1000
+    - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+      with:
+        global-json-file: ./global.json
+    - name: Bootstrap packaging
+      if: success()
+      run: |-
+        import-module ./build.psm1
+        start-psbootstrap -Scenario package
+      shell: pwsh
+    - name: Build PowerShell and Create macOS package
+      if: success()
+      run: |-
+        import-module ./build.psm1
+        import-module ./tools/ci.psm1
+        import-module ./tools/packaging/packaging.psm1
+        Switch-PSNugetConfig -Source Public
+        Sync-PSTags -AddRemoteIfMissing
+        $releaseTag = Get-ReleaseTag
+        Start-PSBuild -Configuration Release -PSModuleRestore -ReleaseTag $releaseTag
+        $macOSRuntime = if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq 'Arm64') { 'osx-arm64' } else { 'osx-x64' }
+        Start-PSPackage -Type osxpkg -ReleaseTag $releaseTag -MacOSRuntime $macOSRuntime -SkipReleaseChecks
+      shell: pwsh
+
+    - name: Install Pester
+      if: success()
+      run: |-
+        Import-Module ./tools/ci.psm1
+        Install-CIPester
+      shell: pwsh
+
+    - name: Test package contents
+      if: success()
+      run: |-
+        $env:PACKAGE_FOLDER = Get-Location
+        $testResultsPath = Join-Path $env:RUNNER_WORKSPACE "testResults"
+        if (-not (Test-Path $testResultsPath)) {
+          New-Item -ItemType Directory -Path $testResultsPath -Force | Out-Null
+        }
+        Import-Module Pester
+        $pesterConfig = New-PesterConfiguration
+        $pesterConfig.Run.Path = './test/packaging/macos/package-validation.tests.ps1'
+        $pesterConfig.Run.PassThru = $true
+        $pesterConfig.Output.Verbosity = 'Detailed'
+        $pesterConfig.TestResult.Enabled = $true
+        $pesterConfig.TestResult.OutputFormat = 'NUnitXml'
+        $pesterConfig.TestResult.OutputPath = Join-Path $testResultsPath "macOSPackage.xml"
+        $result = Invoke-Pester -Configuration $pesterConfig
+        if ($result.FailedCount -gt 0) {
+          throw "Package validation failed with $($result.FailedCount) failed test(s)"
+        }
+      shell: pwsh
+    - name: Publish and Upload Pester Test Results
+      if: always()
+      uses: "./.github/actions/test/process-pester-results"
+      with:
+        name: "macOSPackage"
+        testResultsFolder: "${{ runner.workspace }}/testResults"
+    - name: Upload package artifact
+      if: always()
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      with:
+        name: macos-package
+        path: "*.pkg"
+  ready_to_merge:
+    name: macos ready to merge
+    needs:
+      - xunit_tests
+      - PackageMac-macos_packaging
+      - macos_test_elevated_ci
+      - macos_test_elevated_others
+      - macos_test_unelevated_ci
+      - macos_test_unelevated_others
+    if: always()
+    uses: PowerShell/compliance/.github/workflows/ready-to-merge.yml@c8b3ad5819ad7078f3e375519b4f8c6232d1cbdf # v1.0.0
+    with:
+      needs_context: ${{ toJson(needs) }}
diff --git a/.github/workflows/markdownLink.yml b/.github/workflows/markdownLink.yml
deleted file mode 100644
index 7c73f649a86..00000000000
--- a/.github/workflows/markdownLink.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-on:
-  pull_request:
-    branches:
-      - master
-      - 'release/**'
-
-name: Check modified markdown files
-permissions:
-  contents: read
-
-jobs:
-  markdown-link-check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - 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
-  markdown-lint:
-    permissions:
-      contents: read
-      packages: read
-      statuses: write
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        # Full git history is needed to get a proper
-        # list of changed files within `super-linter`
-        fetch-depth: 0
-    - name: Lint Markdown
-      uses: super-linter/super-linter@v5
-      env:
-        VALIDATE_ALL_CODEBASE: false
-        DEFAULT_BRANCH: master
-        FILTER_REGEX_INCLUDE: .*\.md
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        VALIDATE_EDITORCONFIG: false
diff --git a/.github/workflows/markdownLinkDaily.yml b/.github/workflows/markdownLinkDaily.yml
deleted file mode 100644
index 557b801273d..00000000000
--- a/.github/workflows/markdownLinkDaily.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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 * * *'
-
-permissions:
-  contents: read
-
-jobs:
-  markdown-link-check:
-    runs-on: ubuntu-latest
-    if: github.repository == 'PowerShell/PowerShell'
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - 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}`}"
diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
deleted file mode 100644
index c660788a620..00000000000
--- a/.github/workflows/processReminders.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: 'Process reminders'
-
-on:
-  schedule:
-    - 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:
-      - name: check reminders and notify
-        uses: agrc/reminder-action@v1
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
deleted file mode 100644
index faf5ddda535..00000000000
--- a/.github/workflows/rebase.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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:
-  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
-    steps:
-    - name: Checkout the latest code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Post rebase started comment to pull request
-      uses: actions/github-script@v6
-      continue-on-error: true
-      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.8
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
new file mode 100644
index 00000000000..7b3711666aa
--- /dev/null
+++ b/.github/workflows/scorecards.yml
@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '20 7 * * 2'
+  push:
+    branches: ["master"]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    if: github.repository_owner == 'PowerShell'
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      contents: read
+      actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecards on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/verify-markdown-links.yml b/.github/workflows/verify-markdown-links.yml
new file mode 100644
index 00000000000..19da648a959
--- /dev/null
+++ b/.github/workflows/verify-markdown-links.yml
@@ -0,0 +1,32 @@
+name: Verify Markdown Links
+
+on:
+  push:
+    branches: [ main, master ]
+    paths:
+      - '**/*.md'
+      - '.github/workflows/verify-markdown-links.yml'
+      - '.github/actions/infrastructure/markdownlinks/**'
+  pull_request:
+    branches: [ main, master ]
+    paths:
+      - '**/*.md'
+  schedule:
+    # Run weekly on Sundays at midnight UTC to catch external link rot
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+jobs:
+  verify-markdown-links:
+    name: Verify Markdown Links
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Verify markdown links
+        id: verify
+        uses: ./.github/actions/infrastructure/markdownlinks
+        with:
+          timeout-sec: 30
+          maximum-retry-count: 2
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
new file mode 100644
index 00000000000..8a57b8b9726
--- /dev/null
+++ b/.github/workflows/windows-ci.yml
@@ -0,0 +1,194 @@
+name: Windows-CI
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - release/**
+      - github-mirror
+    paths:
+      - "**"
+      - "*"
+      - ".globalconfig"
+      - "!.vsts-ci/misc-analysis.yml"
+      - "!.github/ISSUE_TEMPLATE/**"
+      - "!.dependabot/config.yml"
+      - "!test/perf/**"
+      - "!.pipelines/**"
+  pull_request:
+    branches:
+      - master
+      - release/**
+      - github-mirror
+      - "*-feature"
+
+# Path filters for PRs need to go into the changes job
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ contains(github.ref, 'merge')}}
+
+permissions:
+  contents: read
+
+run-name: "${{ github.ref_name }} - ${{ github.run_number }}"
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
+  NugetSecurityAnalysisWarningLevel: none
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  __SuppressAnsiEscapeSequences: 1
+  nugetMultiFeedWarnLevel: none
+  SYSTEM_ARTIFACTSDIRECTORY: ${{ github.workspace }}/artifacts
+  BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts
+jobs:
+  changes:
+    name: Change Detection
+    runs-on: ubuntu-latest
+    if: startsWith(github.repository_owner, 'azure') || github.repository_owner == 'PowerShell'
+    # Required permissions
+    permissions:
+      pull-requests: read
+      contents: read
+
+    # Set job outputs to values from filter step
+    outputs:
+      source: ${{ steps.filter.outputs.source }}
+      buildModuleChanged: ${{ steps.filter.outputs.buildModuleChanged }}
+      packagingChanged: ${{ steps.filter.outputs.packagingChanged }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Change Detection
+        id: filter
+        uses: "./.github/actions/infrastructure/path-filters"
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  ci_build:
+    name: Build PowerShell
+    needs: changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: windows-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Build
+        uses: "./.github/actions/build/ci"
+  windows_test_unelevated_ci:
+    name: Windows Unelevated CI
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: windows-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Windows Unelevated CI
+        uses: "./.github/actions/test/windows"
+        with:
+          purpose: UnelevatedPesterTests
+          tagSet: CI
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  windows_test_elevated_ci:
+    name: Windows Elevated CI
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: windows-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Windows Elevated CI
+        uses: "./.github/actions/test/windows"
+        with:
+          purpose: ElevatedPesterTests
+          tagSet: CI
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  windows_test_unelevated_others:
+    name: Windows Unelevated Others
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: windows-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Windows Unelevated Others
+        uses: "./.github/actions/test/windows"
+        with:
+          purpose: UnelevatedPesterTests
+          tagSet: Others
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  windows_test_elevated_others:
+    name: Windows Elevated Others
+    needs:
+      - ci_build
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    runs-on: windows-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+      - name: Windows Elevated Others
+        uses: "./.github/actions/test/windows"
+        with:
+          purpose: ElevatedPesterTests
+          tagSet: Others
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  xunit_tests:
+    name: xUnit Tests
+    needs:
+      - changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    uses: ./.github/workflows/xunit-tests.yml
+    with:
+      runner_os: windows-latest
+      test_results_artifact_name: testResults-xunit
+  analyze:
+    name: CodeQL Analysis
+    needs: changes
+    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
+    uses: ./.github/workflows/analyze-reusable.yml
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    with:
+      runner_os: windows-latest
+  windows_packaging:
+    name: Windows Packaging
+    needs:
+      - changes
+    if: ${{ needs.changes.outputs.packagingChanged == 'true' }}
+    uses: ./.github/workflows/windows-packaging-reusable.yml
+  ready_to_merge:
+    name: windows ready to merge
+    needs:
+      - xunit_tests
+      - windows_test_elevated_ci
+      - windows_test_elevated_others
+      - windows_test_unelevated_ci
+      - windows_test_unelevated_others
+      - analyze
+      - windows_packaging
+    if: always()
+    uses: PowerShell/compliance/.github/workflows/ready-to-merge.yml@c8b3ad5819ad7078f3e375519b4f8c6232d1cbdf # v1.0.0
+    with:
+      needs_context: ${{ toJson(needs) }}
diff --git a/.github/workflows/windows-packaging-reusable.yml b/.github/workflows/windows-packaging-reusable.yml
new file mode 100644
index 00000000000..8d0255d4443
--- /dev/null
+++ b/.github/workflows/windows-packaging-reusable.yml
@@ -0,0 +1,92 @@
+name: Windows Packaging (Reusable)
+
+on:
+  workflow_call:
+
+env:
+  GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  __SuppressAnsiEscapeSequences: 1
+  nugetMultiFeedWarnLevel: none
+  SYSTEM_ARTIFACTSDIRECTORY: ${{ github.workspace }}/artifacts
+  BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts
+
+permissions:
+  contents: read
+
+jobs:
+  package:
+    name: ${{ matrix.architecture }} - ${{ matrix.channel }}
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - architecture: x64
+            channel: preview
+            runtimePrefix: win7
+          - architecture: x86
+            channel: stable
+            runtimePrefix: win7
+          - architecture: x86
+            channel: preview
+            runtimePrefix: win7
+          - architecture: arm64
+            channel: preview
+            runtimePrefix: win
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+
+      - name: Capture Environment
+        if: success() || failure()
+        run: |
+          Import-Module .\tools\ci.psm1
+          Show-Environment
+        shell: pwsh
+
+      - name: Capture PowerShell Version Table
+        if: success() || failure()
+        run: |
+          $PSVersionTable
+        shell: pwsh
+
+      - name: Switch to Public Feeds
+        if: success()
+        run: |
+          Import-Module .\tools\ci.psm1
+          Switch-PSNugetConfig -Source Public
+        shell: pwsh
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+        with:
+          global-json-file: ./global.json
+
+      - name: Bootstrap
+        if: success()
+        run: |
+          Import-Module .\tools\ci.psm1
+          Invoke-CIInstall -SkipUser
+        shell: pwsh
+
+      - name: Build and Package
+        run: |
+          Import-Module .\tools\ci.psm1
+          New-CodeCoverageAndTestPackage
+          Invoke-CIFinish -Runtime ${{ matrix.runtimePrefix }}-${{ matrix.architecture }} -channel ${{ matrix.channel }}
+        shell: pwsh
+
+      - name: Upload Build Artifacts
+        if: always()
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: windows-packaging-${{ matrix.architecture }}-${{ matrix.channel }}
+          path: |
+            ${{ github.workspace }}/artifacts/**/*
+            !${{ github.workspace }}/artifacts/**/*.pdb
diff --git a/.github/workflows/xunit-tests.yml b/.github/workflows/xunit-tests.yml
new file mode 100644
index 00000000000..c643917edd0
--- /dev/null
+++ b/.github/workflows/xunit-tests.yml
@@ -0,0 +1,56 @@
+name: xUnit Tests (Reusable)
+
+on:
+  workflow_call:
+    inputs:
+      runner_os:
+        description: 'Runner OS for xUnit tests'
+        type: string
+        required: false
+        default: ubuntu-latest
+      test_results_artifact_name:
+        description: 'Artifact name for xUnit test results directory'
+        type: string
+        required: false
+        default: testResults-xunit
+
+permissions:
+  contents: read
+
+jobs:
+  xunit:
+    name: Run xUnit Tests
+    runs-on: ${{ inputs.runner_os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 1000
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+        with:
+          global-json-file: ./global.json
+
+      - name: Bootstrap
+        shell: pwsh
+        run: |
+          Import-Module ./tools/ci.psm1
+          Invoke-CIInstall -SkipUser
+          Sync-PSTags -AddRemoteIfMissing
+
+      - name: Build PowerShell and run xUnit tests
+        shell: pwsh
+        run: |
+          Import-Module ./tools/ci.psm1
+          Start-PSBuild
+          Write-Host "Running full xUnit test suite (no skipping)..."
+          Invoke-CIxUnit
+          Write-Host "Completed xUnit test run."
+
+      - name: Upload xUnit results
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        if: always()
+        with:
+          name: ${{ inputs.test_results_artifact_name }}
+          path: ${{ github.workspace }}/xUnitTestResults.xml
diff --git a/.gitignore b/.gitignore
index f8fac8a21bb..48556cf1b8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ project.lock.json
 # dotnet cli install/uninstall scripts
 dotnet-install.ps1
 dotnet-install.sh
+dotnet-install.sh.*
 dotnet-uninstall-pkgs.sh
 dotnet-uninstall-debian-packages.sh
 
@@ -82,6 +83,9 @@ TestsResults*.xml
 ParallelXUnitResults.xml
 xUnitResults.xml
 
+# Attack Surface Analyzer results
+asa-results/
+
 # Resharper settings
 PowerShell.sln.DotSettings.user
 *.msp
@@ -101,3 +105,22 @@ StartupProfileData-NonInteractive
 
 # Ignore logfiles
 logfile/*
+
+# Ignore nuget.config because it is dynamically generated
+nuget.config
+
+# Ignore MSBuild Binary Logs
+msbuild.binlog
+
+# Ignore gzip files in the manpage folder
+assets/manpage/*.gz
+
+# Ignore files and folders generated by some gh cli extensions
+tmp/*
+.env.local
+
+# Pester test failure analysis results (generated by analyze-pr-test-failures.ps1)
+**/pester-analysis-*/
+
+# Ignore CTRF report files
+crtf/*
diff --git a/.globalconfig b/.globalconfig
index 82db4cdf071..e0dd4ccb9e5 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -215,7 +215,7 @@ dotnet_diagnostic.CA1070.severity = warning
 
 # CA1200: Avoid using cref tags with a prefix
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1200
-dotnet_diagnostic.CA1200.severity = silent
+dotnet_diagnostic.CA1200.severity = warning
 
 # CA1303: Do not pass literals as localized parameters
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1303
@@ -510,6 +510,38 @@ dotnet_diagnostic.CA1846.severity = warning
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1847
 dotnet_diagnostic.CA1847.severity = warning
 
+# CA1852: Seal internal types
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852
+dotnet_diagnostic.CA1852.severity = warning
+
+# CA1853: Unnecessary call to 'Dictionary.ContainsKey(key)'
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1853
+dotnet_diagnostic.CA1853.severity = warning
+
+# CA1858: Use 'StartsWith' instead of 'IndexOf'
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1858
+dotnet_diagnostic.CA1858.severity = warning
+
+# CA1860: Avoid using 'Enumerable.Any()' extension method
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1860
+dotnet_diagnostic.CA1860.severity = warning
+
+# CA1865: Use char overload
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1865
+dotnet_diagnostic.CA1865.severity = warning
+
+# CA1866: Use char overload
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1866
+dotnet_diagnostic.CA1866.severity = warning
+
+# CA1867: Use char overload
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1867
+dotnet_diagnostic.CA1867.severity = warning
+
+# CA1868: Unnecessary call to 'Contains' for sets
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1868
+dotnet_diagnostic.CA1868.severity = warning
+
 # CA2000: Dispose objects before losing scope
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2000
 dotnet_diagnostic.CA2000.severity = none
@@ -554,6 +586,14 @@ dotnet_diagnostic.CA2015.severity = warning
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2016
 dotnet_diagnostic.CA2016.severity = suggestion
 
+# CA2021: Do not call Enumerable.Cast<T> or Enumerable.OfType<T> with incompatible types
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2021
+dotnet_diagnostic.CA2021.severity = warning
+
+# CA2022: Avoid inexact read with 'Stream.Read'
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2022
+dotnet_diagnostic.CA2022.severity = warning
+
 # CA2100: Review SQL queries for security vulnerabilities
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2100
 dotnet_diagnostic.CA2100.severity = none
@@ -1202,7 +1242,7 @@ dotnet_diagnostic.IDE0018.severity = silent
 
 # IDE0019: InlineAsTypeCheck
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0019
-dotnet_diagnostic.IDE0019.severity = silent
+dotnet_diagnostic.IDE0019.severity = warning
 
 # IDE0020: InlineIsTypeCheck
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0020
@@ -1322,7 +1362,7 @@ dotnet_diagnostic.IDE0048.severity = suggestion
 
 # IDE0049: PreferBuiltInOrFrameworkType
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0049
-dotnet_diagnostic.IDE0049.severity = warning
+dotnet_diagnostic.IDE0049.severity = suggestion
 
 # IDE0050: ConvertAnonymousTypeToTuple
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0050
@@ -1434,7 +1474,7 @@ dotnet_diagnostic.IDE0079.severity = silent
 
 # IDE0080: RemoveConfusingSuppressionForIsExpression
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0080
-dotnet_diagnostic.IDE0080.severity = silent
+dotnet_diagnostic.IDE0080.severity = warning
 
 # IDE0081: RemoveUnnecessaryByVal
 # https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0081
@@ -1830,7 +1870,7 @@ dotnet_diagnostic.SA1205.severity = warning
 
 # SA1206: Declaration keywords should follow order
 # https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1206.md
-dotnet_diagnostic.SA1206.severity = none
+dotnet_diagnostic.SA1206.severity = warning
 
 # SA1207: Protected should come before internal
 # https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1207.md
diff --git a/.markdownlintignore b/.markdownlintignore
new file mode 100644
index 00000000000..1d3c5b1ac92
--- /dev/null
+++ b/.markdownlintignore
@@ -0,0 +1 @@
+.github/SECURITY.md
diff --git a/.pipelines/EV2Specs/ServiceGroupRoot/RolloutSpec.json b/.pipelines/EV2Specs/ServiceGroupRoot/RolloutSpec.json
new file mode 100644
index 00000000000..9ed971068cc
--- /dev/null
+++ b/.pipelines/EV2Specs/ServiceGroupRoot/RolloutSpec.json
@@ -0,0 +1,28 @@
+{
+  "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/rolloutSpecification.json",
+  "contentVersion": "1.0.0.0",
+  "rolloutMetadata": {
+    "serviceModelPath": "ServiceModel.json",
+    "ScopeBindingsPath": "ScopeBindings.json",
+    "name": "OneBranch-Demo-Container-Deployment",
+    "rolloutType": "Major",
+    "buildSource": {
+      "parameters": {
+        "versionFile": "buildver.txt"
+      }
+    },
+    "Notification": {
+      "Email": {
+        "To": "default"
+      }
+    }
+  },
+  "orchestratedSteps": [
+    {
+      "name": "UploadLinuxContainer",
+      "targetType": "ServiceResource",
+      "targetName": "LinuxContainerUpload",
+      "actions": ["Shell/Run"]
+    }
+  ]
+}
diff --git a/.pipelines/EV2Specs/ServiceGroupRoot/ScopeBindings.json b/.pipelines/EV2Specs/ServiceGroupRoot/ScopeBindings.json
new file mode 100644
index 00000000000..c3a98555867
--- /dev/null
+++ b/.pipelines/EV2Specs/ServiceGroupRoot/ScopeBindings.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/scopeBindings.json",
+  "contentVersion": "0.0.0.1",
+  "scopeBindings": [
+    {
+      "scopeTagName": "Global",
+      "bindings": [
+        {
+          "find": "__SUBSCRIPTION_ID__",
+          "replaceWith": "$azureSubscriptionId()"
+        },
+        {
+          "find": "__RESOURCE_GROUP__",
+          "replaceWith": "$azureResourceGroup()"
+        },
+        {
+          "find": "__BUILD_VERSION__",
+          "replaceWith": "$buildVersion()"
+        }
+      ]
+    }
+  ]
+}
diff --git a/.pipelines/EV2Specs/ServiceGroupRoot/ServiceModel.json b/.pipelines/EV2Specs/ServiceGroupRoot/ServiceModel.json
new file mode 100644
index 00000000000..ce974fe69e5
--- /dev/null
+++ b/.pipelines/EV2Specs/ServiceGroupRoot/ServiceModel.json
@@ -0,0 +1,51 @@
+{
+  "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/serviceModel.json",
+  "contentVersion": "1.0.0.0",
+  "serviceMetadata": {
+    "serviceGroup": "OneBranch-PowerShellDocker",
+    "environment": "Test"
+  },
+  "serviceResourceGroupDefinitions": [
+    {
+      "name": "OneBranch-PowerShellDocker-RGDef",
+      "serviceResourceDefinitions": [
+        {
+          "name": "OneBranch-PowerShellDocker.Shell-SRDef",
+          "composedOf": {
+            "extension": {
+              "shell": [
+                {
+                  "type": "Run",
+                  "properties": {
+                    "imageName": "adm-azurelinux-30-l",
+                    "imageVersion": "v2"
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ]
+    }
+  ],
+  "serviceResourceGroups": [
+    {
+      "azureResourceGroupName": "default",
+      "location": "West US 3",
+      "instanceOf": "OneBranch-PowerShellDocker-RGDef",
+      "azureSubscriptionId": "default",
+        "scopeTags": [
+          {
+            "name": "Global"
+          }
+        ],
+      "serviceResources": [
+        {
+          "Name": "LinuxContainerUpload",
+          "InstanceOf": "OneBranch-PowerShellDocker.Shell-SRDef",
+          "RolloutParametersPath": "UploadLinux.Rollout.json"
+        }
+      ]
+    }
+  ]
+}
diff --git a/.pipelines/EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1 b/.pipelines/EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1
new file mode 100644
index 00000000000..6797ff94575
--- /dev/null
+++ b/.pipelines/EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1
@@ -0,0 +1,397 @@
+<#
+This function gets info from pmc's derived list of all repositories and from mapping.json (which contains info on just the repositories powershell publishes packages to, their package formats, etc)
+to create a list of repositories PowerShell cares about along with repository Ids, repository full Urls and associated package that will be published to it.
+#>
+function Get-MappedRepositoryIds {
+    param(
+        [Parameter(Mandatory)]
+        [hashtable]
+        $Mapping,
+
+        [Parameter(Mandatory)]
+        $RepoList,
+
+        # LTS is not consider a package in this context.
+        # LTS is just another package name.
+        [Parameter(Mandatory)]
+        [ValidateSet('stable', 'preview')]
+        $Channel
+    )
+
+    $mappedReposUsedByPwsh = @()
+    foreach ($package in $Mapping.Packages)
+    {
+        Write-Verbose "package: $package"
+        $packageChannel = $package.channel
+        if (!$packageChannel) {
+            $packageChannel = 'all'
+        }
+
+        Write-Verbose "package channel: $packageChannel"
+        if ($packageChannel -eq 'all' -or $packageChannel -eq $Channel)
+        {
+            $repoIds = [System.Collections.Generic.List[string]]::new()
+            $packageFormat = $package.PackageFormat
+            Write-Verbose "package format: $packageFormat" -Verbose
+            $extension = [System.io.path]::GetExtension($packageFormat)
+            $packageType = $extension -replace '^\.'
+
+            if ($package.distribution.count -gt 1) {
+                throw "Package $($package | out-string) has more than one Distribution."
+            }
+
+            foreach ($distribution in $package.distribution)
+            {
+                $urlGlob = $package.url
+                switch ($packageType)
+                {
+                    'deb' {
+                        $urlGlob = $urlGlob + '-apt'
+                    }
+                    'rpm' {
+                        $urlGlob = $urlGlob + '-yum'
+                    }
+                    default {
+                        throw "Unknown package type: $packageType"
+                    }
+                }
+
+                Write-Verbose "---Finding repo id for: $urlGlob---" -Verbose
+                $repos = $RepoList | Where-Object { $_.name -eq $urlGlob }
+
+                if ($repos.id) {
+                    Write-Verbose "Found repo id: $($repos.id)" -Verbose
+                    $repoIds.AddRange(([string[]]$repos.id))
+                }
+                else {
+                    throw "Could not find repo for $urlGlob"
+                }
+
+                if ($repoIds.Count -gt 0) {
+                    $mappedReposUsedByPwsh += ($package + @{ "RepoId" = $repoIds.ToArray() })
+                }
+            }
+        }
+    }
+
+    Write-Verbose -Verbose "mapped repos length: $($mappedReposUsedByPwsh.Length)"
+    return $mappedReposUsedByPwsh
+}
+
+<#
+This function creates package objects for the packages to be published,
+with the package name (ie package name format resolve with channel based PackageName and pwsh version), repoId, distribution and package path.
+#>
+function Get-PackageObjects() {
+    param(
+        [Parameter(Mandatory)]
+        [psobject[]]
+        $RepoObjects,
+
+        [Parameter(Mandatory)]
+        [string]
+        $ReleaseVersion,
+
+        [Parameter(Mandatory)]
+        [string[]]
+        $PackageName
+    )
+
+    $packages = @()
+
+    foreach ($pkg in $RepoObjects)
+    {
+        if ($pkg.RepoId.count -gt 1) {
+            throw "Package $($pkg.name) has more than one repo id."
+        }
+
+        if ($pkg.Distribution.count -gt 1) {
+            throw "Package $($pkg.name) has more than one Distribution."
+        }
+
+        $pkgRepo = $pkg.RepoId | Select-Object -First 1
+        $pkgDistribution = $pkg.Distribution | Select-Object -First 1
+
+        foreach ($name in $PackageName) {
+            $pkgName = $pkg.PackageFormat.Replace('PACKAGE_NAME', $name).Replace('POWERSHELL_RELEASE', $ReleaseVersion)
+
+            if ($pkgName.EndsWith('.rpm')) {
+                $pkgName = $pkgName.Replace($ReleaseVersion, $ReleaseVersion.Replace('-', '_'))
+            }
+
+            $packagePath = "$pwshPackagesFolder/$pkgName"
+            $packagePathExists = Test-Path -Path $packagePath
+            if (!$packagePathExists)
+            {
+                throw "package path $packagePath does not exist"
+            }
+
+            Write-Verbose "Creating package info object for package '$pkgName' for repo '$pkgRepo'"
+            $packages += @{
+                PackagePath = $packagePath
+                PackageName = $pkgName
+                RepoId = $pkgRepo
+                Distribution = $pkgDistribution
+            }
+
+            Write-Verbose -Verbose "package info obj: Name: $pkgName RepoId: $pkgRepo Distribution: $pkgDistribution PackagePath: $packagePath"
+        }
+    }
+
+    Write-Verbose -Verbose "count of packages objects: $($packages.Length)"
+    return $packages
+}
+
+<#
+This function stages, uploads and publishes the powershell packages to their associated repositories in PMC.
+#>
+function Publish-PackageToPMC() {
+    param(
+        [Parameter(Mandatory)]
+        [pscustomobject[]]
+        $PackageObject,
+
+        [Parameter(Mandatory)]
+        [string]
+        $ConfigPath,
+
+        [Parameter(Mandatory)]
+        [bool]
+        $SkipPublish
+    )
+
+    # Don't fail outright when an error occurs, but instead pool them until
+    # after attempting to publish every package. That way we can choose to
+    # proceed for a partial failure.
+    $errorMessage = [System.Collections.Generic.List[string]]::new()
+    foreach ($finalPackage in $PackageObject)
+    {
+        Write-Verbose "---Staging package: $($finalPackage.PackageName)---" -Verbose
+        $packagePath = $finalPackage.PackagePath
+        $pkgRepo = $finalPackage.RepoId
+
+        $extension = [System.io.path]::GetExtension($packagePath)
+        $packageType = $extension -replace '^\.'
+        Write-Verbose "packageType: $packageType" -Verbose
+
+        $packageListJson = pmc --config $ConfigPath package $packageType list --file $packagePath
+        $list = $packageListJson | ConvertFrom-Json
+
+        $packageId = @()
+        if ($list.count -ne 0)
+        {
+            Write-Verbose "Package '$packagePath' already exists, skipping upload" -Verbose
+            $packageId = $list.results.id | Select-Object -First 1
+        }
+        else {
+            # PMC UPLOAD COMMAND
+            Write-Verbose -Verbose "Uploading package, config: '$ConfigPath' package: '$packagePath'"
+            $uploadResult = $null
+            try {
+                $uploadResult = pmc --config $ConfigPath package upload $packagePath --type $packageType
+            }
+            catch {
+                $errorMessage.Add("Uploading package $($finalPackage.PackageName) to $pkgRepo failed. See errors above for details.")
+                continue
+            }
+
+            $packageId = ($uploadResult | ConvertFrom-Json).id
+        }
+
+        Write-Verbose "Got package ID: '$packageId'" -Verbose
+        $distribution = $finalPackage.Distribution | select-object -First 1
+        Write-Verbose "distribution: $distribution" -Verbose
+
+        if (!$SkipPublish)
+        {
+            Write-Verbose "---Publishing package: $($finalPackage.PackageName) to $pkgRepo---" -Verbose
+
+            if (($packageType -ne 'rpm') -and ($packageType -ne 'deb'))
+            {
+                throw "Unsupported package type: $packageType"
+                return 1
+            }
+            else {
+                # PMC UPDATE COMMAND
+                $rawUpdateResponse = $null
+                try {
+                    if ($packageType -eq 'rpm') {
+                        $rawUpdateResponse = pmc --config $ConfigPath repo package update $pkgRepo --add-packages $packageId
+                    } elseif ($packageType -eq 'deb') {
+                        $rawUpdateResponse = pmc --config $ConfigPath repo package update $pkgRepo $distribution --add-packages $packageId
+                    }
+                }
+                catch {
+                    $errorMessage.Add("Invoking update for package $($finalPackage.PackageName) to $pkgRepo failed. See errors above for details.")
+                    continue
+                }
+
+                $state = ($rawUpdateResponse | ConvertFrom-Json).state
+                Write-Verbose -Verbose "update response state: $state"
+                if ($state -ne 'completed') {
+                    $errorMessage.Add("Publishing package $($finalPackage.PackageName) to $pkgRepo failed: $rawUpdateResponse")
+                    continue
+                }
+            }
+
+            # PMC PUBLISH COMMAND
+            # The CLI outputs messages and JSON in the same stream, so we must sift through it for now
+            # This is planned to be fixed with a switch in a later release
+            Write-Verbose -Verbose ([pscustomobject]($package + @{
+                PackageId = $packageId
+            }))
+
+            # At this point, the changes are staged and will eventually be publish.
+            # Running publish, causes them to go live "immediately"
+            $rawPublishResponse = $null
+            try {
+                $rawPublishResponse = pmc --config $ConfigPath repo publish $pkgRepo
+            }
+            catch {
+                $errorMessage.Add("Invoking final publish for package $($finalPackage.PackageName) to $pkgRepo failed. See errors above for details.")
+                continue
+            }
+
+            $publishState = ($rawPublishResponse | ConvertFrom-Json).state
+            Write-Verbose -Verbose "publish response state: $publishState"
+            if ($publishState -ne 'completed') {
+                $errorMessage.Add("Final publishing of package $($finalPackage.PackageName) to $pkgRepo failed: $rawPublishResponse")
+                continue
+            }
+        } else {
+            Write-Verbose -Verbose "Skipping Uploading package --config-file '$ConfigPath' package add '$packagePath' --repoID '$pkgRepo'"
+        }
+    }
+
+    if ($errorMessage) {
+        throw $errorMessage -join [Environment]::NewLine
+    }
+}
+
+if ($null -eq $env:MAPPING_FILE)
+{
+    Write-Verbose -Verbose "MAPPING_FILE variable didn't get passed correctly"
+    return 1
+}
+
+if ($null -eq $env:PWSH_PACKAGES_TARGZIP)
+{
+    Write-Verbose -Verbose "PWSH_PACKAGES_TARGZIP variable didn't get passed correctly"
+    return 1
+}
+
+if ($null -eq $env:PMC_METADATA)
+{
+    Write-Verbose -Verbose "PMC_METADATA variable didn't get passed correctly"
+    return 1
+}
+
+try {
+    Write-Verbose -Verbose "Downloading files"
+    Invoke-WebRequest -Uri $env:MAPPING_FILE -OutFile mapping.json
+    Invoke-WebRequest -Uri $env:PWSH_PACKAGES_TARGZIP -OutFile packages.tar.gz
+    Invoke-WebRequest -Uri $env:PMC_METADATA -OutFile pmcMetadata.json
+
+    # create variables to those paths and test them
+    $mappingFilePath = Join-Path "/package/unarchive/" -ChildPath "mapping.json"
+    $mappingFilePathExists = Test-Path $mappingFilePath
+    if (!$mappingFilePathExists)
+    {
+        Write-Verbose -Verbose "mapping.json expected at $mappingFilePath does not exist"
+        return 1
+    }
+
+    $packagesTarPath = Join-Path -Path "/package/unarchive/" -ChildPath "packages.tar.gz"
+    $packagesTarPathExists = Test-Path $packagesTarPath
+    if (!$packagesTarPathExists)
+    {
+        Write-Verbose -Verbose "packages.tar.gz expected at $packagesTarPath does not exist"
+        return 1
+    }
+
+    # Extract files from 'packages.tar.gz'
+    Write-Verbose -Verbose "---Extracting files from packages.tar.gz---"
+    $pwshPackagesFolder = Join-Path -Path "/package/unarchive/" -ChildPath "packages"
+    New-Item -Path $pwshPackagesFolder -ItemType Directory
+    tar -xzvf $packagesTarPath -C $pwshPackagesFolder --force-local
+    Get-ChildItem $pwshPackagesFolder -Recurse
+
+    $metadataFilePath = Join-Path -Path "/package/unarchive/" -ChildPath "pmcMetadata.json"
+    $metadataFilePathExists = Test-Path $metadataFilePath
+    if (!$metadataFilePathExists)
+    {
+        Write-Verbose -Verbose "pmcMetadata.json expected at $metadataFilePath does not exist"
+        return 1
+    }
+
+    # files in the extracted Run dir
+    $configPath = Join-Path '/package/unarchive/Run' -ChildPath 'settings.toml'
+    $configPathExists = Test-Path -Path $configPath
+    if (!$configPathExists)
+    {
+        Write-Verbose -Verbose "settings.toml expected at $configPath does not exist"
+        return 1
+    }
+
+    $pythonDlFolder = Join-Path '/package/unarchive/Run' -ChildPath 'python_dl'
+    $pyPathExists = Test-Path -Path $pythonDlFolder
+    if (!$pyPathExists)
+    {
+        Write-Verbose -Verbose "python_dl expected at $pythonDlFolder does not exist"
+        return 1
+    }
+
+    Write-Verbose -Verbose "Installing pmc-cli"
+    pip install --upgrade pip
+    pip --version --verbose
+    pip install /package/unarchive/Run/python_dl/*.whl
+
+    # Get metadata
+    $channel = ""
+    $packageNames = @()
+    $metadataContent = Get-Content -Path $metadataFilePath | ConvertFrom-Json
+    $releaseVersion = $metadataContent.ReleaseTag.TrimStart('v')
+    $skipPublish = $metadataContent.SkipPublish
+    $lts = $metadataContent.LTS
+
+    # Check if this is a rebuild version (e.g., 7.4.13-rebuild.5)
+    $isRebuild = $releaseVersion -match '-rebuild\.'
+
+    if ($releaseVersion.Contains('-')) {
+        $channel = 'preview'
+        $packageNames = @('powershell-preview')
+    }
+    else {
+        $channel = 'stable'
+        $packageNames = @('powershell')
+    }
+
+    # Only add LTS package if not a rebuild branch
+    if ($lts -and -not $isRebuild) {
+        $packageNames += @('powershell-lts')
+    }
+
+    Write-Verbose -Verbose "---Getting repository list---"
+    $rawResponse = pmc --config $configPath repo list --limit 800
+    $response = $rawResponse | ConvertFrom-Json
+    $limit = $($response.limit)
+    $count = $($response.count)
+    Write-Verbose -Verbose "'pmc repo list' limit is: $limit and count is: $count"
+    $repoList = $response.results
+
+    Write-Verbose -Verbose "---Getting package info---"
+
+
+    Write-Verbose "Reading mapping file from '$mappingFilePath'" -Verbose
+    $mapping = Get-Content -Raw -LiteralPath $mappingFilePath | ConvertFrom-Json -AsHashtable
+    $mappedReposUsedByPwsh = Get-MappedRepositoryIds -Mapping $mapping -RepoList $repoList -Channel $channel
+    $packageObjects = Get-PackageObjects -RepoObjects $mappedReposUsedByPwsh -PackageName $packageNames -ReleaseVersion $releaseVersion
+    Write-Verbose -Verbose "skip publish $skipPublish"
+    Publish-PackageToPMC -PackageObject $packageObjects -ConfigPath $configPath -SkipPublish $skipPublish
+}
+catch {
+    Write-Error -ErrorAction Stop $_.Exception.Message
+    return 1
+}
+
+return 0
diff --git a/.pipelines/EV2Specs/ServiceGroupRoot/UploadLinux.Rollout.json b/.pipelines/EV2Specs/ServiceGroupRoot/UploadLinux.Rollout.json
new file mode 100644
index 00000000000..d7c75c2e216
--- /dev/null
+++ b/.pipelines/EV2Specs/ServiceGroupRoot/UploadLinux.Rollout.json
@@ -0,0 +1,54 @@
+{
+  "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/rolloutParameters.json",
+  "contentVersion": "1.0.0.0",
+  "shellExtensions": [
+    {
+      "name": "Run",
+      "type": "Run",
+      "properties": {
+        "maxExecutionTime": "PT2H"
+      },
+      "package": {
+        "reference": {
+          "path": "Shell/Run.tar"
+        }
+      },
+      "launch": {
+        "command": [
+          "/bin/bash",
+          "-c",
+          "pwsh ./Run/Run.ps1"
+        ],
+        "environmentVariables": [
+          {
+            "name": "MAPPING_FILE",
+            "reference":
+            {
+                "path": "Parameters\\mapping.json"
+            }
+          },
+          {
+            "name": "PWSH_PACKAGES_TARGZIP",
+            "reference":
+            {
+                "path": "Parameters\\packages.tar.gz"
+            }
+          },
+          {
+            "name": "PMC_METADATA",
+            "reference":
+            {
+                "path": "Parameters\\pmcMetadata.json"
+            }
+          }
+        ],
+        "identity": {
+          "type": "userAssigned",
+          "userAssignedIdentities": [
+            "default"
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/.pipelines/EV2Specs/ServiceGroupRoot/buildVer.txt b/.pipelines/EV2Specs/ServiceGroupRoot/buildVer.txt
new file mode 100644
index 00000000000..7dea76edb3d
--- /dev/null
+++ b/.pipelines/EV2Specs/ServiceGroupRoot/buildVer.txt
@@ -0,0 +1 @@
+1.0.1
diff --git a/.pipelines/MSIXBundle-vPack-Official.yml b/.pipelines/MSIXBundle-vPack-Official.yml
new file mode 100644
index 00000000000..08edd0367bd
--- /dev/null
+++ b/.pipelines/MSIXBundle-vPack-Official.yml
@@ -0,0 +1,509 @@
+trigger: none
+pr: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+- name: 'createVPack'
+  displayName: 'Create and Submit VPack'
+  type: boolean
+  default: true
+- name: 'ReleaseTagVar'
+  type: string
+  displayName: 'Release Tag Var:'
+  default: 'fromBranch'
+- name: 'debug'
+  displayName: 'Enable debug output'
+  type: boolean
+  default: false
+- name: netiso
+  displayName: "Network Isolation Policy"
+  type: string
+  values:
+    - KS4
+    - R1
+    - Netlock
+  default: "R1"
+
+name: msixbundle_vPack_$(Build.SourceBranchName)_Prod.True_Create.${{ parameters.createVPack }}_$(date:yyyyMMdd).$(rev:rr)
+
+variables:
+  - name: CDP_DEFINITION_BUILD_COUNT
+    value: $[counter('', 0)]
+  - name: system.debug
+    value: ${{ parameters.debug }}
+  - name: BuildSolution
+    value: $(Build.SourcesDirectory)\dirs.proj
+  - name: BuildConfiguration
+    value: Release
+  - name: WindowsContainerImage
+    value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+  - name: Codeql.Enabled
+    value: false  #  pipeline is not building artifacts; it repackages existing artifacts into a vpack
+  - name: DOTNET_CLI_TELEMETRY_OPTOUT
+    value: 1
+  - name: POWERSHELL_TELEMETRY_OPTOUT
+    value: 1
+  - name: nugetMultiFeedWarnLevel
+    value: none
+  - name: ReleaseTagVar
+    value: ${{ parameters.ReleaseTagVar }}
+  - name: netiso
+    value: ${{ parameters.netiso }}
+  - group: certificate_logical_to_actual # used within signing task
+  - group: MSIXSigningProfile
+  - group: msixTools
+
+resources:
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+
+extends:
+  template: v2/Microsoft.Official.yml@onebranchTemplates
+  parameters:
+    platform:
+      name: 'windows_undocked' # windows undocked
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: ${{ variables.netiso }}
+    cloudvault:
+      enabled: false
+    globalSdl:
+      useCustomPolicy: true # for signing code
+      disableLegacyManifest: true
+      # disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      sbom:
+        enabled: true
+      compiled:
+        enabled: false
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        enabled: false
+        exactToolVersion: 4.4.2
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: false
+      tsaOptionsFile: .config/tsaoptions.json
+
+    stages:
+    - stage: Build_MSIX_Package
+      displayName: 'Build and create MSIX packages'
+      dependsOn: []
+      jobs:
+      - job: Build
+        pool:
+          type: windows
+
+        strategy:
+          matrix:
+            x64:
+              Architecture: x64
+            arm64:
+              Architecture: arm64
+
+        variables:
+          ArtifactPlatform: 'windows'
+          ob_outputDirectory: '$(BUILD.SOURCESDIRECTORY)\out'
+          ob_artifactBaseName: drop_build_$(Architecture)
+
+        steps:
+        - checkout: self
+          displayName: Checkout source code - during restore
+          clean: true
+          path: s  ## $(Build.SourcesDirectory) is at '$(Pipeline.Workspace)\s', so we need to check out repo to the 's' folder.
+          env:
+            ob_restore_phase: true
+
+        # The env variable 'ReleaseTagVar' will be updated in this step.
+        - template: /.pipelines/templates/SetVersionVariables.yml@self
+          parameters:
+            ReleaseTagVar: $(ReleaseTagVar)
+            CreateJson: yes
+
+        - pwsh: |
+            $releaseTag = '$(ReleaseTagVar)'
+            if ($releaseTag -match '-') {
+                throw "Never release msixbundle vpack for a preview build. Current version: $releaseTag"
+            }
+
+            # Check if release tag matches the expected format v#.#.#
+            $matched = $releaseTag -match '^v\d+\.(\d+)\.\d+$'
+            if (-not $matched) {
+                throw "Release tag must be in the format v#.#.#, such as 'v7.4.3'. Current version: $releaseTag"
+            }
+
+            # Extract minor version and verify it's even (LTS versions only)
+            $minorVersion = [int]$Matches[1]
+            if($minorVersion % 2 -ne 0) {
+                throw "Only release msixbundle vpack for LTS releases. Current version: $releaseTag"
+            }
+          displayName: Stop any preview release
+          env:
+            ob_restore_phase: true
+
+        ### START BUILD ###
+
+        # Clone the checked out PowerShell repo to '/PowerShell' and set the variable 'PowerShellRoot'.
+        - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+
+        - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+          parameters:
+            repoRoot: $(PowerShellRoot)
+
+        # Add CodeQL Init task right before your 'Build' step.
+        - task: CodeQL3000Init@0
+          env:
+            ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+          inputs:
+            Enabled: true
+            # AnalyzeInPipeline: false = upload results
+            # AnalyzeInPipeline: true = do not upload results
+            AnalyzeInPipeline: false
+            Language: csharp
+
+        - template: /.pipelines/templates/install-dotnet.yml@self
+
+        - pwsh: |
+            $runtime = switch ($env:Architecture)
+              {
+                "x64" { "win7-x64" }
+                "arm64" { "win-arm64" }
+              }
+
+            $vstsCommandString = "vso[task.setvariable variable=Runtime]$runtime"
+            Write-Host ("sending " + $vstsCommandString)
+            Write-Host "##$vstsCommandString"
+
+            Write-Verbose -Message "Building PowerShell with Runtime: $runtime for '$env:BuildConfiguration' configuration"
+            Import-Module -Name $(PowerShellRoot)/build.psm1 -Force
+            $buildWithSymbolsPath = New-Item -ItemType Directory -Path $(Pipeline.Workspace)/Symbols_$(Architecture) -Force
+
+            Start-PSBootstrap -Scenario Package
+            $null = New-Item -ItemType Directory -Path $buildWithSymbolsPath -Force -Verbose
+
+            Start-PSBuild -Runtime $runtime -Configuration Release -Output $buildWithSymbolsPath -Clean -PSModuleRestore -ReleaseTag $(ReleaseTagVar)
+
+            $refFolderPath = Join-Path $buildWithSymbolsPath 'ref'
+            Write-Verbose -Verbose "refFolderPath: $refFolderPath"
+            $outputPath = Join-Path '$(ob_outputDirectory)' 'psoptions'
+            $null = New-Item -ItemType Directory -Path $outputPath -Force
+            $psOptPath = "$outputPath/psoptions.json"
+            Save-PSOptions -PSOptionsPath $psOptPath
+
+            Write-Verbose -Verbose "Verifying pdbs exist in build folder"
+            $pdbs = Get-ChildItem -Path $buildWithSymbolsPath -Recurse -Filter *.pdb
+            if ($pdbs.Count -eq 0) {
+              throw "No pdbs found in build folder"
+            }
+            else {
+              Write-Verbose -Verbose "Found $($pdbs.Count) pdbs in build folder"
+              $pdbs | ForEach-Object {
+                Write-Verbose -Verbose "Pdb: $($_.FullName)"
+              }
+
+              $pdbs | Compress-Archive -DestinationPath '$(ob_outputDirectory)\symbols-$(Architecture).zip' -Update
+            }
+
+            Write-Verbose -Verbose "Completed building PowerShell for '$env:BuildConfiguration' configuration"
+          displayName: 'Build Windows Universal - $(Architecture)-$(BuildConfiguration) Symbols folder'
+          env:
+            ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+        # Add CodeQL Finalize task right after your 'Build' step.
+        - task: CodeQL3000Finalize@0
+          env:
+            ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+        - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+          displayName: 'Component Detection'
+          inputs:
+            sourceScanPath: '$(PowerShellRoot)\src'
+            ob_restore_phase: true
+
+        # The signed files will be put in '$(ob_outputDirectory)\Signed-$(Runtime)' after this step.
+        - template: /.pipelines/templates/obp-file-signing.yml@self
+          parameters:
+            binPath: '$(Pipeline.Workspace)/Symbols_$(Architecture)'
+            OfficialBuild: true
+
+        ### END OF BUILD ###
+
+        - pwsh: |
+            Get-ChildItem -Path '$(ob_outputDirectory)\Signed-$(Runtime)' -Recurse | Out-String -Width 9999
+          displayName: Capture signed files
+          condition: succeededOrFailed()
+
+        - pwsh: |
+            Get-ChildItem -Path env: | Out-String -Width 9999
+          displayName: Capture Environment
+          condition: succeededOrFailed()
+
+        ### START Packaging ###
+
+        - template: /.pipelines/templates/shouldSign.yml@self
+          parameters:
+            ob_restore_phase: false
+
+        - pwsh: |
+            Write-Verbose -Verbose "runtime = '$(Runtime)'"
+            Write-Verbose -Verbose "RepoRoot = '$(PowerShellRoot)'"
+
+            $runtime = '$(Runtime)'
+            $repoRoot = '$(PowerShellRoot)'
+            Import-Module "$repoRoot\build.psm1"
+            Import-Module "$repoRoot\tools\packaging"
+
+            Find-Dotnet
+
+            $signedFilesPath = '$(ob_outputDirectory)\Signed-$(Runtime)'
+            $psoptionsFilePath = '$(ob_outputDirectory)\psoptions\psoptions.json'
+
+            Write-Verbose -Verbose "signedFilesPath: $signedFilesPath"
+            Write-Verbose -Verbose "psoptionsFilePath: $psoptionsFilePath"
+
+            Write-Verbose -Message "checking pwsh exists in $signedFilesPath" -Verbose
+            if (-not (Test-Path $signedFilesPath\pwsh.exe)) {
+              throw "pwsh.exe not found in $signedFilesPath"
+            }
+
+            Write-Verbose -Message "Restoring PSOptions from $psoptionsFilePath" -Verbose
+
+            Restore-PSOptions -PSOptionsPath "$psoptionsFilePath"
+            Get-PSOptions | Write-Verbose -Verbose
+
+            ## Generated packages are placed in the current directory by default.
+            Set-Location $repoRoot
+            Start-PSPackage -Type msix -SkipReleaseChecks -WindowsRuntime $runtime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath -LTS
+
+            $msixPkgNameFilter = "PowerShell*.msix"
+            $msixPkgFile = Get-ChildItem -Path $repoRoot -Filter $msixPkgNameFilter -File
+            $msixPkgPath = $msixPkgFile.FullName
+            Write-Verbose -Verbose "Unsigned msix package: $msixPkgPath"
+
+            $pkgDir = '$(ob_outputDirectory)\pkgs'
+            $null = New-Item -ItemType Directory -Path $pkgDir -Force
+            Copy-Item -Path $msixPkgPath -Destination $pkgDir -Force -Verbose
+          displayName: 'Build MSIX Package (Unsigned)'
+
+        ### END OF Packaging ###
+
+        - pwsh: |
+            Get-ChildItem -Path '$(ob_outputDirectory)\pkgs' -Recurse
+          displayName: 'List Unsigned Package'
+
+    - stage: Pack_MSIXBundle_And_Sign
+      displayName: 'Pack and sign MSIXBundle'
+      dependsOn: [Build_MSIX_Package]
+      jobs:
+      - job: Bundle
+        pool:
+          type: windows
+        variables:
+          ArtifactPlatform: 'windows'
+          ob_outputDirectory: '$(BUILD.SOURCESDIRECTORY)\out'
+          ob_artifactBaseName: drop_pack_msixbundle
+          ob_createvpack_enabled: ${{ parameters.createVPack }}
+          ob_createvpack_packagename: 'PowerShell7.Store.app'
+          ob_createvpack_owneralias: 'dongbow'
+          ob_createvpack_description: 'VPack for the PowerShell 7 Store Application'
+          ob_createvpack_targetDestinationDirectory: '$(Destination)'  ## The value is from the 'CreateVpack' task, used when pulling the generated VPack.
+          ob_createvpack_propsFile: false
+          ob_createvpack_provData: true
+          ob_createvpack_metadata: '$(Build.SourceVersion)'
+          ob_createvpack_versionAs: string
+          ob_createvpack_version: '$(Version)'
+          ob_createvpack_verbose: true
+
+        steps:
+        - checkout: self
+          displayName: Checkout source code - during restore
+          clean: true
+          path: s  ## $(Build.SourcesDirectory) is at '$(Pipeline.Workspace)\s', so we need to check out repo to the 's' folder.
+          env:
+            ob_restore_phase: true
+
+        - template: /.pipelines/templates/SetVersionVariables.yml@self
+          parameters:
+            ReleaseTagVar: $(ReleaseTagVar)
+            CreateJson: no
+
+        - template: /.pipelines/templates/shouldSign.yml@self
+
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifactName: drop_build_x64
+            itemPattern: |
+              **/*.msix
+            targetPath: '$(Build.ArtifactStagingDirectory)\downloads'
+          displayName: Download msix for x64
+
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifactName: drop_build_arm64
+            itemPattern: |
+              **/*.msix
+            targetPath: '$(Build.ArtifactStagingDirectory)\downloads'
+          displayName: Download msix for arm64
+
+        # Finds the makeappx tool on the machine.
+        - pwsh: |
+            Write-Verbose -Verbose 'PowerShell Version: $(Version)'
+            $cmd = Get-Command makeappx.exe -ErrorAction Ignore
+            if ($cmd) {
+                Write-Verbose -Verbose 'makeappx available in PATH'
+                $exePath = $cmd.Source
+            } else {
+                $makeappx = Get-ChildItem -Recurse 'C:\Program Files (x86)\Windows Kits\10\makeappx.exe' |
+                  Where-Object { $_.DirectoryName -match 'x64' } |
+                  Select-Object -Last 1
+                $exePath = $makeappx.FullName
+                Write-Verbose -Verbose "makeappx was found: $exePath"
+            }
+            $vstsCommandString = "vso[task.setvariable variable=MakeAppxPath]$exePath"
+            Write-Host ("sending " + $vstsCommandString)
+            Write-Host "##$vstsCommandString"
+          displayName: Find makeappx tool
+          retryCountOnTaskFailure: 1
+
+        - pwsh: |
+            $sourceDir = '$(Pipeline.Workspace)\releasePipeline\msix'
+            $null = New-Item -Path $sourceDir -ItemType Directory -Force
+
+            $msixFiles = Get-ChildItem -Path "$(Build.ArtifactStagingDirectory)\downloads\*.msix" -Recurse
+            foreach ($msixFile in $msixFiles) {
+                $null = Copy-Item -Path $msixFile.FullName -Destination $sourceDir -Force -Verbose
+            }
+
+            $file = Get-ChildItem $sourceDir | Select-Object -First 1
+            $prefix = ($file.BaseName -split "-win")[0]
+            $pkgName = "$prefix.msixbundle"
+            Write-Verbose -Verbose "Creating $pkgName"
+
+            $makeappx = '$(MakeAppxPath)'
+            $outputDir = "$sourceDir\output"
+            New-Item $outputDir -Type Directory -Force > $null
+            & $makeappx bundle /d $sourceDir /p "$outputDir\$pkgName"
+            if ($LASTEXITCODE -ne 0) {
+                throw "makeappx bundle failed with exit code $LASTEXITCODE"
+            }
+
+            Get-ChildItem -Path $sourceDir -Recurse | Out-String -Width 200
+            $vstsCommandString = "vso[task.setvariable variable=BundleDir]$outputDir"
+            Write-Host ("sending " + $vstsCommandString)
+            Write-Host "##$vstsCommandString"
+          displayName: Create MsixBundle
+          retryCountOnTaskFailure: 1
+
+        - task: onebranch.pipeline.signing@1
+          displayName: Sign MsixBundle
+          inputs:
+            command: 'sign'
+            signing_profile: $(MSIXProfile)
+            files_to_sign: '**/*.msixbundle'
+            search_root: '$(BundleDir)'
+
+        - pwsh: |
+            $signedBundle = Get-ChildItem -Path $(BundleDir) -Filter "*.msixbundle" -File
+            Write-Verbose -Verbose "Signed bundle: $signedBundle"
+
+            $signature = Get-AuthenticodeSignature -FilePath $signedBundle.FullName
+            if ($signature.Status -ne 'Valid') {
+                throw "The bundle file doesn't have a valid signature. Signature status: $($signature.Status)"
+            }
+
+            if (-not (Test-Path '$(ob_outputDirectory)' -PathType Container)) {
+                $null = New-Item '$(ob_outputDirectory)' -ItemType Directory -ErrorAction Stop
+            }
+
+            $targetPath = Join-Path '$(ob_outputDirectory)' 'Microsoft.PowerShell-LTS_8wekyb3d8bbwe.msixbundle'
+            Copy-Item -Verbose -Path $signedBundle.FullName -Destination $targetPath
+
+            Write-Verbose -Verbose "Uploaded Bundle:"
+            Get-ChildItem -Path $(ob_outputDirectory) | Out-String -Width 200 -Stream | Write-Verbose -Verbose
+          displayName: 'Stage msixbundle for VPack'
+
+        - pwsh: |
+            Write-Verbose "VPack Version: $(ob_createvpack_version)" -Verbose
+            $vpackFiles = Get-ChildItem -Path '$(ob_outputDirectory)\*' -Recurse
+            if($vpackFiles.Count -eq 0) {
+                throw "No files found in $(ob_outputDirectory)"
+            }
+            $vpackFiles | Out-String -Width 200
+          displayName: Debug Output Directory and Version
+          condition: succeededOrFailed()
+
+    - stage: Publish_Symbols
+      displayName: 'Publish Symbols'
+      dependsOn: [Pack_MSIXBundle_And_Sign]
+      jobs:
+      - job: PublishSymbols
+        pool:
+          type: windows
+        variables:
+          ob_outputDirectory: '$(BUILD.SOURCESDIRECTORY)\out'
+
+        steps:
+        - checkout: self
+          displayName: Checkout source code - during restore
+          clean: true
+          path: s  ## $(Build.SourcesDirectory) is at '$(Pipeline.Workspace)\s', so we need to check out repo to the 's' folder.
+          env:
+            ob_restore_phase: true
+
+        - pwsh: |
+            Get-ChildItem Env: | Out-String -Width 9999
+          displayName: 'Capture Environment Variables'
+
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifactName: drop_build_x64
+            itemPattern: |
+              **/symbols-*.zip
+            targetPath: '$(Build.ArtifactStagingDirectory)\downloads'
+          displayName: Download symbols for x64
+
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifactName: drop_build_arm64
+            itemPattern: |
+              **/symbols-*.zip
+            targetPath: '$(Build.ArtifactStagingDirectory)\downloads'
+          displayName: Download symbols for arm64
+
+        - pwsh: |
+            $downloadDir = '$(Build.ArtifactStagingDirectory)\downloads'
+            Write-Verbose -Verbose "Enumerating $downloadDir"
+            $downloadedArtifacts = Get-ChildItem -Path $downloadDir -Recurse -Filter 'symbols-*.zip'
+            $downloadedArtifacts | Out-String -Width 9999
+
+            $expandedRoot = New-Item -Path "$(Pipeline.Workspace)\expanded" -ItemType Directory -Verbose
+            $downloadedArtifacts | ForEach-Object {
+                $expandDir = Join-Path $expandedRoot $_.BaseName
+                Write-Verbose -Verbose "Expanding $($_.FullName) to $expandDir"
+                $null = New-Item -Path $expandDir -ItemType Directory -Verbose
+                Expand-Archive -Path $_.FullName -DestinationPath $expandDir -Force
+            }
+
+            Write-Verbose -Verbose "Enumerating $expandedRoot"
+            Get-ChildItem -Path $expandedRoot -Recurse | Out-String -Width 9999
+            $vstsCommandString = "vso[task.setvariable variable=SymbolsPath]$expandedRoot"
+            Write-Verbose -Message "$vstsCommandString" -Verbose
+            Write-Host -Object "##$vstsCommandString"
+          displayName: Expand and capture symbols folders
+
+        - task: PublishSymbols@2
+          condition: and(succeeded(), ${{ parameters.createVPack }})
+          inputs:
+            symbolsFolder: '$(SymbolsPath)'
+            searchPattern: '**/*.pdb'
+            indexSources: false
+            publishSymbols: true
+            symbolServerType: TeamServices
+            detailedLog: true
diff --git a/.pipelines/NonOfficial/PowerShell-Coordinated_Packages-NonOfficial.yml b/.pipelines/NonOfficial/PowerShell-Coordinated_Packages-NonOfficial.yml
new file mode 100644
index 00000000000..69506750c34
--- /dev/null
+++ b/.pipelines/NonOfficial/PowerShell-Coordinated_Packages-NonOfficial.yml
@@ -0,0 +1,98 @@
+trigger: none
+
+parameters:
+  - name: InternalSDKBlobURL
+    displayName: URL to the blob having internal .NET SDK
+    type: string
+    default: ' '
+  - name: ReleaseTagVar
+    displayName: Release Tag
+    type: string
+    default: 'fromBranch'
+  - name: SKIP_SIGNING
+    displayName: Debugging - Skip Signing
+    type: string
+    default: 'NO'
+  - name: RUN_TEST_AND_RELEASE
+    displayName: Debugging - Run Test and Release Artifacts Stage
+    type: boolean
+    default: true
+  - name: RUN_WINDOWS
+    displayName: Debugging - Enable Windows Stage
+    type: boolean
+    default: true
+  - name: ENABLE_MSBUILD_BINLOGS
+    displayName: Debugging - Enable MSBuild Binary Logs
+    type: boolean
+    default: false
+  - name: FORCE_CODEQL
+    displayName: Debugging - Enable CodeQL and set cadence to 1 hour
+    type: boolean
+    default: false
+
+name: bins-$(BUILD.SOURCEBRANCHNAME)-nonofficial-$(Build.BuildId)
+
+resources:
+  repositories:
+  - repository: ComplianceRepo
+    type: github
+    endpoint: ComplianceGHRepo
+    name: PowerShell/compliance
+    ref: master
+  - repository: onebranchTemplates
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
+
+variables:
+  - template: /.pipelines/templates/variables/PowerShell-Coordinated_Packages-Variables.yml@self
+    parameters:
+      InternalSDKBlobURL: ${{ parameters.InternalSDKBlobURL }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+      SKIP_SIGNING: ${{ parameters.SKIP_SIGNING }}
+      ENABLE_MSBUILD_BINLOGS: ${{ parameters.ENABLE_MSBUILD_BINLOGS }}
+      FORCE_CODEQL: ${{ parameters.FORCE_CODEQL }}
+
+extends:
+  template: v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates
+  parameters:
+    customTags: 'ES365AIMigrationTooling'
+    featureFlags:
+      LinuxHostVersion:
+          Network: KS3
+      WindowsHostVersion:
+          Version: 2022
+          Network: KS3
+      incrementalSDLBinaryAnalysis: true
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armorty as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      sbom:
+        enabled: true
+      codeql:
+        compiled:
+          enabled: $(CODEQL_ENABLED)
+        tsaEnabled: true # This enables TSA bug filing only for CodeQL 3000
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      cg:
+        enabled: true
+        ignoreDirectories: '.devcontainer,demos,docker,docs,src,test,tools/packaging'
+      binskim:
+        enabled: false
+        exactToolVersion: 4.4.2
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: false
+      tsaOptionsFile: .config\tsaoptions.json
+
+    stages:
+    - template: /.pipelines/templates/stages/PowerShell-Coordinated_Packages-Stages.yml@self
+      parameters:
+        RUN_WINDOWS: ${{ parameters.RUN_WINDOWS }}
+        RUN_TEST_AND_RELEASE: ${{ parameters.RUN_TEST_AND_RELEASE }}
+        OfficialBuild: false
diff --git a/.pipelines/NonOfficial/PowerShell-Packages-NonOfficial.yml b/.pipelines/NonOfficial/PowerShell-Packages-NonOfficial.yml
new file mode 100644
index 00000000000..0993cd69546
--- /dev/null
+++ b/.pipelines/NonOfficial/PowerShell-Packages-NonOfficial.yml
@@ -0,0 +1,97 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+  - name: ForceAzureBlobDelete
+    displayName: Delete Azure Blob
+    type: string
+    values:
+    - true
+    - false
+    default: false
+  - name: 'debug'
+    displayName: 'Enable debug output'
+    type: boolean
+    default: false
+  - name: InternalSDKBlobURL
+    displayName: URL to the blob having internal .NET SDK
+    type: string
+    default: ' '
+  - name: ReleaseTagVar
+    displayName: Release Tag
+    type: string
+    default: 'fromBranch'
+  - name: SKIP_SIGNING
+    displayName: Skip Signing
+    type: string
+    default: 'NO'
+  - name: disableNetworkIsolation
+    type: boolean
+    default: false
+
+name: pkgs-$(BUILD.SOURCEBRANCHNAME)-nonofficial-$(Build.BuildId)
+
+variables:
+  - template: /.pipelines/templates/variables/PowerShell-Packages-Variables.yml@self
+    parameters:
+      debug: ${{ parameters.debug }}
+      ForceAzureBlobDelete: ${{ parameters.ForceAzureBlobDelete }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+      disableNetworkIsolation: ${{ parameters.disableNetworkIsolation }}
+
+resources:
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated_Packages-NonOfficial'
+      trigger:
+        branches:
+          include:
+            - master
+            - releases/*
+
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+
+extends:
+  template: v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates
+  parameters:
+    cloudvault:
+      enabled: false
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: KS3
+      LinuxHostVersion:
+        Network: KS3
+      linuxEsrpSigning: true
+      incrementalSDLBinaryAnalysis: true
+      disableNetworkIsolation: ${{ variables.disableNetworkIsolation }}
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armorty as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      sbom:
+        enabled: true
+      compiled:
+        enabled: false
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      cg:
+        enabled: true
+        ignoreDirectories: '.devcontainer,demos,docker,docs,src,test,tools/packaging'
+      binskim:
+        enabled: false
+        exactToolVersion: 4.4.2
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: false
+      tsaOptionsFile: .config\tsaoptions.json
+    stages:
+    - template: /.pipelines/templates/stages/PowerShell-Packages-Stages.yml@self
+      parameters:
+        OfficialBuild: false
diff --git a/.pipelines/NonOfficial/PowerShell-Release-Azure-NonOfficial.yml b/.pipelines/NonOfficial/PowerShell-Release-Azure-NonOfficial.yml
new file mode 100644
index 00000000000..b0bb4d79b39
--- /dev/null
+++ b/.pipelines/NonOfficial/PowerShell-Release-Azure-NonOfficial.yml
@@ -0,0 +1,82 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+  - name: 'debug'
+    displayName: 'Enable debug output'
+    type: boolean
+    default: false
+  - name: skipPublish
+    displayName: Skip PMC Publish
+    type: boolean
+    default: false
+  - name: SKIP_SIGNING
+    displayName: Skip Signing
+    type: string
+    default: 'NO'
+
+name: ev2-$(BUILD.SOURCEBRANCHNAME)-nonofficial-$(Build.BuildId)
+
+variables:
+  - template: /.pipelines/templates/variables/PowerShell-Release-Azure-Variables.yml@self
+    parameters:
+      debug: ${{ parameters.debug }}
+
+resources:
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated_Packages-NonOfficial'
+
+    - pipeline: PSPackagesOfficial
+      source: 'PowerShell-Packages-NonOfficial'
+      trigger:
+        branches:
+          include:
+            - master
+            - releases/*
+
+extends:
+  template: v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates
+  parameters:
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: Netlock
+      linuxEsrpSigning: true
+      incrementalSDLBinaryAnalysis: true
+    cloudvault:
+      enabled: false
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      tsa:
+        enabled: true
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        break: false # always break the build on binskim issues in addition to TSA upload
+        exactToolVersion: 4.4.2
+      policheck:
+        break: true # always break the build on policheck issues. You can disable it by setting to 'false'
+      tsaOptionsFile: $(Build.SourcesDirectory)\.config\tsaoptions.json
+    stages:
+      - template: /.pipelines/templates/release-prep-for-ev2.yml@self
+        parameters:
+          skipPublish: ${{ parameters.skipPublish }}
+
+      # NonOfficial: run the publish stage to verify templateContext artifact download,
+      # but skip the actual Ev2 push to PMC.
+      - template: /.pipelines/templates/release-publish-pmc.yml@self
+        parameters:
+          releaseEnvironment: Test
+          stagePrefix: Test
+          skipEv2Push: true
diff --git a/.pipelines/NonOfficial/PowerShell-Release-NonOfficial.yml b/.pipelines/NonOfficial/PowerShell-Release-NonOfficial.yml
new file mode 100644
index 00000000000..ebfc599e42a
--- /dev/null
+++ b/.pipelines/NonOfficial/PowerShell-Release-NonOfficial.yml
@@ -0,0 +1,106 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+  - name: 'debug'
+    displayName: 'Enable debug output'
+    type: boolean
+    default: false
+  - name: InternalSDKBlobURL
+    displayName: URL to the blob having internal .NET SDK
+    type: string
+    default: ' '
+  - name: ReleaseTagVar
+    displayName: Release Tag
+    type: string
+    default: 'fromBranch'
+  - name: SKIP_SIGNING
+    displayName: Skip Signing
+    type: string
+    default: 'NO'
+  - name: SkipPublish
+    displayName: Skip Publishing to Nuget
+    type: boolean
+    default: false
+  - name: SkipPSInfraInstallers
+    displayName: Skip Copying Archives and Installers to PSInfrastructure Public Location
+    type: boolean
+    default: false
+  - name: skipMSIXPublish
+    displayName: Skip MSIX Publish
+    type: boolean
+    default: false
+
+name: release-$(BUILD.SOURCEBRANCHNAME)-nonofficial-$(Build.BuildId)
+
+variables:
+  - template: /.pipelines/templates/variables/PowerShell-Release-Variables.yml@self
+    parameters:
+      debug: ${{ parameters.debug }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+
+resources:
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+    - repository: PSInternalTools
+      type: git
+      name: PowerShellCore/Internal-PowerShellTeam-Tools
+      ref: refs/heads/master
+
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated_Packages-NonOfficial'
+
+    # NOTE: The alias name "PSPackagesOfficial" is intentionally reused here even
+    # for the NonOfficial pipeline source. Downstream shared templates (for example,
+    # release-validate-sdk.yml and release-upload-buildinfo.yml) reference artifacts
+    # using `download: PSPackagesOfficial`, so changing this alias would break them.
+    - pipeline: PSPackagesOfficial
+      source: 'PowerShell-Packages-NonOfficial'
+      trigger:
+        branches:
+          include:
+            - master
+            - releases/*
+
+extends:
+  template: v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates
+  parameters:
+    release:
+      category: NonAzure
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: KS3
+      incrementalSDLBinaryAnalysis: true
+    cloudvault:
+      enabled: false
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      tsa:
+        enabled: true
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        break: false # always break the build on binskim issues in addition to TSA upload
+        exactToolVersion: 4.4.2
+      policheck:
+        break: true # always break the build on policheck issues. You can disable it by setting to 'false'
+      # suppression:
+      #   suppressionFile: $(Build.SourcesDirectory)\.gdn\global.gdnsuppress
+      tsaOptionsFile: .config\tsaoptions.json
+
+    stages:
+    - template: /.pipelines/templates/stages/PowerShell-Release-Stages.yml@self
+      parameters:
+        releaseEnvironment: Test
+        SkipPublish: ${{ parameters.SkipPublish }}
+        SkipPSInfraInstallers: ${{ parameters.SkipPSInfraInstallers }}
+        skipMSIXPublish: ${{ parameters.skipMSIXPublish }}
diff --git a/.pipelines/NonOfficial/PowerShell-vPack-NonOfficial.yml b/.pipelines/NonOfficial/PowerShell-vPack-NonOfficial.yml
new file mode 100644
index 00000000000..071db02cff8
--- /dev/null
+++ b/.pipelines/NonOfficial/PowerShell-vPack-NonOfficial.yml
@@ -0,0 +1,88 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+- name: 'createVPack'
+  displayName: 'Create and Submit VPack'
+  type: boolean
+  default: true
+- name: vPackName
+  type: string
+  displayName: 'VPack Name:'
+  default: 'PowerShell.BuildTool'
+  values:
+    - PowerShell.BuildTool
+    - PowerShell
+    - PowerShellDoNotUse
+- name: 'ReleaseTagVar'
+  type: string
+  displayName: 'Release Tag Var:'
+  default: 'fromBranch'
+- name: 'debug'
+  displayName: 'Enable debug output'
+  type: boolean
+  default: false
+- name: netiso
+  displayName: "Network Isolation Policy"
+  type: string
+  values:
+    - KS4
+    - R1
+    - Netlock
+  default: "R1"
+
+name: vPack_$(Build.SourceBranchName)_NonOfficial_Create.${{ parameters.createVPack }}_Name.${{ parameters.vPackName}}_$(date:yyyyMMdd).$(rev:rr)
+
+variables:
+  - template: /.pipelines/templates/variables/PowerShell-vPack-Variables.yml@self
+    parameters:
+      debug: ${{ parameters.debug }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+      netiso: ${{ parameters.netiso }}
+
+resources:
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+
+extends:
+  template: v2/Microsoft.NonOfficial.yml@onebranchTemplates
+  parameters:
+    platform:
+      name: 'windows_undocked' # windows undocked
+
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: ${{ variables.netiso }}
+
+    cloudvault:
+      enabled: false
+
+    globalSdl:
+      useCustomPolicy: true # for signing code
+      disableLegacyManifest: true
+      # disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      sbom:
+        enabled: true
+      compiled:
+        enabled: false
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        enabled: false
+        exactToolVersion: 4.4.2
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: false
+      tsaOptionsFile: .config/tsaoptions.json
+    stages:
+    - template: /.pipelines/templates/stages/PowerShell-vPack-Stages.yml@self
+      parameters:
+        createVPack: ${{ parameters.createVPack }}
+        vPackName: ${{ parameters.vPackName }}
diff --git a/.pipelines/PowerShell-Coordinated_Packages-Official.yml b/.pipelines/PowerShell-Coordinated_Packages-Official.yml
new file mode 100644
index 00000000000..82f129a0a5e
--- /dev/null
+++ b/.pipelines/PowerShell-Coordinated_Packages-Official.yml
@@ -0,0 +1,98 @@
+trigger: none
+
+parameters:
+  - name: InternalSDKBlobURL
+    displayName: URL to the blob having internal .NET SDK
+    type: string
+    default: ' '
+  - name: ReleaseTagVar
+    displayName: Release Tag
+    type: string
+    default: 'fromBranch'
+  - name: SKIP_SIGNING
+    displayName: Debugging - Skip Signing
+    type: string
+    default: 'NO'
+  - name: RUN_TEST_AND_RELEASE
+    displayName: Debugging - Run Test and Release Artifacts Stage
+    type: boolean
+    default: true
+  - name: RUN_WINDOWS
+    displayName: Debugging - Enable Windows Stage
+    type: boolean
+    default: true
+  - name: ENABLE_MSBUILD_BINLOGS
+    displayName: Debugging - Enable MSBuild Binary Logs
+    type: boolean
+    default: false
+  - name: FORCE_CODEQL
+    displayName: Debugging - Enable CodeQL and set cadence to 1 hour
+    type: boolean
+    default: false
+
+name: bins-$(BUILD.SOURCEBRANCHNAME)-prod-$(Build.BuildId)
+
+resources:
+  repositories:
+  - repository: ComplianceRepo
+    type: github
+    endpoint: ComplianceGHRepo
+    name: PowerShell/compliance
+    ref: master
+  - repository: onebranchTemplates
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
+
+variables:
+  - template: templates/variables/PowerShell-Coordinated_Packages-Variables.yml
+    parameters:
+      InternalSDKBlobURL: ${{ parameters.InternalSDKBlobURL }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+      SKIP_SIGNING: ${{ parameters.SKIP_SIGNING }}
+      ENABLE_MSBUILD_BINLOGS: ${{ parameters.ENABLE_MSBUILD_BINLOGS }}
+      FORCE_CODEQL: ${{ parameters.FORCE_CODEQL }}
+
+extends:
+  template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
+  parameters:
+    customTags: 'ES365AIMigrationTooling'
+    featureFlags:
+      LinuxHostVersion:
+          Network: KS3
+      WindowsHostVersion:
+          Version: 2022
+          Network: KS3
+      incrementalSDLBinaryAnalysis: true
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armorty as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      sbom:
+        enabled: true
+      codeql:
+        compiled:
+          enabled: $(CODEQL_ENABLED)
+        tsaEnabled: true # This enables TSA bug filing only for CodeQL 3000
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      cg:
+        enabled: true
+        ignoreDirectories: '.devcontainer,demos,docker,docs,src,test,tools/packaging'
+      binskim:
+        enabled: false
+        exactToolVersion: 4.4.2
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: false
+      tsaOptionsFile: .config\tsaoptions.json
+
+    stages:
+    - template: templates/stages/PowerShell-Coordinated_Packages-Stages.yml
+      parameters:
+        RUN_WINDOWS: ${{ parameters.RUN_WINDOWS }}
+        RUN_TEST_AND_RELEASE: ${{ parameters.RUN_TEST_AND_RELEASE }}
+        OfficialBuild: true
diff --git a/.pipelines/PowerShell-Packages-Official.yml b/.pipelines/PowerShell-Packages-Official.yml
new file mode 100644
index 00000000000..8afce29ede7
--- /dev/null
+++ b/.pipelines/PowerShell-Packages-Official.yml
@@ -0,0 +1,97 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+  - name: ForceAzureBlobDelete
+    displayName: Delete Azure Blob
+    type: string
+    values:
+    - true
+    - false
+    default: false
+  - name: 'debug'
+    displayName: 'Enable debug output'
+    type: boolean
+    default: false
+  - name: InternalSDKBlobURL
+    displayName: URL to the blob having internal .NET SDK
+    type: string
+    default: ' '
+  - name: ReleaseTagVar
+    displayName: Release Tag
+    type: string
+    default: 'fromBranch'
+  - name: SKIP_SIGNING
+    displayName: Skip Signing
+    type: string
+    default: 'NO'
+  - name: disableNetworkIsolation
+    type: boolean
+    default: false
+
+name: pkgs-$(BUILD.SOURCEBRANCHNAME)-prod-$(Build.BuildId)
+
+variables:
+  - template: templates/variables/PowerShell-Packages-Variables.yml
+    parameters:
+      debug: ${{ parameters.debug }}
+      ForceAzureBlobDelete: ${{ parameters.ForceAzureBlobDelete }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+      disableNetworkIsolation: ${{ parameters.disableNetworkIsolation }}
+
+resources:
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated Binaries-Official'
+      trigger:
+        branches:
+          include:
+            - master
+            - releases/*
+
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+
+extends:
+  template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
+  parameters:
+    cloudvault:
+      enabled: false
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: KS3
+      LinuxHostVersion:
+        Network: KS3
+      linuxEsrpSigning: true
+      incrementalSDLBinaryAnalysis: true
+      disableNetworkIsolation: ${{ variables.disableNetworkIsolation }}
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armorty as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      sbom:
+        enabled: true
+      compiled:
+        enabled: false
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      cg:
+        enabled: true
+        ignoreDirectories: '.devcontainer,demos,docker,docs,src,test,tools/packaging'
+      binskim:
+        enabled: false
+        exactToolVersion: 4.4.2
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: false
+      tsaOptionsFile: .config\tsaoptions.json
+    stages:
+    - template: templates/stages/PowerShell-Packages-Stages.yml
+      parameters:
+        OfficialBuild: true
diff --git a/.pipelines/PowerShell-Release-Official-Azure.yml b/.pipelines/PowerShell-Release-Official-Azure.yml
new file mode 100644
index 00000000000..b5f57438925
--- /dev/null
+++ b/.pipelines/PowerShell-Release-Official-Azure.yml
@@ -0,0 +1,76 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+  - name: 'debug'
+    displayName: 'Enable debug output'
+    type: boolean
+    default: false
+  - name: skipPublish
+    displayName: Skip PMC Publish
+    type: boolean
+    default: false
+  - name: SKIP_SIGNING
+    displayName: Skip Signing
+    type: string
+    default: 'NO'
+
+name: ev2-$(BUILD.SOURCEBRANCHNAME)-prod-$(Build.BuildId)
+
+variables:
+  - template: templates/variables/PowerShell-Release-Azure-Variables.yml
+    parameters:
+      debug: ${{ parameters.debug }}
+
+resources:
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated Binaries-Official'
+
+    - pipeline: PSPackagesOfficial
+      source: 'PowerShell-Packages-Official'
+      trigger:
+        branches:
+          include:
+            - master
+            - releases/*
+
+extends:
+  template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
+  parameters:
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: Netlock
+      linuxEsrpSigning: true
+      incrementalSDLBinaryAnalysis: true
+    cloudvault:
+      enabled: false
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      tsa:
+        enabled: true
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        break: false # always break the build on binskim issues in addition to TSA upload
+        exactToolVersion: 4.4.2
+      policheck:
+        break: true # always break the build on policheck issues. You can disable it by setting to 'false'
+      tsaOptionsFile: $(Build.SourcesDirectory)\.config\tsaoptions.json
+    stages:
+      - template: /.pipelines/templates/release-prep-for-ev2.yml@self
+        parameters:
+          skipPublish: ${{ parameters.skipPublish }}
+
+      - template: /.pipelines/templates/release-publish-pmc.yml@self
diff --git a/.pipelines/PowerShell-Release-Official.yml b/.pipelines/PowerShell-Release-Official.yml
new file mode 100644
index 00000000000..3528e6b1471
--- /dev/null
+++ b/.pipelines/PowerShell-Release-Official.yml
@@ -0,0 +1,102 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+  - name: 'debug'
+    displayName: 'Enable debug output'
+    type: boolean
+    default: false
+  - name: InternalSDKBlobURL
+    displayName: URL to the blob having internal .NET SDK
+    type: string
+    default: ' '
+  - name: ReleaseTagVar
+    displayName: Release Tag
+    type: string
+    default: 'fromBranch'
+  - name: SKIP_SIGNING
+    displayName: Skip Signing
+    type: string
+    default: 'NO'
+  - name: SkipPublish
+    displayName: Skip Publishing to Nuget
+    type: boolean
+    default: false
+  - name: SkipPSInfraInstallers
+    displayName: Skip Copying Archives and Installers to PSInfrastructure Public Location
+    type: boolean
+    default: false
+  - name: skipMSIXPublish
+    displayName: Skip MSIX Publish
+    type: boolean
+    default: false
+
+name: release-$(BUILD.SOURCEBRANCHNAME)-prod-$(Build.BuildId)
+
+variables:
+  - template: templates/variables/PowerShell-Release-Variables.yml
+    parameters:
+      debug: ${{ parameters.debug }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+
+resources:
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+    - repository: PSInternalTools
+      type: git
+      name: PowerShellCore/Internal-PowerShellTeam-Tools
+      ref: refs/heads/master
+
+  pipelines:
+    - pipeline: CoOrdinatedBuildPipeline
+      source: 'PowerShell-Coordinated Binaries-Official'
+
+    - pipeline: PSPackagesOfficial
+      source: 'PowerShell-Packages-Official'
+      trigger:
+        branches:
+          include:
+            - master
+            - releases/*
+
+extends:
+  template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
+  parameters:
+    release:
+      category: NonAzure
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: KS3
+      incrementalSDLBinaryAnalysis: true
+    cloudvault:
+      enabled: false
+    globalSdl:
+      disableLegacyManifest: true
+      # disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      tsa:
+        enabled: true
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        break: false # always break the build on binskim issues in addition to TSA upload
+        exactToolVersion: 4.4.2
+      policheck:
+        break: true # always break the build on policheck issues. You can disable it by setting to 'false'
+      # suppression:
+      #   suppressionFile: $(Build.SourcesDirectory)\.gdn\global.gdnsuppress
+      tsaOptionsFile: .config\tsaoptions.json
+
+    stages:
+    - template: templates/stages/PowerShell-Release-Stages.yml
+      parameters:
+        releaseEnvironment: Production
+        SkipPublish: ${{ parameters.SkipPublish }}
+        SkipPSInfraInstallers: ${{ parameters.SkipPSInfraInstallers }}
+        skipMSIXPublish: ${{ parameters.skipMSIXPublish }}
diff --git a/.pipelines/PowerShell-vPack-Official.yml b/.pipelines/PowerShell-vPack-Official.yml
new file mode 100644
index 00000000000..13087fbbf65
--- /dev/null
+++ b/.pipelines/PowerShell-vPack-Official.yml
@@ -0,0 +1,88 @@
+trigger: none
+
+parameters: # parameters are shown up in ADO UI in a build queue time
+- name: 'createVPack'
+  displayName: 'Create and Submit VPack'
+  type: boolean
+  default: true
+- name: vPackName
+  type: string
+  displayName: 'VPack Name:'
+  default: 'PowerShell.BuildTool'
+  values:
+    - PowerShell.BuildTool
+    - PowerShell
+    - PowerShellDoNotUse
+- name: 'ReleaseTagVar'
+  type: string
+  displayName: 'Release Tag Var:'
+  default: 'fromBranch'
+- name: 'debug'
+  displayName: 'Enable debug output'
+  type: boolean
+  default: false
+- name: netiso
+  displayName: "Network Isolation Policy"
+  type: string
+  values:
+    - KS4
+    - R1
+    - Netlock
+  default: "R1"
+
+name: vPack_$(Build.SourceBranchName)_Prod_Create.${{ parameters.createVPack }}_Name.${{ parameters.vPackName}}_$(date:yyyyMMdd).$(rev:rr)
+
+variables:
+  - template: templates/variables/PowerShell-vPack-Variables.yml
+    parameters:
+      debug: ${{ parameters.debug }}
+      ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
+      netiso: ${{ parameters.netiso }}
+
+resources:
+  repositories:
+    - repository: onebranchTemplates
+      type: git
+      name: OneBranch.Pipelines/GovernedTemplates
+      ref: refs/heads/main
+
+extends:
+  template: v2/Microsoft.Official.yml@onebranchTemplates
+  parameters:
+    platform:
+      name: 'windows_undocked' # windows undocked
+
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+        Network: ${{ variables.netiso }}
+
+    cloudvault:
+      enabled: false
+
+    globalSdl:
+      useCustomPolicy: true # for signing code
+      disableLegacyManifest: true
+      # disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
+      armory:
+        enabled: false
+      sbom:
+        enabled: true
+      compiled:
+        enabled: false
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        enabled: false
+        exactToolVersion: 4.4.2
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: false
+      tsaOptionsFile: .config/tsaoptions.json
+    stages:
+    - template: templates/stages/PowerShell-vPack-Stages.yml
+      parameters:
+        createVPack: ${{ parameters.createVPack }}
+        vPackName: ${{ parameters.vPackName }}
diff --git a/.pipelines/apiscan-gen-notice.yml b/.pipelines/apiscan-gen-notice.yml
new file mode 100644
index 00000000000..df5ebaac091
--- /dev/null
+++ b/.pipelines/apiscan-gen-notice.yml
@@ -0,0 +1,111 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+name: apiscan-genNotice-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
+trigger: none
+
+parameters:
+  - name: FORCE_CODEQL
+    displayName: Debugging - Enable CodeQL and set cadence to 1 hour
+    type: boolean
+    default: false
+
+variables:
+  # 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: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: CDP_DEFINITION_BUILD_COUNT
+    value: $[counter('', 0)]
+  # Defines the variables AzureFileCopySubscription, StorageAccount, StorageAccountKey, StorageResourceGroup, StorageSubscriptionName
+  - group: 'Azure Blob variable group'
+  # Defines the variables CgPat, CgOrganization, and CgProject
+  - group: 'ComponentGovernance'
+  - group: 'PoolNames'
+  - name: LinuxContainerImage
+    value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
+  - name: WindowsContainerImage
+    value: onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
+  - ${{ if eq(parameters['FORCE_CODEQL'],'true') }}:
+    # Cadence is hours before CodeQL will allow a re-upload of the database
+    - name: CodeQL.Cadence
+      value: 0
+  - name: CODEQL_ENABLED
+    ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(parameters['FORCE_CODEQL'],'true')) }}:
+      value: true
+    ${{ else }}:
+      value: false
+  - name: Codeql.TSAEnabled
+    value: $(CODEQL_ENABLED)
+  # AnalyzeInPipeline: false = upload results
+  # AnalyzeInPipeline: true = do not upload results
+  - name: Codeql.AnalyzeInPipeline
+    ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(parameters['FORCE_CODEQL'],'true')) }}:
+      value: false
+    ${{ else }}:
+      value: true
+
+resources:
+  repositories:
+  - repository: templates
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
+
+extends:
+  template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates
+  parameters:
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
+    globalSdl:
+      codeql:
+        compiled:
+          enabled: $(CODEQL_ENABLED)
+        tsaEnabled: $(CODEQL_ENABLED) # This enables TSA bug filing only for CodeQL 3000
+      armory:
+        enabled: false
+      sbom:
+        enabled: false
+      cg:
+        enabled: true
+        ignoreDirectories: '.devcontainer,demos,docker,docs,src,test,tools/packaging'
+      tsa:
+        enabled: true  # onebranch publish all SDL results to TSA. If TSA is disabled all SDL tools will forced into 'break' build mode.
+      credscan:
+        enabled: true
+        scanFolder:  $(Build.SourcesDirectory)
+        suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
+      binskim:
+        break: true  # always break the build on binskim issues in addition to TSA upload
+      policheck:
+        break: true  # always break the build on policheck issues. You can disable it by setting to 'false'
+      # APIScan requires a non-Ready-To-Run build
+      apiscan:
+        enabled: true
+        softwareName: "PowerShell" # Default is repo name
+        versionNumber: "7.6" # Default is build number
+        isLargeApp: false # Default: false.
+        symbolsFolder: $(SymbolsServerUrl);$(ob_outputDirectory)
+#softwareFolder - relative path to a folder to be scanned. Default value is root of artifacts folder
+      tsaOptionsFile: .config\tsaoptions.json
+      psscriptanalyzer:
+          enabled: true
+          policyName: Microsoft
+          break: false
+
+    stages:
+      - stage: APIScan
+        displayName: 'ApiScan'
+        dependsOn: []
+        jobs:
+          - template: /.pipelines/templates/compliance/apiscan.yml@self
+            parameters:
+              parentJobs: []
+      - stage: notice
+        displayName: Generate Notice File
+        dependsOn: []
+        jobs:
+          - template: /.pipelines/templates/compliance/generateNotice.yml@self
+            parameters:
+              parentJobs: []
diff --git a/.pipelines/store/PDP/PDP-Media/en-US/.gitkeep b/.pipelines/store/PDP/PDP-Media/en-US/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/.pipelines/store/PDP/PDP/en-US/PDP.xml b/.pipelines/store/PDP/PDP/en-US/PDP.xml
new file mode 100644
index 00000000000..ce36a3677f7
--- /dev/null
+++ b/.pipelines/store/PDP/PDP/en-US/PDP.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProductDescription language="en-us" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
+  <AppStoreName _locID="PowerShell-Private">
+    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
+    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
+    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
+    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
+    <!-- Dev Home -->
+  </AppStoreName>
+  <Keywords>
+    <!-- Valid length: 30 character limit, up to 7 elements -->
+    <Keyword _locID="App_keyword1">
+      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Shell</Keyword>
+    <Keyword _locID="App_keyword2">
+      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->PowerShell</Keyword>
+    <Keyword _locID="App_keyword3">
+      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->Terminal</Keyword>
+    <Keyword _locID="App_keyword4">
+      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->Command Line</Keyword>
+    <Keyword _locID="App_keyword5">
+      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->Automation</Keyword>
+    <Keyword _locID="App_keyword6">
+      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->Task Automation</Keyword>
+    <Keyword _locID="App_keyword7">
+      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->Scripting</Keyword>
+  </Keywords>
+  <Description _locID="App_Description">
+      <!-- _locComment_text="{MaxLength=10000} {Locked=Windows} App Description" -->PowerShell is a task-based command-line shell and scripting language built on .NET.  PowerShell helps system administrators and power-users rapidly automate task that manage operating systems (Linux, macOS, and Windows) and processes.
+
+PowerShell commands let you manage computers from the command line.  PowerShell providers let you access data stores, such as the registry and certificate store, as easily as you access the file system.  PowerShell includes a rich expression parser and a fully developed scripting language.
+
+PowerShell is Open Source.  See https://github.com/powershell/powershell </Description>
+  <ShortDescription _locID="App_ShortDescription">
+    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
+    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
+  </ShortDescription>
+  <ShortTitle _locID="App_ShortTitle">
+    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
+    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
+  </ShortTitle>
+  <SortTitle _locID="App_SortTitle">
+    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
+    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
+  </SortTitle>
+  <VoiceTitle _locID="App_VoiceTitle">
+    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
+    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
+  </VoiceTitle>
+  <DevStudio _locID="App_DevStudio">
+    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
+    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
+  </DevStudio>
+  <ReleaseNotes _locID="App_ReleaseNotes">
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Please see our GitHub releases page for additional details.</ReleaseNotes>
+  <ScreenshotCaptions>
+    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
+    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
+  </ScreenshotCaptions>
+  <AdditionalAssets>
+    <!-- Valid elements:-->
+    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
+    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
+    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
+    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
+    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
+    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
+    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
+  </AdditionalAssets>
+  <Trailers>
+  </Trailers>
+  <AppFeatures>
+    <!-- Valid length: 200 character limit, up to 20 elements -->
+    <AppFeature _locID="App_feature1">
+      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Interactive Shell</AppFeature>
+    <AppFeature _locID="App_feature2">
+      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Scripting Language</AppFeature>
+    <AppFeature _locID="App_feature3">
+      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->Remote Management</AppFeature>
+    <AppFeature _locID="App_feature4">
+      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature5">
+      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature6">
+      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature7">
+      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature8">
+      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature9">
+      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature10">
+      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature11">
+      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature12">
+      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature13">
+      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature14">
+      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature15">
+      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature16">
+      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature17">
+      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature18">
+      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature19">
+      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature20">
+      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
+    </AppFeature>
+  </AppFeatures>
+  <RecommendedHardware>
+    <!-- Valid length: 200 character limit, up to 11 elements -->
+    <Recommendation _locID="App_RecommendedHW1">
+      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->
+    </Recommendation>
+  </RecommendedHardware>
+  <MinimumHardware>
+    <!-- Valid length: 200 character limit, up to 11 elements -->
+  </MinimumHardware>
+  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
+    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Microsoft Corporation</CopyrightAndTrademark>
+  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
+    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
+  </AdditionalLicenseTerms>
+  <WebsiteURL _locID="App_WebsiteURL">
+    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/PowerShell/PowerShell</WebsiteURL>
+  <SupportContactInfo _locID="App_SupportContactInfo">
+    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/PowerShell/PowerShell/issues</SupportContactInfo>
+  <PrivacyPolicyURL _locID="App_PrivacyURL">
+    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
+</ProductDescription>
diff --git a/.pipelines/store/SBConfig.json b/.pipelines/store/SBConfig.json
new file mode 100644
index 00000000000..a52d60b045f
--- /dev/null
+++ b/.pipelines/store/SBConfig.json
@@ -0,0 +1,69 @@
+{
+  "helpUri": "https:\\\\aka.ms\\StoreBroker_Config",
+  "schemaVersion": 2,
+  "packageParameters": {
+    "PDPRootPath": "",
+    "Release": "",
+    "PDPInclude": [
+      "PDP.xml"
+    ],
+    "PDPExclude": [],
+    "LanguageExclude": [
+      "default",
+      "qps-ploc",
+      "qps-ploca",
+      "qps-plocm"
+    ],
+    "MediaRootPath": "",
+    "MediaFallbackLanguage": "en-US",
+    "PackagePath": [],
+    "OutPath": "",
+    "OutName": "",
+    "DisableAutoPackageNameFormatting": false
+  },
+  "appSubmission": {
+    "productId": "",
+    "targetPublishMode": "Immediate",
+    "targetPublishDate": null,
+    "visibility": "NotSet",
+    "pricing": {
+      "priceId": "NotAvailable",
+      "trialPeriod": "NoFreeTrial",
+      "marketSpecificPricings": {},
+      "sales": []
+    },
+    "allowTargetFutureDeviceFamilies": {
+      "Xbox": false,
+      "Team": false,
+      "Holographic": false,
+      "Desktop": false,
+      "Mobile": false
+    },
+    "allowMicrosoftDecideAppAvailabilityToFutureDeviceFamilies": false,
+    "enterpriseLicensing": "None",
+    "applicationCategory": "NotSet",
+    "hardwarePreferences": [],
+    "hasExternalInAppProducts": false,
+    "meetAccessibilityGuidelines": false,
+    "canInstallOnRemovableMedia": false,
+    "automaticBackupEnabled": false,
+    "isGameDvrEnabled": false,
+    "gamingOptions": [
+      {
+        "genres": [],
+        "isLocalMultiplayer": false,
+        "isLocalCooperative": false,
+        "isOnlineMultiplayer": false,
+        "isOnlineCooperative": false,
+        "localMultiplayerMinPlayers": 0,
+        "localMultiplayerMaxPlayers": 0,
+        "localCooperativeMinPlayers": 0,
+        "localCooperativeMaxPlayers": 0,
+        "isBroadcastingPrivilegeGranted": false,
+        "isCrossPlayEnabled": false,
+        "kinectDataForExternal": "Disabled"
+      }
+    ],
+    "notesForCertification": ""
+  }
+}
diff --git a/.pipelines/templates/SetVersionVariables.yml b/.pipelines/templates/SetVersionVariables.yml
new file mode 100644
index 00000000000..30ed1704022
--- /dev/null
+++ b/.pipelines/templates/SetVersionVariables.yml
@@ -0,0 +1,48 @@
+parameters:
+- name: ReleaseTagVar
+  default: v6.2.0
+- name: ReleaseTagVarName
+  default: ReleaseTagVar
+- name: CreateJson
+  default: 'no'
+- name: ob_restore_phase
+  type: boolean
+  default: true
+
+steps:
+- template: set-reporoot.yml@self
+  parameters:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
+
+- powershell: |
+    $createJson = ("${{ parameters.CreateJson }}" -ne "no")
+
+    $REPOROOT = $env:REPOROOT
+
+    if (-not (Test-Path $REPOROOT/tools/releaseBuild/setReleaseTag.ps1)) {
+      if (Test-Path "$REPOROOT/PowerShell/tools/releaseBuild/setReleaseTag.ps1") {
+        $REPOROOT = "$REPOROOT/PowerShell"
+      } else {
+        throw "Could not find setReleaseTag.ps1 in $REPOROOT/tools/releaseBuild or $REPOROOT/PowerShell/tools/releaseBuild"
+      }
+    }
+
+    $releaseTag = & "$REPOROOT/tools/releaseBuild/setReleaseTag.ps1" -ReleaseTag ${{ parameters.ReleaseTagVar }} -Variable "${{ parameters.ReleaseTagVarName }}" -CreateJson:$createJson
+    $version = $releaseTag.Substring(1)
+    $vstsCommandString = "vso[task.setvariable variable=Version]$version"
+    Write-Host ("sending " + $vstsCommandString)
+    Write-Host "##$vstsCommandString"
+    $azureVersion = $releaseTag.ToLowerInvariant() -replace '\.', '-'
+    $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
+    Write-Host ("sending " + $vstsCommandString)
+    Write-Host "##$vstsCommandString"
+  displayName: 'Set ${{ parameters.ReleaseTagVarName }} and other version Variables'
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
+
+- powershell: |
+    Get-ChildItem -Path Env: | Out-String -Width 150
+  displayName: Capture environment
+  condition: succeededOrFailed()
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
diff --git a/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml b/.pipelines/templates/approvalJob.yml
similarity index 96%
rename from tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
rename to .pipelines/templates/approvalJob.yml
index b34cc4c75b6..ac3b8bc2ab2 100644
--- a/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
+++ b/.pipelines/templates/approvalJob.yml
@@ -24,7 +24,8 @@ jobs:
   - job: ${{ parameters.jobName }}
     dependsOn: ${{ parameters.dependsOnJob }}
     displayName: ${{ parameters.displayName }}
-    pool: server
+    pool:
+      type: agentless
     timeoutInMinutes: 4320 # job times out in 3 days
     steps:
     - task: ManualValidation@0
diff --git a/.pipelines/templates/channelSelection.yml b/.pipelines/templates/channelSelection.yml
new file mode 100644
index 00000000000..d6ddb53256e
--- /dev/null
+++ b/.pipelines/templates/channelSelection.yml
@@ -0,0 +1,49 @@
+steps:
+- pwsh: |
+    # Determine LTS, Preview, or Stable
+    $metadata = Get-Content "$(Build.SourcesDirectory)/PowerShell/tools/metadata.json" -Raw | ConvertFrom-Json
+
+    $LTS = $metadata.LTSRelease.PublishToChannels
+    $Stable = $metadata.StableRelease.PublishToChannels
+    $isPreview = '$(OutputReleaseTag.releaseTag)' -match '-'
+    $releaseTag = '$(OutputReleaseTag.releaseTag)'
+
+    # Rebuild branches should be treated as preview builds
+    # NOTE: The following regex is duplicated from rebuild-branch-check.yml.
+    # This duplication is necessary because channelSelection.yml does not call rebuild-branch-check.yml,
+    # and is used in contexts where that check may not have run.
+    # If you update this regex, also update it in rebuild-branch-check.yml to keep them in sync.
+    $isRebuildBranch = '$(Build.SourceBranch)' -match 'refs/heads/rebuild/.*-rebuild\.'
+
+    # If this is a rebuild branch, force preview mode and ignore LTS metadata
+    if ($isRebuildBranch) {
+        $IsLTS = $false
+        $IsStable = $false
+        $IsPreview = $true
+        Write-Verbose -Message "Rebuild branch detected, forcing Preview channel" -Verbose
+    }
+    else {
+        $IsLTS = [bool]$LTS
+        $IsStable = [bool]$Stable
+        $IsPreview = [bool]$isPreview
+    }
+
+    $channelVars = @{
+        IsLTS     = $IsLTS
+        IsStable  = $IsStable
+        IsPreview = $IsPreview
+    }
+
+    $trueCount = ($channelVars.Values | Where-Object { $_ }) | Measure-Object | Select-Object -ExpandProperty Count
+    if ($trueCount -gt 1) {
+        Write-Error "Only one of IsLTS, IsStable, or IsPreview can be true. Current values: IsLTS=$IsLTS, IsStable=$IsStable, IsPreview=$IsPreview"
+        exit 1
+    }
+
+    foreach ($name in $channelVars.Keys) {
+        $value = if ($channelVars[$name]) { 'true' } else { 'false' }
+        Write-Verbose -Message "Setting $name variable: $value" -Verbose
+        Write-Host "##vso[task.setvariable variable=$name;isOutput=true]$value"
+    }
+  name: ChannelSelection
+  displayName: Select Preview, Stable, or LTS Channel
diff --git a/.pipelines/templates/checkAzureContainer.yml b/.pipelines/templates/checkAzureContainer.yml
new file mode 100644
index 00000000000..3e383d2c572
--- /dev/null
+++ b/.pipelines/templates/checkAzureContainer.yml
@@ -0,0 +1,86 @@
+jobs:
+- job: DeleteBlob
+  variables:
+  - group: Azure Blob variable group
+  - group: AzureBlobServiceConnection
+  - name: ob_artifactBaseName
+    value: BuildInfoJson
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT/BuildJson'
+  - name: ob_sdl_sbom_enabled
+    value: false
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+
+  displayName: Delete blob is exists
+  pool:
+    type: windows
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+      CreateJson: yes
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+
+  - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+    parameters:
+      repoRoot: $(PowerShellRoot)
+
+  - pwsh: |
+      if (-not (Test-Path -Path $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json)) {
+        Get-ChildItem -Path $(Build.SourcesDirectory) -Recurse
+        throw 'tsaoptions.json not found'
+      }
+    displayName: 'Check tsaoptions.json'
+
+  - pwsh: |
+      if (-not (Test-Path -Path $(Build.SourcesDirectory)\PowerShell\.config\suppress.json)) {
+        Get-ChildItem -Path $(Build.SourcesDirectory) -Recurse
+        throw 'suppress.json not found'
+      }
+    displayName: 'Check suppress.json'
+
+  - task: AzurePowerShell@5
+    displayName: Check if blob exists and delete if specified
+    inputs:
+      azureSubscription: az-blob-cicd-infra
+      scriptType: inlineScript
+      azurePowerShellVersion: LatestVersion
+      pwsh: true
+      inline: |
+        $containersToDelete = @('$(AzureVersion)', '$(AzureVersion)-private', '$(AzureVersion)-nuget', '$(AzureVersion)-gc')
+
+        $containersToDelete | ForEach-Object {
+          $containerName = $_
+          try {
+              $container = Get-AzStorageContainer -Container $containerName -Context (New-AzStorageContext -StorageAccountName '$(StorageAccount)') -ErrorAction Stop
+              if ($container -ne $null -and '$(ForceAzureBlobDelete)' -eq 'false') {
+                  throw "Azure blob container $containerName already exists. To overwrite, use ForceAzureBlobDelete parameter"
+              }
+              elseif ($container -ne $null -and '$(ForceAzureBlobDelete)' -eq 'true') {
+                  Write-Verbose -Verbose "Removing container $containerName due to ForceAzureBlobDelete parameter"
+                  Remove-AzStorageContainer -Name $containerName -Context (New-AzStorageContext -StorageAccountName '$(StorageAccount)') -Force
+              }
+          }
+          catch {
+              if ($_.FullyQualifiedErrorId -eq 'ResourceNotFoundException,Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet.GetAzureStorageContainerCommand') {
+                  Write-Verbose -Verbose "Container $containerName does not exists."
+              }
+              else {
+                  throw $_
+              }
+          }
+        }
+  - template: /.pipelines/templates/step/finalize.yml@self
diff --git a/.pipelines/templates/cloneToOfficialPath.yml b/.pipelines/templates/cloneToOfficialPath.yml
new file mode 100644
index 00000000000..b060c713683
--- /dev/null
+++ b/.pipelines/templates/cloneToOfficialPath.yml
@@ -0,0 +1,31 @@
+parameters:
+- name: nativePathRoot
+  default: ''
+- name: ob_restore_phase
+  type: boolean
+  default: true
+
+steps:
+- powershell: |
+    $dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
+    $nativePath = "${{parameters.nativePathRoot }}${dirSeparatorChar}PowerShell"
+    Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"
+    if ((Test-Path "$nativePath")) {
+      Remove-Item -Path "$nativePath" -Force -Recurse -Verbose -ErrorAction ignore
+    }
+    else {
+      Write-Verbose -Verbose -Message "No cleanup required."
+    }
+    # REPOROOT must be set by the pipeline - this is where the repository was checked out
+    $sourceDir = $env:REPOROOT
+    if (-not $sourceDir) { throw "REPOROOT environment variable is not set. This step depends on REPOROOT being configured in the pipeline." }
+
+    $buildModulePath = Join-Path $sourceDir "build.psm1"
+    if (-not (Test-Path $buildModulePath)) { throw "build.psm1 not found at: $buildModulePath. REPOROOT must point to the PowerShell repository root." }
+
+    Write-Verbose -Verbose -Message "Cloning from: $sourceDir to $nativePath"
+    git clone --quiet $sourceDir $nativePath
+  displayName: Clone PowerShell Repo to /PowerShell
+  errorActionPreference: silentlycontinue
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
diff --git a/.pipelines/templates/compliance/apiscan.yml b/.pipelines/templates/compliance/apiscan.yml
new file mode 100644
index 00000000000..b5a15699026
--- /dev/null
+++ b/.pipelines/templates/compliance/apiscan.yml
@@ -0,0 +1,170 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+jobs:
+  - job: APIScan
+    variables:
+      - name: NugetSecurityAnalysisWarningLevel
+        value: none
+      - name: ReleaseTagVar
+        value: fromBranch
+      # Defines the variables APIScanClient, APIScanTenant and APIScanSecret
+      - group: PS-PS-APIScan
+      - name: branchCounterKey
+        value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
+      - name: branchCounter
+        value: $[counter(variables['branchCounterKey'], 1)]
+      - group: DotNetPrivateBuildAccess
+      - group: ReleasePipelineSecrets
+      - group: mscodehub-feed-read-general
+      - group: mscodehub-feed-read-akv
+      - name: ob_outputDirectory
+        value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+      - name: repoRoot
+        value: '$(Build.SourcesDirectory)\PowerShell'
+      - name: ob_sdl_tsa_configFile
+        value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+      - name: ob_sdl_credscan_suppressionsFile
+        value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+      - name: Codeql.SourceRoot
+        value: $(repoRoot)
+
+    pool:
+        type: windows
+
+    # APIScan can take a long time
+    timeoutInMinutes: 180
+
+    steps:
+    - checkout: self
+      clean: true
+      fetchTags: true
+      fetchDepth: 1000
+      displayName: Checkout PowerShell
+      retryCountOnTaskFailure: 1
+      env:
+        ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+    - template: ../SetVersionVariables.yml
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: no
+
+    - template: ../insert-nuget-config-azfeed.yml
+      parameters:
+        repoRoot: '$(repoRoot)'
+
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core sdk'
+      inputs:
+        useGlobalJson: true
+        packageType: 'sdk'
+        workingDirectory: $(Build.SourcesDirectory)"
+
+    - 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
+      workingDirectory: '$(repoRoot)'
+      retryCountOnTaskFailure: 2
+
+    - task: CodeQL3000Init@0 # Add CodeQL Init task right before your 'Build' step.
+      displayName: 🔏 CodeQL 3000 Init
+      condition: eq(variables['CODEQL_ENABLED'], 'true')
+      inputs:
+        Language: csharp
+
+    - pwsh: |
+        Import-Module .\build.psm1 -force
+        Find-DotNet
+        Start-PSBuild -Configuration StaticAnalysis -PSModuleRestore -Clean -Runtime fxdependent-win-desktop
+
+        $OutputFolder = Split-Path (Get-PSOutput)
+
+        Write-Verbose -Verbose -Message "Deleting ref folder from output folder"
+        if (Test-Path $OutputFolder/ref) {
+          Remove-Item -Recurse -Force $OutputFolder/ref
+        }
+
+        $Destination = '$(ob_outputDirectory)'
+        if (-not (Test-Path $Destination)) {
+          Write-Verbose -Verbose -Message "Creating destination folder '$Destination'"
+          $null = mkdir $Destination
+        }
+
+        Copy-Item -Path "$OutputFolder\*" -Destination $Destination -Recurse -Verbose
+      workingDirectory: '$(repoRoot)'
+      displayName: 'Build PowerShell Source'
+
+    - pwsh: |
+        # Only keep windows runtimes
+        Write-Verbose -Verbose -Message "Deleting non-win-x64 runtimes ..."
+        Get-ChildItem -Path '$(ob_outputDirectory)\runtimes\*' | Where-Object {$_.FullName -notmatch '.*\\runtimes\\win'} | Foreach-Object {
+          Write-Verbose -Verbose -Message "Deleting $($_.FullName)"
+          Remove-Item -Path $_.FullName -Recurse -Force
+        }
+
+        # Remove win-x86/arm/arm64 runtimes due to issues with those runtimes
+        Write-Verbose -Verbose -Message "Temporarily deleting win-x86/arm/arm64 runtimes ..."
+        Get-ChildItem -Path '$(ob_outputDirectory)\runtimes\*' | Where-Object {$_.FullName -match '.*\\runtimes\\win-(x86|arm)'} | Foreach-Object {
+          Write-Verbose -Verbose -Message "Deleting $($_.FullName)"
+          Remove-Item -Path $_.FullName -Recurse -Force
+        }
+
+        Write-Host
+        Write-Verbose -Verbose -Message "Show content in 'runtimes' folder:"
+        Get-ChildItem -Path '$(ob_outputDirectory)\runtimes'
+        Write-Host
+      workingDirectory: '$(repoRoot)'
+      displayName: 'Remove unused runtimes'
+
+    - task: CodeQL3000Finalize@0 # Add CodeQL Finalize task right after your 'Build' step.
+      displayName: 🔏 CodeQL 3000 Finalize
+      condition: eq(variables['CODEQL_ENABLED'], 'true')
+
+    - pwsh: |
+        Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      workingDirectory: '$(repoRoot)'
+      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:ob_outputDirectory\*" --recurse-subdirectories
+      displayName: 'Download Symbols for binaries'
+      retryCountOnTaskFailure: 2
+      workingDirectory: '$(repoRoot)'
+
+    - pwsh: |
+        Get-ChildItem '$(ob_outputDirectory)' -File -Recurse |
+        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'
+      workingDirectory: '$(repoRoot)'
+      displayName: 'Create release file hash artifact'
+
+    - pwsh: |
+        Copy-Item -Path '$(Build.SourcesDirectory)/ReleaseFileHash.csv' -Destination '$(ob_outputDirectory)' -Verbose
+      displayName: 'Publish Build File Hash artifact'
+
+    - pwsh: |
+        Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      displayName: Capture Environment
+      condition: succeededOrFailed()
+      workingDirectory: '$(repoRoot)'
diff --git a/.pipelines/templates/compliance/generateNotice.yml b/.pipelines/templates/compliance/generateNotice.yml
new file mode 100644
index 00000000000..aec44b9b8f6
--- /dev/null
+++ b/.pipelines/templates/compliance/generateNotice.yml
@@ -0,0 +1,112 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+parameters:
+  - name: parentJobs
+    type: jobList
+
+jobs:
+- job: generateNotice
+  variables:
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT/notice'
+  - name: ob_sdl_apiscan_enabled
+    value: false
+  - name: repoRoot
+    value: '$(Build.SourcesDirectory)\PowerShell'
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+
+  displayName: Generate Notice
+  dependsOn:
+    ${{ parameters.parentJobs }}
+  pool:
+    type: windows
+
+  timeoutInMinutes: 15
+
+  steps:
+  - 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 {
+        $branchOnly = $branchOnly -replace '[\./]', '-'
+        $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:
+      sourceScanPath: '$(repoRoot)\tools\cgmanifest\tpn'
+
+  - task: msospo.ospo-extension.8d7f9abb-6896-461d-9e25-4f74ed65ddb2.notice@0
+    displayName: 'NOTICE File Generator'
+    inputs:
+      outputfile: '$(ob_outputDirectory)\ThirdPartyNotices.txt'
+      # output format can be html or text
+      outputformat: text
+      # this isn't working
+      # additionaldata: $(Build.SourcesDirectory)\assets\additionalAttributions.txt
+
+  - pwsh: |
+      Get-Content -Raw -Path $(repoRoot)\assets\additionalAttributions.txt | Out-File '$(ob_outputDirectory)\ThirdPartyNotices.txt' -Encoding utf8NoBOM -Force -Append
+      Get-Content -Raw -Path $(repoRoot)\assets\additionalAttributions.txt
+    displayName: Append Additional Attributions
+    continueOnError: true
+
+  - pwsh: |
+      Get-Content -Raw -Path '$(ob_outputDirectory)\ThirdPartyNotices.txt'
+    displayName: Capture Notice
+    continueOnError: true
+
+  - task: AzurePowerShell@5
+    displayName: Upload Notice
+    inputs:
+      azureSubscription: az-blob-cicd-infra
+      scriptType: inlineScript
+      azurePowerShellVersion: LatestVersion
+      workingDirectory: '$(repoRoot)'
+      pwsh: true
+      inline: |
+        try {
+          $downloadsDirectory = '$(Build.ArtifactStagingDirectory)/downloads'
+          $uploadedDirectory = '$(Build.ArtifactStagingDirectory)/uploaded'
+          $storageAccountName = "pscoretestdata"
+          $containerName = '$(tpnContainer)'
+          $blobName = 'ThirdPartyNotices.txt'
+          $noticePath = "$(ob_outputDirectory)\$blobName"
+
+          Write-Verbose -Verbose "creating context ($storageAccountName) ..."
+          $context = New-AzStorageContext -StorageAccountName $storageAccountName -UseConnectedAccount
+
+          Write-Verbose -Verbose "checking if container ($containerName) exists ..."
+          $containerExists = Get-AzStorageContainer -Name $containerName -Context $context -ErrorAction SilentlyContinue
+          if (-not $containerExists) {
+            Write-Verbose -Verbose "Creating container ..."
+            $null = New-AzStorageContainer -Name $containerName -Context $context
+            Write-Verbose -Verbose "Blob container $containerName created successfully."
+          }
+
+          Write-Verbose -Verbose "Setting blob ($blobName) content ($noticePath) ..."
+          $null = Set-AzStorageBlobContent -File $noticePath -Container $containerName -Blob $blobName -Context $context -confirm:$false -force
+          Write-Verbose -Verbose "Done"
+        } catch {
+          Get-Error
+          throw
+        }
diff --git a/.pipelines/templates/insert-nuget-config-azfeed.yml b/.pipelines/templates/insert-nuget-config-azfeed.yml
new file mode 100644
index 00000000000..20057440c00
--- /dev/null
+++ b/.pipelines/templates/insert-nuget-config-azfeed.yml
@@ -0,0 +1,53 @@
+parameters:
+- name: "repoRoot"
+  default: $(REPOROOT)
+- name: "ob_restore_phase"
+  type: boolean
+  default: true
+
+steps:
+- task: NuGetAuthenticate@1
+  displayName: Install Azure Artifacts Credential Provider
+  inputs:
+    forceReinstallCredentialProvider: true
+
+- pwsh: |
+    try {
+      $configPath = "${env:NugetConfigDir}/nuget.config"
+      Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
+
+      Write-Verbose -Verbose "Running: Switch-PSNugetConfig -Source Private -UserName '$(AzDevopsFeedUserNameKVPAT)' -ClearTextPAT '$(powershellPackageReadPat)'"
+      Switch-PSNugetConfig -Source Private -UserName '$(AzDevopsFeedUserNameKVPAT)' -ClearTextPAT '$(powershellPackageReadPat)'
+
+      if(-not (Test-Path $configPath))
+      {
+          throw "nuget.config is not created"
+      }
+    }
+    catch {
+      Get-Error
+      throw
+    }
+  displayName: 'Switch to production Azure DevOps feed for all nuget.configs'
+  condition: and(succeededOrFailed(), ne(variables['UseAzDevOpsFeed'], ''))
+  env:
+    NugetConfigDir: ${{ parameters.repoRoot }}/src/Modules
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
+
+- pwsh: |
+    Get-ChildItem ${{ parameters.repoRoot }}/nuget.config -Recurse | Foreach-Object {
+      Write-Verbose -Verbose "--- START $($_.fullname) ---"
+      get-content $_.fullname  | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      Write-Verbose -Verbose "--- END $($_.fullname) ---"
+    }
+  displayName: 'Capture all nuget.config files'
+  condition: and(succeededOrFailed(), ne(variables['UseAzDevOpsFeed'], ''))
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
+
+- pwsh: |
+    Get-ChildItem -Path env:VSS* | Out-String -width 9999 -Stream | write-Verbose -Verbose
+  displayName: Capture VSS* Environment
+  condition: and(succeededOrFailed(), ne(variables['UseAzDevOpsFeed'], ''))
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
diff --git a/.pipelines/templates/install-dotnet.yml b/.pipelines/templates/install-dotnet.yml
new file mode 100644
index 00000000000..464e13d1047
--- /dev/null
+++ b/.pipelines/templates/install-dotnet.yml
@@ -0,0 +1,24 @@
+parameters:
+- name: ob_restore_phase
+  type: boolean
+  default: true
+
+steps:
+  - pwsh: |
+      if (-not (Test-Path '$(RepoRoot)')) {
+        $psRoot = '$(Build.SourcesDirectory)/PowerShell'
+        Set-Location $psRoot -Verbose
+      }
+
+      $version = Get-Content ./global.json | ConvertFrom-Json | Select-Object -ExpandProperty sdk | Select-Object -ExpandProperty version
+
+      Write-Verbose -Verbose "Installing .NET SDK with version $version"
+
+      Import-Module ./build.psm1 -Force
+      Install-Dotnet -Version $version -Verbose
+
+    displayName: 'Install dotnet SDK'
+    workingDirectory: $(RepoRoot)
+    env:
+      ob_restore_phase: ${{ parameters.ob_restore_phase }}
+
diff --git a/.pipelines/templates/linux-package-build.yml b/.pipelines/templates/linux-package-build.yml
new file mode 100644
index 00000000000..bb7ed723f42
--- /dev/null
+++ b/.pipelines/templates/linux-package-build.yml
@@ -0,0 +1,201 @@
+parameters:
+  unsignedDrop: 'drop_linux_build_linux_x64'
+  signedeDrop: 'drop_linux_sign_linux_x64'
+  packageType: deb
+  jobName: 'deb'
+  signingProfile: 'CP-450779-pgpdetached'
+
+jobs:
+- job: ${{ parameters.jobName }}
+  displayName: Package linux ${{ parameters.packageType }}
+  condition: succeeded()
+  pool:
+    type: linux
+
+  variables:
+    - name: nugetMultiFeedWarnLevel
+      value: none
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - name: skipNugetSecurityAnalysis
+      value: true
+    - group: DotNetPrivateBuildAccess
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_binskim_enabled
+      value: true
+    - name: PackageType
+      value: ${{ parameters.packageType }}
+    - name: signedDrop
+      value: ${{ parameters.signedDrop }}
+    - name: unsignedDrop
+      value: ${{ parameters.unsignedDrop }}
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)/PowerShell/.config/tsaoptions.json
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)/PowerShell/.config/suppress.json
+    - name: SigningProfile
+      value: ${{ parameters.signingProfile }}
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - pwsh: |
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: Capture environment
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - template: SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+      CreateJson: no
+
+  - template: shouldSign.yml
+
+  - template: cloneToOfficialPath.yml
+    parameters:
+      nativePathRoot: '$(Agent.TempDirectory)'
+
+  - template: rebuild-branch-check.yml@self
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: ${{ parameters.unsignedDrop }}
+    displayName: 'Download unsigned artifacts'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: ${{ parameters.signedDrop }}
+    displayName: 'Download signed artifacts'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - pwsh: |
+      Write-Verbose -Verbose "Unsigned artifacts"
+      Get-ChildItem "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/${{ parameters.unsignedDrop }}" -Recurse
+
+      Write-Verbose -Verbose "Signed artifacts"
+      Get-ChildItem "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/${{ parameters.signedDrop }}" -Recurse
+    displayName: 'Capture Downloaded Artifacts'
+    # Diagnostics is not critical it passes every time it runs
+    continueOnError: true
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - template: /.pipelines/templates/install-dotnet.yml@self
+
+  - pwsh: |
+      $packageType = '$(PackageType)'
+      Write-Verbose -Verbose "packageType = $packageType"
+
+      $signedDrop = '$(signedDrop)'
+      Write-Verbose -Verbose "signedDrop = $signedDrop"
+
+      $unsignedDrop = '$(unsignedDrop)'
+      Write-Verbose -Verbose "unsignedDrop = $unsignedDrop"
+
+      Write-Verbose -Message "Init..." -Verbose
+
+      $repoRoot = "$env:REPOROOT"
+      Import-Module "$repoRoot/build.psm1"
+      Import-Module "$repoRoot/tools/packaging"
+
+      Start-PSBootstrap -Scenario Both
+
+      $psOptionsPath = "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/${unsignedDrop}/psoptions/psoptions.json"
+
+      if (-not (Test-Path $psOptionsPath)) {
+        throw "psOptionsPath file not found at $psOptionsPath"
+      }
+
+      Restore-PSOptions $psOptionsPath
+      Write-Verbose -Message "Restoring PSOptions from $psoptionsFilePath" -Verbose
+      Get-PSOptions | Write-Verbose -Verbose
+
+      $signedFolder, $pkgFilter = switch ($packageType) {
+        'tar-arm' { 'Signed-linux-arm', 'powershell*.tar.gz' }
+        'tar-arm64' { 'Signed-linux-arm64', 'powershell*.tar.gz' }
+        'tar-alpine' { 'Signed-linux-musl-x64', 'powershell*.tar.gz' }
+        'fxdependent' { 'Signed-fxdependent', 'powershell*.tar.gz' }
+        'tar' { 'Signed-linux-x64', 'powershell*.tar.gz' }
+        'tar-alpine-fxdependent' { 'Signed-fxdependent-noopt-linux-musl-x64', 'powershell*.tar.gz' }
+        'deb' { 'Signed-linux-x64', 'powershell*.deb' }
+        'rpm-fxdependent' { 'Signed-fxdependent-linux-x64', 'powershell*.rpm' }
+        'rpm-fxdependent-arm64' { 'Signed-fxdependent-linux-arm64', 'powershell*.rpm' }
+        'rpm' { 'Signed-linux-x64', 'powershell*.rpm' }
+        'min-size' { 'Signed-linux-x64', 'powershell*.tar.gz' }
+      }
+
+      $signedFilesPath = "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/${signedDrop}/${signedFolder}"
+      Write-Verbose -Verbose "signedFilesPath: $signedFilesPath"
+
+      Write-Verbose -Message "checking pwsh exists in $signedFilesPath" -Verbose
+      if (-not (Test-Path "$signedFilesPath/pwsh")) {
+        throw "pwsh not found in $signedFilesPath"
+      }
+
+      $metadata = Get-Content "$repoRoot/tools/metadata.json" -Raw | ConvertFrom-Json
+
+      Write-Verbose -Verbose "metadata:"
+      $metadata | Out-String | Write-Verbose -Verbose
+
+      # Use the rebuild branch check from the template
+      $isRebuildBranch = '$(RebuildBranchCheck.IsRebuildBranch)' -eq 'true'
+
+      # Don't build LTS packages for rebuild branches
+      $LTS = $metadata.LTSRelease.Package -and -not $isRebuildBranch
+
+      if ($isRebuildBranch) {
+        Write-Verbose -Message "Rebuild branch detected, skipping LTS package build" -Verbose
+      }
+
+      Write-Verbose -Verbose "LTS: $LTS"
+
+      if (-not (Test-Path $(ob_outputDirectory))) {
+        New-Item -ItemType Directory -Path $(ob_outputDirectory) -Force
+      }
+
+      $packageType = '$(PackageType)'
+      Write-Verbose -Verbose "packageType = $packageType"
+
+      Start-PSPackage -Type $packageType -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath
+
+      if ($LTS) {
+        Write-Verbose -Message "LTS Release: $LTS" -Verbose
+        Start-PSPackage -Type $packageType -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath -LTS
+      }
+
+      $vstsCommandString = "vso[task.setvariable variable=PackageFilter]$pkgFilter"
+      Write-Host ("sending " + $vstsCommandString)
+      Write-Host "##$vstsCommandString"
+    displayName: 'Package ${{ parameters.packageType}}'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - task: onebranch.pipeline.signing@1
+    displayName: Sign deb and rpm packages
+    inputs:
+      command: 'sign'
+      signing_profile: '$(SigningProfile)'
+      files_to_sign: '**/*.rpm;**/*.deb'
+      search_root: '$(Pipeline.Workspace)'
+
+  - pwsh: |
+      $pkgFilter = '$(PackageFilter)'
+      Write-Verbose -Verbose "pkgFilter: $pkgFilter"
+
+      $pkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $pkgFilter -Recurse -File | Select-Object -ExpandProperty FullName
+      Write-Verbose -Verbose "pkgPath: $pkgPath"
+      Copy-Item -Path $pkgPath -Destination '$(ob_outputDirectory)' -Force -Verbose
+    displayName: 'Copy artifacts to output directory'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
+  - pwsh: |
+      Get-ChildItem -Path $(ob_outputDirectory) -Recurse
+    displayName: 'List artifacts'
diff --git a/.pipelines/templates/linux.yml b/.pipelines/templates/linux.yml
new file mode 100644
index 00000000000..97b594830b3
--- /dev/null
+++ b/.pipelines/templates/linux.yml
@@ -0,0 +1,197 @@
+parameters:
+  Runtime: 'linux-x64'
+  BuildConfiguration: 'release'
+  JobName: 'build_linux'
+
+jobs:
+- job: build_${{ parameters.JobName }}
+  displayName: Build_Linux_${{ parameters.Runtime }}_${{ parameters.BuildConfiguration }}
+  condition: succeeded()
+  pool:
+    type: linux
+  variables:
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: DOTNET_NOLOGO
+    value: 1
+  - group: DotNetPrivateBuildAccess
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_binskim_enabled
+    value: true
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: BUILDCONFIGURATION
+    value: ${{ parameters.BuildConfiguration }}
+  - name: Runtime
+    value: ${{ parameters.Runtime }}
+  - name: ob_sdl_sbom_packageName
+    value: 'Microsoft.Powershell.Linux.${{ parameters.Runtime }}'
+  # We add this manually, so we need it disabled the OneBranch auto-injected one.
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+
+  - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+    parameters:
+      repoRoot: $(PowerShellRoot)
+
+  - task: CodeQL3000Init@0 # Add CodeQL Init task right before your 'Build' step.
+    condition: eq(variables['CODEQL_ENABLED'], 'true')
+    env:
+      ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+    inputs:
+      Enabled: true
+      # AnalyzeInPipeline: false = upload results
+      # AnalyzeInPipeline: true = do not upload results
+      AnalyzeInPipeline: false
+      Language: csharp
+
+  - template: /.pipelines/templates/install-dotnet.yml@self
+
+  - pwsh: |
+      $runtime = $env:RUNTIME
+
+      $params = @{}
+      if ($env:BUILDCONFIGURATION -eq 'minSize') {
+        Write-Verbose -Message "Building for minimal size"
+        $params['ForMinimalSize'] = $true
+      }
+
+      Write-Verbose -Message "Building PowerShell with Runtime: $runtime"
+      Import-Module -Name $(PowerShellRoot)/build.psm1 -Force
+      $buildWithSymbolsPath = New-Item -ItemType Directory -Path $(Pipeline.Workspace)/Symbols_$(Runtime) -Force
+
+      $null = New-Item -ItemType Directory -Path $buildWithSymbolsPath -Force -Verbose
+
+      $ReleaseTagParam = @{}
+
+      if ($env:RELEASETAGVAR) {
+        $ReleaseTagParam['ReleaseTag'] = $env:RELEASETAGVAR
+      }
+
+      Start-PSBuild -Runtime $runtime -Configuration Release -Output $buildWithSymbolsPath @params -Clean -PSModuleRestore @ReleaseTagParam
+
+      $outputPath = Join-Path '$(ob_outputDirectory)' 'psoptions'
+      $null = New-Item -ItemType Directory -Path $outputPath -Force
+      $psOptPath = "$outputPath/psoptions.json"
+      Save-PSOptions -PSOptionsPath $psOptPath
+
+      Write-Verbose -Verbose "Verifying pdbs exist in build folder"
+      $pdbs = Get-ChildItem -Path $buildWithSymbolsPath -Recurse -Filter *.pdb
+      if ($pdbs.Count -eq 0) {
+        Write-Error -Message "No pdbs found in build folder"
+      }
+      else {
+        Write-Verbose -Verbose "Found $($pdbs.Count) pdbs in build folder"
+        $pdbs | ForEach-Object {
+          Write-Verbose -Verbose "Pdb: $($_.FullName)"
+        }
+      }
+
+      Write-Verbose -Verbose "Completed building PowerShell for '$env:BUILDCONFIGURATION' configuration"
+    displayName: 'Build Linux - $(Runtime)'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+      ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+  - task: CodeQL3000Finalize@0 # Add CodeQL Finalize task right after your 'Build' step.
+    condition: eq(variables['CODEQL_ENABLED'], 'true')
+    env:
+      ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+  - pwsh: |
+      $platform = 'linux'
+      $vstsCommandString = "vso[task.setvariable variable=ArtifactPlatform]$platform"
+      Write-Host ("sending " + $vstsCommandString)
+      Write-Host "##$vstsCommandString"
+    displayName: Set artifact platform
+
+  - pwsh: |
+      $pathForUpload = New-Item -ItemType Directory -Path '$(ob_outputDirectory)/Unsigned-$(Runtime)' -Force
+      Write-Verbose -Verbose -Message "pathForUpload: $pathForUpload"
+      Copy-Item -Path '$(Pipeline.Workspace)/Symbols_$(Runtime)/*' -Destination $pathForUpload -Recurse -Force -Verbose
+    displayName: Copy unsigned files for upload
+
+  - template: /.pipelines/templates/step/finalize.yml@self
+
+- job: sign_${{ parameters.JobName }}
+  displayName: Sign_Linux_${{ parameters.Runtime }}_${{ parameters.BuildConfiguration }}
+  condition: succeeded()
+  dependsOn: build_${{ parameters.JobName }}
+  pool:
+    type: windows
+  variables:
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: DOTNET_NOLOGO
+    value: 1
+  - group: DotNetPrivateBuildAccess
+  - group: certificate_logical_to_actual
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_binskim_enabled
+    value: false
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: BuildConfiguration
+    value: ${{ parameters.BuildConfiguration }}
+  - name: Runtime
+    value: ${{ parameters.Runtime }}
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: drop_linux_build_${{ parameters.JobName }}
+      path: $(Pipeline.Workspace)/drop_linux_build
+    displayName: Download build
+
+  - pwsh: |
+      Get-ChildItem -Path $(Pipeline.Workspace)/drop_linux_build -Recurse
+    displayName: Capture downloaded files
+
+  - pwsh: |
+      $pwshPath = Get-ChildItem -Path $(Pipeline.Workspace)/drop_linux_build -File -Recurse | Where-Object { $_.Name -eq 'pwsh' }
+      $rootPath = Split-Path -Path $pwshPath.FullName -Parent
+      Write-Verbose -Verbose "Setting vso[task.setvariable variable=DropRootPath]$rootPath"
+      Write-Host "##vso[task.setvariable variable=DropRootPath]$rootPath"
+    displayName: Set drop root path
+
+  - template: /.pipelines/templates/obp-file-signing.yml@self
+    parameters:
+      binPath: $(DropRootPath)
+      OfficialBuild: $(ps_official_build)
+
+  - template: /.pipelines/templates/step/finalize.yml@self
diff --git a/.pipelines/templates/mac-package-build.yml b/.pipelines/templates/mac-package-build.yml
new file mode 100644
index 00000000000..6585773c743
--- /dev/null
+++ b/.pipelines/templates/mac-package-build.yml
@@ -0,0 +1,249 @@
+parameters:
+  parentJob: ''
+  buildArchitecture: x64
+
+jobs:
+- job: package_macOS_${{ parameters.buildArchitecture }}
+  displayName: Package macOS ${{ parameters.buildArchitecture }}
+  condition: succeeded()
+  pool:
+    type: linux
+    isCustom: true
+    name: Azure Pipelines
+    vmImage: 'macOS-latest'
+
+  variables:
+    - name: HOMEBREW_NO_ANALYTICS
+      value: 1
+    - name: nugetMultiFeedWarnLevel
+      value: none
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - name: skipNugetSecurityAnalysis
+      value: true
+    - group: DotNetPrivateBuildAccess
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_binskim_enabled
+      value: true
+    - name: ob_sdl_credscan_suppressionsfileforartifacts
+      value: $(Build.SourcesDirectory)/PowerShell/.config/suppress.json
+    - name: BuildArch
+      value: ${{ parameters.buildArchitecture }}
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - pwsh: |
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: Capture environment
+
+  - pwsh: |
+      # create folder
+      sudo mkdir "$(Agent.TempDirectory)/PowerShell"
+
+      # make the current user the owner
+      sudo chown $env:USER "$(Agent.TempDirectory)/PowerShell"
+    displayName: 'Create $(Agent.TempDirectory)/PowerShell'
+
+  - template: SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+      CreateJson: no
+
+  - template: shouldSign.yml
+
+  - template: cloneToOfficialPath.yml
+    parameters:
+      nativePathRoot: '$(Agent.TempDirectory)'
+
+  - template: rebuild-branch-check.yml@self
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: macosBinResults-${{ parameters.buildArchitecture }}
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_macos_sign_${{ parameters.buildArchitecture }}
+
+  - pwsh: |
+      Write-Verbose -Verbose "unsigned artifacts"
+      Get-ChildItem "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/macosBinResults-${{ parameters.buildArchitecture }}" -Recurse
+
+      Write-Verbose -Verbose "unsigned artifacts"
+      Get-ChildItem "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/drop_macos_sign_${{ parameters.buildArchitecture }}" -Recurse
+    displayName: 'Capture Downloaded Artifacts'
+    # Diagnostics is not critical it passes every time it runs
+    continueOnError: true
+
+  - pwsh: |
+      # Add -SkipReleaseChecks as a mitigation to unblock release.
+      # macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
+
+      $buildArch = '${{ parameters.buildArchitecture }}'
+
+      Write-Verbose -Message "Init..." -Verbose
+      $repoRoot = $env:REPOROOT
+      Set-Location $repoRoot
+      Import-Module "$repoRoot/build.psm1"
+      Import-Module "$repoRoot/tools/packaging"
+
+      $unsignedFilesPath = "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/macosBinResults-$buildArch"
+      $signedFilesPath = "$(Pipeline.Workspace)/CoOrdinatedBuildPipeline/drop_macos_sign_$buildArch/Signed-$buildArch"
+
+      Write-Verbose -Message "checking pwsh exists in $signedFilesPath" -Verbose
+      if (-not (Test-Path $signedFilesPath/pwsh)) {
+        throw "pwsh not found in $signedFilesPath"
+      }
+
+      $psoptionsPath = Get-ChildItem -Path $unsignedFilesPath -Filter 'psoptions.json' -Recurse -File | Select-Object -ExpandProperty FullName
+      Write-Verbose -Message "Restoring PSOptions from $psoptionsPath" -Verbose
+
+      Restore-PSOptions -PSOptionsPath "$psoptionsPath"
+      Get-PSOptions | Write-Verbose -Verbose
+
+      if (-not (Test-Path "$repoRoot/tools/metadata.json")) {
+        throw "metadata.json not found in $repoRoot/tools"
+      }
+
+      $metadata = Get-Content "$repoRoot/tools/metadata.json" -Raw | ConvertFrom-Json
+
+      Write-Verbose -Verbose "metadata:"
+      $metadata | Out-String | Write-Verbose -Verbose
+
+      # Use the rebuild branch check from the template
+      $isRebuildBranch = '$(RebuildBranchCheck.IsRebuildBranch)' -eq 'true'
+
+      # Don't build LTS packages for rebuild branches
+      $LTS = $metadata.LTSRelease.Package -and -not $isRebuildBranch
+
+      if ($isRebuildBranch) {
+        Write-Verbose -Message "Rebuild branch detected, skipping LTS package build" -Verbose
+      }
+
+      Write-Verbose -Verbose "LTS: $LTS"
+
+      if ($LTS) {
+        Write-Verbose -Message "LTS Release: $LTS" -Verbose
+      }
+
+      Start-PSBootstrap -Scenario Package
+
+      $macosRuntime = "osx-$buildArch"
+
+      Start-PSPackage -Type osxpkg -SkipReleaseChecks -MacOSRuntime $macosRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath
+
+      if ($LTS) {
+        Start-PSPackage -Type osxpkg -SkipReleaseChecks -MacOSRuntime $macosRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath -LTS
+      }
+
+      $pkgNameFilter = "powershell-*$macosRuntime.pkg"
+      Write-Verbose -Verbose "Looking for pkg packages with filter: $pkgNameFilter in '$(Pipeline.Workspace)' to upload..."
+      $pkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $pkgNameFilter -Recurse -File
+
+      foreach($p in $pkgPath) {
+        $file = $p.FullName
+        Write-Verbose -verbose "Uploading $file to macos-pkgs"
+        Write-Host "##vso[artifact.upload containerfolder=macos-pkgs;artifactname=macos-pkgs]$file"
+      }
+
+      Start-PSPackage -Type tar -SkipReleaseChecks -MacOSRuntime $macosRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath -LTS:$LTS
+      $tarPkgNameFilter = "powershell-*$macosRuntime.tar.gz"
+      Write-Verbose -Verbose "Looking for tar packages with filter: $tarPkgNameFilter in '$(Pipeline.Workspace)' to upload..."
+      $tarPkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $tarPkgNameFilter -Recurse -File
+
+      foreach($t in $tarPkgPath) {
+        $file = $t.FullName
+        Write-Verbose -verbose "Uploading $file to macos-pkgs"
+        Write-Host "##vso[artifact.upload containerfolder=macos-pkgs;artifactname=macos-pkgs]$file"
+      }
+
+    displayName: 'Package ${{ parameters.buildArchitecture}}'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
+- job: sign_package_macOS_${{ parameters.buildArchitecture }}
+  displayName: Sign Package macOS ${{ parameters.buildArchitecture }}
+  dependsOn: package_macOS_${{ parameters.buildArchitecture }}
+  condition: succeeded()
+  pool:
+    type: windows
+
+  variables:
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_binskim_enabled
+    value: true
+  - name: ob_sdl_credscan_suppressionsfileforartifacts
+    value: $(Build.SourcesDirectory)/PowerShell/.config/suppress.json
+  - name: BuildArch
+    value: ${{ parameters.buildArchitecture }}
+  - group: mscodehub-macos-package-signing
+
+  steps:
+  - download: current
+    artifact: macos-pkgs
+
+  - pwsh: |
+      $buildArch = '${{ parameters.buildArchitecture }}'
+      $macosRuntime = "osx-$buildArch"
+      $pkgNameFilter = "powershell-*$macosRuntime.pkg"
+      $pkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $pkgNameFilter -Recurse -File
+
+      if ($pkgPath.Count -eq 0) {
+        throw "No package found for $macosRuntime"
+      }
+
+      foreach($p in $pkgPath) {
+        $file = $p.FullName
+        $fileName = $p.BaseName
+        Write-Verbose -verbose "Compressing $file"
+        $zipFile = "$(Pipeline.Workspace)\${fileName}.zip"
+        Write-Verbose -Verbose "Zip file: $zipFile"
+        Compress-Archive -Path $file -Destination $zipFile
+      }
+
+      Write-Verbose -Verbose "Compressed files:"
+      Get-ChildItem -Path $(Pipeline.Workspace) -Filter "*.zip" -File | Write-Verbose -Verbose
+    displayName: Compress package files for signing
+
+  - task: onebranch.pipeline.signing@1
+    displayName: 'OneBranch CodeSigning Package'
+    inputs:
+      command: 'sign'
+      files_to_sign: '**/*-osx-*.zip'
+      search_root: '$(Pipeline.Workspace)'
+      inline_operation: |
+        [
+          {
+            "KeyCode": "$(KeyCode)",
+            "OperationCode": "MacAppDeveloperSign",
+            "ToolName": "sign",
+            "ToolVersion": "1.0",
+            "Parameters": {
+              "Hardening": "Enable",
+              "OpusInfo": "http://microsoft.com"
+            }
+          }
+        ]
+
+  - pwsh: |
+      $signedPkg = Get-ChildItem -Path $(Pipeline.Workspace) -Filter "*osx*.zip" -File
+
+      $signedPkg | ForEach-Object {
+        Write-Verbose -Verbose "Signed package zip: $_"
+
+        if (-not (Test-Path $_)) {
+          throw "Package not found: $_"
+        }
+
+        if (-not (Test-Path $(ob_outputDirectory))) {
+          $null = New-Item -Path $(ob_outputDirectory) -ItemType Directory
+        }
+
+        Expand-Archive -Path $_ -DestinationPath $(ob_outputDirectory) -Verbose
+      }
+
+      Write-Verbose -Verbose "Expanded pkg file:"
+      Get-ChildItem -Path $(ob_outputDirectory) | Write-Verbose -Verbose
+    displayName: Expand signed file
diff --git a/.pipelines/templates/mac.yml b/.pipelines/templates/mac.yml
new file mode 100644
index 00000000000..1699207c657
--- /dev/null
+++ b/.pipelines/templates/mac.yml
@@ -0,0 +1,147 @@
+parameters:
+  buildArchitecture: 'x64'
+jobs:
+- job: build_macOS_${{ parameters.buildArchitecture }}
+  displayName: Build macOS ${{ parameters.buildArchitecture }}
+  condition: succeeded()
+  pool:
+    type: linux
+    isCustom: true
+    name: Azure Pipelines
+    vmImage: 'macOS-latest'
+
+  variables:
+  - name: HOMEBREW_NO_ANALYTICS
+    value: 1
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - group: DotNetPrivateBuildAccess
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: PowerShellRoot
+    value: $(Build.SourcesDirectory)
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+  - pwsh: |
+      # create folder
+      sudo mkdir "$(Agent.TempDirectory)/PowerShell"
+      # make the current user the owner
+      sudo chown $env:USER "$(Agent.TempDirectory)/PowerShell"
+    displayName: 'Create $(Agent.TempDirectory)/PowerShell'
+
+    ## We cross compile for arm64, so the arch is always x64
+  - template: /.pipelines/templates/install-dotnet.yml@self
+
+  - pwsh: |
+      Import-Module $(PowerShellRoot)/build.psm1 -Force
+      Start-PSBootstrap -Scenario Package
+    displayName: 'Bootstrap VM'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
+  - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+    parameters:
+      repoRoot: $(PowerShellRoot)
+  - pwsh: |
+      $env:AzDevOpsFeedPAT2 = '$(powershellPackageReadPat)'
+      # Add -SkipReleaseChecks as a mitigation to unblock release.
+      # macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
+
+      Import-Module ./build.psm1 -Force
+
+      $ReleaseTagParam = @{}
+
+      if ($env:RELEASETAGVAR) {
+        $ReleaseTagParam['ReleaseTag'] = $env:RELEASETAGVAR
+      }
+
+      Start-PSBuild -Runtime 'osx-${{ parameters.buildArchitecture }}' -Configuration Release -PSModuleRestore -Clean -Output $(OB_OUTPUTDIRECTORY) @ReleaseTagParam
+      $artifactName = "macosBinResults-${{ parameters.buildArchitecture }}"
+
+      $psOptPath = "$(OB_OUTPUTDIRECTORY)/psoptions.json"
+      Save-PSOptions -PSOptionsPath $psOptPath
+
+      # Since we are using custom pool for macOS, we need to use artifact.upload to publish the artifacts
+      Write-Host "##vso[artifact.upload containerfolder=$artifactName;artifactname=$artifactName]$(OB_OUTPUTDIRECTORY)"
+
+      $env:AzDevOpsFeedPAT2 = $null
+    displayName: 'Build'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
+  - template: /.pipelines/templates/step/finalize.yml@self
+
+- job: sign_${{ parameters.buildArchitecture }}
+  displayName: Sign_macOS_${{ parameters.buildArchitecture }}
+  condition: succeeded()
+  dependsOn: build_macOS_${{ parameters.buildArchitecture }}
+  pool:
+    type: windows
+  variables:
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - group: DotNetPrivateBuildAccess
+  - group: certificate_logical_to_actual
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: true
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: BuildArchitecture
+    value: ${{ parameters.buildArchitecture }}
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+  - name: ob_sdl_sbom_packageName
+    value: 'Microsoft.Powershell.MacOS.${{parameters.buildArchitecture}}'
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: 'macosBinResults-$(BuildArchitecture)'
+      path: '$(Pipeline.Workspace)\Symbols'
+    displayName: Download build
+
+  - pwsh: |
+        Get-ChildItem "$(Pipeline.Workspace)\*" -Recurse
+    displayName: 'Capture Downloaded Artifacts'
+    # Diagnostics is not critical it passes every time it runs
+    continueOnError: true
+
+  - pwsh: |
+      $runtime = '$(BuildArchitecture)'
+      Write-Host "sending.. vso[task.setvariable variable=Runtime]$runtime"
+      Write-Host "##vso[task.setvariable variable=Runtime]$runtime"
+
+      $rootPath = "$(Pipeline.Workspace)\Symbols"
+      Write-Verbose -Verbose "Setting vso[task.setvariable variable=DropRootPath]$rootPath"
+      Write-Host "##vso[task.setvariable variable=DropRootPath]$rootPath"
+    displayName: Expand symbols zip
+
+  - template: /.pipelines/templates/obp-file-signing.yml@self
+    parameters:
+      binPath: $(DropRootPath)
+      OfficialBuild: $(ps_official_build)
+
+  - template: /.pipelines/templates/step/finalize.yml@self
diff --git a/.pipelines/templates/nupkg.yml b/.pipelines/templates/nupkg.yml
new file mode 100644
index 00000000000..c296aadc242
--- /dev/null
+++ b/.pipelines/templates/nupkg.yml
@@ -0,0 +1,298 @@
+jobs:
+- job: build_nupkg
+  displayName: Package NuPkgs
+  condition: succeeded()
+  pool:
+    type: windows
+
+  variables:
+    - name: nugetMultiFeedWarnLevel
+      value: none
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - name: skipNugetSecurityAnalysis
+      value: true
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)\ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_binskim_enabled
+      value: true
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    - group: mscodehub-feed-read-general
+    - group: mscodehub-feed-read-akv
+    - group: DotNetPrivateBuildAccess
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - pwsh: |
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: Capture environment
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - template: SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+      CreateJson: no
+
+  - template: shouldSign.yml
+
+  - template: cloneToOfficialPath.yml
+    parameters:
+      nativePathRoot: '$(Agent.TempDirectory)'
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_windows_build_windows_fxdependent_release
+    displayName: 'Download drop_windows_build_windows_fxdependent_release'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_windows_build_windows_fxdependentWinDesktop_release
+    displayName: 'Download drop_windows_build_windows_fxdependentWinDesktop_release'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_linux_sign_linux_fxd
+    displayName: 'Download drop_linux_sign_linux_fxd'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_linux_sign_linux_fxd_x64_alpine
+    displayName: 'Download drop_linux_sign_linux_fxd_x64_alpine'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - pwsh: |
+      Write-Verbose -Verbose "drop_windows_build_windows_fxdependent_release"
+      Get-ChildItem -Path $(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependent_release -Recurse | Out-String | Write-Verbose -Verbose
+
+      Write-Verbose -Verbose "drop_windows_build_windows_fxdependentWinDesktop_release"
+      Get-ChildItem -Path $(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependentWinDesktop_release -Recurse | Out-String | Write-Verbose -Verbose
+
+      Write-Verbose -Verbose "drop_linux_sign_linux_fxd"
+      Get-ChildItem -Path $(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_linux_sign_linux_fxd -Recurse | Out-String | Write-Verbose -Verbose
+
+      Write-Verbose -Verbose "drop_linux_sign_linux_fxd_x64_alpine"
+      Get-ChildItem -Path $(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_linux_sign_linux_fxd_x64_alpine -Recurse | Out-String | Write-Verbose -Verbose
+    displayName: 'Capture download artifacts'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
+
+  - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+    parameters:
+      repoRoot: $(PowerShellRoot)
+
+  - template: /.pipelines/templates/install-dotnet.yml@self
+
+  - pwsh: |
+      Set-Location -Path '$(PowerShellRoot)'
+      Import-Module "$(PowerShellRoot)/build.psm1" -Force
+
+      $sharedModules = @('Microsoft.PowerShell.Commands.Management',
+                        'Microsoft.PowerShell.Commands.Utility',
+                        'Microsoft.PowerShell.ConsoleHost',
+                        'Microsoft.PowerShell.Security',
+                        'System.Management.Automation'
+                        )
+
+      $winOnlyModules = @('Microsoft.Management.Infrastructure.CimCmdlets',
+                          'Microsoft.PowerShell.Commands.Diagnostics',
+                          'Microsoft.PowerShell.CoreCLR.Eventing',
+                          'Microsoft.WSMan.Management',
+                          'Microsoft.WSMan.Runtime'
+                          )
+
+      $refAssemblyFolder = Join-Path '$(System.ArtifactsDirectory)' 'RefAssembly'
+      $null = New-Item -Path $refAssemblyFolder -Force -Verbose -Type Directory
+
+      Start-PSBuild -Clean -Runtime linux-x64 -Configuration Release -ReleaseTag $(ReleaseTagVar)
+
+      $sharedModules | Foreach-Object {
+        $refFile = Get-ChildItem -Path "$(PowerShellRoot)\src\$_\obj\Release\net11.0\refint\$_.dll"
+        Write-Verbose -Verbose "RefAssembly: $refFile"
+        Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
+        $refDoc = "$(PowerShellRoot)\src\$_\bin\Release\net11.0\$_.xml"
+        if (-not (Test-Path $refDoc)) {
+          Write-Warning "$refDoc not found"
+          Get-ChildItem -Path "$(PowerShellRoot)\src\$_\bin\Release\net11.0\" | Out-String | Write-Verbose -Verbose
+        }
+        else {
+          Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose
+        }
+      }
+
+      Start-PSBuild -Clean -Runtime win7-x64 -Configuration Release -ReleaseTag $(ReleaseTagVar)
+
+      $winOnlyModules | Foreach-Object {
+        $refFile = Get-ChildItem -Path "$(PowerShellRoot)\src\$_\obj\Release\net11.0\refint\*.dll"
+        Write-Verbose -Verbose 'RefAssembly: $refFile'
+        Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
+        $refDoc = "$(PowerShellRoot)\src\$_\bin\Release\net11.0\$_.xml"
+        if (-not (Test-Path $refDoc)) {
+          Write-Warning "$refDoc not found"
+          Get-ChildItem -Path "$(PowerShellRoot)\src\$_\bin\Release\net11.0" | Out-String | Write-Verbose -Verbose
+        }
+        else {
+          Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose
+        }
+      }
+
+      Get-ChildItem $refAssemblyFolder -Recurse | Out-String | Write-Verbose -Verbose
+
+      # Set RefAssemblyPath path variable
+      $vstsCommandString = "vso[task.setvariable variable=RefAssemblyPath]${refAssemblyFolder}"
+      Write-Host "sending " + $vstsCommandString
+      Write-Host "##$vstsCommandString"
+    displayName: Build reference assemblies
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
+  - task: onebranch.pipeline.signing@1
+    displayName: Sign ref assemblies
+    inputs:
+      command: 'sign'
+      signing_profile: external_distribution
+      files_to_sign: '**\*.dll'
+      search_root: '$(System.ArtifactsDirectory)\RefAssembly'
+
+  - pwsh: |
+      $files = @(
+        "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"
+      )
+
+      Import-Module -Name '$(PowerShellRoot)\build.psm1'
+      Import-Module -Name '$(PowerShellRoot)\tools\packaging'
+      Find-DotNet
+
+      Write-Verbose -Verbose "Version == $(Version)"
+
+      $winFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependent_release\Signed-fxdependent"
+      Write-Verbose -Verbose "winFxdPath == $winFxdPath"
+
+      $linuxFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_linux_sign_linux_fxd\Signed-fxdependent"
+      Write-Verbose -Verbose "linuxFxdPath == $linuxFxdPath"
+
+      $nupkgOutputPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'nupkg'
+      New-Item -Path $nupkgOutputPath -ItemType Directory -Force
+
+      $files | Foreach-Object {
+        $FileBaseName = [System.IO.Path]::GetFileNameWithoutExtension($_)
+        $FilePackagePath = Join-Path -Path $nupkgOutputPath -ChildPath $FileBaseName
+        Write-Verbose -Verbose "FileName to package: $_"
+        Write-Verbose -Verbose "FilePackage path: $FilePackagePath"
+        New-ILNugetPackageSource -File $_ -PackagePath $FilePackagePath -PackageVersion '$(Version)' -WinFxdBinPath $winFxdPath -LinuxFxdBinPath $linuxFxdPath -RefAssemblyPath $(RefAssemblyPath)
+        New-ILNugetPackageFromSource -FileName $_ -PackageVersion '$(Version)' -PackagePath $FilePackagePath
+      }
+    displayName: 'Create NuGet Package for single file'
+
+  - task: onebranch.pipeline.signing@1
+    displayName: Sign nupkg files
+    inputs:
+      command: 'sign'
+      cp_code: 'CP-401405'
+      files_to_sign: '**\*.nupkg'
+      search_root: '$(Pipeline.Workspace)\nupkg'
+
+  ### Create global tools
+
+  - pwsh: |
+      $winFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependent_release\Signed-fxdependent"
+      $winDesktopFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependentWinDesktop_release\Signed-fxdependent-win-desktop"
+      $linuxFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_linux_sign_linux_fxd\Signed-fxdependent"
+      $alpineFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_linux_sign_linux_fxd_x64_alpine\Signed-fxdependent-noopt-linux-musl-x64"
+
+      Import-Module -Name '$(PowerShellRoot)\build.psm1'
+      Import-Module -Name '$(PowerShellRoot)\tools\packaging'
+
+      Start-PrepForGlobalToolNupkg -LinuxBinPath $linuxFxdPath -WindowsBinPath $winFxdPath -WindowsDesktopBinPath $winDesktopFxdPath -AlpineBinPath $alpineFxdPath
+    displayName: 'Prepare for global tool packages'
+
+  - pwsh: |
+      Import-Module -Name '$(PowerShellRoot)\build.psm1'
+      Import-Module -Name '$(PowerShellRoot)\tools\packaging'
+      Find-DotNet
+
+      $gblToolOutputPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'globaltools'
+      New-Item -Path $gblToolOutputPath -ItemType Directory -Force
+
+      $winFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependent_release\Signed-fxdependent"
+      $winDesktopFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependentWinDesktop_release\Signed-fxdependent-win-desktop"
+      $linuxFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_linux_sign_linux_fxd\Signed-fxdependent"
+      $alpineFxdPath = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_linux_sign_linux_fxd_x64_alpine\Signed-fxdependent-noopt-linux-musl-x64"
+
+      # Build global tools which do not have the shims exe generated in build.
+      $packageTypes = @('Unified', 'PowerShell.Linux.Alpine', 'PowerShell.Linux.x64', 'PowerShell.Linux.arm32', 'PowerShell.Linux.arm64')
+
+      $packageTypes | Foreach-Object {
+        $PackageType = $_
+        Write-Verbose -Verbose "PackageType: $PackageType"
+
+        New-GlobalToolNupkgSource -PackageType $PackageType -PackageVersion '$(Version)' -LinuxBinPath $linuxFxdPath -WindowsBinPath $winFxdPath -WindowsDesktopBinPath $winDesktopFxdPath -AlpineBinPath $alpineFxdPath -SkipCGManifest
+
+        Write-Verbose -Verbose "GlobalToolNuspecSourcePath = $global:GlobalToolNuSpecSourcePath"
+        Write-Verbose -Verbose "GlobalToolPkgName = $global:GlobalToolPkgName"
+
+        Write-Verbose -Verbose "Starting global tool package creation for $PackageType"
+        New-GlobalToolNupkgFromSource -PackageNuSpecPath "$global:GlobalToolNuSpecSourcePath" -PackageName "$global:GlobalToolPkgName" -DestinationPath $gblToolOutputPath
+        Write-Verbose -Verbose "Global tool package created for $PackageType"
+        $global:GlobalToolNuSpecSourcePath = $null
+        $global:GlobalToolPkgName = $null
+      }
+    displayName: 'Create global tools'
+
+  - pwsh: |
+      $gblToolOutputPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'globaltools'
+      Get-ChildItem -Path $gblToolOutputPath
+    displayName: Capture global tools
+
+  - task: onebranch.pipeline.signing@1
+    displayName: Sign nupkg files
+    inputs:
+      command: 'sign'
+      cp_code: 'CP-401405'
+      files_to_sign: '**\*.nupkg'
+      search_root: '$(Pipeline.Workspace)\globaltools'
+
+  - pwsh: |
+      if (-not (Test-Path '$(ob_outputDirectory)')) {
+        New-Item -ItemType Directory -Path '$(ob_outputDirectory)' -Force
+      }
+
+      Write-Verbose -Verbose "Copying nupkgs to output directory"
+      $nupkgOutputPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'nupkg'
+      Get-ChildItem -Path $nupkgOutputPath -Filter *.nupkg -Recurse | Copy-Item -Destination '$(ob_outputDirectory)' -Force -Verbose
+
+      # Copy Windows.x86 global tool from build to output directory
+      $winX64GlobalTool = "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_fxdependent_release\globaltool\powershell*.nupkg"
+      Write-Verbose -Verbose "Finding Windows.x64 global tool at $winX64GlobalTool"
+      $globalToolPath = Get-Item $winX64GlobalTool
+      Copy-Item -Path $globalToolPath -Destination '$(ob_outputDirectory)' -Force -Verbose
+
+      Write-Verbose -Verbose "Copying global tools to output directory"
+      $gblToolOutputPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'globaltools'
+      Get-ChildItem -Path $gblToolOutputPath -Filter *.nupkg -Recurse | Copy-Item -Destination '$(ob_outputDirectory)' -Force -Verbose
+    displayName: Copy artifacts to output directory
+
+  - pwsh: |
+      $nupkgOutputPath = '$(ob_outputDirectory)'
+      Get-ChildItem -Path $nupkgOutputPath | Out-String | Write-Verbose -Verbose
+    displayName: List artifacts
diff --git a/.pipelines/templates/obp-file-signing.yml b/.pipelines/templates/obp-file-signing.yml
new file mode 100644
index 00000000000..cbe44ad0018
--- /dev/null
+++ b/.pipelines/templates/obp-file-signing.yml
@@ -0,0 +1,175 @@
+parameters:
+  binPath: '$(ob_outputDirectory)'
+  globalTool: 'false'
+  SigningProfile: 'external_distribution'
+  OfficialBuild: true
+  vPackScenario: false
+
+steps:
+- pwsh: |
+    $fullSymbolsFolder = '${{ parameters.binPath }}'
+    Write-Verbose -Verbose "fullSymbolsFolder == $fullSymbolsFolder"
+    Get-ChildItem -Recurse $fullSymbolsFolder | Select-Object -ExpandProperty FullName | Write-Verbose -Verbose
+    $filesToSignDirectory = "$(Pipeline.Workspace)/toBeSigned"
+    if ((Test-Path -Path $filesToSignDirectory))  {
+      Remove-Item -Path $filesToSignDirectory -Recurse -Force
+    }
+    $null = New-Item -ItemType Directory -Path $filesToSignDirectory -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('$(ArtifactPlatform)' -eq 'windows') {
+      $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"
+      }
+    }
+
+    $itemsToExclude = @(
+      # This package is retrieved from https://www.github.com/powershell/MarkdownRender
+      "$($fullSymbolsFolder)/Microsoft.PowerShell.MarkdownRender.dll"
+    )
+
+    if('$(ArtifactPlatform)' -eq 'linux' -or '$(ArtifactPlatform)' -eq 'macos') {
+      $itemsToExclude += "$($fullSymbolsFolder)/pwsh"
+    }
+
+    Write-Verbose -verbose "recursively copying $($itemsToCopyWithRecurse | out-string) to $filesToSignDirectory"
+    Copy-Item -Path $itemsToCopyWithRecurse -Destination $filesToSignDirectory -Recurse -verbose -exclude $itemsToExclude
+    Write-Verbose -verbose "recursive copy done."
+
+    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"
+
+      if (-not (Test-Path -Path $pattern)) {
+        Write-Verbose -verbose "No files found for pattern $pattern"
+        continue
+      }
+
+      Copy-Item -Path $pattern -Destination $destinationFolder -Recurse -verbose
+    }
+
+    Write-Verbose -verbose "copying done."
+    Write-Verbose -verbose "Files to be signed at: $filesToSignDirectory"
+
+    Get-ChildItem -Recurse -File $filesToSignDirectory | Select-Object -Property FullName
+  displayName: 'Prepare files to be signed'
+
+- task: onebranch.pipeline.signing@1
+  displayName: Sign 1st party files
+  inputs:
+    command: 'sign'
+    signing_profile: ${{ parameters.SigningProfile }}
+    files_to_sign: '**\*.psd1;**\*.psm1;**\*.ps1xml;**\*.ps1;**\*.dll;**\*.exe;**\pwsh'
+    search_root: $(Pipeline.Workspace)/toBeSigned
+
+- pwsh : |
+    Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+  displayName: Capture environment
+
+- pwsh: |
+    Import-Module $(PowerShellRoot)/build.psm1 -Force
+    Import-Module $(PowerShellRoot)/tools/packaging -Force
+
+    $BuildPath = (Get-Item '${{ parameters.binPath }}').FullName
+    Write-Verbose -Verbose -Message "BuildPath: $BuildPath"
+
+    $officialBuild = [System.Convert]::ToBoolean('${{ parameters.OfficialBuild }}')
+    ## copy all files to be signed to build folder
+    Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath '$(Pipeline.Workspace)/toBeSigned' -OfficialBuild $officialBuild
+
+    $dlls = Get-ChildItem $BuildPath/*.dll, $BuildPath/*.exe -Recurse
+    $signatures = $dlls | Get-AuthenticodeSignature
+    $officialIssuerPattern = '^CN=(Microsoft Code Signing PCA|Microsoft Root Certificate Authority|Microsoft Corporation).*'
+    $testCert = '^CN=(Microsoft|TestAzureEngBuildCodeSign).*'
+    $missingSignatures = $signatures | Where-Object { $_.status -eq 'notsigned' -or $_.SignerCertificate.Issuer -notmatch $testCert -or $_.SignerCertificate.Issuer -notmatch $officialIssuerPattern} | select-object -ExpandProperty Path
+
+    Write-Verbose -verbose "to be signed:`r`n $($missingSignatures | Out-String)"
+
+    $filesToSignDirectory = "$(Pipeline.Workspace)/thirdPartyToBeSigned"
+    if (Test-Path $filesToSignDirectory) {
+      Remove-Item -Path $filesToSignDirectory -Recurse -Force
+    }
+    $null = New-Item -ItemType Directory -Path $filesToSignDirectory -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: Create ThirdParty Signing Folder
+
+- task: onebranch.pipeline.signing@1
+  displayName: Sign 3rd Party files
+  inputs:
+    command: 'sign'
+    signing_profile: $(msft_3rd_party_cert_id)
+    files_to_sign: '**\*.dll;**\*.exe'
+    search_root: $(Pipeline.Workspace)/thirdPartyToBeSigned
+
+- pwsh: |
+    Get-ChildItem '$(Pipeline.Workspace)/thirdPartyToBeSigned/*'
+  displayName: Capture ThirdParty Signed files
+
+- pwsh: |
+    $officialBuild = [System.Convert]::ToBoolean('${{ parameters.OfficialBuild }}')
+    $vPackScenario = [System.Convert]::ToBoolean('${{ parameters.vPackScenario }}')
+    Import-Module '$(PowerShellRoot)/build.psm1' -Force
+    Import-Module '$(PowerShellRoot)/tools/packaging' -Force
+    $isGlobalTool = '${{ parameters.globalTool }}' -eq 'true'
+
+    if ($vPackScenario) {
+      Write-Verbose -Verbose -Message "vPackScenario is true, copying to $(ob_outputDirectory)"
+      $pathForUpload = New-Item -ItemType Directory -Path '$(ob_outputDirectory)' -Force
+      Write-Verbose -Verbose -Message "pathForUpload: $pathForUpload"
+      Copy-Item -Path '${{ parameters.binPath }}\*' -Destination $pathForUpload -Recurse -Force -Verbose
+      Write-Verbose -Verbose -Message "Files copied to $pathForUpload"
+    }
+    elseif (-not $isGlobalTool) {
+      $pathForUpload = New-Item -ItemType Directory -Path '$(ob_outputDirectory)/Signed-$(Runtime)' -Force
+      Write-Verbose -Verbose -Message "pathForUpload: $pathForUpload"
+      Copy-Item -Path '${{ parameters.binPath }}\*' -Destination $pathForUpload -Recurse -Force -Verbose
+      Write-Verbose -Verbose -Message "Files copied to $pathForUpload"
+    }
+    else {
+      $pathForUpload = '${{ parameters.binPath }}'
+    }
+
+    Write-Verbose "Copying third party signed files to the build folder"
+    $thirdPartySignedFilesPath = (Get-Item '$(Pipeline.Workspace)/thirdPartyToBeSigned').FullName
+    Update-PSSignedBuildFolder -BuildPath $pathForUpload -SignedFilesPath $thirdPartySignedFilesPath -OfficialBuild $officialBuild
+
+  displayName: 'Copy signed files for upload'
+
+- template: /.pipelines/templates/step/finalize.yml@self
diff --git a/.pipelines/templates/package-create-msix.yml b/.pipelines/templates/package-create-msix.yml
new file mode 100644
index 00000000000..97d2f4fc46a
--- /dev/null
+++ b/.pipelines/templates/package-create-msix.yml
@@ -0,0 +1,154 @@
+parameters:
+  - name: OfficialBuild
+    type: boolean
+    default: false
+
+jobs:
+- job: CreateMSIXBundle
+  displayName: Create .msixbundle file
+  pool:
+    type: windows
+
+  variables:
+    - group: msixTools
+    - group: 'Azure Blob variable group'
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+
+  steps:
+    - checkout: self
+      clean: true
+      env:
+        ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+    - template: release-SetReleaseTagandContainerName.yml@self
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        buildType: 'current'
+        artifact: drop_windows_package_arm64
+        itemPattern: |
+          **/*.msix
+        targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+      displayName: Download windows arm64 packages
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        buildType: 'current'
+        artifact: drop_windows_package_x64
+        itemPattern: |
+          **/*.msix
+        targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+      displayName: Download windows x64 packages
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        buildType: 'current'
+        artifact: drop_windows_package_x86
+        itemPattern: |
+          **/*.msix
+        targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+      displayName: Download windows x86 packages
+
+    # Finds the makeappx tool on the machine with image: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+    - pwsh: |
+        $cmd = Get-Command makeappx.exe -ErrorAction Ignore
+        if ($cmd) {
+            Write-Verbose -Verbose 'makeappx available in PATH'
+            $exePath = $cmd.Source
+        } else {
+            $toolsDir = '$(Pipeline.Workspace)\releasePipeline\tools'
+            New-Item $toolsDir -Type Directory -Force > $null
+            $makeappx = Get-ChildItem -Recurse 'C:\Program Files (x86)\Windows Kits\10\makeappx.exe' |
+              Where-Object { $_.DirectoryName -match 'x64' } |
+              Select-Object -Last 1
+            $exePath = $makeappx.FullName
+            Write-Verbose -Verbose 'makeappx was found:'
+        }
+        $vstsCommandString = "vso[task.setvariable variable=MakeAppxPath]$exePath"
+        Write-Host "sending " + $vstsCommandString
+        Write-Host "##$vstsCommandString"
+      displayName: Find makeappx tool
+      retryCountOnTaskFailure: 1
+
+    - pwsh: |
+        $sourceDir = '$(Pipeline.Workspace)\releasePipeline\msix'
+        $null = New-Item -Path $sourceDir -ItemType Directory -Force
+
+        $msixFiles = Get-ChildItem -Path "$(Build.ArtifactStagingDirectory)/downloads/*.msix" -Recurse
+        foreach ($msixFile in $msixFiles) {
+            $null = Copy-Item -Path $msixFile.FullName -Destination $sourceDir -Force -Verbose
+        }
+
+        $makeappx = '$(MakeAppxPath)'
+        $outputDir = "$sourceDir\output"
+        New-Item $outputDir -Type Directory -Force > $null
+
+        # Separate LTS and Stable/Preview MSIX files by filename convention
+        $ltsMsix = @(Get-ChildItem $sourceDir -Filter '*.msix' | Where-Object { $_.BaseName -match '-LTS-' })
+        $stableMsix = @(Get-ChildItem $sourceDir -Filter '*.msix' | Where-Object { $_.BaseName -notmatch '-LTS-' })
+
+        Write-Verbose -Verbose "Stable/Preview MSIX files: $($stableMsix.Name -join ', ')"
+        Write-Verbose -Verbose "LTS MSIX files: $($ltsMsix.Name -join ', ')"
+
+        # Create Stable/Preview bundle
+        if ($stableMsix.Count -gt 0) {
+            $stableDir = "$sourceDir\stable"
+            New-Item $stableDir -Type Directory -Force > $null
+            $stableMsix | Copy-Item -Destination $stableDir -Force
+            $file = $stableMsix | Select-Object -First 1
+            $prefix = ($file.BaseName -split "-win")[0]
+            $stableBundleName = "$prefix.msixbundle"
+            Write-Verbose -Verbose "Creating Stable/Preview bundle: $stableBundleName"
+            & $makeappx bundle /d $stableDir /p "$outputDir\$stableBundleName"
+        }
+
+        # Create LTS bundle
+        if ($ltsMsix.Count -gt 0) {
+            $ltsDir = "$sourceDir\lts"
+            New-Item $ltsDir -Type Directory -Force > $null
+            $ltsMsix | Copy-Item -Destination $ltsDir -Force
+            $file = $ltsMsix | Select-Object -First 1
+            $prefix = ($file.BaseName -split "-win")[0]
+            $ltsBundleName = "$prefix.msixbundle"
+            Write-Verbose -Verbose "Creating LTS bundle: $ltsBundleName"
+            & $makeappx bundle /d $ltsDir /p "$outputDir\$ltsBundleName"
+        }
+
+        Write-Verbose -Verbose "Created bundles:"
+        Get-ChildItem -Path $outputDir -Recurse
+
+        $vstsCommandString = "vso[task.setvariable variable=BundleDir]$outputDir"
+        Write-Host "sending " + $vstsCommandString
+        Write-Host "##$vstsCommandString"
+      displayName: Create MsixBundle
+      retryCountOnTaskFailure: 1
+
+    - task: onebranch.pipeline.signing@1
+      displayName: Sign MsixBundle
+      condition: eq('${{ parameters.OfficialBuild }}', 'true')
+      inputs:
+        command: 'sign'
+        signing_profile: $(MSIXProfile)
+        files_to_sign: '**/*.msixbundle'
+        search_root: '$(BundleDir)'
+
+    - pwsh: |
+        $signedBundles = @(Get-ChildItem -Path $(BundleDir) -Filter "*.msixbundle" -File)
+        Write-Verbose -Verbose "Signed bundles: $($signedBundles.Name -join ', ')"
+
+        if (-not (Test-Path $(ob_outputDirectory))) {
+          New-Item -ItemType Directory -Path $(ob_outputDirectory) -Force
+        }
+
+        foreach ($bundle in $signedBundles) {
+          Copy-Item -Path $bundle.FullName -Destination "$(ob_outputDirectory)" -Verbose
+        }
+
+        Write-Verbose -Verbose "Uploaded Bundles:"
+        Get-ChildItem -Path $(ob_outputDirectory) | Write-Verbose -Verbose
+      displayName: Upload msixbundle to Artifacts
diff --git a/.pipelines/templates/package-store-package.yml b/.pipelines/templates/package-store-package.yml
new file mode 100644
index 00000000000..6abddae6851
--- /dev/null
+++ b/.pipelines/templates/package-store-package.yml
@@ -0,0 +1,244 @@
+jobs:
+- job: CreateStorePackage
+  displayName: Create StoreBroker Package
+  pool:
+    type: windows
+
+  variables:
+    - group: 'Azure Blob variable group'
+    - group: 'Store Publish Variables'
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: ob_signing_setup_enabled
+      value: false
+    - name: ob_sdl_codeSignValidation_enabled
+      value: false
+
+  steps:
+    - checkout: self
+      clean: true
+
+    - template: release-SetReleaseTagandContainerName.yml@self
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        buildType: 'current'
+        artifact: drop_msixbundle_CreateMSIXBundle
+        itemPattern: |
+          **/*.msixbundle
+        targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+      displayName: Download signed msixbundle
+
+    - pwsh: |
+        $bundleDir = '$(Build.ArtifactStagingDirectory)/downloads'
+        $bundle = Get-ChildItem -Path $bundleDir -Filter '*.msixbundle' -Recurse | Select-Object -First 1
+        if (-not $bundle) {
+          Write-Error "No .msixbundle file found in $bundleDir"
+          exit 1
+        }
+        Write-Verbose -Verbose "Found bundle: $($bundle.FullName)"
+        $vstsCommandString = "vso[task.setvariable variable=BundleDir]$($bundle.DirectoryName)"
+        Write-Host "##$vstsCommandString"
+      displayName: Locate msixbundle
+
+    - template: channelSelection.yml@self
+
+    - pwsh: |
+        $IsLTS = '$(ChannelSelection.IsLTS)' -eq 'true'
+        $IsStable = '$(ChannelSelection.IsStable)' -eq 'true'
+        $IsPreview = '$(ChannelSelection.IsPreview)' -eq 'true'
+
+        Write-Verbose -Verbose "Channel Selection - LTS: $IsLTS, Stable: $IsStable, Preview: $IsPreview"
+
+        # Define app configurations for each channel
+        $channelConfigs = @{
+          'LTS' = @{
+            AppStoreName = 'PowerShell-LTS'
+            ProductId = '$(productId-LTS)'
+            AppId = '$(AppID-LTS)'
+            ServiceEndpoint = "StoreAppPublish-Stable"
+          }
+          'Stable' = @{
+            AppStoreName = 'PowerShell'
+            ProductId = '$(productId-Stable)'
+            AppId = '$(AppID-Stable)'
+            ServiceEndpoint = "StoreAppPublish-Stable"
+          }
+          'Preview' = @{
+            AppStoreName = 'PowerShell (Preview)'
+            ProductId = '$(productId-Preview)'
+            AppId = '$(AppID-Preview)'
+            ServiceEndpoint = "StoreAppPublish-Preview"
+          }
+        }
+
+        $currentChannel = if ($IsLTS) { 'LTS' }
+          elseif ($IsStable) { 'Stable' }
+          elseif ($IsPreview) { 'Preview' }
+          else {
+            Write-Error "No valid channel detected"
+            exit 1
+          }
+
+        $config = $channelConfigs[$currentChannel]
+        Write-Verbose -Verbose "Selected channel: $currentChannel"
+        Write-Verbose -Verbose "App Store Name: $($config.AppStoreName)"
+        Write-Verbose -Verbose "Product ID: $($config.ProductId)"
+
+        # Update PDP.xml file
+        $pdpPath = '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/PDP/PDP/en-US/PDP.xml'
+        if (Test-Path $pdpPath) {
+          Write-Verbose -Verbose "Updating PDP file: $pdpPath"
+
+          [xml]$pdpXml = Get-Content $pdpPath -Raw
+
+          # Create namespace manager for XML with default namespace
+          $nsManager = New-Object System.Xml.XmlNamespaceManager($pdpXml.NameTable)
+          $nsManager.AddNamespace("pd", "http://schemas.microsoft.com/appx/2012/ProductDescription")
+
+          $appStoreNameElement = $pdpXml.SelectSingleNode("//pd:AppStoreName", $nsManager)
+          if ($appStoreNameElement) {
+            $appStoreNameElement.SetAttribute("_locID", $config.AppStoreName)
+            Write-Verbose -Verbose "Updated AppStoreName _locID to: $($config.AppStoreName)"
+          } else {
+            Write-Warning "AppStoreName element not found in PDP file"
+          }
+
+          $pdpXml.Save($pdpPath)
+          Write-Verbose -Verbose "PDP file updated successfully"
+          Get-Content -Path $pdpPath | Write-Verbose -Verbose
+        } else {
+          Write-Error "PDP file not found: $pdpPath"
+          exit 1
+        }
+
+        # Update SBConfig.json file
+        $sbConfigPath = '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/SBConfig.json'
+        if (Test-Path $sbConfigPath) {
+          Write-Verbose -Verbose "Updating SBConfig file: $sbConfigPath"
+
+          $sbConfigJson = Get-Content $sbConfigPath -Raw | ConvertFrom-Json
+
+          $sbConfigJson.appSubmission.productId = $config.ProductId
+          Write-Verbose -Verbose "Updated productId to: $($config.ProductId)"
+
+          $sbConfigJson | ConvertTo-Json -Depth 100 | Set-Content $sbConfigPath -Encoding UTF8
+          Write-Verbose -Verbose "SBConfig file updated successfully"
+          Get-Content -Path $sbConfigPath | Write-Verbose -Verbose
+        } else {
+          Write-Error "SBConfig file not found: $sbConfigPath"
+          exit 1
+        }
+
+        Write-Host "##vso[task.setvariable variable=ServiceConnection]$($config.ServiceEndpoint)"
+        Write-Host "##vso[task.setvariable variable=SBConfigPath]$($sbConfigPath)"
+
+        # Select the correct bundle based on channel
+        $bundleFiles = @(Get-ChildItem -Path '$(BundleDir)' -Filter '*.msixbundle')
+        Write-Verbose -Verbose "Available bundles: $($bundleFiles.Name -join ', ')"
+
+        if ($IsLTS) {
+          $bundleFile = $bundleFiles | Where-Object { $_.Name -match '-LTS-' }
+        } else {
+          # Catches Stable or Preview
+          $bundleFile = $bundleFiles | Where-Object { $_.Name -notmatch '-LTS-' }
+        }
+
+        if (-not $bundleFile) {
+          Write-Error "No matching bundle found for channel '$currentChannel'. Available bundles: $($bundleFiles.Name -join ', ')"
+          exit 1
+        }
+
+        # Copy the selected bundle to a dedicated directory for store packaging
+        $storeBundleDir = '$(Pipeline.Workspace)\releasePipeline\msix\store-bundle'
+        New-Item $storeBundleDir -Type Directory -Force > $null
+        Copy-Item -Path $bundleFile.FullName -Destination $storeBundleDir -Force -Verbose
+        Write-Host "##vso[task.setvariable variable=StoreBundleDir]$storeBundleDir"
+        Write-Verbose -Verbose "Selected bundle for store packaging: $($bundleFile.Name)"
+
+        # These variables are used in the next tasks to determine which ServiceEndpoint to use
+        $ltsValue = $IsLTS.ToString().ToLower()
+        $stableValue = $IsStable.ToString().ToLower()
+        $previewValue = $IsPreview.ToString().ToLower()
+
+        Write-Verbose -Verbose "About to set variables:"
+        Write-Verbose -Verbose "  LTS=$ltsValue"
+        Write-Verbose -Verbose "  STABLE=$stableValue"
+        Write-Verbose -Verbose "  PREVIEW=$previewValue"
+
+        Write-Host "##vso[task.setvariable variable=LTS]$ltsValue"
+        Write-Host "##vso[task.setvariable variable=STABLE]$stableValue"
+        Write-Host "##vso[task.setvariable variable=PREVIEW]$previewValue"
+
+        Write-Verbose -Verbose "Variables set successfully"
+      name: UpdateConfigs
+      displayName: Update PDPs and SBConfig.json
+
+    - pwsh: |
+        Write-Verbose -Verbose "Checking variables after UpdateConfigs:"
+        Write-Verbose -Verbose "LTS=$(LTS)"
+        Write-Verbose -Verbose "STABLE=$(STABLE)"
+        Write-Verbose -Verbose "PREVIEW=$(PREVIEW)"
+      displayName: Debug - Check Variables
+
+    - task: MS-RDX-MRO.windows-store-publish.package-task.store-package@3
+      displayName: 'Create StoreBroker Package (Preview)'
+      condition: eq(variables['PREVIEW'], 'true')
+      inputs:
+        serviceEndpoint: 'StoreAppPublish-Preview'
+        sbConfigPath: '$(SBConfigPath)'
+        sourceFolder: '$(StoreBundleDir)'
+        contents: '*.msixBundle'
+        outSBName: 'PowerShellStorePackage'
+        pdpPath: '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/PDP/PDP'
+        pdpMediaPath: '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/PDP/PDP-Media'
+
+    - task: MS-RDX-MRO.windows-store-publish.package-task.store-package@3
+      displayName: 'Create StoreBroker Package (Stable/LTS)'
+      condition: or(eq(variables['STABLE'], 'true'), eq(variables['LTS'], 'true'))
+      inputs:
+        serviceEndpoint: 'StoreAppPublish-Stable'
+        sbConfigPath: '$(SBConfigPath)'
+        sourceFolder: '$(StoreBundleDir)'
+        contents: '*.msixBundle'
+        outSBName: 'PowerShellStorePackage'
+        pdpPath: '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/PDP/PDP'
+        pdpMediaPath: '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/PDP/PDP-Media'
+
+    - pwsh: |
+        $outputDirectory = "$(ob_outputDirectory)"
+        if (-not (Test-Path -LiteralPath $outputDirectory)) {
+          New-Item -ItemType Directory -Path $outputDirectory -Force | Out-Null
+        }
+
+        Get-Item -Path "$(System.DefaultWorkingDirectory)/SBLog.txt" -ErrorAction SilentlyContinue |
+          Copy-Item -Destination $outputDirectory -Verbose
+      displayName: Upload Store Failure Log
+      condition: failed()
+
+    - pwsh: |
+        $outputDirectory = "$(ob_outputDirectory)"
+        if (-not (Test-Path -LiteralPath $outputDirectory)) {
+          New-Item -ItemType Directory -Path $outputDirectory -Force | Out-Null
+        }
+
+        $submissionPackageDir = "$(System.DefaultWorkingDirectory)/SBOutDir"
+        $jsonFile = "$submissionPackageDir/PowerShellStorePackage.json"
+        $zipFile = "$submissionPackageDir/PowerShellStorePackage.zip"
+
+        if ((Test-Path $jsonFile) -and (Test-Path $zipFile)) {
+          Write-Verbose -Verbose "Uploading StoreBroker Package files:"
+          Write-Verbose -Verbose "JSON File: $jsonFile"
+          Write-Verbose -Verbose "ZIP File: $zipFile"
+
+          Copy-Item -Path $submissionPackageDir -Destination $outputDirectory -Verbose -Recurse
+        }
+        else {
+          Write-Error "Required files not found in $submissionPackageDir"
+          exit 1
+        }
+      displayName: 'Upload StoreBroker Package'
diff --git a/.pipelines/templates/packaging/windows/package.yml b/.pipelines/templates/packaging/windows/package.yml
new file mode 100644
index 00000000000..8b0e230b6b8
--- /dev/null
+++ b/.pipelines/templates/packaging/windows/package.yml
@@ -0,0 +1,225 @@
+parameters:
+  runtime: x64
+
+jobs:
+- job: build_win_${{ parameters.runtime }}
+  displayName: Build Windows Packages ${{ parameters.runtime }}
+  condition: succeeded()
+  pool:
+    type: windows
+
+  variables:
+    - name: ob_sdl_codeSignValidation_enabled
+      value: false  # Skip signing validation in build-only stage
+    - name: ob_signing_setup_enabled
+      value: false  # Disable signing setup - this is a build-only stage, signing happens in separate stage
+    - name: ob_artifactBaseName
+      value: drop_windows_package_${{ parameters.runtime }}
+    - name: nugetMultiFeedWarnLevel
+      value: none
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - name: skipNugetSecurityAnalysis
+      value: true
+    - group: DotNetPrivateBuildAccess
+    - group: certificate_logical_to_actual
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)\ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_binskim_enabled
+      value: false  # Disable for build-only, enable in signing stage
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    - name: Runtime
+      value: ${{ parameters.runtime }}
+    - group: msixTools
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - pwsh: |
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: Capture environment
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+      CreateJson: no
+      ob_restore_phase: false
+
+  - template: /.pipelines/templates/shouldSign.yml@self
+    parameters:
+      ob_restore_phase: false
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+    parameters:
+      nativePathRoot: '$(Agent.TempDirectory)'
+      ob_restore_phase: false
+
+  - template: /.pipelines/templates/rebuild-branch-check.yml@self
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_windows_build_windows_${{ parameters.runtime }}_release
+    displayName: Download signed artifacts
+    condition: ${{ ne(parameters.runtime, 'minSize') }}
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_windows_build_windows_x64_${{ parameters.runtime }}
+    displayName: Download minsize signed artifacts
+    condition: ${{ eq(parameters.runtime, 'minSize') }}
+
+  - pwsh: |
+      Write-Verbose -Verbose "signed artifacts"
+      Get-ChildItem "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_${{ parameters.runtime }}_release" -Recurse
+    displayName: 'Capture Downloaded Artifacts'
+    # Diagnostics is not critical it passes every time it runs
+    continueOnError: true
+
+  - template: /.pipelines/templates/install-dotnet.yml@self
+    parameters:
+      ob_restore_phase: false
+
+  - pwsh: |
+      $runtime = '$(Runtime)'
+      Write-Verbose -Verbose "runtime = '$(Runtime)'"
+
+      $signedFolder = switch ($runtime) {
+        'x64' { 'Signed-win7-x64' }
+        'x86' { 'Signed-win7-x86' }
+        'arm64' { 'Signed-win-arm64' }
+        'fxdependent' { 'Signed-fxdependent' }
+        'fxdependentWinDesktop' { 'Signed-fxdependent-win-desktop' }
+        'minsize' { 'Signed-win7-x64' }
+      }
+
+      Write-Verbose -Message "Init..." -Verbose
+
+      $repoRoot = "$env:REPOROOT"
+      Import-Module "$repoRoot\build.psm1"
+      Import-Module "$repoRoot\tools\packaging"
+
+      Start-PSBootstrap -Scenario Both
+
+      Find-Dotnet
+
+      $signedFilesPath, $psoptionsFilePath = if ($env:RUNTIME -eq 'minsize') {
+          "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_x64_${runtime}\$signedFolder"
+          "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_x64_${runtime}\psoptions\psoptions.json"
+        }
+        else {
+          "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_${runtime}_release\$signedFolder"
+          "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline\drop_windows_build_windows_${runtime}_release\psoptions\psoptions.json"
+        }
+
+      Write-Verbose -Verbose "signedFilesPath: $signedFilesPath"
+      Write-Verbose -Verbose "psoptionsFilePath: $psoptionsFilePath"
+
+      Write-Verbose -Message "checking pwsh exists in $signedFilesPath" -Verbose
+      if (-not (Test-Path $signedFilesPath\pwsh.exe)) {
+        throw "pwsh.exe not found in $signedFilesPath"
+      }
+
+      Write-Verbose -Message "Restoring PSOptions from $psoptionsFilePath" -Verbose
+
+      Restore-PSOptions -PSOptionsPath "$psoptionsFilePath"
+      Get-PSOptions | Write-Verbose -Verbose
+
+      $metadata = Get-Content "$repoRoot/tools/metadata.json" -Raw | ConvertFrom-Json
+
+      Write-Verbose -Verbose "metadata:"
+      $metadata | Out-String | Write-Verbose -Verbose
+
+      # Use the rebuild branch check from the template
+      $isRebuildBranch = '$(RebuildBranchCheck.IsRebuildBranch)' -eq 'true'
+
+      # Don't build LTS packages for rebuild branches
+      $LTS = $metadata.LTSRelease.Package -and -not $isRebuildBranch
+      $Stable = [bool]$metadata.StableRelease.Package
+
+      if ($isRebuildBranch) {
+        Write-Verbose -Message "Rebuild branch detected, skipping LTS package build" -Verbose
+      }
+
+      Write-Verbose -Verbose "LTS: $LTS"
+      Write-Verbose -Verbose "Stable: $Stable"
+
+      if ($LTS) {
+        Write-Verbose -Message "LTS Release: $LTS"
+      }
+
+      Start-PSBootstrap -Scenario Package
+
+      $WindowsRuntime = switch ($runtime) {
+        'x64' { 'win7-x64' }
+        'x86' { 'win7-x86' }
+        'arm64' { 'win-arm64' }
+        'fxdependent' { 'win7-x64' }
+        'fxdependentWinDesktop' { 'win7-x64' }
+        'minsize' { 'win7-x64' }
+      }
+
+      $packageTypes = switch ($runtime) {
+        'x64' { @('zip', 'msix') }
+        'x86' { @('zip', 'msix') }
+        'arm64' { @('zip', 'msix') }
+        'fxdependent' { 'fxdependent' }
+        'fxdependentWinDesktop' { 'fxdependent-win-desktop' }
+        'minsize' { 'min-size' }
+      }
+
+      if (-not (Test-Path $(ob_outputDirectory))) {
+        New-Item -ItemType Directory -Path $(ob_outputDirectory) -Force
+      }
+
+      Set-Location $repoRoot
+
+      Start-PSPackage -Type $packageTypes -SkipReleaseChecks -WindowsRuntime $WindowsRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath -LTS:$LTS
+
+      # When both LTS and Stable are requested, also build the Stable MSIX
+      if ($packageTypes -contains 'msix' -and $LTS -and $Stable) {
+        Write-Verbose -Verbose "Both LTS and Stable packages requested. Building additional Stable MSIX."
+        Start-PSPackage -Type msix -SkipReleaseChecks -WindowsRuntime $WindowsRuntime -ReleaseTag $(ReleaseTagVar) -PackageBinPath $signedFilesPath
+      }
+
+    displayName: 'Build Packages (Unsigned)'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
+  # Copy unsigned packages to output directory
+  - pwsh: |
+      $runtime = '$(Runtime)'
+      Write-Verbose -Verbose "runtime = '$(Runtime)'"
+
+      $packageTypes = switch ($runtime) {
+        'x64' { @('zip', 'msix') }
+        'x86' { @('zip', 'msix') }
+        'arm64' { @('zip', 'msix') }
+        'fxdependent' { 'fxdependent' }
+        'fxdependentWinDesktop' { 'fxdependent-win-desktop' }
+        'minsize' { 'min-size' }
+      }
+
+      if (-not (Test-Path $(ob_outputDirectory))) {
+        New-Item -ItemType Directory -Path $(ob_outputDirectory) -Force
+      }
+
+      if ($packageTypes -contains 'zip' -or $packageTypes -contains 'fxdependent' -or $packageTypes -contains 'min-size' -or $packageTypes -contains 'fxdependent-win-desktop') {
+        $zipPkgNameFilter = "powershell-*.zip"
+        $zipPkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $zipPkgNameFilter -Recurse -File | Select-Object -ExpandProperty FullName
+        Write-Verbose -Verbose "unsigned zipPkgPath: $zipPkgPath"
+        Copy-Item -Path $zipPkgPath -Destination '$(ob_outputDirectory)' -Force -Verbose
+      }
+
+      if ($packageTypes -contains 'msix') {
+        $msixPkgNameFilter = "PowerShell*.msix"
+        $msixPkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $msixPkgNameFilter -Recurse -File | Select-Object -ExpandProperty FullName
+        Write-Verbose -Verbose "unsigned msixPkgPath: $msixPkgPath"
+        Copy-Item -Path $msixPkgPath -Destination '$(ob_outputDirectory)' -Force -Verbose
+      }
+    displayName: Copy unsigned packages to output directory
+
+  - pwsh: |
+      Get-ChildItem -Path $(ob_outputDirectory) -Recurse
+    displayName: 'List unsigned artifacts'
diff --git a/.pipelines/templates/packaging/windows/sign.yml b/.pipelines/templates/packaging/windows/sign.yml
new file mode 100644
index 00000000000..151b5d676fb
--- /dev/null
+++ b/.pipelines/templates/packaging/windows/sign.yml
@@ -0,0 +1,117 @@
+parameters:
+  runtime: x64
+
+jobs:
+- job: sign_win_${{ parameters.runtime }}
+  displayName: Sign Windows Packages ${{ parameters.runtime }}
+  condition: succeeded()
+  pool:
+    type: windows
+
+  variables:
+    - name: runCodesignValidationInjection
+      value: false
+    - name: ob_artifactBaseName
+      value: drop_windows_package_package_win_${{ parameters.runtime }}
+    - name: nugetMultiFeedWarnLevel
+      value: none
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - name: skipNugetSecurityAnalysis
+      value: true
+    - group: DotNetPrivateBuildAccess
+    - group: certificate_logical_to_actual
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)\ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_binskim_enabled
+      value: true
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    - name: Runtime
+      value: ${{ parameters.runtime }}
+    - group: msixTools
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+      CreateJson: no
+
+  - template: /.pipelines/templates/shouldSign.yml@self
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+    parameters:
+      nativePathRoot: '$(Agent.TempDirectory)'
+
+  # Download unsigned packages from the build stage
+  - download: current
+    artifact: drop_windows_package_${{ parameters.runtime }}
+    displayName: Download unsigned packages
+    env:
+      ob_restore_phase: true
+
+  - pwsh: |
+      Write-Verbose -Verbose "Downloaded unsigned artifacts:"
+      Get-ChildItem "$(Pipeline.Workspace)\drop_windows_package_${{ parameters.runtime }}" -Recurse
+    displayName: 'Capture Downloaded Unsigned Artifacts'
+    continueOnError: true
+    env:
+      ob_restore_phase: true
+
+  - template: /.pipelines/templates/install-dotnet.yml@self
+
+  # Import build.psm1 and bootstrap packaging dependencies
+  - pwsh: |
+      $repoRoot = "$env:REPOROOT"
+      Import-Module "$repoRoot\build.psm1"
+      Import-Module "$repoRoot\tools\packaging"
+      Write-Verbose -Verbose "Modules imported successfully"
+    displayName: 'Import modules'
+    env:
+      ob_restore_phase: true
+
+  # Copy all signed packages to output directory
+  - pwsh: |
+      $runtime = '$(Runtime)'
+      Write-Verbose -Verbose "runtime = '$(Runtime)'"
+
+      $packageTypes = switch ($runtime) {
+        'x64' { @('zip', 'msix') }
+        'x86' { @('zip', 'msix') }
+        'arm64' { @('zip', 'msix') }
+        'fxdependent' { 'fxdependent' }
+        'fxdependentWinDesktop' { 'fxdependent-win-desktop' }
+        'minsize' { 'min-size' }
+      }
+
+      if (-not (Test-Path $(ob_outputDirectory))) {
+        New-Item -ItemType Directory -Path $(ob_outputDirectory) -Force
+      }
+
+      if ($packageTypes -contains 'zip' -or $packageTypes -contains 'fxdependent' -or $packageTypes -contains 'min-size' -or $packageTypes -contains 'fxdependent-win-desktop') {
+        $zipPkgNameFilter = "powershell-*.zip"
+        $zipPkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $zipPkgNameFilter -Recurse -File | Select-Object -ExpandProperty FullName
+        Write-Verbose -Verbose "signed zipPkgPath: $zipPkgPath"
+        Copy-Item -Path $zipPkgPath -Destination '$(ob_outputDirectory)' -Force -Verbose
+      }
+
+      if ($packageTypes -contains 'msix') {
+        $msixPkgNameFilter = "PowerShell*.msix"
+        $msixPkgPath = Get-ChildItem -Path $(Pipeline.Workspace) -Filter $msixPkgNameFilter -Recurse -File | Select-Object -ExpandProperty FullName
+        Write-Verbose -Verbose "signed msixPkgPath: $msixPkgPath"
+        Copy-Item -Path $msixPkgPath -Destination '$(ob_outputDirectory)' -Force -Verbose
+      }
+    displayName: Copy signed packages to output directory
+
+  - pwsh: |
+      Get-ChildItem -Path $(ob_outputDirectory) -Recurse
+    displayName: 'List signed artifacts'
+    env:
+      ob_restore_phase: true
diff --git a/.pipelines/templates/rebuild-branch-check.yml b/.pipelines/templates/rebuild-branch-check.yml
new file mode 100644
index 00000000000..a4b546a0dc6
--- /dev/null
+++ b/.pipelines/templates/rebuild-branch-check.yml
@@ -0,0 +1,17 @@
+# This template checks if the current branch is a rebuild branch
+# and sets an output variable IsRebuildBranch that can be used by other templates
+steps:
+- pwsh: |
+    # Check if this is a rebuild branch (e.g., rebuild/v7.4.13-rebuild.5)
+    $isRebuildBranch = '$(Build.SourceBranch)' -match 'refs/heads/rebuild/.*-rebuild\.'
+
+    $value = if ($isRebuildBranch) { 'true' } else { 'false' }
+    Write-Verbose -Message "IsRebuildBranch: $value" -Verbose
+
+    if ($isRebuildBranch) {
+        Write-Verbose -Message "Rebuild branch detected: $(Build.SourceBranch)" -Verbose
+    }
+
+    Write-Host "##vso[task.setvariable variable=IsRebuildBranch;isOutput=true]$value"
+  name: RebuildBranchCheck
+  displayName: Check if Rebuild Branch
diff --git a/.pipelines/templates/release-MSIX-Publish.yml b/.pipelines/templates/release-MSIX-Publish.yml
new file mode 100644
index 00000000000..cbbdb70cc4f
--- /dev/null
+++ b/.pipelines/templates/release-MSIX-Publish.yml
@@ -0,0 +1,138 @@
+parameters:
+  - name: skipMSIXPublish
+    type: boolean
+
+jobs:
+- job: Store_Publish_MSIX
+  displayName: Publish MSIX to the Microsoft Store
+  pool:
+    type: release
+    os: windows
+  templateContext:
+    inputs:
+      - input: pipelineArtifact
+        pipeline: PSPackagesOfficial
+        artifactName: drop_store_package_CreateStorePackage
+  variables:
+    - group: 'Store Publish Variables'
+    - name: LTS
+      value: $[ stageDependencies.setReleaseTagAndChangelog.setTagAndChangelog.outputs['ChannelSelection.IsLTS'] ]
+    - name: STABLE
+      value: $[ stageDependencies.setReleaseTagAndChangelog.setTagAndChangelog.outputs['ChannelSelection.IsStable'] ]
+    - name: PREVIEW
+      value: $[ stageDependencies.setReleaseTagAndChangelog.setTagAndChangelog.outputs['ChannelSelection.IsPreview'] ]
+    - template: ./variables/release-shared.yml@self
+      parameters:
+        RELEASETAG: $[ stageDependencies.setReleaseTagAndChangelog.setTagAndChangelog.outputs['OutputReleaseTag.releaseTag'] ]
+  steps:
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        Write-Verbose -Verbose "Release Tag: $(ReleaseTag)"
+        Get-ChildItem $(Pipeline.Workspace) -Recurse | Select-Object -ExpandProperty FullName
+    displayName: 'Capture ReleaseTag and Downloaded Packages'
+
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        if ("$(ReleaseTag)" -eq '') {
+          Write-Error "ReleaseTag is not set. Cannot proceed with publishing to the Store."
+          exit 1
+        }
+        $middleURL = ''
+        $tagString = "$(ReleaseTag)"
+        if ($tagString -match '-preview') {
+          $middleURL = "preview"
+        }
+        elseif ($tagString -match '(\d+\.\d+)') {
+          $middleURL = $matches[1]
+        }
+
+        $endURL = $tagString -replace '^v','' -replace '\.',''
+        $message = "Changelog: https://github.com/PowerShell/PowerShell/blob/master/CHANGELOG/$middleURL.md#$endURL"
+        Write-Verbose -Verbose "Release Notes for the Store:"
+        Write-Verbose -Verbose "$message"
+        $jsonPath = "$(Pipeline.Workspace)\SBOutDir\PowerShellStorePackage.json"
+        $json = Get-Content $jsonPath -Raw | ConvertFrom-Json
+
+        $json.listings.'en-us'.baseListing.releaseNotes = $message
+
+        # Add PowerShell version to the top of the description
+        $description = $json.listings.'en-us'.baseListing.description
+        $version = "$(ReleaseTag)"
+        $updatedDescription = "Version: $version`n`n$description"
+        $json.listings.'en-us'.baseListing.description = $updatedDescription
+        Write-Verbose -Verbose "Updated description: $updatedDescription"
+
+        $json | ConvertTo-Json -Depth 100 | Set-Content $jsonPath -Encoding UTF8
+    displayName: 'Add Changelog Link and Version Number to SBJSON'
+
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        # Convert ADO variables to PowerShell boolean variables
+        $IsLTS = '$(LTS)' -eq 'true'
+        $IsStable = '$(STABLE)' -eq 'true' 
+        $IsPreview = '$(PREVIEW)' -eq 'true'
+
+        Write-Verbose -Verbose "Channel Selection - LTS: $(LTS), Stable: $(STABLE), Preview: $(PREVIEW)"
+
+        $currentChannel = if ($IsLTS) { 'LTS' }
+          elseif ($IsStable) { 'Stable' }
+          elseif ($IsPreview) { 'Preview' }
+          else { 
+            Write-Error "No valid channel detected"
+            exit 1
+          }
+
+        # Assign AppID for Store-Publish Task
+        $appID = $null
+        if ($IsLTS) {
+          $appID = '$(AppID-LTS)'
+        }
+        elseif ($IsStable) {
+          $appID = '$(AppID-Stable)'
+        }
+        else {
+          $appID = '$(AppID-Preview)'
+        }
+
+        Write-Host "##vso[task.setvariable variable=AppID]$appID"
+        Write-Verbose -Verbose "Selected channel: $currentChannel"
+        Write-Verbose -Verbose "Conditional tasks will handle the publishing based on channel variables"
+    displayName: 'Validate Channel Selection'
+
+  - task: MS-RDX-MRO.windows-store-publish.publish-task.store-publish@3
+    displayName: 'Publish StoreBroker Package (Stable/LTS)'
+    condition: and(not(${{ parameters.skipMSIXPublish }}), or(eq(variables['STABLE'], 'true'), eq(variables['LTS'], 'true')))
+    inputs:
+      serviceEndpoint: 'StoreAppPublish-Stable'
+      appId: '$(AppID)'
+      inputMethod: JsonAndZip
+      jsonPath: '$(Pipeline.Workspace)\SBOutDir\PowerShellStorePackage.json'
+      zipPath: '$(Pipeline.Workspace)\SBOutDir\PowerShellStorePackage.zip'
+      force: true
+      deletePackages: true
+      numberOfPackagesToKeep: 2
+      jsonZipUpdateMetadata: true
+      targetPublishMode: 'Immediate'
+      skipPolling: true
+
+  - task: MS-RDX-MRO.windows-store-publish.publish-task.store-publish@3
+    displayName: 'Publish StoreBroker Package (Preview)'
+    condition: and(not(${{ parameters.skipMSIXPublish }}), eq(variables['PREVIEW'], 'true'))
+    inputs:
+      serviceEndpoint: 'StoreAppPublish-Preview'
+      appId: '$(AppID)'
+      inputMethod: JsonAndZip
+      jsonPath: '$(Pipeline.Workspace)\SBOutDir\PowerShellStorePackage.json'
+      zipPath: '$(Pipeline.Workspace)\SBOutDir\PowerShellStorePackage.zip'
+      force: true
+      deletePackages: true
+      numberOfPackagesToKeep: 2
+      jsonZipUpdateMetadata: true
+      targetPublishMode: 'Immediate'
+      skipPolling: true
diff --git a/.pipelines/templates/release-MakeBlobPublic.yml b/.pipelines/templates/release-MakeBlobPublic.yml
new file mode 100644
index 00000000000..758298202a1
--- /dev/null
+++ b/.pipelines/templates/release-MakeBlobPublic.yml
@@ -0,0 +1,177 @@
+parameters:
+  - name: SkipPSInfraInstallers
+    displayName: Skip Copying Archives and Installers to PSInfrastructure Public Location
+    type: boolean
+    default: false
+
+jobs:
+- template: /.pipelines/templates/approvalJob.yml@self
+  parameters:
+    displayName: Approve Copy release packages to PSInfra storage
+    jobName: CopyReleaseBlobApproval
+    instructions: |
+      Approval for Copy release packages to PSInfra storage
+
+- job: PSInfraReleaseBlobPublic
+  displayName: Copy release to PSInfra storage
+  dependsOn: CopyReleaseBlobApproval
+  condition: and(succeeded(), ne('${{ parameters.SkipPSInfraInstallers }}', true))
+  pool:
+    name: PowerShell1ES
+    type: windows
+    isCustom: true
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
+
+
+  variables:
+  - group: 'PSInfraStorage'
+  - group: 'Azure Blob variable group'
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+
+  steps:
+    - checkout: self
+      clean: true
+      env:
+        ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+    - template: /.pipelines/templates/SetVersionVariables.yml@self
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: no
+
+    - pwsh: |
+        Get-ChildItem Env:
+      displayName: 'Capture Environment Variables'
+
+    - task: AzurePowerShell@5
+      displayName: Copy blobs to PSInfra storage
+      inputs:
+        azureSubscription: az-blob-cicd-infra
+        scriptType: inlineScript
+        azurePowerShellVersion: LatestVersion
+        pwsh: true
+        inline: |
+          $sourceStorageAccountName = '$(StorageAccount)'
+          $destinationStorageAccountName = '$(PSInfraStorageAccount)'
+          $destinationContainerName = '$web'
+          $destinationPrefix = 'install/$(ReleaseTagVar)'
+
+          $sourceContext = New-AzStorageContext -StorageAccountName $sourceStorageAccountName
+          Write-Verbose -Verbose "Source context: $($sourceContext.BlobEndPoint)"
+
+          $destinationContext = New-AzStorageContext -StorageAccountName $destinationStorageAccountName
+          Write-Verbose -Verbose "Destination context: $($destinationContext.BlobEndPoint)"
+
+          foreach ($sourceContainerName in '$(AzureVersion)', '$(AzureVersion)-gc') {
+            $blobs = Get-AzStorageBlob -Context $sourceContext -Container $sourceContainerName
+
+            Write-Verbose -Verbose "Blobs found in $sourceContainerName"
+            $blobs.Name | Write-Verbose -Verbose
+
+            Write-Verbose -Verbose "Copying blobs from $sourceContainerName to $destinationContainerName/$destinationPrefix"
+
+            foreach ($blob in $blobs) {
+              $sourceBlobName = $blob.Name
+              Write-Verbose -Verbose "sourceBlobName = $sourceBlobName"
+
+              $destinationBlobName = "$destinationPrefix/$sourceBlobName"
+              Write-Verbose -Verbose "destinationBlobName = $destinationBlobName"
+              $existingBlob = Get-AzStorageBlob -Blob $destinationBlobName -Container $destinationContainerName -Context $destinationContext -ErrorAction Ignore
+              if ($existingBlob) {
+                Write-Verbose -Verbose "Blob $destinationBlobName already exists in '$destinationStorageAccountName/$destinationContainerName', removing before copy."
+                $existingBlob | Remove-AzStorageBlob -ErrorAction Stop -Verbose
+              }
+
+              Copy-AzStorageBlob -SourceContext $sourceContext -DestinationContext $destinationContext -SrcContainer $sourceContainerName -SrcBlob $sourceBlobName -DestContainer $destinationContainerName -DestBlob $destinationBlobName -Force -Verbose -Confirm:$false
+            }
+          }
+
+
+- template: /.pipelines/templates/approvalJob.yml@self
+  parameters:
+    displayName: Approve Copy Global tool packages to PSInfra storage
+    jobName: CopyBlobApproval
+    instructions: |
+      Approval for Copy global tool packages to PSInfra storage
+
+- job: PSInfraBlobPublic
+  displayName: Copy global tools to PSInfra storage
+  dependsOn: CopyBlobApproval
+  pool:
+    name: PowerShell1ES
+    type: windows
+    isCustom: true
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
+
+  variables:
+    - group: 'PSInfraStorage'
+    - group: 'Azure Blob variable group'
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+
+  steps:
+    - checkout: self
+      clean: true
+      env:
+        ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+    - template: /.pipelines/templates/SetVersionVariables.yml@self
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: no
+
+    - pwsh: |
+        Get-ChildItem Env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      displayName: 'Capture Environment Variables'
+
+    - task: AzurePowerShell@5
+      displayName: Copy blobs to PSInfra storage
+      inputs:
+        azureSubscription: az-blob-cicd-infra
+        scriptType: inlineScript
+        azurePowerShellVersion: LatestVersion
+        pwsh: true
+        inline: |
+          $sourceStorageAccountName = '$(StorageAccount)'
+          $sourceContainerName = '$(AzureVersion)-nuget'
+          $prefix = 'globaltool'
+
+          $destinationStorageAccountName = '$(PSInfraStorageAccount)'
+          $destinationContainerName = '$web'
+          $destinationPrefix = 'tool/$(Version)'
+
+          $sourceContext = New-AzStorageContext -StorageAccountName $sourceStorageAccountName
+          Write-Verbose -Verbose "Source context: $($sourceContext.BlobEndPoint)"
+
+          $destinationContext = New-AzStorageContext -StorageAccountName $destinationStorageAccountName
+          Write-Verbose -Verbose "Destination context: $($destinationContext.BlobEndPoint)"
+
+          $blobs = Get-AzStorageBlob -Context $sourceContext -Container $sourceContainerName -Prefix $prefix
+
+          Write-Verbose -Verbose "Blobs found in $sourceContainerName"
+          $blobs.Name | Write-Verbose -Verbose
+
+          Write-Verbose -Verbose "Copying blobs from $sourceContainerName to $destinationContainerName/$destinationPrefix"
+
+          foreach ($blob in $blobs) {
+            $sourceBlobName = $blob.Name
+            Write-Verbose -Verbose "sourceBlobName = $sourceBlobName"
+
+            $destinationBlobName = $sourceBlobName -replace "$prefix", $destinationPrefix
+            Write-Verbose -Verbose "destinationBlobName = $destinationBlobName"
+
+            Copy-AzStorageBlob -SourceContext $sourceContext -DestinationContext $destinationContext -SrcContainer $sourceContainerName -SrcBlob $sourceBlobName -DestContainer $destinationContainerName -DestBlob $destinationBlobName -Force -Verbose -Confirm:$false
+          }
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml b/.pipelines/templates/release-SetReleaseTagandContainerName.yml
similarity index 59%
rename from tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml
rename to .pipelines/templates/release-SetReleaseTagandContainerName.yml
index 7e88624b45c..d40551353d2 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml
+++ b/.pipelines/templates/release-SetReleaseTagandContainerName.yml
@@ -1,3 +1,7 @@
+parameters:
+- name: restorePhase
+  default: false
+
 steps:
 - pwsh: |
     $variable = 'releaseTag'
@@ -8,19 +12,25 @@ steps:
     }
 
     $releaseTag = $Branch -replace '^.*((release|rebuild)/)'
-    $vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag"
+    $vstsCommandString = "vso[task.setvariable variable=$Variable;isOutput=true]$releaseTag"
     Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose
     Write-Host -Object "##$vstsCommandString"
+  name: OutputReleaseTag
   displayName: Set Release Tag
+  env:
+    ob_restore_phase: ${{ parameters.restorePhase }}
 
 - pwsh: |
-    $azureVersion = '$(ReleaseTag)'.ToLowerInvariant() -replace '\.', '-'
-    $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
+    $azureVersion = '$(OutputReleaseTag.ReleaseTag)'.ToLowerInvariant() -replace '\.', '-'
+    $vstsCommandString = "vso[task.setvariable variable=AzureVersion;isOutput=true]$azureVersion"
     Write-Host "sending " + $vstsCommandString
     Write-Host "##$vstsCommandString"
 
-    $version = '$(ReleaseTag)'.ToLowerInvariant().Substring(1)
-    $vstsCommandString = "vso[task.setvariable variable=Version]$version"
+    $version = '$(OutputReleaseTag.ReleaseTag)'.ToLowerInvariant().Substring(1)
+    $vstsCommandString = "vso[task.setvariable variable=Version;isOutput=true]$version"
     Write-Host ("sending " + $vstsCommandString)
     Write-Host "##$vstsCommandString"
+  name: OutputVersion
   displayName: Set container name
+  env:
+    ob_restore_phase: ${{ parameters.restorePhase }}
diff --git a/.pipelines/templates/release-SetTagAndChangelog.yml b/.pipelines/templates/release-SetTagAndChangelog.yml
new file mode 100644
index 00000000000..b33e652b3c7
--- /dev/null
+++ b/.pipelines/templates/release-SetTagAndChangelog.yml
@@ -0,0 +1,51 @@
+jobs:
+- job: setTagAndChangelog
+  displayName: Set Tag and Upload Changelog
+  condition: succeeded()
+  pool:
+    type: windows
+  variables:
+  - group: 'mscodehub-code-read-akv'
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  steps:
+  - template: release-SetReleaseTagandContainerName.yml@self
+
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true
+
+  - pwsh: |
+      Write-Verbose -Verbose "Release Tag: $(OutputReleaseTag.releaseTag)"
+      $releaseVersion = '$(OutputReleaseTag.releaseTag)' -replace '^v',''
+      Write-Verbose -Verbose "Release Version: $releaseVersion"
+      $semanticVersion = [System.Management.Automation.SemanticVersion]$releaseVersion
+
+      $isPreview = $semanticVersion.PreReleaseLabel -ne $null
+
+      $fileName = if ($isPreview) {
+        "preview.md"
+      }
+      else {
+        $semanticVersion.Major.ToString() + "." + $semanticVersion.Minor.ToString() + ".md"
+      }
+
+      $filePath = "$(Build.SourcesDirectory)/PowerShell/CHANGELOG/$fileName"
+      Write-Verbose -Verbose "Selected Log file: $filePath"
+
+      if (-not (Test-Path -Path $filePath)) {
+        Write-Error "Changelog file not found: $filePath"
+        exit 1
+      }
+      
+      Write-Verbose -Verbose "Creating output directory for CHANGELOG: $(ob_outputDirectory)/CHANGELOG"
+      New-Item -Path $(ob_outputDirectory)/CHANGELOG -ItemType Directory -Force
+      Copy-Item -Path $filePath -Destination $(ob_outputDirectory)/CHANGELOG
+    displayName: Upload Changelog
+
+  - template: channelSelection.yml@self
diff --git a/.pipelines/templates/release-githubNuget.yml b/.pipelines/templates/release-githubNuget.yml
new file mode 100644
index 00000000000..e7c36a49fe6
--- /dev/null
+++ b/.pipelines/templates/release-githubNuget.yml
@@ -0,0 +1,218 @@
+parameters:
+  - name: skipPublish
+    type: boolean
+
+jobs:
+- job: GithubReleaseDraft
+  displayName: Create GitHub Release Draft
+  condition: succeeded()
+  pool:
+    type: release
+    os: windows
+  templateContext:
+    inputs:
+      - input: pipelineArtifact
+        artifactName: drop_setReleaseTagAndChangelog_SetTagAndChangelog
+      - input: pipelineArtifact
+        pipeline: PSPackagesOfficial
+        artifactName: drop_upload_upload_packages
+  variables:
+    - template: ./variables/release-shared.yml@self
+      parameters:
+        RELEASETAG: $[ stageDependencies.setReleaseTagAndChangelog.setTagAndChangelog.outputs['OutputReleaseTag.releaseTag'] ]
+
+  steps:
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        Write-Verbose -Verbose "Release Tag: $(ReleaseTag)"
+        Get-ChildItem Env: | Out-String -Stream | Write-Verbose -Verbose
+    displayName: 'Capture Environment Variables'
+
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        $Path = "$(Pipeline.Workspace)/GitHubPackages"
+
+        # The .exe packages are for Windows Update only and should not be uploaded to GitHub release.
+        $exefiles = Get-ChildItem -Path $Path -Filter *.exe
+        if ($exefiles) {
+            Write-Verbose -Verbose "Remove .exe packages:"
+            $exefiles | Remove-Item -Force -Verbose
+        }
+
+        # The .msi packages should not be uploaded to GitHub release.
+        $msifiles = Get-ChildItem -Path $Path -Filter *.msi
+        if ($msifiles) {
+            Write-Verbose -Verbose "Remove .msi packages:"
+            $msifiles | Remove-Item -Force -Verbose
+        }
+
+        $OutputPath = Join-Path $Path 'hashes.sha256'
+        $packages  = Get-ChildItem -Path $Path -Include * -Recurse -File
+        $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
+  
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        Get-ChildItem $(Pipeline.Workspace) -recurse | Select-Object -ExpandProperty FullName
+    displayName: List all files in the workspace
+
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        $releaseVersion = '$(ReleaseTag)' -replace '^v',''
+        Write-Verbose -Verbose "Available modules: "
+        Get-Module | Write-Verbose -Verbose
+
+        $filePath = Get-ChildItem -Path "$(Pipeline.Workspace)/CHANGELOG" -Filter '*.md' | Select-Object -First 1 -ExpandProperty FullName
+  
+        if (-not (Test-Path $filePath)) {
+          throw "$filePath not found"
+        }
+  
+        $changelog = Get-Content -Path $filePath
+  
+        $headingPattern = "^## \[\d+\.\d+\.\d+"
+        $headingStartLines = $changelog | Select-String -Pattern $headingPattern | Select-Object -ExpandProperty LineNumber
+        $startLine = $headingStartLines[0]
+        $endLine = $headingStartLines[1] - 1
+  
+        $clContent = $changelog | Select-Object -Skip ($startLine-1) -First ($endLine - $startLine) | Out-String
+
+        $StringBuilder = [System.Text.StringBuilder]::new($clContent, $clContent.Length + 2kb)
+        $StringBuilder.AppendLine().AppendLine() > $null
+        $StringBuilder.AppendLine("### SHA256 Hashes of the release artifacts").AppendLine() > $null
+        Get-ChildItem -Path "$(Pipeline.Workspace)/GitHubPackages/" -File | ForEach-Object {
+            $PackageName = $_.Name
+            $SHA256 = (Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash
+            $StringBuilder.AppendLine("- $PackageName").AppendLine("  - $SHA256") > $null
+        }
+
+        $clContent = $StringBuilder.ToString()
+  
+        Write-Verbose -Verbose "Selected content: `n$clContent"
+
+        $releaseNotesFilePath = "$(Pipeline.Workspace)/release-notes.md"
+        $clContent | Out-File -FilePath $releaseNotesFilePath -Encoding utf8
+  
+        Write-Host "##vso[task.setvariable variable=ReleaseNotesFilePath;]$releaseNotesFilePath"
+  
+        #if name has prelease then make prerelease true as a variable
+        if ($releaseVersion -like '*-*') {
+            Write-Host "##vso[task.setvariable variable=IsPreRelease;]true"
+        } else {
+            Write-Host "##vso[task.setvariable variable=IsPreRelease;]false"
+        }
+    displayName: Set variables for GitHub release task
+
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        Write-Host "ReleaseNotes content:"
+        Get-Content "$(Pipeline.Workspace)/release-notes.md" -Raw | Out-String -width 9999 | Write-Host
+    displayName: Verify Release Notes
+
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        $middleURL = ''
+        $tagString = "$(ReleaseTag)"
+        Write-Verbose -Verbose "Use the following command to push the tag:"
+        if ($tagString -match '-preview') {
+          $middleURL = "preview"
+        }
+        elseif ($tagString -match '(\d+\.\d+)') {
+          $middleURL = $matches[1]
+        }
+        $endURL = $tagString -replace '^v|\.', ''
+        $message = "https://github.com/PowerShell/PowerShell/blob/master/CHANGELOG/$middleURL.md#$endURL"
+        Write-Verbose -Verbose "git tag -a $(ReleaseTag) $env:BUILD_SOURCEVERSION -m $message"
+    displayName: Git Push Tag Command
+
+  - task: GitHubRelease@1
+    inputs:
+      gitHubConnection: GitHubReleasePAT
+      repositoryName: PowerShell/PowerShell
+      target: master
+      assets: '$(Pipeline.Workspace)/GitHubPackages/*'
+      tagSource: 'userSpecifiedTag'
+      tag: '$(ReleaseTag)'
+      title: "$(ReleaseTag) Release of PowerShell"
+      isDraft: true
+      addChangeLog: false
+      action: 'create'
+      releaseNotesFilePath: '$(ReleaseNotesFilePath)'
+      isPrerelease: '$(IsPreRelease)'
+
+- job: NuGetPublish
+  displayName: Publish to NuGet
+  condition: succeeded()
+  pool:
+    type: release
+    os: windows
+  templateContext:
+    inputs:
+      - input: pipelineArtifact
+        pipeline: PSPackagesOfficial
+        artifactName: drop_upload_upload_packages
+  variables:
+  - template: ./variables/release-shared.yml@self
+    parameters:
+      VERSION: $[ stageDependencies.setReleaseTagAndChangelog.SetTagAndChangelog.outputs['OutputVersion.Version'] ]
+
+  steps:
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        Write-Verbose -Verbose "Version: $(Version)"
+        Get-ChildItem Env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: 'Capture Environment Variables'
+
+  - task: PowerShell@2
+    inputs:
+      targetType: inline
+      script: |
+        #Exclude all global tool packages. Their names start with 'PowerShell.'
+        $null = New-Item -ItemType Directory -Path "$(Pipeline.Workspace)/release"
+        Copy-Item "$(Pipeline.Workspace)/NuGetPackages/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force -Verbose
+
+        $releaseVersion = '$(Version)'
+        $globalToolPath = "$(Pipeline.Workspace)/NuGetPackages/PowerShell.$releaseVersion.nupkg"
+
+        if ($releaseVersion -notlike '*-*') {
+            # Copy the global tool package for stable releases
+            Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release"
+        }
+
+        Write-Verbose -Verbose "The .nupkgs below will be pushed:"
+        Get-ChildItem "$(Pipeline.Workspace)/release" -recurse
+    displayName: Download and capture nupkgs
+    condition: and(ne('${{ parameters.skipPublish }}', 'true'), succeeded())
+
+  - task: NuGetCommand@2
+    displayName: 'NuGet push'
+    condition: and(ne('${{ parameters.skipPublish }}', 'true'), succeeded())
+    inputs:
+      command: push
+      packagesToPush: '$(Pipeline.Workspace)/release/*.nupkg'
+      nuGetFeedType: external
+      publishFeedCredentials: PowerShellNuGetOrgPush
diff --git a/.pipelines/templates/release-prep-for-ev2.yml b/.pipelines/templates/release-prep-for-ev2.yml
new file mode 100644
index 00000000000..3ad716a3af4
--- /dev/null
+++ b/.pipelines/templates/release-prep-for-ev2.yml
@@ -0,0 +1,231 @@
+parameters:
+- name: skipPublish
+  type: boolean
+  default: false
+
+stages:
+- stage: PrepForEV2
+  displayName: 'Copy and prep all files needed for EV2 stage'
+  jobs:
+  - job: CopyEV2FilesToArtifact
+    displayName: 'Copy EV2 Files to Artifact'
+    pool:
+      type: linux
+    templateContext:
+      inputs:
+        - input: pipelineArtifact
+          pipeline: PSPackagesOfficial
+          artifactName: drop_linux_package_deb
+        - input: pipelineArtifact
+          pipeline: PSPackagesOfficial
+          artifactName: drop_linux_package_rpm
+        - input: pipelineArtifact
+          pipeline: PSPackagesOfficial
+          artifactName: drop_linux_package_mariner_x64
+        - input: pipelineArtifact
+          pipeline: PSPackagesOfficial
+          artifactName: drop_linux_package_mariner_arm64
+    variables:
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: repoRoot
+      value: '$(Build.SourcesDirectory)/PowerShell'
+    - name: ev2ServiceGroupRootFolder
+      value: '$(Build.SourcesDirectory)/PowerShell/.pipelines/EV2Specs/ServiceGroupRoot'
+    - name: ev2ParametersFolder
+      value: '$(Build.SourcesDirectory)/PowerShell/.pipelines/EV2Specs/ServiceGroupRoot/Parameters'
+    - group: 'mscodehub-code-read-akv'
+    - group: 'packages.microsoft.com'
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)/PowerShell/.config/suppress.json
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)/PowerShell/.config/tsaoptions.json
+    steps:
+    - checkout: self ## the global setting on lfs didn't work
+      lfs: false
+      env:
+        ob_restore_phase: true
+
+    - template: release-SetReleaseTagandContainerName.yml
+      parameters:
+        restorePhase: true
+
+    - pwsh: |
+        $packageVersion = '$(OutputReleaseTag.ReleaseTag)'.ToLowerInvariant() -replace '^v',''
+        $vstsCommandString = "vso[task.setvariable variable=packageVersion]$packageVersion"
+        Write-Host "sending " + $vstsCommandString
+        Write-Host "##$vstsCommandString"
+      displayName: Set Package version
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        $branch = 'mirror-target'
+        $gitArgs = "clone",
+        "--verbose",
+        "--branch",
+        "$branch",
+        "https://$(mscodehubCodeReadPat)@mscodehub.visualstudio.com/PowerShellCore/_git/Internal-PowerShellTeam-Tools",
+        '$(Pipeline.Workspace)/tools'
+        $gitArgs | Write-Verbose -Verbose
+        git $gitArgs
+      displayName: Clone Internal-PowerShellTeam-Tools from MSCodeHub
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        Get-ChildItem Env: | Out-String -Stream | write-Verbose -Verbose
+      displayName: 'Capture Environment Variables'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        Get-ChildItem '$(Build.SourcesDirectory)'
+      displayName: 'Capture BuildDirectory'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        Get-ChildItem '$(Pipeline.Workspace)' -Recurse | Out-String -Stream | write-Verbose -Verbose
+      displayName: 'Capture Workspace'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        New-Item -Path '$(ev2ParametersFolder)' -ItemType Directory
+      displayName: 'Create Parameters folder under EV2Specs folder'
+      env:
+        ob_restore_phase: true
+
+    - task: PipAuthenticate@1
+      inputs:
+        artifactFeeds: 'PowerShellCore/PowerShellCore_PublicPackages'
+      displayName: 'Pip Authenticate'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        python3 -m pip install --upgrade pip
+        pip --version --verbose
+
+        Write-Verbose -Verbose "Download pmc-cli to folder without installing it"
+        $pythonDlFolderPath = Join-Path '$(ev2ServiceGroupRootFolder)/Shell/Run' -ChildPath "python_dl"
+        pip download -d $pythonDlFolderPath pmc-cli --platform=manylinux_2_17_x86_64 --only-binary=:all: --verbose
+      displayName: 'Download pmc-cli package'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        Write-Verbose -Verbose "Copy ESRP signed .deb and .rpm packages"
+        # templateContext.inputs places the PSPackagesOfficial pipelineArtifact files
+        # directly under $(Pipeline.Workspace), not in per-artifact subfolders.
+        $downloadedPipelineFolder = '$(Pipeline.Workspace)'
+        $srcFilesFolder = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'SourceFiles'
+        New-Item -Path $srcFilesFolder -ItemType Directory
+        $packagesFolder = Join-Path -Path $srcFilesFolder -ChildPath 'packages'
+        New-Item -Path $packagesFolder -ItemType Directory
+
+        $packageFiles = Get-ChildItem -Path $downloadedPipelineFolder -File | Where-Object { $_.Extension -in '.deb', '.rpm' }
+        foreach ($file in $packageFiles)
+        {
+          Write-Verbose -Verbose "copying file: $($file.FullName)"
+          Copy-Item -Path $($file.FullName) -Destination $packagesFolder -Verbose
+        }
+
+        $packagesTarGzDestination = Join-Path -Path '$(ev2ParametersFolder)' -ChildPath 'packages.tar.gz'
+        tar -czvf $packagesTarGzDestination -C $packagesFolder .
+      displayName: 'Copy signed .deb and .rpm packages to .tar.gz to pass as a file var to shell extension'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        $pathToPMCMetadataFile = Join-Path -Path '$(ev2ParametersFolder)' -ChildPath 'pmcMetadata.json'
+
+        $metadata = Get-Content -Path "$(repoRoot)/tools/metadata.json" -Raw | ConvertFrom-Json
+        $metadataHash = @{}
+        $skipPublishValue = '${{ parameters.skipPublish }}'
+        $metadataHash["ReleaseTag"] = '$(OutputReleaseTag.ReleaseTag)'
+        $metadataHash["LTS"] = $metadata.LTSRelease.PublishToChannels
+        $metadataHash["ForProduction"] = $true
+        $metadataHash["SkipPublish"] = [System.Convert]::ToBoolean($skipPublishValue)
+
+        $metadataHash | ConvertTo-Json | Out-File $pathToPMCMetadataFile
+
+        $mappingFilePath = Join-Path -Path '$(repoRoot)/tools/packages.microsoft.com' -ChildPath 'mapping.json'
+        $mappingFilePathExists = Test-Path $mappingFilePath
+        $mappingFileEV2Path = Join-Path -Path '$(ev2ParametersFolder)' -ChildPath "mapping.json"
+        Write-Verbose -Verbose "Copy mapping.json file at: $mappingFilePath which exists: $mappingFilePathExists to: $mappingFileEV2Path"
+        Copy-Item -Path $mappingFilePath -Destination $mappingFileEV2Path
+      displayName: 'Create pmcScriptMetadata.json and mapping.json file'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        $pathToJsonFile = Join-Path -Path '$(ev2ServiceGroupRootFolder)' -ChildPath 'RolloutSpec.json'
+        $content = Get-Content -Path $pathToJsonFile | ConvertFrom-Json
+        $content.RolloutMetadata.Notification.Email.To = '$(PmcEV2SupportEmail)'
+        Remove-Item -Path $pathToJsonFile
+        $content | ConvertTo-Json -Depth 4 | Out-File $pathToJsonFile
+      displayName: 'Replace values in RolloutSpecPath.json'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        $pathToJsonFile = Join-Path -Path '$(ev2ServiceGroupRootFolder)' -ChildPath 'UploadLinux.Rollout.json'
+        $content = Get-Content -Path $pathToJsonFile | ConvertFrom-Json
+
+        $identityString = "/subscriptions/$(PmcSubscription)/resourcegroups/$(PmcResourceGroup)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$(PmcMIName)"
+        $content.shellExtensions.launch.identity.userAssignedIdentities[0] = $identityString
+
+        Remove-Item -Path $pathToJsonFile
+        $content | ConvertTo-Json -Depth 6 | Out-File $pathToJsonFile
+      displayName: 'Replace values in UploadLinux.Rollout.json file'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        $pathToJsonFile = Join-Path -Path '$(ev2ServiceGroupRootFolder)' -ChildPath 'ServiceModel.json'
+        $content = Get-Content -Path $pathToJsonFile | ConvertFrom-Json
+        $content.ServiceResourceGroups[0].AzureResourceGroupName = '$(PmcResourceGroup)'
+        $content.ServiceResourceGroups[0].AzureSubscriptionId = '$(PmcSubscription)'
+
+        Remove-Item -Path $pathToJsonFile
+        $content | ConvertTo-Json -Depth 9 | Out-File $pathToJsonFile
+      displayName: 'Replace values in ServiceModel.json'
+      env:
+        ob_restore_phase: true
+
+    - pwsh: |
+        $settingFilePath = Join-Path '$(ev2ServiceGroupRootFolder)/Shell/Run' -ChildPath 'settings.toml'
+        New-Item -Path $settingFilePath -ItemType File
+        $pmcMIClientID = '$(PmcMIClientID)'
+        $pmcEndpoint = '$(PmcEndpointUrl)'
+
+        Add-Content -Path $settingFilePath -Value "[default]"
+        Add-Content -Path $settingFilePath -Value "base_url = `"$pmcEndpoint`""
+        Add-Content -Path $settingFilePath -Value "auth_type = `"msi`""
+        Add-Content -Path $settingFilePath -Value "client_id = `"$pmcMIClientID`""
+      displayName: 'Create settings.toml file with MI clientId populated'
+      env:
+        ob_restore_phase: true
+
+    - task: onebranch.pipeline.signing@1
+      inputs:
+        command: 'sign'
+        signing_profile: external_distribution
+        files_to_sign: '*.ps1'
+        search_root: '$(repoRoot)/.pipelines/EV2Specs/ServiceGroupRoot/Shell/Run'
+      displayName: Sign Run.ps1
+
+    - pwsh: |
+        # folder to tar must have: Run.ps1, settings.toml, python_dl
+        $srcPath = Join-Path '$(ev2ServiceGroupRootFolder)' -ChildPath 'Shell'
+        $pathToRunTarFile = Join-Path $srcPath -ChildPath "Run.tar"
+        tar -cvf $pathToRunTarFile -C $srcPath ./Run
+      displayName: 'Create archive for the shell extension'
+
+    - task: CopyFiles@2
+      inputs:
+        SourceFolder: '$(repoRoot)/.pipelines'
+        Contents: 'EV2Specs/**'
+        TargetFolder: $(ob_outputDirectory)
diff --git a/.pipelines/templates/release-publish-pmc.yml b/.pipelines/templates/release-publish-pmc.yml
new file mode 100644
index 00000000000..dc7fc8534e3
--- /dev/null
+++ b/.pipelines/templates/release-publish-pmc.yml
@@ -0,0 +1,56 @@
+parameters:
+- name: releaseEnvironment
+  type: string
+  default: Production
+  values:
+    - Production
+    - PPE
+    - Test
+- name: approvalServiceEnvironment
+  type: string
+  default: Production
+  values:
+    - Production
+    - PPE
+    - Test
+# OneBranch requires the stage name to be prefixed with the release environment.
+# Official uses 'Prod' for Production; NonProd validators require '<env>' (e.g. 'Test', 'PPE').
+- name: stagePrefix
+  type: string
+  default: Prod
+# When true, the Ev2 push step is skipped. Useful for NonOfficial dry-runs that
+# only want to validate artifact download via templateContext.inputs.
+- name: skipEv2Push
+  type: boolean
+  default: false
+
+stages:
+- stage: ${{ parameters.stagePrefix }}_Release
+  displayName: 'Deploy packages to PMC with EV2'
+  dependsOn:
+  - PrepForEV2
+  variables:
+    - name: ob_release_environment
+      value: ${{ parameters.releaseEnvironment }}
+    - name: repoRoot
+      value: $(Build.SourcesDirectory)
+  jobs:
+  - job: ${{ parameters.stagePrefix }}_ReleaseJob
+    displayName: Publish to PMC
+    pool:
+      type: release
+    templateContext:
+      inputs:
+        - input: pipelineArtifact
+          artifactName: drop_PrepForEV2_CopyEv2FilesToArtifact
+
+    steps:
+    - ${{ if not(parameters.skipEv2Push) }}:
+      - task: vsrm-ev2.vss-services-ev2.adm-release-task.ExpressV2Internal@1
+        displayName: 'Ev2: Push to PMC'
+        inputs:
+          UseServerMonitorTask: true
+          EndpointProviderType: ApprovalService
+          ApprovalServiceEnvironment: ${{ parameters.approvalServiceEnvironment }}
+          ServiceRootPath: '$(Pipeline.Workspace)/EV2Specs/ServiceGroupRoot'
+          RolloutSpecPath: '$(Pipeline.Workspace)/EV2Specs/ServiceGroupRoot/RolloutSpec.json'
diff --git a/.pipelines/templates/release-symbols.yml b/.pipelines/templates/release-symbols.yml
new file mode 100644
index 00000000000..a628f4d7127
--- /dev/null
+++ b/.pipelines/templates/release-symbols.yml
@@ -0,0 +1,89 @@
+parameters:
+  - name: skipPublish
+    default: false
+    type: boolean
+
+jobs:
+- job: PublishSymbols
+  displayName: Publish Symbols
+  condition: succeeded()
+  pool:
+    type: windows
+  variables:
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: DOTNET_NOLOGO
+    value: 1
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_binskim_enabled
+    value: false
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: release-SetReleaseTagandContainerName.yml
+
+  - pwsh: |
+      Get-ChildItem Env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: 'Capture Environment Variables'
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_windows_build_windows_x64_release
+    patterns: 'symbols.zip'
+    displayName: Download winx64
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_windows_build_windows_x86_release
+    patterns: 'symbols.zip'
+    displayName: Download winx86
+
+  - download: CoOrdinatedBuildPipeline
+    artifact: drop_windows_build_windows_arm64_release
+    patterns: 'symbols.zip'
+    displayName: Download winx64
+
+  - pwsh: |
+      Write-Verbose -Verbose "Enumerating $(Pipeline.Workspace)\CoOrdinatedBuildPipeline"
+      $downloadedArtifacts = Get-ChildItem -Path "$(Pipeline.Workspace)\CoOrdinatedBuildPipeline" -Recurse -Filter 'symbols.zip'
+      $downloadedArtifacts
+      $expandedRoot = New-Item -Path "$(Pipeline.Workspace)/expanded" -ItemType Directory -Verbose
+      $symbolsRoot = New-Item -Path "$(Pipeline.Workspace)/symbols" -ItemType Directory -Verbose
+
+      $downloadedArtifacts | ForEach-Object {
+        $folderName = (Get-Item (Split-Path $_.FullName)).Name
+        Write-Verbose -Verbose "Expanding $($_.FullName) to $expandedRoot/$folderName/$($_.BaseName)"
+        $destFolder = New-Item -Path "$expandedRoot/$folderName/$($_.BaseName)/" -ItemType Directory -Verbose
+        Expand-Archive -Path $_.FullName -DestinationPath $destFolder -Force
+
+        $symbolsToPublish = New-Item -Path "$symbolsRoot/$folderName/$($_.BaseName)" -ItemType Directory -Verbose
+
+        Get-ChildItem -Path $destFolder -Recurse -Filter '*.pdb' | ForEach-Object {
+          Copy-Item -Path $_.FullName -Destination $symbolsToPublish -Verbose
+        }
+      }
+
+      Write-Verbose -Verbose "Enumerating $symbolsRoot"
+      Get-ChildItem -Path $symbolsRoot -Recurse
+      $vstsCommandString = "vso[task.setvariable variable=SymbolsPath]$symbolsRoot"
+      Write-Verbose -Message "$vstsCommandString" -Verbose
+      Write-Host -Object "##$vstsCommandString"
+    displayName: Expand and capture symbols folders
+
+  - task: PublishSymbols@2
+    inputs:
+      symbolsFolder: '$(SymbolsPath)'
+      searchPattern: '**/*.pdb'
+      indexSources: false
+      publishSymbols: true
+      symbolServerType: teamServices
+      detailedLog: true
diff --git a/.pipelines/templates/release-upload-buildinfo.yml b/.pipelines/templates/release-upload-buildinfo.yml
new file mode 100644
index 00000000000..9e3d6a6accb
--- /dev/null
+++ b/.pipelines/templates/release-upload-buildinfo.yml
@@ -0,0 +1,164 @@
+parameters:
+  - name: skipPublish
+    default: false
+    type: boolean
+
+jobs:
+- job: BuildInfoPublish
+  displayName: Publish BuildInfo
+  condition: succeeded()
+  pool:
+    name: PowerShell1ES
+    type: windows
+    isCustom: true
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
+  variables:
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: DOTNET_NOLOGO
+    value: 1
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - group: 'Azure Blob variable group'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_binskim_enabled
+    value: false
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: release-SetReleaseTagandContainerName.yml
+
+  - pwsh: |
+      Get-ChildItem Env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: 'Capture Environment Variables'
+
+  - download: PSPackagesOfficial
+    artifact: BuildInfoJson
+    displayName: Download build info artifact
+
+  - pwsh: |
+      $toolsDirectory = '$(Build.SourcesDirectory)/tools'
+      Import-Module "$toolsDirectory/ci.psm1"
+      $jsonFile = Get-Item "$ENV:PIPELINE_WORKSPACE/PSPackagesOfficial/BuildInfoJson/*.json"
+      $fileName = Split-Path $jsonFile -Leaf
+      # The build itself has already determined if it is preview or stable/LTS,
+      # we just need to check via the file name
+      $isPreview = $fileName -eq "preview.json"
+      $isStable = $fileName -eq "stable.json"
+
+      $dateTime = [datetime]::UtcNow
+      $dateTime = [datetime]::new($dateTime.Ticks - ($dateTime.Ticks % [timespan]::TicksPerSecond), $dateTime.Kind)
+
+      $metadata = Get-Content -LiteralPath "$toolsDirectory/metadata.json" -ErrorAction Stop | ConvertFrom-Json
+      # Note: version tags in metadata.json (e.g. StableReleaseTag) may not reflect the current release being
+      # published, so they must not be used to gate channel decisions. Use the explicit publish flags instead.
+      $stableRelease = $metadata.StableRelease.PublishToChannels
+      $ltsRelease = $metadata.LTSRelease.PublishToChannels
+
+      Write-Verbose -Verbose "Writing $jsonFile contents:"
+      $buildInfoJsonContent = Get-Content $jsonFile -Encoding UTF8NoBom -Raw
+      Write-Verbose -Verbose $buildInfoJsonContent
+
+      $buildInfo =  $buildInfoJsonContent | ConvertFrom-Json
+      $buildInfo.ReleaseDate = $dateTime
+      $currentReleaseTag = $buildInfo.ReleaseTag -Replace 'v',''
+
+      $targetFile = "$ENV:PIPELINE_WORKSPACE/$fileName"
+      ConvertTo-Json -InputObject $buildInfo | Out-File $targetFile -Encoding ascii
+
+      if ($isPreview) {
+        Set-BuildVariable -Name UploadPreview -Value YES
+      } else {
+        Set-BuildVariable -Name UploadPreview -Value NO
+      }
+
+      Set-BuildVariable -Name PreviewBuildInfoFile -Value $targetFile
+
+      ## Create 'lts.json' if marked as a LTS release.
+      if ($isStable) {
+        if ($ltsRelease) {
+          $ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
+          Copy-Item -Path $targetFile -Destination $ltsFile -Force
+          Set-BuildVariable -Name LTSBuildInfoFile -Value $ltsFile
+          Set-BuildVariable -Name UploadLTS -Value YES
+        } else {
+          Set-BuildVariable -Name UploadLTS -Value NO
+        }
+
+        ## Gate stable.json upload on the metadata publish flag.
+        if ($stableRelease) {
+          Set-BuildVariable -Name StableBuildInfoFile -Value $targetFile
+          Set-BuildVariable -Name UploadStable -Value YES
+        } else {
+          Set-BuildVariable -Name UploadStable -Value NO
+        }
+
+        ## Always publish the version-specific {Major}-{Minor}.json for non-preview builds.
+        [System.Management.Automation.SemanticVersion] $currentVersion = $currentReleaseTag
+        $versionFile = "$ENV:PIPELINE_WORKSPACE/$($currentVersion.Major)-$($currentVersion.Minor).json"
+        Copy-Item -Path $targetFile -Destination $versionFile -Force
+        Set-BuildVariable -Name VersionSpecificBuildInfoFile -Value $versionFile
+        Set-BuildVariable -Name UploadVersionSpecific -Value YES
+
+      } else {
+        Set-BuildVariable -Name UploadStable -Value NO
+        Set-BuildVariable -Name UploadVersionSpecific -Value NO
+      }
+    displayName: Create json files
+
+  - task: AzurePowerShell@5
+    displayName: Upload buildjson to blob
+    inputs:
+      azureSubscription: az-blob-cicd-infra
+      scriptType: inlineScript
+      azurePowerShellVersion: LatestVersion
+      pwsh: true
+      inline: |
+        $containerName = '$web'
+        $storageAccount = '$(PSInfraStorageAccount)'
+        $prefix = "buildinfo"
+
+        $storageContext = New-AzStorageContext -StorageAccountName $storageAccount -UseConnectedAccount
+
+        #preview
+        if ($env:UploadPreview -eq 'YES') {
+          $jsonFile = "$env:PreviewBuildInfoFile"
+          $blobName = Get-Item $jsonFile | Split-Path -Leaf
+          Write-Verbose -Verbose "Uploading $jsonFile to $containerName/$prefix/$blobName"
+          Set-AzStorageBlobContent -File $jsonFile -Container $containerName -Blob "$prefix/$blobName" -Context $storageContext -Force
+        }
+
+        #LTS
+        if ($env:UploadLTS -eq 'YES') {
+          $jsonFile = "$env:LTSBuildInfoFile"
+          $blobName = Get-Item $jsonFile | Split-Path -Leaf
+          Write-Verbose -Verbose "Uploading $jsonFile to $containerName/$prefix/$blobName"
+          Set-AzStorageBlobContent -File $jsonFile -Container $containerName -Blob "$prefix/$blobName" -Context $storageContext -Force
+        }
+
+        #stable
+        if ($env:UploadStable -eq 'YES') {
+          $jsonFile = "$env:StableBuildInfoFile"
+          $blobName = Get-Item $jsonFile | Split-Path -Leaf
+          Write-Verbose -Verbose "Uploading $jsonFile to $containerName/$prefix/$blobName"
+          Set-AzStorageBlobContent -File $jsonFile -Container $containerName -Blob "$prefix/$blobName" -Context $storageContext -Force
+        }
+
+        #version-specific
+        if ($env:UploadVersionSpecific -eq 'YES') {
+          $jsonFile = "$env:VersionSpecificBuildInfoFile"
+          $blobName = Get-Item $jsonFile | Split-Path -Leaf
+          Write-Verbose -Verbose "Uploading $jsonFile to $containerName/$prefix/$blobName"
+          Set-AzStorageBlobContent -File $jsonFile -Container $containerName -Blob "$prefix/$blobName" -Context $storageContext -Force
+        }
+    condition: and(succeeded(), or(eq(variables['UploadPreview'], 'YES'), eq(variables['UploadLTS'], 'YES'), eq(variables['UploadStable'], 'YES'), eq(variables['UploadVersionSpecific'], 'YES')))
diff --git a/.pipelines/templates/release-validate-fxdpackages.yml b/.pipelines/templates/release-validate-fxdpackages.yml
new file mode 100644
index 00000000000..3f4f9a3bb6c
--- /dev/null
+++ b/.pipelines/templates/release-validate-fxdpackages.yml
@@ -0,0 +1,118 @@
+parameters:
+  - name: jobName
+    type: string
+    default: ""
+  - name: displayName
+    type: string
+    default: ""
+  - name: jobtype
+    type: string
+    default: ""
+  - name: artifactName
+    type: string
+    default: ""
+  - name: packageNamePattern
+    type: string
+    default: ""
+  - name: arm64
+    type: string
+    default: "no"
+  - name: enableCredScan
+    type: boolean
+    default: true
+
+jobs:
+- job: ${{ parameters.jobName }}
+  displayName: ${{ parameters.displayName }}
+  variables:
+  - group: DotNetPrivateBuildAccess
+  - name: artifactName
+    value: ${{ parameters.artifactName }}
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_enabled
+    value: ${{ parameters.enableCredScan }}
+
+  pool:
+    type: ${{ parameters.jobtype }}
+    ${{ if eq(parameters.arm64, 'yes') }}:
+      hostArchitecture: arm64
+
+  steps:
+    - checkout: self
+      clean: true
+
+    - template: release-SetReleaseTagandContainerName.yml@self
+
+    - download: PSPackagesOfficial
+      artifact: "${{ parameters.artifactName }}"
+      displayName: Download fxd artifact
+
+    - pwsh: |
+        Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      displayName: Capture environment
+
+    - pwsh: |
+        $artifactName = '$(artifactName)'
+        Get-ChildItem "$(Pipeline.Workspace)/PSPackagesOfficial/$artifactName" -Recurse
+      displayName: 'Capture Downloaded Artifacts'
+
+    - template: /.pipelines/templates/install-dotnet.yml@self
+
+    - pwsh: |
+        $artifactName = '$(artifactName)'
+        $rootPath = "$(Pipeline.Workspace)/PSPackagesOfficial/$artifactName"
+
+        $destPath = New-Item "$rootPath/fxd" -ItemType Directory
+        $packageNameFilter = '${{ parameters.packageNamePattern }}'
+
+        if ($packageNameFilter.EndsWith('tar.gz')) {
+            $package = @(Get-ChildItem -Path "$rootPath/*.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 "$rootPath/*.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: |
+        $repoRoot = "$(Build.SourcesDirectory)/PowerShell"
+        $artifactName = '$(artifactName)'
+        $rootPath = "$(Pipeline.Workspace)/PSPackagesOfficial/$artifactName"
+
+        $env:DOTNET_NOLOGO=1
+        Import-Module "$repoRoot/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' }
+        $pwshPath = Join-Path "$rootPath/fxd" $pwshExeName
+
+        if ($IsLinux) {
+          chmod u+x $pwshPath
+        }
+
+        $pwshDllPath = Join-Path "$rootPath/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"
+        }
+      displayName: Test package
diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/.pipelines/templates/release-validate-globaltools.yml
similarity index 51%
rename from tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
rename to .pipelines/templates/release-validate-globaltools.yml
index 8591791de0e..8c2031d5cc9 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/.pipelines/templates/release-validate-globaltools.yml
@@ -1,7 +1,7 @@
 parameters:
   jobName: ""
   displayName: ""
-  imageName: ""
+  jobtype: "windows"
   globalToolExeName: 'pwsh.exe'
   globalToolPackageName: 'PowerShell.Windows.x64'
 
@@ -10,75 +10,51 @@ jobs:
 - job: ${{ parameters.jobName }}
   displayName: ${{ parameters.displayName }}
   pool:
-    # test
-    vmImage: ${{ parameters.imageName }}
+    type: ${{ parameters.jobtype }}
   variables:
     - group: DotNetPrivateBuildAccess
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
 
   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: '**/*.nupkg'
-        path: '$(Pipeline.Workspace)/releasePipeline/finalResults'
+    - template: release-SetReleaseTagandContainerName.yml@self
 
-    - pwsh: |
-        $dotnetMetadataPath = "$(Build.SourcesDirectory)/DotnetRuntimeMetadata.json"
-        $dotnetMetadataJson = Get-Content $dotnetMetadataPath -Raw | ConvertFrom-Json
-
-        # Channel is like: $Channel = "5.0.1xx-preview2"
-        $Channel = $dotnetMetadataJson.sdk.channel
-
-        $sdkVersion = (Get-Content "$(Build.SourcesDirectory)/global.json" -Raw | ConvertFrom-Json).sdk.version
-        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-
-        Find-Dotnet
-
-        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
-            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
+    - download: PSPackagesOfficial
+      artifact: drop_nupkg_build_nupkg
+      displayName: Download nupkgs
 
-        #Install-Dotnet -Channel "$Channel" -Version $sdkVersion
-        Start-PSBootstrap
+    - pwsh: |
+        Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      displayName: Capture environment
 
-        Write-Verbose -Message "Installing .NET SDK completed." -Verbose
+    - pwsh: |
+        Get-ChildItem "$(Pipeline.Workspace)/PSPackagesOfficial/drop_nupkg_build_nupkg" -Recurse
+      displayName: 'Capture Downloaded Artifacts'
 
-      displayName: Install .NET
-      env:
-        __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+    - template: /.pipelines/templates/install-dotnet.yml@self
 
     - pwsh: |
-        $branch = $ENV:BUILD_SOURCEBRANCH
-        $version = $branch -replace '^.*(release[-/])v'
-        $vstsCommandString = "vso[task.setvariable variable=PowerShellVersion]$version"
-        Write-Verbose -Message "Version is $version" -Verbose
-        Write-Host -Object "##$vstsCommandString"
-      displayName: Set PowerShell Version
+        $repoRoot = "$(Build.SourcesDirectory)/PowerShell"
 
-    - pwsh: |
-        $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-        Start-PSBootstrap
+        Import-Module "$repoRoot/build.psm1" -Force -Verbose
+        Start-PSBootstrap -Scenario Dotnet
 
         $toolPath = New-Item -ItemType Directory "$(System.DefaultWorkingDirectory)/toolPath" | Select-Object -ExpandProperty FullName
 
-        dotnet tool install --add-source "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults" --tool-path $toolPath --version '$(PowerShellVersion)' '${{ parameters.globalToolPackageName }}'
+        Write-Verbose -Verbose "dotnet tool list -g"
+        dotnet tool list -g
+
+        $packageName = '${{ parameters.globalToolPackageName }}'
+        Write-Verbose -Verbose "Installing $packageName"
+
+        dotnet tool install --add-source "$ENV:PIPELINE_WORKSPACE/PSPackagesOfficial/drop_nupkg_build_nupkg" --tool-path $toolPath --version '$(OutputVersion.Version)' $packageName
 
         Get-ChildItem -Path $toolPath
 
@@ -100,8 +76,10 @@ jobs:
       displayName: Validate tool is installed
 
     - pwsh: |
-        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-        Start-PSBootstrap
+        $repoRoot = "$(Build.SourcesDirectory)/PowerShell"
+
+        Import-Module "$repoRoot/build.psm1" -Force -Verbose
+        Start-PSBootstrap -Scenario Dotnet
 
         $exeName = if ($IsWindows) { "pwsh.exe" } else { "pwsh" }
 
@@ -125,7 +103,7 @@ jobs:
 
         $versionFound = & $toolPath -c '$PSVersionTable.PSVersion.ToString()'
 
-        if ( '$(PowerShellVersion)' -ne $versionFound)
+        if ( '$(OutputVersion.Version)' -ne $versionFound)
         {
             throw "Expected version of global tool not found. Installed version is $versionFound"
         }
diff --git a/.pipelines/templates/release-validate-packagenames.yml b/.pipelines/templates/release-validate-packagenames.yml
new file mode 100644
index 00000000000..7271ffc05a8
--- /dev/null
+++ b/.pipelines/templates/release-validate-packagenames.yml
@@ -0,0 +1,184 @@
+jobs:
+- job: validatePackageNames
+  displayName: Validate Package Names
+  pool:
+    type: windows
+  variables:
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - group: 'Azure Blob variable group'
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - template: release-SetReleaseTagandContainerName.yml
+
+  - pwsh: |
+       Get-ChildItem ENV: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: Capture environment
+
+  - pwsh: |
+      $name = "{0}_{1:x}" -f '$(OutputReleaseTag.releaseTag)', (Get-Date).Ticks
+      Write-Host $name
+      Write-Host "##vso[build.updatebuildnumber]$name"
+    displayName: Set Release Name
+
+  - task: AzurePowerShell@5
+    displayName: Upload packages to blob
+    inputs:
+      azureSubscription: az-blob-cicd-infra
+      scriptType: inlineScript
+      azurePowerShellVersion: LatestVersion
+      pwsh: true
+      inline: |
+        $storageAccount = Get-AzStorageAccount -ResourceGroupName '$(StorageResourceGroup)' -Name '$(StorageAccount)'
+        $ctx = $storageAccount.Context
+        $container = '$(OutputVersion.AzureVersion)'
+
+        $destinationPath = '$(System.ArtifactsDirectory)'
+        $blobList = Get-AzStorageBlob -Container $container -Context $ctx
+        foreach ($blob in $blobList) {
+          $blobName = $blob.Name
+          $destinationFile = Join-Path -Path $destinationPath -ChildPath $blobName
+          Get-AzStorageBlobContent -Container $container -Blob $blobName -Destination $destinationFile -Context $ctx -Force
+          Write-Output "Downloaded $blobName to $destinationFile"
+        }
+
+  - pwsh: |
+      Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
+    displayName: Capture Artifact Listing
+
+  - 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|cm).(x86_64|aarch64)\.rpm')
+          {
+              $messageInstance = "$($_.Name) is not a valid package name"
+              $message += $messageInstance
+              Write-Warning $messageInstance
+          }
+      }
+      if($message.count -gt 0){throw ($message | out-string)}
+    displayName: Validate RPM package names
+
+  - 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-musl)+\-(x64\-fxdependent|x64|arm32|arm64|x64\-musl-noopt\-fxdependent)\.(tar\.gz)')
+          {
+              $messageInstance = "$($_.Name) is not a valid package name"
+              $message += $messageInstance
+              Write-Warning $messageInstance
+          }
+      }
+      if($message.count -gt 0){throw ($message | out-string)}
+    displayName: Validate Tar.Gz Package Names
+
+  - pwsh: |
+      $message = @()
+      Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.pkg | ForEach-Object {
+          if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx\-(x64|arm64)\.pkg')
+          {
+              $messageInstance = "$($_.Name) is not a valid package name"
+              $message += $messageInstance
+              Write-Warning $messageInstance
+          }
+      }
+      if($message.count -gt 0){throw ($message | out-string)}
+    displayName: Validate PKG Package Names
+
+  - pwsh: |
+      $message = @()
+      Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -include *.zip | ForEach-Object {
+          if($_.Name -notmatch 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm64|x86|fxdependentWinDesktop)\.(zip){1}')
+          {
+              $messageInstance = "$($_.Name) is not a valid package name"
+              $message += $messageInstance
+              Write-Warning $messageInstance
+          }
+      }
+
+      if($message.count -gt 0){throw ($message | out-string)}
+    displayName: Validate Zip Package Names
+
+  - 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')
+          {
+              $messageInstance = "$($_.Name) is not a valid package name"
+              $message += $messageInstance
+              Write-Warning $messageInstance
+          }
+      }
+      if($message.count -gt 0){throw ($message | out-string)}
+    displayName: Validate Deb Package Names
+
+# Move to 1ES SBOM validation tool
+# - job: validateBOM
+#   displayName: Validate Package Names
+#   pool:
+#     type: windows
+#   variables:
+#     - name: ob_outputDirectory
+#       value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+#     - name: ob_sdl_credscan_suppressionsFile
+#       value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+#     - name: ob_sdl_tsa_configFile
+#       value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+#     - group: 'Azure Blob variable group'
+
+#   steps:
+#   - checkout: self
+#     clean: true
+
+#   - pwsh: |
+#       Get-ChildItem ENV: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+#     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
+
+#   - task: DownloadPipelineArtifact@2
+#     inputs:
+#       source: specific
+#       project: PowerShellCore
+#       pipeline: '696'
+#       preferTriggeringPipeline: true
+#       runVersion: latestFromBranch
+#       runBranch: '$(Build.SourceBranch)'
+#       artifact: finalResults
+#       path: $(System.ArtifactsDirectory)
+
+
+#   - 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/.pipelines/templates/release-validate-sdk.yml b/.pipelines/templates/release-validate-sdk.yml
new file mode 100644
index 00000000000..3b0442f65d6
--- /dev/null
+++ b/.pipelines/templates/release-validate-sdk.yml
@@ -0,0 +1,98 @@
+parameters:
+  jobName: ""
+  displayName: ""
+  poolName: "windows"
+  imageName: 'none'
+
+jobs:
+- job: ${{ parameters.jobName }}
+  displayName: ${{ parameters.displayName }}
+  pool:
+    type: linux
+    isCustom: true
+    ${{ if eq( parameters.poolName, 'Azure Pipelines') }}:
+      name: ${{ parameters.poolName }}
+      vmImage: ${{ parameters.imageName }}
+    ${{ else }}:
+      name: ${{ parameters.poolName }}
+      demands:
+        - ImageOverride -equals ${{ parameters.imageName }}
+
+  variables:
+  - group: mscodehub-feed-read-general
+  - group: mscodehub-feed-read-akv
+  - group: DotNetPrivateBuildAccess
+
+  steps:
+    - checkout: self
+      clean: true
+      lfs: false
+
+    - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+      parameters:
+        repoRoot: "$(Build.SourcesDirectory)"
+
+    - template: release-SetReleaseTagandContainerName.yml@self
+
+    - download: PSPackagesOfficial
+      artifact: drop_nupkg_build_nupkg
+      displayName: Download nupkgs
+
+    - pwsh: |
+        Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      displayName: Capture environment
+
+    - pwsh: |
+        Get-ChildItem "$(Pipeline.Workspace)/PSPackagesOfficial/drop_nupkg_build_nupkg" -Recurse
+      displayName: 'Capture Downloaded Artifacts'
+
+    - template: /.pipelines/templates/install-dotnet.yml@self
+
+    - pwsh: |
+        $repoRoot = "$(Build.SourcesDirectory)"
+
+        Import-Module "$repoRoot/build.psm1" -Force -Verbose
+        Start-PSBootstrap -Scenario Dotnet
+
+        $env:DOTNET_NOLOGO=1
+
+        $localLocation = "$(Pipeline.Workspace)/PSPackagesOfficial/drop_nupkg_build_nupkg"
+        $xmlElement = @"
+          <add key=`"local`" value=`"$localLocation`" />
+          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v2" />
+        </packageSources>
+        "@
+
+        $releaseVersion = '$(OutputVersion.Version)'
+
+        Write-Verbose -Message "Release Version: $releaseVersion" -Verbose
+
+        Set-Location -Path $repoRoot/test/hosting
+
+        Get-ChildItem
+
+        ## register the packages download directory in the nuget file
+        $nugetPath = './NuGet.Config'
+        if(!(test-path $nugetPath)) {
+          $nugetPath = "$repoRoot/nuget.config"
+        }
+        Write-Verbose -Verbose "nugetPath: $nugetPath"
+        $nugetConfigContent = Get-Content $nugetPath -Raw
+        $updateNugetContent = $nugetConfigContent.Replace("</packageSources>", $xmlElement)
+
+        $updateNugetContent | Out-File $nugetPath -Encoding ascii
+
+        Get-Content $nugetPath
+
+        dotnet --info
+        dotnet restore
+        dotnet test /property:RELEASE_VERSION=$releaseVersion --test-adapter-path:. "--logger:xunit;LogFilePath=$(System.DefaultWorkingDirectory)/test-hosting.xml"
+      displayName: Restore and execute tests
+      env:
+        __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
+    - task: PublishTestResults@2
+      displayName: 'Publish Test Results **\test-hosting.xml'
+      inputs:
+        testResultsFormat: XUnit
+        testResultsFiles: '**\test-hosting.xml'
diff --git a/.pipelines/templates/set-reporoot.yml b/.pipelines/templates/set-reporoot.yml
new file mode 100644
index 00000000000..af7983afaa1
--- /dev/null
+++ b/.pipelines/templates/set-reporoot.yml
@@ -0,0 +1,35 @@
+parameters:
+- name: ob_restore_phase
+  type: boolean
+  default: true
+
+steps:
+- pwsh: |
+    $path = "./build.psm1"
+    if($env:REPOROOT){
+      Write-Verbose "reporoot already set to ${env:REPOROOT}" -Verbose
+      exit 0
+    }
+    if(Test-Path -Path $path)
+    {
+      Write-Verbose "reporoot detected at: ." -Verbose
+      $repoRoot = '.'
+    }
+    else{
+      $path = "./PowerShell/build.psm1"
+      if(Test-Path -Path $path)
+      {
+        Write-Verbose "reporoot detected 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'
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
diff --git a/tools/releaseBuild/azureDevOps/templates/shouldSign.yml b/.pipelines/templates/shouldSign.yml
similarity index 86%
rename from tools/releaseBuild/azureDevOps/templates/shouldSign.yml
rename to .pipelines/templates/shouldSign.yml
index e3c38cb29d5..551297f3aaa 100644
--- a/tools/releaseBuild/azureDevOps/templates/shouldSign.yml
+++ b/.pipelines/templates/shouldSign.yml
@@ -1,29 +1,30 @@
+parameters:
+- name: ob_restore_phase
+  type: boolean
+  default: true
+
 steps:
 - powershell: |
     $shouldSign = $true
     $authenticodeCert = 'CP-230012'
     $msixCert = 'CP-230012'
-
     if($env:IS_DAILY -eq 'true')
     {
       $authenticodeCert = 'CP-460906'
     }
-
     if($env:SKIP_SIGNING -eq 'Yes')
     {
       $shouldSign = $false
     }
-
     $vstsCommandString = "vso[task.setvariable variable=SHOULD_SIGN]$($shouldSign.ToString().ToLowerInvariant())"
     Write-Host "sending " + $vstsCommandString
     Write-Host "##$vstsCommandString"
-
     $vstsCommandString = "vso[task.setvariable variable=MSIX_CERT]$($msixCert)"
     Write-Host "sending " + $vstsCommandString
     Write-Host "##$vstsCommandString"
-
     $vstsCommandString = "vso[task.setvariable variable=AUTHENTICODE_CERT]$($authenticodeCert)"
     Write-Host "sending " + $vstsCommandString
     Write-Host "##$vstsCommandString"
-
   displayName: 'Set SHOULD_SIGN Variable'
+  env:
+    ob_restore_phase: ${{ parameters.ob_restore_phase }}
diff --git a/.pipelines/templates/stages/PowerShell-Coordinated_Packages-Stages.yml b/.pipelines/templates/stages/PowerShell-Coordinated_Packages-Stages.yml
new file mode 100644
index 00000000000..cd0a4ebc065
--- /dev/null
+++ b/.pipelines/templates/stages/PowerShell-Coordinated_Packages-Stages.yml
@@ -0,0 +1,202 @@
+parameters:
+  - name: RUN_WINDOWS
+    type: boolean
+    default: true
+  - name: RUN_TEST_AND_RELEASE
+    type: boolean
+    default: true
+  - name: OfficialBuild
+    type: boolean
+
+stages:
+- stage: prep
+  jobs:
+  - job: SetVars
+    displayName: Set Variables
+    pool:
+      type: linux
+
+    variables:
+      - name: ob_outputDirectory
+        value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT/BuildJson'
+      - name: ob_sdl_codeSignValidation_enabled
+        value: false
+      - name: ob_sdl_codeql_compiled_enabled
+        value: false
+      - name: ob_sdl_credscan_suppressionsFile
+        value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+      - name: ob_sdl_tsa_configFile
+        value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+      - name: ob_signing_setup_enabled
+        value: false
+      - name: ob_sdl_sbom_enabled
+        value: false
+
+    steps:
+    - checkout: self
+      clean: true
+      env:
+        ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+    - pwsh: |
+        Get-ChildItem Env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      displayName: Capture environment variables
+      env:
+        ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+    - template: /.pipelines/templates/SetVersionVariables.yml@self
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: yes
+
+- stage: macos
+  displayName: macOS - build and sign
+  dependsOn: ['prep']
+  variables:
+    - name: ps_official_build
+      value: ${{ parameters.OfficialBuild }}
+  jobs:
+  - template: /.pipelines/templates/mac.yml@self
+    parameters:
+      buildArchitecture: x64
+  - template: /.pipelines/templates/mac.yml@self
+    parameters:
+      buildArchitecture: arm64
+
+- stage: linux
+  displayName: linux - build and sign
+  dependsOn: ['prep']
+  variables:
+    - name: ps_official_build
+      value: ${{ parameters.OfficialBuild }}
+  jobs:
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'linux-x64'
+      JobName: 'linux_x64'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'linux-x64'
+      JobName: 'linux_x64_minSize'
+      BuildConfiguration: 'minSize'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'linux-arm'
+      JobName: 'linux_arm'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'linux-arm64'
+      JobName: 'linux_arm64'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'fxdependent-linux-x64'
+      JobName: 'linux_fxd_x64_mariner'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'fxdependent-linux-arm64'
+      JobName: 'linux_fxd_arm64_mariner'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'fxdependent-noopt-linux-musl-x64'
+      JobName: 'linux_fxd_x64_alpine'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'fxdependent'
+      JobName: 'linux_fxd'
+
+  - template: /.pipelines/templates/linux.yml@self
+    parameters:
+      Runtime: 'linux-musl-x64'
+      JobName: 'linux_x64_alpine'
+
+- stage: windows
+  displayName: windows - build and sign
+  dependsOn: ['prep']
+  condition: and(succeeded(),eq('${{ parameters.RUN_WINDOWS }}','true'))
+  variables:
+    - name: ps_official_build
+      value: ${{ parameters.OfficialBuild }}
+  jobs:
+  - template: /.pipelines/templates/windows-hosted-build.yml@self
+    parameters:
+      Architecture: x64
+      BuildConfiguration: release
+      JobName: build_windows_x64_release
+  - template: /.pipelines/templates/windows-hosted-build.yml@self
+    parameters:
+      Architecture: x64
+      BuildConfiguration: minSize
+      JobName: build_windows_x64_minSize_release
+  - template: /.pipelines/templates/windows-hosted-build.yml@self
+    parameters:
+      Architecture: x86
+      JobName: build_windows_x86_release
+  - template: /.pipelines/templates/windows-hosted-build.yml@self
+    parameters:
+      Architecture: arm64
+      JobName: build_windows_arm64_release
+  - template: /.pipelines/templates/windows-hosted-build.yml@self
+    parameters:
+      Architecture: fxdependent
+      JobName: build_windows_fxdependent_release
+  - template: /.pipelines/templates/windows-hosted-build.yml@self
+    parameters:
+      Architecture: fxdependentWinDesktop
+      JobName: build_windows_fxdependentWinDesktop_release
+
+- stage: test_and_release_artifacts
+  displayName: Test and Release Artifacts
+  dependsOn: ['prep']
+  condition: and(succeeded(),eq('${{ parameters.RUN_TEST_AND_RELEASE }}','true'))
+  jobs:
+  - template: /.pipelines/templates/testartifacts.yml@self
+
+  - job: release_json
+    displayName: Create and Upload release.json
+    pool:
+      type: windows
+    variables:
+    - name: ob_outputDirectory
+      value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+    - name: ob_sdl_tsa_configFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+    - name: ob_sdl_credscan_suppressionsFile
+      value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+    steps:
+    - checkout: self
+      clean: true
+    - template: /.pipelines/templates/SetVersionVariables.yml@self
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+    - template: /.pipelines/templates/rebuild-branch-check.yml@self
+    - powershell: |
+        $metadata = Get-Content '$(Build.SourcesDirectory)/PowerShell/tools/metadata.json' -Raw | ConvertFrom-Json
+
+        # Use the rebuild branch check from the template
+        $isRebuildBranch = '$(RebuildBranchCheck.IsRebuildBranch)' -eq 'true'
+
+        # Don't mark as LTS release for rebuild branches
+        $LTS = $metadata.LTSRelease.Package -and -not $isRebuildBranch
+
+        if ($isRebuildBranch) {
+          Write-Verbose -Message "Rebuild branch detected, not marking as LTS release" -Verbose
+        }
+
+        @{ ReleaseVersion = "$(Version)"; LTSRelease = $LTS } | ConvertTo-Json | Out-File "$(Build.StagingDirectory)\release.json"
+        Get-Content "$(Build.StagingDirectory)\release.json"
+
+        if (-not (Test-Path "$(ob_outputDirectory)\metadata")) {
+          New-Item -ItemType Directory -Path "$(ob_outputDirectory)\metadata"
+        }
+
+        Copy-Item -Path "$(Build.StagingDirectory)\release.json" -Destination "$(ob_outputDirectory)\metadata" -Force
+      displayName: Create and upload release.json file to build artifact
+      retryCountOnTaskFailure: 2
+    - template: /.pipelines/templates/step/finalize.yml@self
diff --git a/.pipelines/templates/stages/PowerShell-Packages-Stages.yml b/.pipelines/templates/stages/PowerShell-Packages-Stages.yml
new file mode 100644
index 00000000000..b1efb2a8097
--- /dev/null
+++ b/.pipelines/templates/stages/PowerShell-Packages-Stages.yml
@@ -0,0 +1,192 @@
+parameters:
+  - name: OfficialBuild
+    type: boolean
+
+stages:
+- stage: prep
+  displayName: 'Prep BuildInfo+Az'
+  jobs:
+  - template: /.pipelines/templates/checkAzureContainer.yml@self
+
+- stage: mac_package
+  displayName: 'macOS Pkg+Sign'
+  dependsOn: []
+  jobs:
+  - template: /.pipelines/templates/mac-package-build.yml@self
+    parameters:
+      buildArchitecture: x64
+
+  - template: /.pipelines/templates/mac-package-build.yml@self
+    parameters:
+      buildArchitecture: arm64
+
+- stage: windows_package_build
+  displayName: 'Win Pkg (unsigned)'
+  dependsOn: []
+  jobs:
+  - template: /.pipelines/templates/packaging/windows/package.yml@self
+    parameters:
+      runtime: x64
+
+  - template: /.pipelines/templates/packaging/windows/package.yml@self
+    parameters:
+      runtime: arm64
+
+  - template: /.pipelines/templates/packaging/windows/package.yml@self
+    parameters:
+      runtime: x86
+
+  - template: /.pipelines/templates/packaging/windows/package.yml@self
+    parameters:
+      runtime: fxdependent
+
+  - template: /.pipelines/templates/packaging/windows/package.yml@self
+    parameters:
+      runtime: fxdependentWinDesktop
+
+  - template: /.pipelines/templates/packaging/windows/package.yml@self
+    parameters:
+      runtime: minsize
+
+- stage: windows_package_sign
+  displayName: 'Win Pkg Sign'
+  dependsOn: [windows_package_build]
+  jobs:
+  - template: /.pipelines/templates/packaging/windows/sign.yml@self
+    parameters:
+      runtime: x64
+
+  - template: /.pipelines/templates/packaging/windows/sign.yml@self
+    parameters:
+      runtime: arm64
+
+  - template: /.pipelines/templates/packaging/windows/sign.yml@self
+    parameters:
+      runtime: x86
+
+  - template: /.pipelines/templates/packaging/windows/sign.yml@self
+    parameters:
+      runtime: fxdependent
+
+  - template: /.pipelines/templates/packaging/windows/sign.yml@self
+    parameters:
+      runtime: fxdependentWinDesktop
+
+  - template: /.pipelines/templates/packaging/windows/sign.yml@self
+    parameters:
+      runtime: minsize
+
+- stage: linux_package
+  displayName: 'Linux Pkg+Sign'
+  dependsOn: []
+  jobs:
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_x64'
+      signedDrop: 'drop_linux_sign_linux_x64'
+      packageType: deb
+      jobName: deb
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_fxd_x64_mariner'
+      signedDrop: 'drop_linux_sign_linux_fxd_x64_mariner'
+      packageType: rpm-fxdependent  #mariner-x64
+      jobName: mariner_x64
+      signingProfile: 'CP-459159-pgpdetached'
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_fxd_arm64_mariner'
+      signedDrop: 'drop_linux_sign_linux_fxd_arm64_mariner'
+      packageType: rpm-fxdependent-arm64 #mariner-arm64
+      jobName: mariner_arm64
+      signingProfile: 'CP-459159-pgpdetached'
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_x64'
+      signedDrop: 'drop_linux_sign_linux_x64'
+      packageType: rpm
+      jobName: rpm
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_arm'
+      signedDrop: 'drop_linux_sign_linux_arm'
+      packageType: tar-arm
+      jobName: tar_arm
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_arm64'
+      signedDrop: 'drop_linux_sign_linux_arm64'
+      packageType: tar-arm64
+      jobName: tar_arm64
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_x64_alpine'
+      signedDrop: 'drop_linux_sign_linux_x64_alpine'
+      packageType: tar-alpine
+      jobName: tar_alpine
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_fxd'
+      signedDrop: 'drop_linux_sign_linux_fxd'
+      packageType: fxdependent
+      jobName: fxdependent
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_x64'
+      signedDrop: 'drop_linux_sign_linux_x64'
+      packageType: tar
+      jobName: tar
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_fxd_x64_alpine'
+      signedDrop: 'drop_linux_sign_linux_fxd_x64_alpine'
+      packageType: tar-alpine-fxdependent
+      jobName: tar_alpine_fxd
+
+  - template: /.pipelines/templates/linux-package-build.yml@self
+    parameters:
+      unsignedDrop: 'drop_linux_build_linux_x64_minSize'
+      signedDrop: 'drop_linux_sign_linux_x64_minSize'
+      packageType: min-size
+      jobName: minSize
+
+- stage: nupkg
+  displayName: 'NuGet Pkg+Sign'
+  dependsOn: []
+  jobs:
+  - template: /.pipelines/templates/nupkg.yml@self
+
+- stage: msixbundle
+  displayName: 'MSIX Bundle+Sign'
+  dependsOn: [windows_package_build]  # Only depends on unsigned packages
+  jobs:
+  - template: /.pipelines/templates/package-create-msix.yml@self
+    parameters:
+      OfficialBuild: ${{ parameters.OfficialBuild }}
+
+- stage: store_package
+  displayName: 'Store Package'
+  dependsOn: [msixbundle]
+  jobs:
+  - template: /.pipelines/templates/package-store-package.yml@self
+
+- stage: upload
+  displayName: 'Upload'
+  dependsOn: [prep, mac_package, windows_package_sign, linux_package, nupkg, msixbundle]  # prep needed for BuildInfo JSON
+  jobs:
+  - template: /.pipelines/templates/uploadToAzure.yml@self
+
+- stage: validatePackages
+  displayName: 'Validate Packages'
+  dependsOn: [upload]
+  jobs:
+  - template: /.pipelines/templates/release-validate-packagenames.yml@self
diff --git a/.pipelines/templates/stages/PowerShell-Release-Stages.yml b/.pipelines/templates/stages/PowerShell-Release-Stages.yml
new file mode 100644
index 00000000000..52ce428a663
--- /dev/null
+++ b/.pipelines/templates/stages/PowerShell-Release-Stages.yml
@@ -0,0 +1,323 @@
+parameters:
+  - name: releaseEnvironment
+    type: string
+  - name: SkipPublish
+    type: boolean
+  - name: SkipPSInfraInstallers
+    type: boolean
+  - name: skipMSIXPublish
+    type: boolean
+
+stages:
+- stage: setReleaseTagAndChangelog
+  displayName: 'Set Release Tag and Upload Changelog'
+  jobs:
+  - template: /.pipelines/templates/release-SetTagAndChangelog.yml@self
+
+- stage: validateSdk
+  displayName: 'Validate SDK'
+  dependsOn: []
+  jobs:
+  - template: /.pipelines/templates/release-validate-sdk.yml@self
+    parameters:
+      jobName: "windowsSDK"
+      displayName: "Windows SDK Validation"
+      imageName: PSMMS2019-Secure
+      poolName: $(windowsPool)
+
+  - template: /.pipelines/templates/release-validate-sdk.yml@self
+    parameters:
+      jobName: "MacOSSDK"
+      displayName: "MacOS SDK Validation"
+      imageName: macOS-latest
+      poolName: Azure Pipelines
+
+  - template: /.pipelines/templates/release-validate-sdk.yml@self
+    parameters:
+      jobName: "LinuxSDK"
+      displayName: "Linux SDK Validation"
+      imageName: PSMMSUbuntu22.04-Secure
+      poolName: $(ubuntuPool)
+
+- stage: gbltool
+  displayName: 'Validate Global tools'
+  dependsOn: []
+  jobs:
+  - template: /.pipelines/templates/release-validate-globaltools.yml@self
+    parameters:
+      jobName: "WindowsGlobalTools"
+      displayName: "Windows Global Tools Validation"
+      jobtype: windows
+
+  - template: /.pipelines/templates/release-validate-globaltools.yml@self
+    parameters:
+      jobName: "LinuxGlobalTools"
+      displayName: "Linux Global Tools Validation"
+      jobtype: linux
+      globalToolExeName: 'pwsh'
+      globalToolPackageName: 'PowerShell.Linux.x64'
+
+- stage: fxdpackages
+  displayName: 'Validate FXD Packages'
+  dependsOn: []
+  jobs:
+  - template: /.pipelines/templates/release-validate-fxdpackages.yml@self
+    parameters:
+      jobName: 'winfxd'
+      displayName: 'Validate Win Fxd Packages'
+      jobtype: 'windows'
+      artifactName: 'drop_windows_package_package_win_fxdependent'
+      packageNamePattern: '**/*win-fxdependent.zip'
+
+  - template: /.pipelines/templates/release-validate-fxdpackages.yml@self
+    parameters:
+      jobName: 'winfxdDesktop'
+      displayName: 'Validate WinDesktop Fxd Packages'
+      jobtype: 'windows'
+      artifactName: 'drop_windows_package_package_win_fxdependentWinDesktop'
+      packageNamePattern: '**/*win-fxdependentwinDesktop.zip'
+
+  - template: /.pipelines/templates/release-validate-fxdpackages.yml@self
+    parameters:
+      jobName: 'linuxfxd'
+      displayName: 'Validate Linux Fxd Packages'
+      jobtype: 'linux'
+      artifactName: 'drop_linux_package_fxdependent'
+      packageNamePattern: '**/*linux-x64-fxdependent.tar.gz'
+
+  - template: /.pipelines/templates/release-validate-fxdpackages.yml@self
+    parameters:
+      jobName: 'linuxArm64fxd'
+      displayName: 'Validate Linux ARM64 Fxd Packages'
+      jobtype: 'linux'
+      artifactName: 'drop_linux_package_fxdependent'
+      # this is really an architecture independent package
+      packageNamePattern: '**/*linux-x64-fxdependent.tar.gz'
+      arm64: 'yes'
+      enableCredScan: false
+
+- stage: ManualValidation
+  dependsOn: []
+  displayName: Manual Validation
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Validate Windows Packages
+      jobName: ValidateWinPkg
+      instructions: |
+        Validate zip package on windows
+
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Validate OSX Packages
+      jobName: ValidateOsxPkg
+      instructions: |
+        Validate tar.gz package on osx-arm64
+
+- stage: ReleaseAutomation
+  dependsOn: []
+  displayName: 'Release Automation'
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Start Release Automation
+      jobName: StartRA
+      instructions: |
+        Kick off Release automation build at: https://dev.azure.com/powershell-rel/Release-Automation/_build?definitionId=10&_a=summary
+
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Triage results
+      jobName: TriageRA
+      dependsOnJob: StartRA
+      instructions: |
+        Triage ReleaseAutomation results
+
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Signoff Tests
+      dependsOnJob: TriageRA
+      jobName: SignoffTests
+      instructions: |
+        Signoff ReleaseAutomation results
+
+- stage: UpdateChangeLog
+  displayName: Update the changelog
+  dependsOn:
+    - ManualValidation
+    - ReleaseAutomation
+    - fxdpackages
+    - gbltool
+    - validateSdk
+
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Make sure the changelog is updated
+      jobName: MergeChangeLog
+      instructions: |
+        Update and merge the changelog for the release.
+        This step is required for creating GitHub draft release.
+
+- stage: PublishGitHubReleaseAndNuget
+  displayName: Publish GitHub and Nuget Release
+  dependsOn:
+    - setReleaseTagAndChangelog
+    - UpdateChangeLog
+  variables:
+    ob_release_environment: ${{ parameters.releaseEnvironment }}
+  jobs:
+  - template: /.pipelines/templates/release-githubNuget.yml@self
+    parameters:
+      skipPublish: ${{ parameters.SkipPublish }}
+
+- stage: PushGitTagAndMakeDraftPublic
+  displayName: Push Git Tag and Make Draft Public
+  dependsOn: PublishGitHubReleaseAndNuget
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Push Git Tag
+      jobName: PushGitTag
+      instructions: |
+        Push the git tag to upstream
+
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Make Draft Public
+      dependsOnJob: PushGitTag
+      jobName: DraftPublic
+      instructions: |
+        Make the GitHub Release Draft Public
+
+- stage: BlobPublic
+  displayName: Make Blob Public
+  dependsOn:
+    - UpdateChangeLog
+    - PushGitTagAndMakeDraftPublic
+  jobs:
+  - template: /.pipelines/templates/release-MakeBlobPublic.yml@self
+    parameters:
+      SkipPSInfraInstallers: ${{ parameters.SkipPSInfraInstallers }}
+
+- stage: PublishPMC
+  displayName: Publish PMC
+  dependsOn: PushGitTagAndMakeDraftPublic
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Publish to PMC
+      jobName: ReleaseToPMC
+      instructions: |
+        Run PowerShell-Release-Official-Azure.yml pipeline to publish to PMC
+
+- stage: UpdateDotnetDocker
+  dependsOn: PushGitTagAndMakeDraftPublic
+  displayName: Update DotNet SDK Docker images
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    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\ specific <dotnetversion> --product-version powershell=<powershellversion> --compute-shas
+        4. create PR targeting nightly branch
+
+- stage: UpdateWinGet
+  dependsOn: PushGitTagAndMakeDraftPublic
+  displayName: Add manifest entry to winget
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    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:
+    - setReleaseTagAndChangelog
+    - PushGitTagAndMakeDraftPublic
+  displayName: Publish MSIX to store
+  variables:
+    ob_release_environment: ${{ parameters.releaseEnvironment }}
+  jobs:
+  - template: /.pipelines/templates/release-MSIX-Publish.yml@self
+    parameters:
+      skipMSIXPublish: ${{ parameters.skipMSIXPublish }}
+
+- stage: PublishVPack
+  dependsOn: PushGitTagAndMakeDraftPublic
+  displayName: Release vPack
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Start 2 vPack Release pipelines
+      jobName: PublishVPack
+      instructions: |
+        1. Kick off PowerShell-vPack-Official pipeline
+        2. Kick off PowerShell-MSIXBundle-VPack pipeline
+
+# Need to verify if the Az PS / CLI team still uses this. Skipping for this release.
+# - stage: ReleaseDeps
+#   dependsOn: GitHubTasks
+#   displayName: Update pwsh.deps.json links
+#   jobs:
+#   - template: templates/release-UpdateDepsJson.yml
+
+- stage: UploadBuildInfoJson
+  dependsOn: PushGitTagAndMakeDraftPublic
+  displayName: Upload BuildInfo.json
+  jobs:
+  - template: /.pipelines/templates/release-upload-buildinfo.yml@self
+
+- stage: ReleaseSymbols
+  dependsOn: PushGitTagAndMakeDraftPublic
+  displayName: Release Symbols
+  jobs:
+  - template: /.pipelines/templates/release-symbols.yml@self
+
+- stage: ChangesToMaster
+  displayName: Ensure changes are in GH master
+  dependsOn:
+    - PublishPMC
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    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: ReleaseToMU
+  displayName: Release to MU
+  dependsOn: PushGitTagAndMakeDraftPublic # This only needs the blob to be available
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Release to MU
+      instructions: |
+        Notify the PM team to start the process of releasing to MU.
+
+- stage: ReleaseClose
+  displayName: Finish Release
+  dependsOn:
+    - ReleaseToMU
+    - ReleaseSymbols
+  jobs:
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Retain Build
+      jobName: RetainBuild
+      instructions: |
+        Retain the build
+
+  - template: /.pipelines/templates/approvalJob.yml@self
+    parameters:
+      displayName: Delete release branch
+      jobName: DeleteBranch
+      instructions: |
+        Delete release branch
diff --git a/.pipelines/templates/stages/PowerShell-vPack-Stages.yml b/.pipelines/templates/stages/PowerShell-vPack-Stages.yml
new file mode 100644
index 00000000000..01a83a5b161
--- /dev/null
+++ b/.pipelines/templates/stages/PowerShell-vPack-Stages.yml
@@ -0,0 +1,236 @@
+parameters:
+  - name: createVPack
+    type: boolean
+  - name: vPackName
+    type: string
+
+stages:
+- stage: BuildStage
+  jobs:
+  - job: BuildJob
+    pool:
+      type: windows
+
+    strategy:
+      matrix:
+        x86:
+          architecture: x86
+
+        x64:
+          architecture: x64
+
+        arm64:
+          architecture: arm64
+
+    variables:
+      ArtifactPlatform: 'windows'
+      ob_artifactBaseName: drop_build_$(architecture)
+      ob_outputDirectory: '$(BUILD.SOURCESDIRECTORY)\out'
+      ob_createvpack_enabled: ${{ parameters.createVPack }}
+      ob_createvpack_owneralias: tplunk
+      ob_createvpack_versionAs: parts
+      ob_createvpack_propsFile: true
+      ob_createvpack_verbose: true
+      ob_createvpack_packagename: '${{ parameters.vPackName }}.$(architecture)'
+      ob_createvpack_description: PowerShell $(architecture) $(version)
+      # I think the variables reload after we transition back to the host so this works. 🤷‍♂️
+      ob_createvpack_majorVer: $(pwshMajorVersion)
+      ob_createvpack_minorVer: $(pwshMinorVersion)
+      ob_createvpack_patchVer: $(pwshPatchVersion)
+      ${{ if ne(variables['pwshPrereleaseVersion'], '') }}:
+        ob_createvpack_prereleaseVer: $(pwshPrereleaseVersion)
+      ${{ else }}:
+        ob_createvpack_prereleaseVer: $(Build.SourceVersion)
+
+    steps:
+      - checkout: self
+        displayName: Checkout source code - during restore
+        clean: true
+        path: s
+        env:
+          ob_restore_phase: true
+
+      - template: /.pipelines/templates/SetVersionVariables.yml@self
+        parameters:
+          ReleaseTagVar: $(ReleaseTagVar)
+          CreateJson: yes
+
+      - pwsh: |
+          $version = '$(Version)'
+          Write-Verbose -Verbose "Version: $version"
+          if(!$version) {
+              throw "Version is not set."
+          }
+
+          $mainVersionParts = $version -split '-'
+
+          Write-Verbose -Verbose "mainVersionParts: $($mainVersionParts[0]) ; $($mainVersionParts[1])"
+          $versionParts =  $mainVersionParts[0] -split '[.]';
+          $major = $versionParts[0]
+          $minor = $versionParts[1]
+          $patch = $versionParts[2]
+
+          $previewPart = $mainVersionParts[1]
+          Write-Verbose -Verbose "previewPart: $previewPart"
+
+          Write-Host "major: $major; minor: $minor; patch: $patch;"
+
+          $vstsCommandString = "vso[task.setvariable variable=pwshMajorVersion]$major"
+          Write-Host ("sending " + $vstsCommandString)
+          Write-Host "##$vstsCommandString"
+
+          $vstsCommandString = "vso[task.setvariable variable=pwshMinorVersion]$minor"
+          Write-Host ("sending " + $vstsCommandString)
+          Write-Host "##$vstsCommandString"
+
+          $vstsCommandString = "vso[task.setvariable variable=pwshPatchVersion]$patch"
+          Write-Host ("sending " + $vstsCommandString)
+          Write-Host "##$vstsCommandString"
+          if($previewPart) {
+            $vstsCommandString = "vso[task.setvariable variable=pwshPrereleaseVersion]$previewPart"
+          } else {
+            Write-Verbose -Verbose "No prerelease part found in version string."
+          }
+        displayName: Set ob_createvpack_*Ver
+        env:
+          ob_restore_phase: true
+
+      # Validate pwsh*Version variables
+      - pwsh: |
+            $variables = @("pwshMajorVersion", "pwshMinorVersion", "pwshPatchVersion")
+            foreach ($var in $variables) {
+                 if (-not (get-item "Env:\$var" -ErrorAction SilentlyContinue).value) {
+                     throw "Required variable '`$env:$var' is not set."
+                 }
+            }
+        displayName: Validate pwsh*Version variables
+        env:
+          ob_restore_phase: true
+
+      - pwsh: |
+          if($env:RELEASETAGVAR -match '-') {
+              throw "Don't release a preview build without coordinating with Windows Engineering Build Tools Team"
+          }
+        displayName: Stop any preview release
+        env:
+          ob_restore_phase: true
+
+      - task: UseDotNet@2
+        displayName: 'Use .NET Core sdk'
+        inputs:
+          packageType: sdk
+          version: 3.1.x
+          installationPath: $(Agent.ToolsDirectory)/dotnet
+
+      ### BUILD ###
+
+      - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+        parameters:
+          repoRoot: $(repoRoot)
+
+      - task: CodeQL3000Init@0 # Add CodeQL Init task right before your 'Build' step.
+        env:
+          ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+        inputs:
+          Enabled: true
+          AnalyzeInPipeline: false # Do not upload results
+          Language: csharp
+
+      - task: UseDotNet@2
+        displayName: 'Install .NET based on global.json'
+        inputs:
+          useGlobalJson: true
+          workingDirectory: $(repoRoot)
+        env:
+          ob_restore_phase: true
+
+      - pwsh: |
+          # Need to set PowerShellRoot variable for obp-file-signing template
+          $vstsCommandString = "vso[task.setvariable variable=PowerShellRoot]$(repoRoot)"
+          Write-Host ("sending " + $vstsCommandString)
+          Write-Host "##$vstsCommandString"
+
+          $Architecture = '$(Architecture)'
+          $runtime = switch ($Architecture)
+            {
+              "x64" { "win7-x64" }
+              "x86" { "win7-x86" }
+              "arm64" { "win-arm64" }
+            }
+
+          $params = @{}
+          if ($env:BuildConfiguration -eq 'minSize') {
+            $params['ForMinimalSize'] = $true
+          }
+
+          $vstsCommandString = "vso[task.setvariable variable=Runtime]$runtime"
+          Write-Host ("sending " + $vstsCommandString)
+          Write-Host "##$vstsCommandString"
+
+          Write-Verbose -Message "Building PowerShell with Runtime: $runtime for '$env:BuildConfiguration' configuration"
+          Import-Module -Name $(repoRoot)/build.psm1 -Force
+          $buildWithSymbolsPath = New-Item -ItemType Directory -Path "$(Pipeline.Workspace)/Symbols_$Architecture" -Force
+
+          Start-PSBootstrap -Scenario Package
+          $null = New-Item -ItemType Directory -Path $buildWithSymbolsPath -Force -Verbose
+
+          $ReleaseTagParam = @{}
+
+          if ($env:RELEASETAGVAR) {
+            $ReleaseTagParam['ReleaseTag'] = $env:RELEASETAGVAR
+          }
+
+          Start-PSBuild -Runtime $runtime -Configuration Release -Output $buildWithSymbolsPath -Clean -PSModuleRestore @params @ReleaseTagParam
+
+          $refFolderPath = Join-Path $buildWithSymbolsPath 'ref'
+          Write-Verbose -Verbose "refFolderPath: $refFolderPath"
+          $outputPath = Join-Path '$(ob_outputDirectory)' 'psoptions'
+          $null = New-Item -ItemType Directory -Path $outputPath -Force
+          $psOptPath = "$outputPath/psoptions.json"
+          Save-PSOptions -PSOptionsPath $psOptPath
+
+          Write-Verbose -Verbose "Completed building PowerShell for '$env:BuildConfiguration' configuration"
+        displayName: Build Windows Universal - $(Architecture) -$(BuildConfiguration) Symbols folder
+        env:
+          __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+          ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+      - task: CodeQL3000Finalize@0 # Add CodeQL Finalize task right after your 'Build' step.
+        env:
+          ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+        displayName: 'Component Detection'
+        inputs:
+          sourceScanPath: '$(repoRoot)\src'
+          ob_restore_phase: true
+
+      - template: /.pipelines/templates/obp-file-signing.yml@self
+        parameters:
+          binPath: '$(Pipeline.Workspace)/Symbols_$(Architecture)'
+          SigningProfile: $(windows_build_tools_cert_id)
+          OfficialBuild: false
+          vPackScenario: true
+
+      ### END OF BUILD ###
+
+      - pwsh: |
+          Get-ChildItem env:/ob_createvpack_*Ver
+          Get-ChildItem -Path "$(Pipeline.Workspace)\Symbols_$(Architecture)\*" -Recurse
+          Get-Content "$(Pipeline.Workspace)\PowerShell\preview.json" -ErrorAction SilentlyContinue | Write-Host
+        displayName: Debug Output Directory and Version
+        condition: succeededOrFailed()
+
+      - pwsh: |
+          Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+        displayName: Capture Environment
+        condition: succeededOrFailed()
+
+      - pwsh: |
+          $vpackFiles = Get-ChildItem -Path "$(Pipeline.Workspace)\Symbols_$(Architecture)\*" -Recurse
+          if($vpackFiles.Count -eq 0) {
+              throw "No files found in $(Pipeline.Workspace)\Symbols_$(Architecture)"
+          }
+          $vpackFiles
+        displayName: Debug Output Directory and Version
+        condition: succeededOrFailed()
diff --git a/.pipelines/templates/step/finalize.yml b/.pipelines/templates/step/finalize.yml
new file mode 100644
index 00000000000..78e0341c829
--- /dev/null
+++ b/.pipelines/templates/step/finalize.yml
@@ -0,0 +1,6 @@
+# This was used before migrating to OneBranch to deal with one of the SDL taks from failing with a warning instead of an error.
+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/.pipelines/templates/testartifacts.yml
similarity index 51%
rename from tools/releaseBuild/azureDevOps/templates/testartifacts.yml
rename to .pipelines/templates/testartifacts.yml
index 43c09236da9..3a6bec4a859 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/.pipelines/templates/testartifacts.yml
@@ -1,106 +1,113 @@
 jobs:
 - job: build_testartifacts_win
   variables:
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - group: DotNetPrivateBuildAccess
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - group: DotNetPrivateBuildAccess
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: ob_sdl_codeSignValidation_excludes
+    value: '-|**\*.ps1;-|**\*.psm1;-|**\*.ps1xml;-|**\*.psd1;-|**\*.exe;-|**\*.dll;-|**\*.cdxml'
+
   displayName: Build windows test artifacts
   condition: succeeded()
   pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
+    type: windows
   steps:
   - checkout: self
     clean: true
+    env:
+      ob_restore_phase: true
 
-  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
     parameters:
-      repoRoot: $(Build.SourcesDirectory)
+      ReleaseTagVar: $(ReleaseTagVar)
 
-  - pwsh: |
-      Import-Module ./build.psm1
-      Start-PSBootstrap
-    displayName: Bootstrap
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+  - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+    parameters:
+      repoRoot: $(RepoRoot)
+      ob_restore_phase: true
 
-  - pwsh: |
-      Import-Module ./build.psm1
+  - template: /.pipelines/templates/install-dotnet.yml@self
 
+  - pwsh: |
+      New-Item -Path '$(ob_outputDirectory)' -ItemType Directory -Force
+      Import-Module $(Build.SourcesDirectory)/PowerShell/build.psm1
       function BuildTestPackage([string] $runtime)
       {
         Write-Verbose -Verbose "Starting to build package for $runtime"
-
         New-TestPackage -Destination $(System.ArtifactsDirectory) -Runtime $runtime
-
         if (-not (Test-Path $(System.ArtifactsDirectory)/TestPackage.zip))
         {
           throw "Test Package was not found at: $(System.ArtifactsDirectory)"
         }
-
         switch ($runtime)
         {
           win7-x64 { $packageName = "TestPackage-win-x64.zip" }
           win7-x86 { $packageName = "TestPackage-win-x86.zip" }
           win-arm64 { $packageName = "TestPackage-win-arm64.zip" }
         }
-
         Rename-Item $(System.ArtifactsDirectory)/TestPackage.zip $packageName
-        Write-Host "##vso[artifact.upload containerfolder=testArtifacts;artifactname=testArtifacts]$(System.ArtifactsDirectory)/$packageName"
-      }
+        ## Write-Host "##vso[artifact.upload containerfolder=testArtifacts;artifactname=testArtifacts]$(System.ArtifactsDirectory)/$packageName"
 
+        Copy-Item -Path $(System.ArtifactsDirectory)/$packageName -Destination $(ob_outputDirectory) -Force -Verbose
+      }
       BuildTestPackage -runtime win7-x64
       BuildTestPackage -runtime win7-x86
       BuildTestPackage -runtime win-arm64
-
     displayName: Build test package and upload
     retryCountOnTaskFailure: 1
+    env:
+      ob_restore_phase: true
+
+  - pwsh: |
+      Write-Host "This doesn't do anything but make the build phase run."
+    displayName: Dummy build task
+
 
 - job: build_testartifacts_nonwin
   variables:
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - group: DotNetPrivateBuildAccess
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - group: DotNetPrivateBuildAccess
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
   displayName: Build non-windows test artifacts
   condition: succeeded()
   pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMSUbuntu20.04-Secure
+    type: linux
   steps:
   - checkout: self
     clean: true
+    env:
+      ob_restore_phase: true
 
-  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
     parameters:
-      repoRoot: $(Build.SourcesDirectory)
+      ReleaseTagVar: $(ReleaseTagVar)
 
-  - pwsh: |
-      Import-Module ./build.psm1
-      Start-PSBootstrap
-    displayName: Bootstrap
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+  - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+    parameters:
+      repoRoot: $(Build.SourcesDirectory)/PowerShell
+      ob_restore_phase: true
 
-  - pwsh: |
-      Import-Module ./build.psm1
+  - template: /.pipelines/templates/install-dotnet.yml@self
 
+  - pwsh: |
+      New-Item -Path '$(ob_outputDirectory)' -ItemType Directory -Force
+      Import-Module $(Build.SourcesDirectory)/PowerShell/build.psm1
       function BuildTestPackage([string] $runtime)
       {
         Write-Verbose -Verbose "Starting to build package for $runtime"
-
         New-TestPackage -Destination $(System.ArtifactsDirectory) -Runtime $runtime
-
         if (-not (Test-Path $(System.ArtifactsDirectory)/TestPackage.zip))
         {
           throw "Test Package was not found at: $(System.ArtifactsDirectory)"
         }
-
         switch ($runtime)
         {
           linux-x64 { $packageName = "TestPackage-linux-x64.zip" }
@@ -109,18 +116,19 @@ jobs:
           osx-x64 { $packageName = "TestPackage-macOS.zip" }
           linux-musl-x64 { $packageName = "TestPackage-alpine-x64.zip"}
         }
-
         Rename-Item $(System.ArtifactsDirectory)/TestPackage.zip $packageName
-        Write-Host "##vso[artifact.upload containerfolder=testArtifacts;artifactname=testArtifacts]$(System.ArtifactsDirectory)/$packageName"
+        Copy-Item -Path $(System.ArtifactsDirectory)/$packageName -Destination $(ob_outputDirectory) -Force -Verbose
       }
-
       BuildTestPackage -runtime linux-x64
       BuildTestPackage -runtime linux-arm
       BuildTestPackage -runtime linux-arm64
       BuildTestPackage -runtime osx-x64
       BuildTestPackage -runtime linux-musl-x64
-
     displayName: Build test package and upload
     retryCountOnTaskFailure: 1
+    env:
+      ob_restore_phase: true
 
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+  - pwsh: |
+      Write-Host "This doesn't do anything but make the build phase run."
+    displayName: Dummy build task
diff --git a/.pipelines/templates/uploadToAzure.yml b/.pipelines/templates/uploadToAzure.yml
new file mode 100644
index 00000000000..de6f8e0d7fd
--- /dev/null
+++ b/.pipelines/templates/uploadToAzure.yml
@@ -0,0 +1,425 @@
+jobs:
+- job: upload_packages
+  displayName: Upload packages
+  condition: succeeded()
+  pool:
+    type: windows
+  variables:
+  - name: ob_sdl_sbom_enabled
+    value: true
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: DOTNET_NOLOGO
+    value: 1
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_binskim_enabled
+    value: false
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+  - group: 'Azure Blob variable group'
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+      CreateJson: no
+
+  - template: /.pipelines/templates/release-SetReleaseTagandContainerName.yml@self
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+
+  - pwsh: |
+      Get-ChildItem Env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: 'Capture Environment Variables'
+
+  - pwsh: |
+      New-Item -Path '$(Build.ArtifactStagingDirectory)/downloads' -ItemType Directory -Force
+    displayName: Create downloads directory
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_deb
+      itemPattern: '**/*.deb'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download deb package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_fxdependent
+      itemPattern: '**/*.tar.gz'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux fxd package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_mariner_arm64
+      itemPattern: '**/*.rpm'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux mariner arm64 package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_mariner_x64
+      itemPattern: '**/*.rpm'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux mariner x64 package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_minSize
+      itemPattern: '**/*.tar.gz'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux minSize package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_rpm
+      itemPattern: '**/*.rpm'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux rpm package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_tar
+      itemPattern: '**/*.tar.gz'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux tar package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_tar_alpine
+      itemPattern: '**/*.tar.gz'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux alpine tar package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_tar_alpine_fxd
+      itemPattern: '**/*.tar.gz'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux alpine fxd tar package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_tar_arm
+      itemPattern: '**/*.tar.gz'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux arm32 tar package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_linux_package_tar_arm64
+      itemPattern: '**/*.tar.gz'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download linux arm64 tar package
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_nupkg_build_nupkg
+      itemPattern: '**/*.nupkg'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download nupkgs
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_windows_package_package_win_arm64
+      itemPattern: |
+        **/*.msix
+        **/*.zip
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download windows arm64 packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_windows_package_package_win_fxdependent
+      itemPattern: '**/*.zip'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download windows fxdependent packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_windows_package_package_win_fxdependentWinDesktop
+      itemPattern: '**/*.zip'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download windows fxdependentWinDesktop packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_windows_package_package_win_minsize
+      itemPattern: '**/*.zip'
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download windows minsize packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_windows_package_package_win_x64
+      itemPattern: |
+        **/*.msix
+        **/*.zip
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download windows x64 packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_windows_package_package_win_x86
+      itemPattern: |
+        **/*.msix
+        **/*.zip
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download windows x86 packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: macos-pkgs
+      itemPattern: |
+        **/*.tar.gz
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download macos tar packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_mac_package_sign_package_macos_arm64
+      itemPattern: |
+        **/*.pkg
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download macos arm packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_mac_package_sign_package_macos_x64
+      itemPattern: |
+        **/*.pkg
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download macos x64 packages
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      artifact: drop_msixbundle_CreateMSIXBundle
+      itemPattern: |
+        **/*.msixbundle
+      targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+    displayName: Download MSIXBundle
+
+  - pwsh: |
+      Get-ChildItem '$(Build.ArtifactStagingDirectory)/downloads' | Select-Object -ExpandProperty FullName
+    displayName: 'Capture downloads'
+
+  - pwsh: |
+      Write-Verbose -Verbose "Copying Github Release files in $(Build.ArtifactStagingDirectory)/downloads to use in Release Pipeline"
+
+      Write-Verbose -Verbose "Creating output directory for GitHub Release files: $(ob_outputDirectory)/GitHubPackages"
+      New-Item -Path $(ob_outputDirectory)/GitHubPackages -ItemType Directory -Force
+      Get-ChildItem -Path "$(Build.ArtifactStagingDirectory)/downloads/*" -Recurse |
+        Where-Object { $_.Extension -notin '.msix', '.nupkg' -and $_.Name -notmatch '-gc'} |
+        Copy-Item -Destination $(ob_outputDirectory)/GitHubPackages -Recurse -Verbose
+
+      Write-Verbose -Verbose "Creating output directory for NuGet packages: $(ob_outputDirectory)/NuGetPackages"
+      New-Item -Path $(ob_outputDirectory)/NuGetPackages -ItemType Directory -Force
+      Get-ChildItem -Path "$(Build.ArtifactStagingDirectory)/downloads/*" -Recurse |
+        Where-Object { $_.Extension -eq '.nupkg' } |
+        Copy-Item -Destination $(ob_outputDirectory)/NuGetPackages -Recurse -Verbose
+    displayName: Copy downloads to Artifacts
+
+  - pwsh: |
+      # Create output directory for packages which have been uploaded to blob storage
+      New-Item -Path $(Build.ArtifactStagingDirectory)/uploaded -ItemType Directory -Force
+    displayName: Create output directory for packages
+
+  - task: AzurePowerShell@5
+    displayName: Upload packages to blob
+    inputs:
+      azureSubscription: az-blob-cicd-infra
+      scriptType: inlineScript
+      azurePowerShellVersion: LatestVersion
+      pwsh: true
+      inline: |
+        $downloadsDirectory = '$(Build.ArtifactStagingDirectory)/downloads'
+        $uploadedDirectory = '$(Build.ArtifactStagingDirectory)/uploaded'
+        $storageAccountName = "pscoretestdata"
+        $containerName = $env:AZUREVERSION
+
+        Write-Verbose -Verbose "Uploading packages to blob storage account: $storageAccountName container: $containerName"
+
+        $context = New-AzStorageContext -StorageAccountName $storageAccountName -UseConnectedAccount
+
+        # Create the blob container if it doesn't exist
+        $containerExists = Get-AzStorageContainer -Name $containerName -Context $context -ErrorAction SilentlyContinue
+        if (-not $containerExists) {
+            $null = New-AzStorageContainer -Name $containerName -Context $context
+            Write-Host "Blob container $containerName created successfully."
+        }
+
+        $gcPackages = Get-ChildItem -Path $downloadsDirectory -Filter "powershell*gc.*"
+        Write-Verbose -Verbose "gc files to upload."
+        $gcPackages | Write-Verbose -Verbose
+        $gcContainerName = "$containerName-gc"
+        # Create the blob container if it doesn't exist
+        $containerExists = Get-AzStorageContainer -Name $gcContainerName -Context $context -ErrorAction SilentlyContinue
+        if (-not $containerExists) {
+            $null = New-AzStorageContainer -Name $gcContainerName -Context $context
+            Write-Host "Blob container $gcContainerName created successfully."
+        }
+
+        $gcPackages | ForEach-Object {
+            $blobName = "${_.Name}"
+            Write-Verbose -Verbose "Uploading $($_.FullName) to $gcContainerName/$blobName"
+            $null = Set-AzStorageBlobContent -File $_.FullName -Container $gcContainerName -Blob $blobName -Context $context
+            # Move to folder to we wont upload again
+            Move-Item -Path $_.FullName -Destination $uploadedDirectory -Force -Verbose
+        }
+
+        $nupkgFiles = Get-ChildItem -Path $downloadsDirectory -Filter "*.nupkg" | Where-Object { $_.Name -notlike "powershell*.nupkg" }
+
+        # create a SHA512 checksum file for each nupkg files
+
+        $checksums = $nupkgFiles |
+          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 "$downloadsDirectory\SHA512SUMS" -Force
+        $fileContent = Get-Content -Path "$downloadsDirectory\SHA512SUMS" -Raw | Out-String
+        Write-Verbose -Verbose -Message $fileContent
+
+        Write-Verbose -Verbose "nupkg files to upload."
+        $nupkgFiles += (Get-Item "$downloadsDirectory\SHA512SUMS")
+        $nupkgFiles | Write-Verbose -Verbose
+        $nugetContainerName = "$containerName-nuget"
+        # Create the blob container if it doesn't exist
+        $containerExists = Get-AzStorageContainer -Name $nugetContainerName -Context $context -ErrorAction SilentlyContinue
+        if (-not $containerExists) {
+            $null = New-AzStorageContainer -Name $nugetContainerName -Context $context
+            Write-Host "Blob container $nugetContainerName created successfully."
+        }
+
+        $nupkgFiles | ForEach-Object {
+            $blobName = $_.Name
+            Write-Verbose -Verbose "Uploading $($_.FullName) to $nugetContainerName/$blobName"
+            $null = Set-AzStorageBlobContent -File $_.FullName -Container $nugetContainerName -Blob $blobName -Context $context
+            # Move to folder to we wont upload again
+            Move-Item -Path $_.FullName -Destination $uploadedDirectory -Force -Verbose
+        }
+
+        $globaltoolFiles = Get-ChildItem -Path $downloadsDirectory -Filter "powershell*.nupkg"
+        # create a SHA512 checksum file for each nupkg files
+
+        $checksums = $globaltoolFiles |
+          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"
+          }
+
+        New-Item -Path "$downloadsDirectory\globaltool" -ItemType Directory -Force
+        $checksums | Out-File -FilePath "$downloadsDirectory\globaltool\SHA512SUMS" -Force
+        $fileContent = Get-Content -Path "$downloadsDirectory\globaltool\SHA512SUMS" -Raw | Out-String
+        Write-Verbose -Verbose -Message $fileContent
+
+        Write-Verbose -Verbose "globaltool files to upload."
+        $globaltoolFiles += Get-Item ("$downloadsDirectory\globaltool\SHA512SUMS")
+        $globaltoolFiles | Write-Verbose -Verbose
+        $globaltoolContainerName = "$containerName-nuget"
+        $globaltoolFiles | ForEach-Object {
+            $blobName = "globaltool/" + $_.Name
+            $globaltoolContainerName = "$containerName-nuget"
+            Write-Verbose -Verbose "Uploading $($_.FullName) to $globaltoolContainerName/$blobName"
+            $null = Set-AzStorageBlobContent -File $_.FullName -Container $globaltoolContainerName -Blob $blobName -Context $context
+            # Move to folder to we wont upload again
+            Move-Item -Path $_.FullName -Destination $uploadedDirectory -Force
+        }
+
+        # To use -Include parameter, we need to use \* to get all files
+        $privateFiles = Get-ChildItem -Path $downloadsDirectory\* -Include @("*.msix", "*.exe")
+        Write-Verbose -Verbose "private files to upload."
+        $privateFiles | Write-Verbose -Verbose
+        $privateContainerName = "$containerName-private"
+        # Create the blob container if it doesn't exist
+        $containerExists = Get-AzStorageContainer -Name $privateContainerName -Context $context -ErrorAction SilentlyContinue
+        if (-not $containerExists) {
+            $null = New-AzStorageContainer -Name $privateContainerName -Context $context
+            Write-Host "Blob container $privateContainerName created successfully."
+        }
+
+        $privateFiles | ForEach-Object {
+            $blobName = $_.Name
+            Write-Verbose -Verbose "Uploading $($_.FullName) to $privateContainerName/$blobName"
+            $null = Set-AzStorageBlobContent -File $_.FullName -Container $privateContainerName -Blob $blobName -Context $context
+            # Move to folder to we wont upload again
+            Move-Item -Path $_.FullName -Destination $uploadedDirectory -Force -Verbose
+        }
+
+        # To use -Include parameter, we need to use \* to get all files
+        $files = Get-ChildItem -Path $downloadsDirectory\* -Include @("*.deb", "*.tar.gz", "*.rpm", "*.zip", "*.pkg")
+        Write-Verbose -Verbose "files to upload."
+        $files | Write-Verbose -Verbose
+
+        $files | ForEach-Object {
+          $blobName = $_.Name
+          Write-Verbose -Verbose "Uploading $($_.FullName) to $containerName/$blobName"
+          $null = Set-AzStorageBlobContent -File $_.FullName -Container $containerName -Blob $blobName -Context $context
+          Write-Host "File $blobName uploaded to $containerName container."
+          Move-Item -Path $_.FullName -Destination $uploadedDirectory -Force -Verbose
+        }
+
+        $msixbundleFiles = Get-ChildItem -Path $downloadsDirectory -Filter "*.msixbundle"
+
+        $containerName = '$(OutputVersion.AzureVersion)-private'
+        $storageAccount = '$(StorageAccount)'
+
+        $storageContext = New-AzStorageContext -StorageAccountName $storageAccount -UseConnectedAccount
+
+        if ($msixbundleFiles) {
+          $bundleFile = $msixbundleFiles[0].FullName
+          $blobName = $msixbundleFiles[0].Name
+
+          $existing = Get-AzStorageBlob -Container $containerName -Blob $blobName -Context $storageContext -ErrorAction Ignore
+          if ($existing) {
+              Write-Verbose -Verbose "MSIX bundle already exists at '$storageAccount/$containerName/$blobName', removing first."
+              $existing | Remove-AzStorageBlob -ErrorAction Stop -Verbose
+          }
+
+          Write-Verbose -Verbose "Uploading $bundleFile to $containerName/$blobName"
+          Set-AzStorageBlobContent -File $bundleFile -Container $containerName -Blob $blobName -Context $storageContext -Force
+        } else {
+            throw "MSIXBundle not found in $downloadsDirectory"
+        }
diff --git a/.pipelines/templates/variables/PowerShell-Coordinated_Packages-Variables.yml b/.pipelines/templates/variables/PowerShell-Coordinated_Packages-Variables.yml
new file mode 100644
index 00000000000..dd67d509a8a
--- /dev/null
+++ b/.pipelines/templates/variables/PowerShell-Coordinated_Packages-Variables.yml
@@ -0,0 +1,67 @@
+parameters:
+  - name: InternalSDKBlobURL
+    type: string
+    default: ' '
+  - name: ReleaseTagVar
+    type: string
+    default: 'fromBranch'
+  - name: SKIP_SIGNING
+    type: string
+    default: 'NO'
+  - name: ENABLE_MSBUILD_BINLOGS
+    type: boolean
+    default: false
+  - name: FORCE_CODEQL
+    type: boolean
+    default: false
+
+variables:
+  - name: PS_RELEASE_BUILD
+    value: 1
+  - name: DOTNET_CLI_TELEMETRY_OPTOUT
+    value: 1
+  - name: POWERSHELL_TELEMETRY_OPTOUT
+    value: 1
+  - name: nugetMultiFeedWarnLevel
+    value: none
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: skipNugetSecurityAnalysis
+    value: true
+  - name: branchCounterKey
+    value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
+  - name: branchCounter
+    value: $[counter(variables['branchCounterKey'], 1)]
+  - name: BUILDSECMON_OPT_IN
+    value: true
+  - name: __DOTNET_RUNTIME_FEED
+    value: ${{ parameters.InternalSDKBlobURL }}
+  - name: LinuxContainerImage
+    value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
+  - name: WindowsContainerImage
+    value: onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
+  - name: CDP_DEFINITION_BUILD_COUNT
+    value: $[counter('', 0)]
+  - name: ReleaseTagVar
+    value: ${{ parameters.ReleaseTagVar }}
+  - name: SKIP_SIGNING
+    value: ${{ parameters.SKIP_SIGNING }}
+  - group: mscodehub-feed-read-general
+  - group: mscodehub-feed-read-akv
+  - name: ENABLE_MSBUILD_BINLOGS
+    value: ${{ parameters.ENABLE_MSBUILD_BINLOGS }}
+  - ${{ if eq(parameters['FORCE_CODEQL'],'true') }}:
+    # Cadence is hours before CodeQL will allow a re-upload of the database
+    - name: CodeQL.Cadence
+      value: 1
+  - name: CODEQL_ENABLED
+    ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(parameters['FORCE_CODEQL'],'true')) }}:
+      value: true
+    ${{ else }}:
+      value: false
+  # Fix for BinSkim ICU package error in Linux containers
+  - name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
+    value: true
+  # Disable BinSkim at job level to override NonOfficial template defaults
+  - name: ob_sdl_binskim_enabled
+    value: false
diff --git a/.pipelines/templates/variables/PowerShell-Packages-Variables.yml b/.pipelines/templates/variables/PowerShell-Packages-Variables.yml
new file mode 100644
index 00000000000..7d1818909b5
--- /dev/null
+++ b/.pipelines/templates/variables/PowerShell-Packages-Variables.yml
@@ -0,0 +1,50 @@
+parameters:
+  - name: debug
+    type: boolean
+    default: false
+  - name: ForceAzureBlobDelete
+    type: string
+    default: 'false'
+  - name: ReleaseTagVar
+    type: string
+    default: 'fromBranch'
+  - name: disableNetworkIsolation
+    type: boolean
+    default: false
+
+variables:
+  - name: CDP_DEFINITION_BUILD_COUNT
+    value: $[counter('', 0)] # needed for onebranch.pipeline.version task
+  - name: system.debug
+    value: ${{ parameters.debug }}
+  - name: ENABLE_PRS_DELAYSIGN
+    value: 1
+  - name: ROOT
+    value: $(Build.SourcesDirectory)
+  - name: ForceAzureBlobDelete
+    value: ${{ parameters.ForceAzureBlobDelete }}
+  - name: NUGET_XMLDOC_MODE
+    value: none
+  - name: nugetMultiFeedWarnLevel
+    value: none
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: skipNugetSecurityAnalysis
+    value: true
+  - name: ReleaseTagVar
+    value: ${{ parameters.ReleaseTagVar }}
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: WindowsContainerImage
+    value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest' # Docker image which is used to build the project
+  - name: LinuxContainerImage
+    value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
+  - group: mscodehub-feed-read-general
+  - group: mscodehub-feed-read-akv
+  - name: branchCounterKey
+    value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
+  - name: branchCounter
+    value: $[counter(variables['branchCounterKey'], 1)]
+  - group: MSIXSigningProfile
+  - name: disableNetworkIsolation
+    value: ${{ parameters.disableNetworkIsolation }}
diff --git a/.pipelines/templates/variables/PowerShell-Release-Azure-Variables.yml b/.pipelines/templates/variables/PowerShell-Release-Azure-Variables.yml
new file mode 100644
index 00000000000..3b47e5eff2b
--- /dev/null
+++ b/.pipelines/templates/variables/PowerShell-Release-Azure-Variables.yml
@@ -0,0 +1,35 @@
+parameters:
+  - name: debug
+    type: boolean
+    default: false
+
+variables:
+  - name: CDP_DEFINITION_BUILD_COUNT
+    value: $[counter('', 0)]
+  - name: system.debug
+    value: ${{ parameters.debug }}
+  - name: ENABLE_PRS_DELAYSIGN
+    value: 1
+  - name: ROOT
+    value: $(Build.SourcesDirectory)
+  - name: REPOROOT
+    value: $(Build.SourcesDirectory)
+  - name: OUTPUTROOT
+    value: $(REPOROOT)\out
+  - name: NUGET_XMLDOC_MODE
+    value: none
+  - name: nugetMultiFeedWarnLevel
+    value: none
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: skipNugetSecurityAnalysis
+    value: true
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\.config\tsaoptions.json
+  - name: WindowsContainerImage
+    value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+  - name: LinuxContainerImage
+    value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
+  - group: PoolNames
diff --git a/.pipelines/templates/variables/PowerShell-Release-Variables.yml b/.pipelines/templates/variables/PowerShell-Release-Variables.yml
new file mode 100644
index 00000000000..930c559eafe
--- /dev/null
+++ b/.pipelines/templates/variables/PowerShell-Release-Variables.yml
@@ -0,0 +1,41 @@
+parameters:
+  - name: debug
+    type: boolean
+    default: false
+  - name: ReleaseTagVar
+    type: string
+    default: 'fromBranch'
+
+variables:
+  - name: CDP_DEFINITION_BUILD_COUNT
+    value: $[counter('', 0)]
+  - name: system.debug
+    value: ${{ parameters.debug }}
+  - name: ENABLE_PRS_DELAYSIGN
+    value: 1
+  - name: ROOT
+    value: $(Build.SourcesDirectory)
+  - name: REPOROOT
+    value: $(Build.SourcesDirectory)
+  - name: OUTPUTROOT
+    value: $(REPOROOT)\out
+  - name: NUGET_XMLDOC_MODE
+    value: none
+  - name: nugetMultiFeedWarnLevel
+    value: none
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: skipNugetSecurityAnalysis
+    value: true
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: WindowsContainerImage
+    value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+  - name: LinuxContainerImage
+    value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
+  - name: ReleaseTagVar
+    value: ${{ parameters.ReleaseTagVar }}
+  - group: PoolNames
+  # Fix for BinSkim ICU package error in Linux containers
+  - name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
+    value: true
diff --git a/.pipelines/templates/variables/PowerShell-vPack-Variables.yml b/.pipelines/templates/variables/PowerShell-vPack-Variables.yml
new file mode 100644
index 00000000000..7f00a5e0e2a
--- /dev/null
+++ b/.pipelines/templates/variables/PowerShell-vPack-Variables.yml
@@ -0,0 +1,39 @@
+parameters:
+  - name: debug
+    type: boolean
+    default: false
+  - name: ReleaseTagVar
+    type: string
+    default: 'fromBranch'
+  - name: netiso
+    type: string
+    default: 'R1'
+
+variables:
+  - name: CDP_DEFINITION_BUILD_COUNT
+    value: $[counter('', 0)]
+  - name: system.debug
+    value: ${{ parameters.debug }}
+  - name: BuildSolution
+    value: $(Build.SourcesDirectory)\dirs.proj
+  - name: BuildConfiguration
+    value: Release
+  - name: WindowsContainerImage
+    value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+  - name: Codeql.Enabled
+    value: false  #  pipeline is not building artifacts; it repackages existing artifacts into a vpack
+  - name: DOTNET_CLI_TELEMETRY_OPTOUT
+    value: 1
+  - name: POWERSHELL_TELEMETRY_OPTOUT
+    value: 1
+  - name: nugetMultiFeedWarnLevel
+    value: none
+  - name: ReleaseTagVar
+    value: ${{ parameters.ReleaseTagVar }}
+  - group: Azure Blob variable group
+  - group: certificate_logical_to_actual # used within signing task
+  - group: DotNetPrivateBuildAccess
+  - name: netiso
+    value: ${{ parameters.netiso }}
+# We shouldn't be using PATs anymore
+#  - group: mscodehub-feed-read-general
diff --git a/.pipelines/templates/variables/release-shared.yml b/.pipelines/templates/variables/release-shared.yml
new file mode 100644
index 00000000000..70d3dd2df97
--- /dev/null
+++ b/.pipelines/templates/variables/release-shared.yml
@@ -0,0 +1,40 @@
+parameters:
+  - name: REPOROOT
+    type: string
+    default: $(Build.SourcesDirectory)\PowerShell
+  - name: SBOM
+    type: boolean
+    default: false
+  - name: RELEASETAG
+    type: string
+    default: 'Not Initialized'
+  - name: VERSION
+    type: string
+    default: 'Not Initialized'
+
+variables:
+  - name: ob_signing_setup_enabled            
+    value: false
+  - name: ob_sdl_sbom_enabled
+    value: ${{ parameters.SBOM }}
+  - name: DOTNET_NOLOGO
+    value: 1
+  - group: 'mscodehub-code-read-akv'
+  - group: 'Azure Blob variable group'
+  - group: 'GitHubTokens'
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_binskim_enabled
+    value: false
+  - name: ob_sdl_tsa_configFile
+    value: ${{ parameters.REPOROOT }}\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: ${{ parameters.REPOROOT }}\.config\suppress.json
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+  - name: ReleaseTag
+    value: ${{ parameters.RELEASETAG }}
+  - name: Version
+    value: ${{ parameters.VERSION }}
diff --git a/.pipelines/templates/windows-hosted-build.yml b/.pipelines/templates/windows-hosted-build.yml
new file mode 100644
index 00000000000..a2933e90817
--- /dev/null
+++ b/.pipelines/templates/windows-hosted-build.yml
@@ -0,0 +1,323 @@
+parameters:
+  Architecture: 'x64'
+  BuildConfiguration: 'release'
+  JobName: 'build_windows'
+
+jobs:
+- job: build_windows_${{ parameters.Architecture }}_${{ parameters.BuildConfiguration }}
+  displayName: Build_Windows_${{ parameters.Architecture }}_${{ parameters.BuildConfiguration }}
+  condition: succeeded()
+  pool:
+    type: windows
+  variables:
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  - name: DOTNET_NOLOGO
+    value: 1
+  - group: DotNetPrivateBuildAccess
+  - group: certificate_logical_to_actual
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_sdl_codeSignValidation_enabled
+    value: false
+  - name: ob_sdl_binskim_enabled
+    value: true
+  - name: ob_sdl_tsa_configFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\tsaoptions.json
+  - name: ob_sdl_credscan_suppressionsFile
+    value: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
+  - name: Architecture
+    value: ${{ parameters.Architecture }}
+  - name: BuildConfiguration
+    value: ${{ parameters.BuildConfiguration }}
+  - name: ob_sdl_sbom_packageName
+    value: 'Microsoft.Powershell.Windows.${{ parameters.Architecture }}'
+  # We add this manually, so we need it disabled the OneBranch auto-injected one.
+  - name: ob_sdl_codeql_compiled_enabled
+    value: false
+
+  steps:
+  - checkout: self
+    clean: true
+    env:
+      ob_restore_phase: true # This ensures checkout is done at the beginning of the restore phase
+
+  - template: /.pipelines/templates/SetVersionVariables.yml@self
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
+  - template: /.pipelines/templates/cloneToOfficialPath.yml@self
+
+  - template: /.pipelines/templates/insert-nuget-config-azfeed.yml@self
+    parameters:
+      repoRoot: $(PowerShellRoot)
+
+  - task: CodeQL3000Init@0 # Add CodeQL Init task right before your 'Build' step.
+    condition: eq(variables['CODEQL_ENABLED'], 'true')
+    env:
+      ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+    inputs:
+      Enabled: true
+      # AnalyzeInPipeline: false = upload results
+      # AnalyzeInPipeline: true = do not upload results
+      AnalyzeInPipeline: false
+      Language: csharp
+
+  - template: /.pipelines/templates/install-dotnet.yml@self
+
+  - pwsh: |
+      $runtime = switch ($env:Architecture)
+        {
+          "x64" { "win7-x64" }
+          "x86" { "win7-x86" }
+          "arm64" { "win-arm64" }
+          "fxdependent" { "fxdependent" }
+          "fxdependentWinDesktop" { "fxdependent-win-desktop" }
+        }
+
+      $params = @{}
+      if ($env:BuildConfiguration -eq 'minSize') {
+        $params['ForMinimalSize'] = $true
+      }
+
+      $vstsCommandString = "vso[task.setvariable variable=Runtime]$runtime"
+      Write-Host ("sending " + $vstsCommandString)
+      Write-Host "##$vstsCommandString"
+
+      Write-Verbose -Message "Building PowerShell with Runtime: $runtime for '$env:BuildConfiguration' configuration"
+      Import-Module -Name $(PowerShellRoot)/build.psm1 -Force
+      $buildWithSymbolsPath = New-Item -ItemType Directory -Path $(Pipeline.Workspace)/Symbols_$(Architecture) -Force
+
+      Start-PSBootstrap -Scenario Package
+      $null = New-Item -ItemType Directory -Path $buildWithSymbolsPath -Force -Verbose
+
+      $ReleaseTagParam = @{}
+
+      if ($env:RELEASETAGVAR) {
+        $ReleaseTagParam['ReleaseTag'] = $env:RELEASETAGVAR
+      }
+
+      Start-PSBuild -Runtime $runtime -Configuration Release -Output $buildWithSymbolsPath -Clean -PSModuleRestore @params @ReleaseTagParam
+
+      $refFolderPath = Join-Path $buildWithSymbolsPath 'ref'
+      Write-Verbose -Verbose "refFolderPath: $refFolderPath"
+      $outputPath = Join-Path '$(ob_outputDirectory)' 'psoptions'
+      $null = New-Item -ItemType Directory -Path $outputPath -Force
+      $psOptPath = "$outputPath/psoptions.json"
+      Save-PSOptions -PSOptionsPath $psOptPath
+
+      Write-Verbose -Verbose "Verifying pdbs exist in build folder"
+      $pdbs = Get-ChildItem -Path $buildWithSymbolsPath -Recurse -Filter *.pdb
+      if ($pdbs.Count -eq 0) {
+        Write-Error -Message "No pdbs found in build folder"
+      }
+      else {
+        Write-Verbose -Verbose "Found $($pdbs.Count) pdbs in build folder"
+        $pdbs | ForEach-Object {
+          Write-Verbose -Verbose "Pdb: $($_.FullName)"
+        }
+
+        $pdbs | Compress-Archive -DestinationPath "$(ob_outputDirectory)/symbols.zip" -Update
+      }
+
+      Write-Verbose -Verbose "Completed building PowerShell for '$env:BuildConfiguration' configuration"
+    displayName: 'Build Windows Universal - $(Architecture)-$(BuildConfiguration) Symbols folder'
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+      ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+  - pwsh: |
+      $runtime = switch ($env:Architecture)
+        {
+          "x64" { "win7-x64" }
+          "x86" { "win7-x86" }
+          "arm64" { "win-arm64" }
+          "fxdependent" { "fxdependent" }
+          "fxdependentWinDesktop" { "fxdependent-win-desktop" }
+        }
+
+      Import-Module -Name $(PowerShellRoot)/build.psm1 -Force
+      Find-Dotnet
+
+      ## Build global tool
+      Write-Verbose -Message "Building PowerShell global tool for Windows.x64" -Verbose
+      $globalToolCsProjDir = Join-Path $(PowerShellRoot) 'src' 'GlobalTools' 'PowerShell.Windows.x64'
+      Push-Location -Path $globalToolCsProjDir -Verbose
+
+      $globalToolArtifactPath = Join-Path $(Build.SourcesDirectory) 'GlobalTool'
+      $vstsCommandString = "vso[task.setvariable variable=GlobalToolArtifactPath]${globalToolArtifactPath}"
+      Write-Host "sending " + $vstsCommandString
+      Write-Host "##$vstsCommandString"
+
+      if ($env:RELEASETAGVAR) {
+        $ReleaseTagToUse = $env:RELEASETAGVAR -Replace '^v'
+      }
+
+      Write-Verbose -Verbose "Building PowerShell global tool for Windows.x64 with cmdline: dotnet publish --no-self-contained --artifacts-path $globalToolArtifactPath /property:PackageVersion=$(Version) --configuration 'Release' /property:ReleaseTag=$ReleaseTagToUse"
+      dotnet publish --no-self-contained --artifacts-path $globalToolArtifactPath /property:PackageVersion=$(Version) --configuration 'Release' /property:ReleaseTag=$ReleaseTagToUse
+      $globalToolBuildModulePath = Join-Path $globalToolArtifactPath 'publish' 'PowerShell.Windows.x64' 'release'
+      Pop-Location
+      # do this to ensure everything gets signed.
+      Restore-PSModuleToBuild -PublishPath $globalToolBuildModulePath
+
+      $buildWithSymbolsPath = Get-Item -Path "$(Pipeline.Workspace)/Symbols_$(Architecture)"
+      $refFolderPath = Join-Path $buildWithSymbolsPath 'ref'
+      Write-Verbose -Verbose "refFolderPath: $refFolderPath"
+
+      # Copy reference assemblies
+      Copy-Item -Path $refFolderPath -Destination $globalToolBuildModulePath -Recurse -Force
+
+      Write-Verbose -Verbose "clean unnecessary files in obj directory"
+      $objDir = Join-Path $globalToolArtifactPath 'obj' 'PowerShell.Windows.x64' 'release'
+
+      $filesToKeep = @("apphost.exe", "PowerShell.Windows.x64.pdb", "PowerShell.Windows.x64.dll", "project.assets.json")
+
+      # only four files are needed in obj folder for global tool packaging
+      Get-ChildItem -Path $objDir -File -Recurse |
+        Where-Object { -not $_.PSIsContainer } |
+        Where-Object { $_.name -notin $filesToKeep } |
+        Remove-Item -Verbose
+
+
+    displayName: 'Build Winx64 Global tool'
+    condition: and(succeeded(), eq(variables['Architecture'], 'fxdependent'))
+    env:
+      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+      ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+  - task: CodeQL3000Finalize@0 # Add CodeQL Finalize task right after your 'Build' step.
+    condition: eq(variables['CODEQL_ENABLED'], 'true')
+    env:
+      ob_restore_phase: true # Set ob_restore_phase to run this step before '🔒 Setup Signing' step.
+
+  - pwsh: |
+      $platform = 'windows'
+      $vstsCommandString = "vso[task.setvariable variable=ArtifactPlatform]$platform"
+      Write-Host ("sending " + $vstsCommandString)
+      Write-Host "##$vstsCommandString"
+    displayName: Set artifact platform
+
+  - template: /.pipelines/templates/obp-file-signing.yml@self
+    parameters:
+      binPath: '$(Pipeline.Workspace)/Symbols_$(Architecture)'
+      OfficialBuild: $(ps_official_build)
+
+  ## first we sign all the files in the bin folder
+  - ${{ if eq(variables['Architecture'], 'fxdependent') }}:
+    - template: /.pipelines/templates/obp-file-signing.yml@self
+      parameters:
+        binPath: '$(GlobalToolArtifactPath)/publish/PowerShell.Windows.x64/release'
+        globalTool: 'true'
+        OfficialBuild: $(ps_official_build)
+
+  - pwsh: |
+      Get-ChildItem '$(GlobalToolArtifactPath)/obj/PowerShell.Windows.x64/release'
+    displayName: Capture obj files
+    condition: and(succeeded(), eq(variables['Architecture'], 'fxdependent'))
+
+  ## Now we sign couple of file from the obj folder which are needed for the global tool packaging
+  - task: onebranch.pipeline.signing@1
+    displayName: Sign obj files
+    inputs:
+      command: 'sign'
+      signing_profile: external_distribution
+      files_to_sign: '**\*.dll;**\*.exe'
+      search_root: '$(GlobalToolArtifactPath)/obj/PowerShell.Windows.x64/release'
+    condition: and(succeeded(), eq(variables['Architecture'], 'fxdependent'))
+
+  - pwsh: |
+      <#  The way the packaging works is a bit tricky as when it is built, we cannot add the modules that come from gallery.
+          We have to use dotnet pack to build the nupkg and then expand it as a zip.
+          After expanding we restore the signed files for the modules from the gallery.
+          We also delete pdbs, content and contentFiles folder which are not necessary.
+          After that, we repack using Compress-Archive and rename it back to a nupkg.
+        #>
+
+      Import-Module -Name $(PowerShellRoot)/build.psm1 -Force
+      Find-Dotnet
+
+      $packagingStrings = Import-PowerShellDataFile "$(PowerShellRoot)\tools\packaging\packaging.strings.psd1"
+
+      $outputPath = Join-Path '$(ob_outputDirectory)' 'globaltool'
+      $null = New-Item -ItemType Directory -Path $outputPath -Force
+      $globalToolCsProjDir = Join-Path $(PowerShellRoot) 'src' 'GlobalTools' 'PowerShell.Windows.x64'
+      Push-Location -Path $globalToolCsProjDir -Verbose
+
+      if ($env:RELASETAGVAR) {
+        $ReleaseTagToUse = $env:RELASETAGVAR -Replace '^v'
+      }
+
+      Write-Verbose -Verbose "Packing PowerShell global tool for Windows.x64 with cmdline: dotnet pack --output $outputPath --no-build --artifacts-path '$(GlobalToolArtifactPath)' /property:PackageVersion=$(Version) /property:PackageIcon=Powershell_64.png /property:Version=$(Version) /property:ReleaseTag=$ReleaseTagToUse"
+
+      dotnet pack --output $outputPath --no-build --artifacts-path '$(GlobalToolArtifactPath)' /property:PackageVersion=$(Version) /property:PackageIcon=Powershell_64.png /property:Version=$(Version) /property:ReleaseTag=$ReleaseTagToUse
+
+      Write-Verbose -Verbose "Deleting content and contentFiles folders from the nupkg"
+
+      $nupkgs = Get-ChildItem -Path $outputPath -Filter powershell*.nupkg
+
+      $nupkgName = $nupkgs.Name
+      $newName = $nupkgName -replace '(\.nupkg)$', '.zip'
+      Rename-Item -Path $nupkgs.FullName -NewName $newName
+
+      $zipPath = Get-ChildItem -Path $outputPath -Filter powershell*.zip
+
+      # Expand zip and remove content and contentFiles folders
+      Expand-Archive -Path $zipPath -DestinationPath "$outputPath\temp" -Force
+
+      $modulesToCopy = @(
+        'PowerShellGet'
+        'PackageManagement'
+        'Microsoft.PowerShell.PSResourceGet'
+        'Microsoft.PowerShell.Archive'
+        'PSReadLine'
+        'Microsoft.PowerShell.ThreadJob'
+      )
+
+      $sourceModulePath = Join-Path '$(GlobalToolArtifactPath)' 'publish' 'PowerShell.Windows.x64' 'release' 'Modules'
+      $destModulesPath = Join-Path "$outputPath" 'temp' 'tools' 'net11.0' 'any' 'modules'
+
+      $modulesToCopy | ForEach-Object {
+        $modulePath = Join-Path $sourceModulePath $_
+        Copy-Item -Path $modulePath -Destination $destModulesPath -Recurse -Force
+      }
+
+      # Copy ref assemblies
+      Copy-Item '$(Pipeline.Workspace)/Symbols_$(Architecture)/ref' "$outputPath\temp\tools\net11.0\any\ref" -Recurse -Force
+
+      $contentPath = Join-Path "$outputPath\temp" 'content'
+      $contentFilesPath = Join-Path "$outputPath\temp" 'contentFiles'
+
+      Remove-Item -Path $contentPath,$contentFilesPath -Recurse -Force
+
+      # remove PDBs to reduce the size of the nupkg
+      Remove-Item -Path "$outputPath\temp\tools\net11.0\any\*.pdb" -Recurse -Force
+
+      # create powershell.config.json
+      $config = [ordered]@{}
+      $config.Add("Microsoft.PowerShell:ExecutionPolicy", "RemoteSigned")
+      $config.Add("WindowsPowerShellCompatibilityModuleDenyList", @("PSScheduledJob", "BestPractices", "UpdateServices"))
+
+      $configPublishPath = Join-Path "$outputPath" 'temp' 'tools' 'net11.0' 'any' "powershell.config.json"
+      Set-Content -Path $configPublishPath -Value ($config | ConvertTo-Json) -Force -ErrorAction Stop
+
+      Compress-Archive -Path "$outputPath\temp\*" -DestinationPath "$outputPath\$nupkgName" -Force
+
+      Remove-Item -Path "$outputPath\temp" -Recurse -Force
+      Remove-Item -Path $zipPath -Force
+
+      if (-not (Test-Path "$outputPath\powershell.windows.x64.*.nupkg")) {
+        throw "Global tool package not found at $outputPath"
+      }
+    displayName: 'Pack Windows.x64 global tool'
+    condition: and(succeeded(), eq(variables['Architecture'], 'fxdependent'))
+
+  - task: onebranch.pipeline.signing@1
+    displayName: Sign nupkg files
+    inputs:
+      command: 'sign'
+      cp_code: 'CP-401405'
+      files_to_sign: '**\*.nupkg'
+      search_root: '$(ob_outputDirectory)\globaltool'
+    condition: and(succeeded(), eq(variables['Architecture'], 'fxdependent'))
+
+  - template: /.pipelines/templates/step/finalize.yml@self
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000000..222861c3415
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "tabWidth": 2,
+  "useTabs": false
+}
diff --git a/.spelling b/.spelling
index dbc54bbc393..cc711f0aa5a 100644
--- a/.spelling
+++ b/.spelling
@@ -622,6 +622,7 @@ NativeCommandProcessor.cs
 NativeCultureResolver
 nativeexecution
 net5.0
+net10.0
 netcoreapp5.0
 netip.ps1.
 netstandard.dll
diff --git a/.vsts-ci/linux-daily.yml b/.vsts-ci/linux-daily.yml
index 82705e8b5ce..10effadd1e3 100644
--- a/.vsts-ci/linux-daily.yml
+++ b/.vsts-ci/linux-daily.yml
@@ -25,8 +25,7 @@ pr:
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   POWERSHELL_TELEMETRY_OPTOUT: 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
+  DOTNET_NOLOGO: 1
   __SuppressAnsiEscapeSequences: 1
 
 resources:
@@ -54,7 +53,7 @@ stages:
 
     steps:
     - pwsh: |
-        Get-ChildItem -Path env:
+        Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
       displayName: Capture Environment
       condition: succeededOrFailed()
 
diff --git a/.vsts-ci/linux-internal.yml b/.vsts-ci/linux-internal.yml
new file mode 100644
index 00000000000..b90ab0d9eb4
--- /dev/null
+++ b/.vsts-ci/linux-internal.yml
@@ -0,0 +1,115 @@
+# Pipeline to run Linux CI internally
+name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
+trigger:
+  # Batch merge builds together while a merge build is running
+  batch: true
+  branches:
+    include:
+    - master
+    - release*
+    - feature*
+  paths:
+    include:
+    - '*'
+    exclude:
+    - .vsts-ci/misc-analysis.yml
+    - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
+    - .dependabot/config.yml
+    - .pipelines/*
+    - test/perf/*
+pr:
+  branches:
+    include:
+    - master
+    - release*
+    - feature*
+  paths:
+    include:
+    - '*'
+    exclude:
+    - .dependabot/config.yml
+    - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
+    - .vsts-ci/misc-analysis.yml
+    - .vsts-ci/windows.yml
+    - .vsts-ci/windows/*
+    - tools/cgmanifest/*
+    - LICENSE.txt
+    - test/common/markdown/*
+    - test/perf/*
+    - tools/releaseBuild/*
+    - tools/install*
+    - tools/releaseBuild/azureDevOps/templates/*
+    - README.md
+    - .spelling
+    - .pipelines/*
+
+variables:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  __SuppressAnsiEscapeSequences: 1
+  nugetMultiFeedWarnLevel: none
+
+resources:
+  repositories:
+    - repository: Docker
+      type: github
+      endpoint: PowerShell
+      name: PowerShell/PowerShell-Docker
+      ref: master
+
+stages:
+- stage: BuildLinuxStage
+  displayName: Build for Linux
+  jobs:
+  - template: templates/ci-build.yml
+    parameters:
+      pool: ubuntu-20.04
+      jobName: linux_build
+      displayName: linux Build
+
+- stage: TestUbuntu
+  displayName: Test for Ubuntu
+  dependsOn: [BuildLinuxStage]
+  jobs:
+  - template: templates/nix-test.yml
+    parameters:
+      name: Ubuntu
+      pool: ubuntu-20.04
+      purpose: UnelevatedPesterTests
+      tagSet: CI
+
+  - template: templates/nix-test.yml
+    parameters:
+      name: Ubuntu
+      pool: ubuntu-20.04
+      purpose: ElevatedPesterTests
+      tagSet: CI
+
+  - template: templates/nix-test.yml
+    parameters:
+      name: Ubuntu
+      pool: ubuntu-20.04
+      purpose: UnelevatedPesterTests
+      tagSet: Others
+
+  - template: templates/nix-test.yml
+    parameters:
+      name: Ubuntu
+      pool: ubuntu-20.04
+      purpose: ElevatedPesterTests
+      tagSet: Others
+
+  - template: templates/verify-xunit.yml
+    parameters:
+      pool: ubuntu-20.04
+
+- stage: PackageLinux
+  displayName: Package Linux
+  dependsOn: ["BuildLinuxStage"]
+  jobs:
+  - template: linux/templates/packaging.yml
+    parameters:
+      pool: ubuntu-20.04
diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 57c60bc25a7..5d9dc663e1c 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -22,7 +22,9 @@ trigger:
     exclude:
     - .vsts-ci/misc-analysis.yml
     - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
     - .dependabot/config.yml
+    - .pipelines/*
     - test/perf/*
 pr:
   branches:
@@ -32,28 +34,21 @@ pr:
     - feature*
   paths:
     include:
-    - '*'
-    exclude:
-    - .dependabot/config.yml
-    - .github/ISSUE_TEMPLATE/*
-    - .vsts-ci/misc-analysis.yml
-    - .vsts-ci/windows.yml
-    - .vsts-ci/windows/*
-    - tools/cgmanifest.json
-    - LICENSE.txt
-    - test/common/markdown/*
-    - test/perf/*
-    - tools/releaseBuild/*
-    - tools/install*
-    - tools/releaseBuild/azureDevOps/templates/*
-    - README.md
-    - .spelling
+    - .vsts-ci/linux.yml
+    - .vsts-ci/linux/templates/packaging.yml
+    - assets/manpage/*
+    - build.psm1
+    - global.json
+    - nuget.config
+    - PowerShell.Common.props
+    - src/*.csproj
+    - tools/ci.psm1
+    - tools/packaging/*
 
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   POWERSHELL_TELEMETRY_OPTOUT: 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
+  DOTNET_NOLOGO: 1
   __SuppressAnsiEscapeSequences: 1
   nugetMultiFeedWarnLevel: none
 
@@ -71,101 +66,14 @@ stages:
   jobs:
   - template: templates/ci-build.yml
     parameters:
-      pool: ubuntu-20.04
+      pool: ubuntu-latest
       jobName: linux_build
       displayName: linux Build
 
-- stage: TestUbuntu
-  displayName: Test for Ubuntu
-  dependsOn: [BuildLinuxStage]
-  jobs:
-  - template: templates/nix-test.yml
-    parameters:
-      name: Ubuntu
-      pool: ubuntu-20.04
-      purpose: UnelevatedPesterTests
-      tagSet: CI
-
-  - template: templates/nix-test.yml
-    parameters:
-      name: Ubuntu
-      pool: ubuntu-20.04
-      purpose: ElevatedPesterTests
-      tagSet: CI
-
-  - template: templates/nix-test.yml
-    parameters:
-      name: Ubuntu
-      pool: ubuntu-20.04
-      purpose: UnelevatedPesterTests
-      tagSet: Others
-
-  - template: templates/nix-test.yml
-    parameters:
-      name: Ubuntu
-      pool: ubuntu-20.04
-      purpose: ElevatedPesterTests
-      tagSet: Others
-
-  - template: templates/verify-xunit.yml
-    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: |
-        # Initialize container test stage
-        Import-Module ./PowerShell/tools/ci.psm1
-        Invoke-InitializeContainerStage -ContainerPattern '${{ parameters.ContainerPattern }}'
-      name: getContainerTask
-      displayName: Initialize Container Stage
-      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: ["BuildLinuxStage"]
   jobs:
   - template: linux/templates/packaging.yml
     parameters:
-      pool: ubuntu-20.04
+      pool: ubuntu-latest
diff --git a/.vsts-ci/linux/templates/packaging.yml b/.vsts-ci/linux/templates/packaging.yml
index fab2e1101fa..8f77b8e24a0 100644
--- a/.vsts-ci/linux/templates/packaging.yml
+++ b/.vsts-ci/linux/templates/packaging.yml
@@ -13,8 +13,14 @@ jobs:
   displayName: ${{ parameters.name }} packaging
 
   steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      useGlobalJson: true
+      packageType: 'sdk'
+
   - pwsh: |
-      Get-ChildItem -Path env:
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
     displayName: Capture Environment
     condition: succeededOrFailed()
 
@@ -33,7 +39,7 @@ jobs:
 
   - pwsh: |
       Import-Module .\build.psm1
-      Start-PSBootstrap -Package
+      Start-PSBootstrap -Scenario Package
     displayName: Bootstrap
 
   - pwsh: |
diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index 4f5e999a335..678ded65259 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -14,7 +14,9 @@ trigger:
     - tools/releaseBuild/**/*
     - .vsts-ci/misc-analysis.yml
     - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
     - .dependabot/config.yml
+    - .pipelines/*
     - test/perf/*
 pr:
   branches:
@@ -28,10 +30,11 @@ pr:
     exclude:
     - .dependabot/config.yml
     - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
     - .vsts-ci/misc-analysis.yml
     - .vsts-ci/windows.yml
     - .vsts-ci/windows/*
-    - tools/cgmanifest.json
+    - tools/cgmanifest/*
     - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
@@ -40,12 +43,12 @@ pr:
     - tools/releaseBuild/azureDevOps/templates/*
     - README.md
     - .spelling
+    - .pipelines/*
 
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   POWERSHELL_TELEMETRY_OPTOUT: 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
+  DOTNET_NOLOGO: 1
   # Turn off Homebrew analytics
   HOMEBREW_NO_ANALYTICS: 1
   __SuppressAnsiEscapeSequences: 1
@@ -92,3 +95,20 @@ stages:
     parameters:
       pool: macOS-latest
 
+- stage: PackageMac
+  dependsOn: ['BuildMac']
+  displayName: Package macOS (bootstrap only)
+  jobs:
+    - job: macos_packaging
+      pool:
+        vmImage: macOS-latest
+
+      displayName: macOS packaging (bootstrap only)
+      steps:
+        - checkout: self
+          clean: true
+        - pwsh: |
+            import-module ./build.psm1
+            start-psbootstrap -Scenario package
+          displayName: Bootstrap packaging
+          condition: succeededOrFailed()
diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
deleted file mode 100644
index 15b3277635b..00000000000
--- a/.vsts-ci/misc-analysis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
-trigger:
-  # Batch merge builds together while a merge build is running
-  batch: true
-  branches:
-    include:
-    - master
-    - feature*
-
-pr:
-  branches:
-    include:
-    - master
-    - feature*
-
-resources:
-  repositories:
-  - repository: ComplianceRepo
-    type: github
-    endpoint: PowerShell
-    name: PowerShell/compliance
-    ref: master
-
-variables:
-  - name: repoFolder
-    value: PowerShell
-
-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
diff --git a/.vsts-ci/psresourceget-acr.yml b/.vsts-ci/psresourceget-acr.yml
new file mode 100644
index 00000000000..225e2699533
--- /dev/null
+++ b/.vsts-ci/psresourceget-acr.yml
@@ -0,0 +1,155 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
+trigger:
+  # Batch merge builds together while a merge build is running
+  batch: true
+  branches:
+    include:
+    - master
+    - release*
+    - feature*
+  paths:
+    include:
+    - '*'
+    exclude:
+    - .vsts-ci/misc-analysis.yml
+    - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
+    - .dependabot/config.yml
+    - test/perf/*
+    - .pipelines/*
+pr:
+  branches:
+    include:
+    - master
+    - release*
+    - feature*
+  paths:
+    include:
+    - '*'
+    exclude:
+    - .dependabot/config.yml
+    - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
+    - .vsts-ci/misc-analysis.yml
+    - tools/cgmanifest/*
+    - LICENSE.txt
+    - test/common/markdown/*
+    - test/perf/*
+    - tools/packaging/*
+    - tools/releaseBuild/*
+    - tools/releaseBuild/azureDevOps/templates/*
+    - README.md
+    - .spelling
+    - .pipelines/*
+
+variables:
+  GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  __SuppressAnsiEscapeSequences: 1
+  NugetSecurityAnalysisWarningLevel: none
+  nugetMultiFeedWarnLevel: none
+
+resources:
+- repo: self
+  clean: true
+
+stages:
+- stage: BuildWin
+  displayName: Build for Windows
+  jobs:
+  - template: templates/ci-build.yml
+
+- stage: TestWin
+  displayName: Test PSResourceGetACR
+  jobs:
+  - job: win_test_ACR
+    displayName: PSResourceGet ACR Tests
+    pool:
+      vmImage: 'windows-latest'
+
+    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: |
+        # Remove "Program Files\dotnet" from the env variable PATH, so old SDKs won't affect us.
+        Write-Host "Old Path:"
+        Write-Host $env:Path
+
+        $dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet'
+        $paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) }
+        $env:Path = $paths -join ";"
+
+        Write-Host "New Path:"
+        Write-Host $env:Path
+
+        # Bootstrap
+        Import-Module .\tools\ci.psm1
+        Invoke-CIInstall
+      displayName: Bootstrap
+
+    - pwsh: |
+        Install-Module -Name 'Microsoft.PowerShell.SecretManagement' -force -SkipPublisherCheck -AllowClobber
+        Install-Module -Name 'Microsoft.PowerShell.SecretStore' -force -SkipPublisherCheck -AllowClobber
+        $vaultPassword = ConvertTo-SecureString $("a!!"+ (Get-Random -Maximum ([int]::MaxValue))) -AsPlainText -Force
+        Set-SecretStoreConfiguration -Authentication None -Interaction None -Confirm:$false -Password $vaultPassword
+        Register-SecretVault -Name SecretStore -ModuleName Microsoft.PowerShell.SecretStore -DefaultVault
+      displayName: 'Install Secret store'
+
+    - task: AzurePowerShell@5
+      inputs:
+        azureSubscription: PSResourceGetACR
+        azurePowerShellVersion: LatestVersion
+        ScriptType: InlineScript
+        pwsh: true
+        inline: |
+          Write-Verbose -Verbose "Getting Azure Container Registry"
+          Get-AzContainerRegistry -ResourceGroupName 'PSResourceGet' -Name 'psresourcegettest' | Select-Object -Property *
+          Write-Verbose -Verbose "Setting up secret for Azure Container Registry"
+          $azt = Get-AzAccessToken
+          $tenantId = $azt.TenantID
+          Set-Secret -Name $tenantId -Secret $azt.Token -Verbose
+          $vstsCommandString = "vso[task.setvariable variable=TenantId]$tenantId"
+          Write-Host "sending " + $vstsCommandString
+          Write-Host "##$vstsCommandString"
+      displayName: 'Setup Azure Container Registry secret'
+
+    - pwsh: |
+        Import-Module .\build.psm1 -force
+        Import-Module .\tools\ci.psm1
+        Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
+        $options = (Get-PSOptions)
+        $path = split-path -path $options.Output
+        $rootPath = split-Path -path $path
+        Expand-Archive -Path '$(System.ArtifactsDirectory)\build\build.zip' -DestinationPath $rootPath -Force
+
+        $pwshExe = Get-ChildItem -Path $rootPath -Recurse -Filter pwsh.exe | Select-Object -First 1
+
+        $outputFilePath = "$(Build.SourcesDirectory)\test\powershell\Modules\Microsoft.PowerShell.PSResourceGet\ACRTests.xml"
+        $cmdline = "`$env:ACRTESTS = 'true'; Invoke-Pester -Path '$(Build.SourcesDirectory)\test\powershell\Modules\Microsoft.PowerShell.PSResourceGet\Microsoft.PowerShell.PSResourceGet.Tests.ps1' -TestName 'PSResourceGet - ACR tests' -OutputFile $outputFilePath -OutputFormat NUnitXml"
+        Write-Verbose -Verbose "Running $cmdline"
+
+        & $pwshExe -Command $cmdline
+
+        Publish-TestResults -Title "PSResourceGet - ACR tests" -Path $outputFilePath -Type NUnit
+      displayName: 'PSResourceGet ACR functional tests using AzAuth'
diff --git a/.vsts-ci/sshremoting-tests.yml b/.vsts-ci/sshremoting-tests.yml
index e7b7003c3b7..72c5710016b 100644
--- a/.vsts-ci/sshremoting-tests.yml
+++ b/.vsts-ci/sshremoting-tests.yml
@@ -27,8 +27,7 @@ variables:
     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
-  - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+  - name: DOTNET_NOLOGO
     value: 1
   - name:  __SuppressAnsiEscapeSequences
     value: 1
@@ -51,7 +50,7 @@ jobs:
 
   steps:
   - pwsh: |
-      Get-ChildItem -Path env:
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
     displayName: Capture Environment
     condition: succeededOrFailed()
 
diff --git a/.vsts-ci/templates/ci-build.yml b/.vsts-ci/templates/ci-build.yml
index c502a9a3d46..5ec458c3c5a 100644
--- a/.vsts-ci/templates/ci-build.yml
+++ b/.vsts-ci/templates/ci-build.yml
@@ -46,7 +46,7 @@ jobs:
     fetchDepth: 1000
 
   - pwsh: |
-      Get-ChildItem -Path env:
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
     displayName: Capture Environment
     condition: succeededOrFailed()
 
@@ -54,9 +54,15 @@ jobs:
     displayName: Set Build Name for Non-PR
     condition: ne(variables['Build.Reason'], 'PullRequest')
 
-  - ${{ if ne(variables['AzDevOpsFeed'], '') }}:
+  - ${{ if ne(variables['UseAzDevOpsFeed'], '') }}:
     - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      useGlobalJson: true
+      packageType: 'sdk'
+
   - pwsh: |
       Import-Module .\tools\ci.psm1
       Invoke-CIInstall -SkipUser
diff --git a/.vsts-ci/templates/install-ps-phase.yml b/.vsts-ci/templates/install-ps-phase.yml
index f521cda0444..4e650273264 100644
--- a/.vsts-ci/templates/install-ps-phase.yml
+++ b/.vsts-ci/templates/install-ps-phase.yml
@@ -22,7 +22,7 @@ jobs:
 
   steps:
   - pwsh: |
-      Get-ChildItem -Path env:
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
     displayName: Capture Environment
     condition: succeededOrFailed()
 
diff --git a/.vsts-ci/templates/nanoserver.yml b/.vsts-ci/templates/nanoserver.yml
deleted file mode 100644
index ae9f639b3b2..00000000000
--- a/.vsts-ci/templates/nanoserver.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-parameters:
-  vmImage: 'windows-latest'
-  jobName: 'Nanoserver_Tests'
-  continueOnError: false
-
-jobs:
-
-- job: ${{ parameters.jobName }}
-  variables:
-    scriptName: ${{ parameters.scriptName }}
-
-  pool:
-    vmImage: ${{ parameters.vmImage }}
-
-  displayName: ${{ parameters.jobName }}
-
-  steps:
-  - script: |
-      set
-    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: |
-      Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
-    displayName: 'Install Pester'
-    continueOnError: true
-
-  - pwsh: |
-      Import-Module .\tools\ci.psm1
-      Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-      $options = (Get-PSOptions)
-      $path = split-path -path $options.Output
-      Write-Verbose "Path: '$path'" -Verbose
-      $rootPath = split-Path -path $path
-      Expand-Archive -Path '$(System.ArtifactsDirectory)\build\build.zip' -DestinationPath $rootPath -Force
-      Invoke-Pester -Path ./test/nanoserver -OutputFormat NUnitXml -OutputFile ./test-nanoserver.xml
-    displayName: Test
-    condition: succeeded()
-
-  - task: PublishTestResults@2
-    condition: succeededOrFailed()
-    displayName: Publish Nanoserver Test Results **\test*.xml
-    inputs:
-      testRunner: NUnit
-      testResultsFiles: '**\test*.xml'
-      testRunTitle: nanoserver
-      mergeTestResults: true
-      failTaskOnFailedTests: true
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
index ab3985dacd6..214ae14b2c6 100644
--- a/.vsts-ci/templates/nix-test.yml
+++ b/.vsts-ci/templates/nix-test.yml
@@ -13,6 +13,12 @@ jobs:
   displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}
 
   steps:
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core sdk'
+      inputs:
+        useGlobalJson: true
+        packageType: 'sdk'
+
     - template: ./test/nix-test-steps.yml
       parameters:
         purpose: ${{ parameters.purpose }}
diff --git a/.vsts-ci/templates/test/nix-container-test.yml b/.vsts-ci/templates/test/nix-container-test.yml
index 931af6fc675..37c60a4c53b 100644
--- a/.vsts-ci/templates/test/nix-container-test.yml
+++ b/.vsts-ci/templates/test/nix-container-test.yml
@@ -23,6 +23,12 @@ jobs:
   displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}
 
   steps:
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core sdk'
+      inputs:
+        useGlobalJson: true
+        packageType: 'sdk'
+
     - template: ./nix-test-steps.yml
       parameters:
         purpose: ${{ parameters.purpose }}
diff --git a/.vsts-ci/templates/test/nix-test-steps.yml b/.vsts-ci/templates/test/nix-test-steps.yml
index 84d7a37b848..f15d59ea73a 100644
--- a/.vsts-ci/templates/test/nix-test-steps.yml
+++ b/.vsts-ci/templates/test/nix-test-steps.yml
@@ -5,7 +5,7 @@ parameters:
 
 steps:
   - pwsh: |
-      Get-ChildItem -Path env:
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
     displayName: Capture Environment
     condition: succeededOrFailed()
 
diff --git a/.vsts-ci/templates/windows-test.yml b/.vsts-ci/templates/windows-test.yml
deleted file mode 100644
index 50ff67a32a8..00000000000
--- a/.vsts-ci/templates/windows-test.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-parameters:
-  pool: 'windows-2019'
-  imageName: 'PSWindows11-ARM64'
-  parentJobs: []
-  purpose: ''
-  tagSet: 'CI'
-
-jobs:
-- job: win_test_${{ parameters.purpose }}_${{ parameters.tagSet }}
-  dependsOn:
-    ${{ parameters.parentJobs }}
-  pool:
-    ${{ if startsWith( parameters.pool, 'windows-') }}:
-      vmImage: ${{ parameters.pool }}
-    ${{ else }}:
-      name: ${{ parameters.pool }}
-      demands:
-      - ImageOverride -equals ${{ parameters.imageName }}
-
-  displayName: Windows Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}
-
-  steps:
-  - powershell: |
-      [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
-      $pwsh = Get-Command pwsh -ErrorAction SilentlyContinue -CommandType Application
-
-      if ($null -eq $pwsh) {
-        $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell'
-        Invoke-WebRequest -Uri https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.ps1 -outfile ./install-powershell.ps1
-        ./install-powershell.ps1 -Destination $powerShellPath
-        $vstsCommandString = "vso[task.setvariable variable=PATH]$powerShellPath;$env:PATH"
-        Write-Host "sending " + $vstsCommandString
-        Write-Host "##$vstsCommandString"
-      }
-
-    displayName: Install PowerShell if missing
-    condition: ne('${{ parameters.pool }}', 'windows-2019')
-
-  - 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
-
-  # must be run frow Windows PowerShell
-  - powershell: |
-      # Remove "Program Files\dotnet" from the env variable PATH, so old SDKs won't affect us.
-      Write-Host "Old Path:"
-      Write-Host $env:Path
-
-      $dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet'
-      $paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) }
-      $env:Path = $paths -join ";"
-
-      Write-Host "New Path:"
-      Write-Host $env:Path
-
-      # Bootstrap
-      Import-Module .\tools\ci.psm1
-      Invoke-CIInstall
-    displayName: Bootstrap
-
-  - pwsh: |
-      Import-Module .\build.psm1 -force
-      Start-PSBootstrap
-      Import-Module .\tools\ci.psm1
-      Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-      $options = (Get-PSOptions)
-      $path = split-path -path $options.Output
-      $rootPath = split-Path -path $path
-      Expand-Archive -Path '$(System.ArtifactsDirectory)\build\build.zip' -DestinationPath $rootPath -Force
-      Invoke-CITest -Purpose '${{ parameters.purpose }}' -TagSet '${{ parameters.tagSet }}'
-    displayName: Test
-    condition: succeeded()
diff --git a/.vsts-ci/windows-arm64.yml b/.vsts-ci/windows-arm64.yml
index be4cfcbaf4c..1c4bc2ee8af 100644
--- a/.vsts-ci/windows-arm64.yml
+++ b/.vsts-ci/windows-arm64.yml
@@ -28,7 +28,7 @@ pr:
     - .dependabot/config.yml
     - .github/ISSUE_TEMPLATE/*
     - .vsts-ci/misc-analysis.yml
-    - tools/cgmanifest.json
+    - tools/cgmanifest/*
     - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
@@ -45,8 +45,7 @@ variables:
     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
-  - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+  - name: DOTNET_NOLOGO
     value: 1
   - name: __SuppressAnsiEscapeSequences
     value: 1
diff --git a/.vsts-ci/windows-daily.yml b/.vsts-ci/windows-daily.yml
deleted file mode 100644
index 4abcf8ec966..00000000000
--- a/.vsts-ci/windows-daily.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
-trigger:
-  # Batch merge builds together while a merge build is running
-  batch: true
-  branches:
-    include:
-    - master
-    - release*
-    - feature*
-  paths:
-    include:
-    - '*'
-    exclude:
-    - /.vsts-ci/misc-analysis.yml
-    - /.github/ISSUE_TEMPLATE/*
-    - /.dependabot/config.yml
-pr:
-  branches:
-    include:
-    - master
-    - release*
-    - feature*
-  paths:
-    include:
-    - '*'
-    exclude:
-    - /.vsts-ci/misc-analysis.yml
-    - /.github/ISSUE_TEMPLATE/*
-    - /.dependabot/config.yml
-
-variables:
-  GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  POWERSHELL_TELEMETRY_OPTOUT: 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
-
-resources:
-- repo: self
-  clean: true
-
-stages:
-- stage: BuildWin
-  displayName: Build for Windows
-  jobs:
-  - template: templates/ci-build.yml
-
-- stage: TestWin
-  displayName: Test for Windows
-  jobs:
-  - job: win_test
-    pool:
-      vmImage: windows-2019
-    displayName: Windows Test
-    timeoutInMinutes: 90
-
-    steps:
-    - pwsh: |
-        Get-ChildItem -Path env:
-      displayName: 'Capture Environment'
-      condition: succeededOrFailed()
-
-    - task: DownloadBuildArtifacts@0
-      displayName: 'Download Build Artifacts'
-      inputs:
-        downloadType: specific
-        itemPattern: |
-          build/**/*
-          xunit/**/*
-        downloadPath: '$(System.ArtifactsDirectory)'
-
-    - pwsh: |
-        Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse
-      displayName: 'Capture Artifacts Directory'
-      continueOnError: true
-
-    # must be run frow Windows PowerShell
-    - powershell: |
-        # Remove "Program Files\dotnet" from the env variable PATH, so old SDKs won't affect us.
-        Write-Host "Old Path:"
-        Write-Host $env:Path
-
-        $dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet'
-        $paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) }
-        $env:Path = $paths -join ";"
-
-        Write-Host "New Path:"
-        Write-Host $env:Path
-
-        Import-Module .\tools\ci.psm1
-        Invoke-CIInstall
-      displayName: Bootstrap
-      condition: succeededOrFailed()
-
-    - pwsh: |
-        Import-Module .\build.psm1
-        Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-        $path = Split-Path -Parent (Get-PSOutput -Options (Get-PSOptions))
-        $rootPath = Split-Path -Path $path
-        Expand-Archive -Path '$(System.ArtifactsDirectory)\build\build.zip' -DestinationPath $rootPath -Force
-      displayName: 'Unzip Build'
-      condition: succeeded()
-
-    - pwsh: |
-        Import-Module .\build.psm1
-        Start-PSBootstrap
-        Import-Module .\tools\ci.psm1
-        Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-        Invoke-CITest -Purpose UnelevatedPesterTests -TagSet CI
-      displayName: Test - UnelevatedPesterTests - CI
-      condition: succeeded()
-
-    - pwsh: |
-        Import-Module .\build.psm1
-        Start-PSBootstrap
-        Import-Module .\tools\ci.psm1
-        Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-        Invoke-CITest -Purpose ElevatedPesterTests -TagSet CI
-      displayName: Test - ElevatedPesterTests - CI
-      condition: succeededOrFailed()
-
-    - pwsh: |
-        Import-Module .\build.psm1
-        Start-PSBootstrap
-        Import-Module .\tools\ci.psm1
-        Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-        Invoke-CITest -Purpose UnelevatedPesterTests -TagSet Others
-      displayName: Test - UnelevatedPesterTests - Others
-      condition: succeededOrFailed()
-
-    - pwsh: |
-        Import-Module .\build.psm1
-        Start-PSBootstrap
-        Import-Module .\tools\ci.psm1
-        Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-        Invoke-CITest -Purpose ElevatedPesterTests -TagSet Others
-      displayName: Test - ElevatedPesterTests - Others
-      condition: succeededOrFailed()
-
-    - pwsh: |
-        Import-Module .\build.psm1
-        $xUnitTestResultsFile = '$(System.ArtifactsDirectory)\xunit\xUnitTestResults.xml'
-        Test-XUnitTestResults -TestResultsFile $xUnitTestResultsFile
-      displayName: Verify xUnit Test Results
-      condition: succeededOrFailed()
diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
index c3a39647852..4171d09643d 100644
--- a/.vsts-ci/windows.yml
+++ b/.vsts-ci/windows.yml
@@ -13,8 +13,10 @@ trigger:
     exclude:
     - .vsts-ci/misc-analysis.yml
     - .github/ISSUE_TEMPLATE/*
+    - .github/workflows/*
     - .dependabot/config.yml
     - test/perf/*
+    - .pipelines/*
 pr:
   branches:
     include:
@@ -23,27 +25,24 @@ pr:
     - feature*
   paths:
     include:
-    - '*'
+    - .vsts-ci/templates/*
+    - .vsts-ci/windows.yml
+    - '*.props'
+    - build.psm1
+    - src/*
+    - test/*
+    - tools/buildCommon/*
+    - tools/ci.psm1
+    - tools/WindowsCI.psm1
     exclude:
-    - .dependabot/config.yml
-    - .github/ISSUE_TEMPLATE/*
-    - .vsts-ci/misc-analysis.yml
-    - tools/cgmanifest.json
-    - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
-    - tools/packaging/*
-    - tools/releaseBuild/*
-    - tools/releaseBuild/azureDevOps/templates/*
-    - README.md
-    - .spelling
 
 variables:
   GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   POWERSHELL_TELEMETRY_OPTOUT: 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
+  DOTNET_NOLOGO: 1
   __SuppressAnsiEscapeSequences: 1
   NugetSecurityAnalysisWarningLevel: none
   nugetMultiFeedWarnLevel: none
diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 3961214c86f..d23b745c30f 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -38,7 +38,7 @@ jobs:
     path: $(complianceRepoFolder)
 
   - powershell: |
-      Get-ChildItem -Path env:
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
     displayName: Capture environment
     condition: succeededOrFailed()
 
@@ -47,8 +47,19 @@ jobs:
     displayName: Capture PowerShell Version Table
     condition: succeededOrFailed()
 
+  - pwsh: |
+      Import-Module .\tools\ci.psm1
+      Switch-PSNugetConfig -Source Public
+    displayName: Switch to public feeds
+    condition: succeeded()
+    workingDirectory: $(repoPath)
 
-  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      useGlobalJson: true
+      packageType: 'sdk'
+      workingDirectory: $(repoPath)
 
   - pwsh: |
       Import-Module .\tools\ci.psm1
diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml
index d0e3c101081..6b73ca05723 100644
--- a/.vsts-ci/windows/windows-packaging.yml
+++ b/.vsts-ci/windows/windows-packaging.yml
@@ -38,6 +38,7 @@ pr:
     - test/packaging/windows/*
     - tools/ci.psm1
     - tools/packaging/*
+    - tools/wix/*
 
 variables:
   - name: GIT_CONFIG_PARAMETERS
@@ -46,8 +47,7 @@ variables:
     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
-  - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+  - name: DOTNET_NOLOGO
     value: 1
   - name: __SuppressAnsiEscapeSequences
     value: 1
diff --git a/Analyzers.props b/Analyzers.props
index 2608f972630..6f906496c73 100644
--- a/Analyzers.props
+++ b/Analyzers.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/CHANGELOG/7.2.md b/CHANGELOG/7.2.md
index ca7e08a2613..c9bde27a841 100644
--- a/CHANGELOG/7.2.md
+++ b/CHANGELOG/7.2.md
@@ -1,5 +1,287 @@
 # 7.2 Changelog
 
+## [7.2.23] - 2024-08-20
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET to 6.0.425</p>
+
+</summary>
+
+<ul>
+<li>Add feature flags for removing network isolation</li>
+<li>Bump PackageManagement to 1.4.8.1 (#24162)</li>
+<li>Bump .NET to 6.0.425 (#24161)</li>
+<li>Skip build steps that do not have exe packages (#23945) (#24156)</li>
+<li>Use correct signing certificates for RPM and DEBs (#21522) (#24154)</li>
+<li>Fix exe signing with third party signing for WiX engine (#23878) (#24155)</li>
+<li>Fix error in the vPack release, debug script that blocked release (#23904)</li>
+<li>Add vPack release (#23898)</li>
+<li>Fix nuget publish download path</li>
+<li>Use correct signing certificates for RPM and DEBs (#21522)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update docs sample nuget.config (#24109) (#24157)
+
+[7.2.23]: https://github.com/PowerShell/PowerShell/compare/v7.2.22...v7.2.23
+
+## [7.2.22] - 2024-07-18
+
+### Engine Updates and Fixes
+
+- Resolve paths correctly when importing files or files referenced in the module manifest (Internal 31777 31788)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET to 6.0.424</p>
+
+</summary>
+
+<ul>
+<li>Enumerate over all signed zip packages</li>
+<li>Update TPN for release v7.2.22 (Internal 31807)</li>
+<li>Update CG Manifest for 7.2.22 (Internal 31804)</li>
+<li>Add macos signing for package files (#24015) (#24058)</li>
+<li>Update .NET version to 6.0.424 (#24033)</li>
+</ul>
+
+</details>
+
+[7.2.22]: https://github.com/PowerShell/PowerShell/compare/v7.2.21...v7.2.22
+
+## [7.2.21] - 2024-06-18
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Release 7.2.20 broadly (was previously just released to the .NET SDK containers.)</p><p>Release 7.2.20 broadly</p>
+
+</summary>
+
+<ul>
+<li>Fixes for change to new Engineering System.</li>
+<li>Create <code>powershell.config.json</code> for <code>PowerShell.Windows.x64</code> global tool (#23941) (#23942)</li>
+</ul>
+
+</details>
+
+[7.2.21]: https://github.com/PowerShell/PowerShell/compare/v7.2.19...v7.2.21
+
+## [7.2.20] - 2024-06-06
+
+Limited release for dotnet SDK container images.
+
+<summary>
+
+<p>Update .NET 6 to 6.0.31 and how global tool is generated</p>
+
+</summary>
+
+<ul>
+<li>Fixes for change to new Engineering System.</li>
+<li>Create <code>powershell.config.json</code> for <code>PowerShell.Windows.x64</code> global tool (#23941) (#23942)</li>
+<li>Update change log for v7.2.20</li>
+<li>Update installation on Wix module (#23808)</li>
+<li>Updates to package and release pipelines (#23800)</li>
+<li>Use feed with Microsoft Wix toolset (#21651)</li>
+<li>update wix package install (#21537)</li>
+<li>Use PSScriptRoot to find path to Wix module (#21611)</li>
+<li>Create the Windows.x64 global tool with shim for signing (#21559)</li>
+<li>Add branch counter variables for daily package builds (#21523)</li>
+<li>Official PowerShell Package pipeline (#21504)</li>
+<li>Add a PAT for fetching PMC cli (#21503)</li>
+<li>[StepSecurity] Apply security best practices (#21480)</li>
+<li>Fix build failure due to missing reference in <code>GlobalToolShim.cs</code> (#21388)</li>
+<li>Fix argument passing in <code>GlobalToolShim</code> (#21333)</li>
+<li>Update .NET 6 to 6.0.31 (Internal 31302)</li>
+<li>Re-apply the OneBranch changes to packaging.psm1&quot;</li>
+</ul>
+
+</details>
+
+[7.2.20]: https://github.com/PowerShell/PowerShell/compare/v7.2.19...v7.2.20
+
+## [7.2.19] - 2024-04-11
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to .NET 6.0.29</p>
+
+</summary>
+
+<ul>
+<li>Allow artifacts produced by partially successful builds to be consumed by release pipeline</li>
+<li>Update SDK, dependencies and <code>cgmanifest</code> for <code>7.2.19</code></li>
+<li>Revert changes to <code>packaging.psm1</code></li>
+<li>Verify environment variable for OneBranch before we try to copy (#21441)</li>
+<li>Multiple fixes in official build pipeline (#21408)</li>
+<li>Add <code>dotenv</code> install as latest version does not work with current Ruby version (#21239)</li>
+<li>PowerShell co-ordinated build OneBranch pipeline (#21364)</li>
+<li>Remove <code>surrogateFile</code> setting of <code>APIScan</code> (#21238)</li>
+</ul>
+
+</details>
+
+[7.2.19]: https://github.com/PowerShell/PowerShell/compare/v7.2.18...v7.2.19
+
+## [7.2.18] - 2024-01-11
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET to 6.0.418</p>
+
+</summary>
+
+<ul>
+<li>Update <code>ThirdPartyNotices.txt</code> for v7.2.18 (Internal 29173)</li>
+<li>Update <code>cgmanifest.json</code> for v7.2.18 release (Internal 29161)</li>
+<li>Update .NET SDK to 6.0.418 (Internal 29141)</li>
+<li>Back port 3 build changes to <code>apiscan.yml</code> (#21036)</li>
+<li>Set the <code>ollForwardOnNoCandidateFx</code> in <code>runtimeconfig.json</code> to roll forward only on minor and patch versions (#20689)</li>
+<li>Remove the <code>ref</code> folder before running compliance (#20373)</li>
+<li>Fix the tab completion tests (#20867)</li>
+</ul>
+
+</details>
+
+[7.2.18]: https://github.com/PowerShell/PowerShell/compare/v7.2.17...v7.2.18
+
+## [7.2.17] - 2023-11-16
+
+### General Cmdlet Updates and Fixes
+
+- Redact Auth header content from ErrorRecord (Internal 28411)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to .NET to version 6.0.417</p>
+
+</summary>
+
+<ul>
+<li>Bump to .NET 6.0.417 (Internal 28486)</li>
+<li>Copy azure blob with PowerShell global tool to private blob and move to CDN during release (Internal 28450)</li>
+</ul>
+
+</details>
+
+[7.2.17]: https://github.com/PowerShell/PowerShell/compare/v7.2.16...v7.2.17
+
+## [7.2.16] - 2023-10-26
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET 6 to version 6.0.416</p>
+
+</summary>
+
+<ul>
+<li>Fix release pipeline yaml</li>
+<li>Fix issues with merging backports in packaging (Internal 28158)</li>
+<li>Update .NET 6 and TPN (Internal 28149)</li>
+<li>Add runtime and packaging type info for mariner2 arm64 (#19450) (#20564)</li>
+<li>Add mariner arm64 to PMC release (#20176) (#20567)</li>
+<li>Remove <code>HostArchitecture</code> dynamic parameter for <code>osxpkg</code> (#19917) (#20565)</li>
+<li>Use <code>fxdependent-win-desktop</code> runtime for compliance runs (#20326) (#20568)</li>
+<li>Add SBOM for release pipeline (#20519) (#20570)</li>
+<li>Increase timeout when publishing packages to <code>pacakages.microsoft.com</code> (#20470) (#20569)</li>
+<li>Add mariner arm64 package build to release build (#19946) (#20566)</li>
+</ul>
+
+</details>
+
+[7.2.16]: https://github.com/PowerShell/PowerShell/compare/v7.2.15...v7.2.16
+
+## [7.2.15] - 2023-10-10
+
+### Security Fixes
+
+- Block getting help from network locations in restricted remoting sessions (Internal 27699)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Build infrastructure maintenance</p>
+
+</summary>
+
+<ul>
+<li>Release build: Change the names of the PATs (#20315)</li>
+<li>Switch to GitHub Action for linting markdown (#20309)</li>
+<li>Put the calls to <code>Set-AzDoProjectInfo</code> and Set-AzDoAuthToken` in the right order (#20312)</li>
+</ul>
+
+</details>
+
+[7.2.15]: https://github.com/PowerShell/PowerShell/compare/v7.2.14...v7.2.15
+
+## [7.2.14] - 2023-09-18
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK version to 6.0.414</p>
+
+</summary>
+
+<ul>
+<li>Update to use .NET SDK 6.0.414 (Internal 27575)</li>
+<li>Enable <code>vPack</code> provenance data (#20242)</li>
+<li>Start using new packages.microsoft.com CLI (#20241)</li>
+<li>Remove spelling CI in favor of GitHub Action (#20239)</li>
+<li>Make PR creation tool use <code>--web</code> because it is more reliable (#20238)</li>
+<li>Update variable used to bypass the blocking check for multiple NuGet feeds (#20237)</li>
+<li>Don't publish notice on failure because it prevents retry (#20236)</li>
+<li>Publish rpm package for rhel9 (#20234)</li>
+<li>Add <code>ProductCode</code> in registry for MSI install (#20233)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update man page to match current help for pwsh (#20240)
+- Update the link for getting started in `README.md` (#20235)
+
+[7.2.14]: https://github.com/PowerShell/PowerShell/compare/v7.2.13...v7.2.14
+
 ## [7.2.13] - 2023-07-13
 
 ### Tests
@@ -275,7 +557,6 @@
 
 [7.2.6]: https://github.com/PowerShell/PowerShell/compare/v7.2.5...v7.2.6
 
-
 ## [7.2.5] - 2022-06-21
 
 ### Engine Updates and Fixes
@@ -286,7 +567,7 @@
 
 - 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)
+- 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)
 
@@ -1231,7 +1512,7 @@ Update .NET to version <code>6.0.100-preview.2.21155.3</code>
 ### Tools
 
 - Update script to use .NET 6 build resources (#14705)
-- Fix the daily GitHub action (#14711) (Thanks @imba-tjd!)
+- 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!)
diff --git a/CHANGELOG/7.3.md b/CHANGELOG/7.3.md
index e0e511feea8..25da137b1c2 100644
--- a/CHANGELOG/7.3.md
+++ b/CHANGELOG/7.3.md
@@ -1,5 +1,172 @@
 # 7.3 Changelog
 
+## [7.3.12] - 2024-04-11
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to .NET 7.0.18</p>
+
+</summary>
+
+<ul>
+<li>Update SDK, dependencies and <code>cgmanifest</code> for <code>7.3.12</code></li>
+<li>Revert changes to <code>packaging.psm1</code></li>
+<li>Verify environment variable for OneBranch before we try to copy (#21441)</li>
+<li>Multiple fixes in official build pipeline (#21408)</li>
+<li>PowerShell co-ordinated build OneBranch pipeline (#21364)</li>
+<li>Add <code>dotenv</code> install as latest version does not work with current Ruby version (#21239)</li>
+<li>Remove <code>surrogateFile</code> setting of <code>APIScan</code> (#21238)</li>
+</ul>
+
+</details>
+
+[7.3.12]: https://github.com/PowerShell/PowerShell/compare/v7.3.11...v7.3.12
+
+## [7.3.11] - 2024-01-11
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET to 7.0.405</p>
+
+</summary>
+
+<ul>
+<li>Update <code>cgmanifest.json</code> for v7.3.11 release (Internal 29160)</li>
+<li>Update .NET SDK to 7.0.405 (Internal 29140)</li>
+<li>Back port 3 build changes to <code>apiscan.yml</code> (#21035)</li>
+<li>Set the <code>ollForwardOnNoCandidateFx</code> in <code>runtimeconfig.json</code> to roll forward only on minor and patch versions (#20689)</li>
+<li>Remove the <code>ref</code> folder before running compliance (#20373)</li>
+<li>Fix the tab completion tests (#20867)</li>
+</ul>
+
+</details>
+
+[7.3.11]: https://github.com/PowerShell/PowerShell/compare/v7.3.10...v7.3.11
+
+## [7.3.10] - 2023-11-16
+
+### General Cmdlet Updates and Fixes
+
+- Redact Auth header content from ErrorRecord (Internal 28410)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET to 7.0.404</p>
+
+</summary>
+
+<ul>
+<li>Add internal .NET SDK URL parameter to release pipeline (Internal 28505)</li>
+<li>Fix release build by making the internal SDK parameter optional (#20658) (Internal 28440)</li>
+<li>Make internal .NET SDK URL as a parameter for release builld (#20655) (Internal 28428)</li>
+<li>Update the Notices file and cgmanifest (Internal 28500)</li>
+<li>Update .NET to 7.0.404 (Internal 28485)</li>
+<li>Copy azure blob with PowerShell global tool to private blob and move to CDN during release (Internal 28448)</li>
+</ul>
+
+</details>
+
+[7.3.10]: https://github.com/PowerShell/PowerShell/compare/v7.3.9...v7.3.10
+
+## [7.3.9] - 2023-10-26
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET 7 to version 7.0.403</p>
+
+</summary>
+
+<ul>
+<li>Use correct agent pool for downloading from Azure blob</li>
+<li>Remove a timeout value from ADO pipeline stage to resolve a syntax issue</li>
+<li>Update .NET 7 and manifests (Internal 28148)</li>
+<li>Add SBOM for release pipeline (#20519) (#20573)</li>
+<li>Increase timeout when publishing packages to <code>pacakages.microsoft.com</code> (#20470) (#20572)</li>
+<li>Use <code>fxdependent-win-desktop</code> runtime for compliance runs (#20326) (#20571)</li>
+</ul>
+
+</details>
+
+[7.3.9]: https://github.com/PowerShell/PowerShell/compare/v7.3.8...v7.3.9
+
+## [7.3.8] - 2023-10-10
+
+### Security Fixes
+
+- Block getting help from network locations in restricted remoting sessions (Internal 27698)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Build infrastructure maintenance</p>
+
+</summary>
+
+<ul>
+<li>Release build: Change the names of the PATs (#20316)</li>
+<li>Add mapping for mariner arm64 stable (#20310)</li>
+<li>Switch to GitHub Action for linting markdown (#20308)</li>
+<li>Put the calls to <code>Set-AzDoProjectInfo</code> and Set-AzDoAuthToken` in the right order (#20311)</li>
+</ul>
+
+</details>
+
+[7.3.8]: https://github.com/PowerShell/PowerShell/compare/v7.3.7...v7.3.8
+
+## [7.3.7] - 2023-09-18
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK version to 7.0.401</p>
+
+</summary>
+
+<ul>
+<li>Update 'ThirdPartyNotices.txt' (Internal 27602)</li>
+<li>Update to use .NET SDK 7.0.401 (Internal 27591)</li>
+<li>Remove <code>HostArchitecture</code> dynamic parameter for <code>osxpkg</code> (#19917)</li>
+<li>Remove spelling CI in favor of GitHub Action (#20248)</li>
+<li>Enable vPack provenance data (#20253)</li>
+<li>Start using new packages.microsoft.com cli (#20252)</li>
+<li>Add mariner arm64 to PMC release (#20251)</li>
+<li>Add mariner arm64 package build to release build (#20250)</li>
+<li>Make PR creation tool use <code>--web</code> because it is more reliable (#20247)</li>
+<li>Update variable used to bypass the blocking check for multiple NuGet feeds (#20246)</li>
+<li>Publish rpm package for rhel9 (#20245)</li>
+<li>Add runtime and packaging type info for mariner2 arm64 (#20244)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update man page to match current help for pwsh (#20249)
+
+[7.3.7]: https://github.com/PowerShell/PowerShell/compare/v7.3.6...v7.3.7
+
 ## [7.3.6] - 2023-07-13
 
 ### Build and Packaging Improvements
diff --git a/CHANGELOG/7.4.md b/CHANGELOG/7.4.md
new file mode 100644
index 00000000000..eb506a7ddbc
--- /dev/null
+++ b/CHANGELOG/7.4.md
@@ -0,0 +1,1665 @@
+# 7.4 Changelog
+
+## [7.4.15]
+
+### General Cmdlet Updates and Fixes
+
+- Delay update notification for one week to ensure all packages become available (#27229)
+- Close pipe client handles after creating the child ssh process (#27139)
+
+### Tests
+
+- Fix the `PSNativeCommandArgumentPassing` test (#27146)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.420</p>
+
+</summary>
+
+<ul>
+<li>Fix the container image for vPack, MSIX vPack and Package pipelines (#27018)</li>
+<li>Update branch for release (#27279)</li>
+<li>Fix package pipeline by adding in PDP-Media directory (#27255)</li>
+<li>Pin ready-to-merge.yml reusable workflow to commit SHA (#27247)</li>
+<li>[StepSecurity] ci: Harden GitHub Actions tags (#27244)</li>
+<li>Build, package, and create VPack for the PowerShell-LTS store package within the same <code>msixbundle-vpack</code> pipeline (#27242)</li>
+<li>Change the display name of PowerShell-LTS package to PowerShell LTS (#27232)</li>
+<li>[StepSecurity] ci: Harden GitHub Actions tokens (#27231)</li>
+<li>Redo windows image fix to use latest image (#27230)</li>
+<li>Separate Store Package Creation, Skip Polling for Store Publish, Clean up PDP-Media (#27228)</li>
+<li>Add comment-based help documentation to build.psm1 functions (#27227)</li>
+<li>Fix a preview detection test for the packaging script (#27226)</li>
+<li>Update the PhoneProductId to be the official LTS id used by Store (#27169)</li>
+<li>Select New MSIX Package Name (#27173)</li>
+<li>Publish <code>.msixbundle</code> package as a VPack (#27187)</li>
+<li>Bump <code>github/codeql-action</code> from 4.32.4 to 4.35.1 (#27143) (#27171) (#27175)</li>
+<li><code>release-upload-buildinfo</code>: replace version-comparison channel gating with metadata flags (#27147)</li>
+<li>Create infrastructure to create two msixs and msixbundles for LTS and Stable (#27145)</li>
+<li>Move <code>_GetDependencies</code> MSBuild target from dynamic generation in <code>build.psm1</code> into <code>Microsoft.PowerShell.SDK.csproj</code> (#27144)</li>
+<li>Bump <code>actions/dependency-review-action</code> from 4.8.3 to 4.9.0 (#27142)</li>
+<li>Bump <code>actions/upload-artifact</code> from 6 to 7 (#27141)</li>
+<li>Separate Official and NonOfficial templates for ADO pipelines (#27140)</li>
+<li>Mirror .NET/runtime ICU version range in PowerShell (#27138)</li>
+</ul>
+
+</details>
+
+[7.4.15]: https://github.com/PowerShell/PowerShell/compare/v7.4.14...v7.4.15
+
+## [7.4.14]
+
+### General Cmdlet Updates and Fixes
+
+- Fix `PSMethodInvocationConstraints.GetHashCode` method (#26959)
+
+### Tools
+
+- Add merge conflict marker detection to `linux-ci` workflow and refactor existing actions to use reusable `get-changed-files` action (#26362)
+- Add reusable `get-changed-files` action and refactor existing actions (#26361)
+- Refactor analyze job to reusable workflow and enable on Windows CI (#26342)
+
+### Tests
+
+- Skip the flaky `Update-Help` test for the `PackageManagement` module (#26871)
+- Fix `$PSDefaultParameterValues` leak causing tests to skip unexpectedly (#26869)
+- Add GitHub Actions annotations for Pester test failures (#26800)
+- Mark flaky `Update-Help` web tests as pending to unblock CI (#26805)
+- Update the `Update-Help` tests to use `-Force` to remove read-only files (#26786)
+- Fix merge conflict checker for empty file lists and filter `*.cs` files (#26387)
+- Add markdown link verification for PRs (#26340)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.419</p>
+
+</summary>
+
+<ul>
+<li>Update MaxVisitCount and MaxHashtableKeyCount if visitor safe value context indicates SkipLimitCheck is true (Internal 38882)</li>
+<li>Hardcode Official templates (#26962)</li>
+<li>Split TPN manifest and Component Governance manifest (#26961)</li>
+<li>Correct the package name for .deb and .rpm packages (#26960)</li>
+<li>Bring over all changes for MSIX packaging template (#26933)</li>
+<li>.NET Resolution and Store Publishing Updates  (#26930)</li>
+<li>Update Application Insights package version to 2.23.0 (#26883)</li>
+<li>Update metadata.json to update the Latest attribute with a better name (#26872)</li>
+<li>Update <code>Get-ChangeLog</code> to handle backport PRs correctly (#26870)</li>
+<li>Remove unused runCodesignValidationInjection variable from pipeline templates (#26868)</li>
+<li>Refactor: Centralize xUnit tests into reusable workflow and remove legacy verification (#26864)</li>
+<li>Fix buildinfo.json uploading for preview, LTS, and stable releases (#26863)</li>
+<li>Fix macOS preview package identifier detection to use version string (#26774)</li>
+<li>Update the macOS package name for preview releases to match the previous pattern (#26435)</li>
+<li>Fix condition syntax for StoreBroker package tasks in MSIX pipeline (#26434)</li>
+<li>Fix template path for rebuild branch check in package.yml (#26433)</li>
+<li>Add rebuild branch support with conditional MSIX signing (#26418)</li>
+<li>Move package validation to package pipeline (#26417)</li>
+<li>Backport Store publishing improvements (#26401)</li>
+<li>Fix path to metadata.json in channel selection script (#26399)</li>
+<li>Optimize/split Windows package signing (#26413)</li>
+<li>Improve ADO package build and validation across platforms (#26405)</li>
+<li>Separate Store Automation Service Endpoints, Resolve AppID (#26396)</li>
+<li>Fix the task name to not use the pre-release task (#26395)</li>
+<li>Remove usage of fpm for DEB package generation (#26382)</li>
+<li>Replace fpm with native macOS packaging tools (pkgbuild/productbuild) (#26344)</li>
+<li>Replace fpm with native rpmbuild for RPM package generation (#26337)</li>
+<li>Add log grouping to build.psm1 for collapsible GitHub Actions logs (#26363)</li>
+<li>Convert Azure DevOps Linux Packaging pipeline to GitHub Actions workflow (#26336)</li>
+<li>Integrate Windows packaging into windows-ci workflow using reusable workflow (#26335)</li>
+<li>Add network isolation policy parameter to vPack pipeline (#26339)</li>
+<li>GitHub Workflow cleanup (#26334)</li>
+<li>Add build to vPack Pipeline (#25980)</li>
+<li>Update vPack name (#26222)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update Third Party Notices (#26892)
+
+[7.4.14]: https://github.com/PowerShell/PowerShell/compare/v7.4.13...v7.4.14
+
+## [7.4.13]
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.415</p>
+
+</summary>
+
+<ul>
+<li>[release/v7.4] Update StableRelease to not be the latest (#26042)</li>
+<li>[release/v7.4] Update Ev2 Shell Extension Image to AzureLinux 3 for PMC Release (#26033)</li>
+<li>[release/v7.4] Add 7.4.12 Changelog (#26018)</li>
+<li>[release/v7.4] Fix variable reference for release environment in pipeline (#26014)</li>
+<li>Backport Release Pipeline Changes (Internal 37169)</li>
+<li>[release/v7.4] Update branch for release (#26194)</li>
+<li>[release/v7.4] Mark the 3 consistently failing tests as pending to unblock PRs (#26197)</li>
+<li>[release/v7.4] Remove UseDotnet task and use the dotnet-install script (#26170)</li>
+<li>[release/v7.4] Automate Store Publishing (#26163)</li>
+<li>[release/v7.4] add CodeQL suppresion for NativeCommandProcessor (#26174)</li>
+<li>[release/v7.4] add CodeQL suppressions for UpdatableHelp and NativeCommandProcessor methods (#26172)</li>
+<li>[release/v7.4] Suppress false positive PSScriptAnalyzer warnings in tests and build scripts (#26058)</li>
+<li>[release/v7.4] Ensure that socket timeouts are set only during the token validation (#26080)</li>
+</ul>
+
+</details>
+
+[7.4.13]: https://github.com/PowerShell/PowerShell/compare/v7.4.12...v7.4.13
+
+## [7.4.12]
+
+### Tools
+
+- Add CodeQL suppressions (#25973)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.413</p>
+
+</summary>
+
+<ul>
+<li>Add LinuxHost Network configuration to PowerShell Packages pipeline (#26003)</li>
+<li>Update container images to use mcr.microsoft.com for Linux and Azure Linux (#25987)</li>
+<li>Update SDK to 8.0.413 (#25993)</li>
+<li>Make logical template name consistent between pipelines (#25992)</li>
+<li>Remove AsyncSDL from Pipelines Toggle Official/NonOfficial Runs (#25965)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update third-party library versions to `8.0.19` for `ObjectPool`, Windows Compatibility, and `System.Drawing.Common` (#26001)
+
+[7.4.12]: https://github.com/PowerShell/PowerShell/compare/v7.4.11...v7.4.12
+
+## [7.4.11] - 2025-06-17
+
+### Engine Updates and Fixes
+
+- Move .NET method invocation logging to after the needed type conversion is done for method arguments (#25568)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.411</p>
+
+</summary>
+
+<ul>
+<li>Correct Capitalization Referencing Templates (#25672)</li>
+<li>Manually update SqlClient in TestService</li>
+<li>Update cgmanifest</li>
+<li>Update package references</li>
+<li>Update .NET SDK to latest version</li>
+<li>Change linux packaging tests to ubuntu latest (#25640)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update Third Party Notices (#25524, #25659)
+
+[7.4.11]: https://github.com/PowerShell/PowerShell/compare/v7.4.10...v7.4.11
+
+
+## [7.4.10]
+
+### Engine Updates and Fixes
+
+- Fallback to AppLocker after `WldpCanExecuteFile` (#25229)
+
+### Code Cleanup
+
+<details>
+
+<ul>
+<li> Remove obsolete template from Windows Packaging CI (#25405)</li>
+<li> Cleanup old release pipelines (#25404)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Do not run labels workflow in the internal repository (#25411)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.408</p>
+
+</summary>
+
+<ul>
+<li> Update branch for release (#25518)</li>
+<li> Move MSIXBundle to Packages and Release to GitHub (#25516)</li>
+<li> Add CodeQL suppressions for PowerShell intended behavior (#25376)</li>
+<li> Enhance path filters action to set outputs for all changes when not a PR (#25378)</li>
+<li> Fix Merge Errors from #25401 and Internal 33077  (#25478)</li>
+<li> Fix MSIX artifact upload, vPack template, changelog hashes, git tag command (#25476)</li>
+<li> Fix Conditional Parameter to Skip NuGet Publish (#25475)</li>
+<li> Use new variables template for vPack (#25474)</li>
+<li> Add Windows Store Signing to MSIX bundle (#25472)</li>
+<li> Update test result processing to use NUnitXml format and enhance logging for better clarity (#25471)</li>
+<li> Fix the expected path of .NET after using UseDotnet 2 task to install (#25470)</li>
+<li> Update Microsoft.PowerShell.PSResourceGet to 1.1.0 (#25469)</li>
+<li> Combine GitHub and Nuget Release Stage (#25473)</li>
+<li> Make GitHub Workflows work in the internal mirror (#25409)</li>
+<li> Add default .NET install path for SDK validation (#25339)</li>
+<li> Update APIScan to use new symbols server (#25400)</li>
+<li> Use GitHubReleaseTask (#25401)</li>
+<li> Migrate MacOS Signing to OneBranch (#25412)</li>
+<li> Remove call to NuGet (#25410)</li>
+<li> Restore a script needed for build from the old release pipeline cleanup (#25201) (#25408)</li>
+<li> Switch to ubuntu-latest for CI (#25406)</li>
+<li> Update GitHub Actions to work in private GitHub repository (#25403)</li>
+<li> Simplify PR Template (#25407)</li>
+<li> Disable SBOM generation on set variables job in release build (#25341)</li>
+<li> Update package pipeline windows image version (#25192)</li>
+</ul>
+
+</details>
+
+[7.4.10]: https://github.com/PowerShell/PowerShell/compare/v7.4.9...v7.4.10
+
+## [7.4.9]
+
+### Notes
+
+_This release is internal only. It is not available for download._
+
+### Tools
+
+- Check GH token availability for `Get-Changelog` (#25156)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.407</p>
+
+</summary>
+
+<ul>
+<li>Update branch for release (#25101)</li>
+<li>Only build Linux for packaging changes (#25161)</li>
+<li>Skip additional packages when generating component manifest (#25160)</li>
+<li>Remove Az module installs and AzureRM uninstalls in pipeline (#25157)</li>
+<li>Add GitHub Actions workflow to verify PR labels (#25158)</li>
+<li>Update security extensions (#25099)</li>
+<li>Make Component Manifest Updater use neutral target in addition to RID target (#25100)</li>
+</ul>
+
+</details>
+
+[7.4.9]: https://github.com/PowerShell/PowerShell/compare/v7.4.8...v7.4.9
+
+## [7.4.8]
+
+### Notes
+
+_This release is internal only. It is not available for download._
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.406</p>
+
+</summary>
+
+<ul>
+<li>Update branch for release  (#25085) (#24884)</li>
+<li>Add UseDotnet task for installing dotnet (#25080)</li>
+<li>Add Justin Chung as PowerShell team member in <code>releaseTools.psm1</code> (#25074)</li>
+<li>Fix V-Pack download package name (#25078)</li>
+<li>Fix MSIX stage in release pipeline (#25079)</li>
+<li>Give the pipeline runs meaningful names (#25081)</li>
+<li>Make sure the vPack pipeline does not produce an empty package (#25082)</li>
+<li>Update CODEOWNERS (#25083)</li>
+<li>Add setup dotnet action to the build composite action (#25084)</li>
+<li>Remove AzDO credscan as it is now in GitHub (#25077)</li>
+<li>Use workload identity service connection to download makeappx tool from storage account (#25075)</li>
+<li>Update .NET SDK (#24993)</li>
+<li>Fix GitHub Action filter overmatching (#24957)</li>
+<li>Fix release branch filters (#24960)</li>
+<li>Convert powershell/PowerShell-CI-macos to GitHub Actions (#24955)</li>
+<li>Convert powershell/PowerShell-CI-linux to GitHub Actions (#24945)</li>
+<li>Convert powershell/PowerShell-Windows-CI to GitHub Actions (#24932)</li>
+<li>PMC parse state correctly from update command's response (#24860)</li>
+<li>Add EV2 support for publishing PowerShell packages to PMC (#24857)</li>
+</ul>
+
+</details>
+
+[7.4.8]: https://github.com/PowerShell/PowerShell/compare/v7.4.7...v7.4.8
+
+## [7.4.7]
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.405</p>
+
+</summary>
+
+<ul>
+<li>Update branch for release  - Transitive - true - minor (#24546)</li>
+<li>Fix backport mistake in #24429 (#24545)</li>
+<li>Fix seed max value for Container Linux CI (#24510) (#24543)</li>
+<li>Add a way to use only NuGet feed sources (#24528) (#24542)</li>
+<li>Bump Microsoft.PowerShell.PSResourceGet to 1.0.6 (#24419)</li>
+<li>Update path due to pool change (Internal 33083)</li>
+<li>Update pool for &quot;Publish BuildInfo&quot; job (Internal 33082)</li>
+<li>Add missing backports and new fixes (Internal 33077)</li>
+<li>Port copy blob changes (Internal 33055)</li>
+<li>Update firewall to monitor (Internal 33048)</li>
+<li>Fix typo in release-MakeBlobPublic.yml (Internal 33046)</li>
+<li>Update change log for 7.4.6 (Internal 33040)</li>
+<li>Update changelog for v7.4.6 release (Internal 32983)</li>
+<li>Fix backport issues with release pipeline (#24835)</li>
+<li>Remove duplicated parameter (#24832)</li>
+<li>Make the <code>AssemblyVersion</code> not change for servicing releases 7.4.7 and onward (#24821)</li>
+<li>Add *.props and sort path filters for windows CI  (#24822) (#24823)</li>
+<li>Take the newest windows signature nuget packages (#24818)</li>
+<li>Use work load identity service connection to download makeappx tool from storage account (#24817) (#24820)</li>
+<li>Update path filters for Windows CI (#24809) (#24819)</li>
+<li>Fixed release pipeline errors and switched to KS3 (#24751) (#24816)</li>
+<li>Update branch for release  - Transitive - true - minor (#24806)</li>
+<li>Add ability to capture MSBuild Binary logs when restore fails (#24128) (#24799)</li>
+<li>Download package from package build for generating vpack (#24481) (#24801)</li>
+<li>Add a parameter that skips verify packages step (#24763) (#24803)</li>
+<li>Fix Changelog content grab during GitHub Release (#24788) (#24804)</li>
+<li>Add tool package download in publish nuget stage (#24790) (#24805)</li>
+<li>Add CodeQL scanning to APIScan build (#24303) (#24800)</li>
+<li>Deploy Box Update (#24632) (#24802)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update notices file (#24810)
+
+[7.4.7]: https://github.com/PowerShell/PowerShell/compare/v7.4.6...v7.4.7
+
+## [7.4.6] - 2024-10-22
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK to 8.0.403</p>
+
+</summary>
+
+<ul>
+<li>Copy to static site instead of making blob public (#24269) (#24473)</li>
+<li>Add ability to capture MSBuild Binary logs when restore fails (#24128)</li>
+<li>Keep the roff file when gzipping it. (#24450)</li>
+<li>Update <code>PowerShell-Coordinated_Packages-Official.yml</code> (#24449)</li>
+<li>Update and add new NuGet package sources for different environments. (#24440)</li>
+<li>Add PMC mapping for Debian 12 (bookworm) (#24413)</li>
+<li>Fixes to Azure Public feed usage (#24429)</li>
+<li>Delete <code>assets/AppImageThirdPartyNotices.txt</code> (#24256)</li>
+<li>Delete <code>demos</code> directory (#24258)</li>
+<li>Add specific path for issues in tsaconfig (#24244)</li>
+<li>Checkin generated manpage (#24423)</li>
+<li>Add updated libicu dependency for Debian packages (#24301)</li>
+<li>Add mapping to azurelinux repo (#24290)</li>
+<li>Update vpack pipeline (#24281)</li>
+<li>Add <code>BaseUrl</code> to <code>buildinfo</code> JSON file (#24376)</li>
+<li>Delete the msix blob if it's already there (#24353)</li>
+<li>Make some release tests run in a hosted pools (#24270)</li>
+<li>Create new pipeline for compliance (#24252)</li>
+<li>Use Managed Identity for <code>APIScan</code> authentication (#24243)</li>
+<li>Check <code>Create and Submit</code> in vPack build by default (#24181)</li>
+<li>Capture environment better (#24148)</li>
+<li>Refactor Nuget package source creation to use <code>New-NugetPackageSource</code> function (#24104)</li>
+<li>Make Microsoft feeds the default (#24426)</li>
+<li>Bump to .NET 8.0.403 and update dependencies (#24405)</li>
+</ul>
+
+</details>
+
+[7.4.6]: https://github.com/PowerShell/PowerShell/compare/v7.4.5...v7.4.6
+
+## [7.4.5] - 2024-08-20
+
+### General Cmdlet Updates and Fixes
+
+- Fix WebCmdlets when `-Body` is specified but `ContentType` is not (#24145)
+
+### Tests
+
+- Rewrite the mac syslog tests to make them less flaky (#24152)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK to 8.0.400</p>
+
+</summary>
+
+<ul>
+<li>Add feature flags for removing network isolation (Internal 32126)</li>
+<li>Update <code>ThirdPartyNotices.txt</code> for v7.4.5 (#24160)</li>
+<li>Update <code>cgmanifest.json</code> for v7.4.5 (#24159)</li>
+<li>Update .NET SDK to 8.0.400 (#24151)</li>
+<li>Cleanup unused csproj (#24146)</li>
+<li>Remember installation options and used them to initialize options for the next installation (#24143)</li>
+<li>Fix failures in GitHub action <code>markdown-link-check</code> (#24142)</li>
+<li>Use correct signing certificates for RPM and DEBs (#21522)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update docs sample nuget.config (#24147)
+- Fix up broken links in Markdown files (#24144)
+
+[7.4.5]: https://github.com/PowerShell/PowerShell/compare/v7.4.4...v7.4.5
+
+## [7.4.4] - 2024-07-18
+
+### Engine Updates and Fixes
+
+- Resolve paths correctly when importing files or files referenced in the module manifest (Internal 31780)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET to 8.0.303</p>
+
+</summary>
+
+<ul>
+<li>Enumerate over all signed zip packages in macos signing</li>
+<li>Update TPN for the v7.4.4 release (Internal 31793)</li>
+<li>Add update cgmanifest (Internal 31789)</li>
+<li>Add macos signing for package files (#24015) (#24059)</li>
+<li>Update .NET SDK to 8.0.303 (#24038)</li>
+</ul>
+
+</details>
+
+[7.4.4]: https://github.com/PowerShell/PowerShell/compare/v7.4.3...v7.4.4
+
+## [7.4.3] - 2024-06-18
+
+### General Cmdlet Updates and Fixes
+
+- Fix the error when using `Start-Process -Credential` without the admin privilege (#21393) (Thanks @jborean93!)
+- Fix `Test-Path -IsValid` to check for invalid path and filename characters (#21358)
+
+### Engine Updates and Fixes
+
+- Fix generating `OutputType` when running in Constrained Language Mode (#21605)
+- Expand `~` to `$home` on Windows with tab completion (#21529)
+- Make sure both stdout and stderr can be redirected from a native executable (#20997)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET 8.0.6</p>
+<p>We thank the following contributors!</p>
+<p>@ForNeVeR!</p>
+
+</summary>
+
+<ul>
+<li>Fixes for change to new Engineering System.</li>
+<li>Fix argument passing in <code>GlobalToolShim</code> (#21333) (Thanks @ForNeVeR!)</li>
+<li>Create <code>powershell.config.json</code> for <code>PowerShell.Windows.x64</code> global tool (#23941)</li>
+<li>Remove markdown link check on release branches (#23937)</li>
+<li>Update to .NET 8.0.6 (#23936)</li>
+<li>Fix error in the vPack release, debug script that blocked release (#23904)</li>
+<li>Add branch counter variables for daily package builds (#21523)</li>
+<li>Updates to package and release pipelines (#23800)</li>
+<li>Fix exe signing with third party signing for WiX engine (#23878)</li>
+<li>Use PSScriptRoot to find path to Wix module (#21611)</li>
+<li>[StepSecurity] Apply security best practices (#21480)</li>
+<li>Fix build failure due to missing reference in <code>GlobalToolShim.cs</code> (#21388)</li>
+<li>Update installation on Wix module (#23808)</li>
+<li>Use feed with Microsoft Wix toolset (#21651)</li>
+<li>Create the Windows.x64 global tool with shim for signing (#21559)</li>
+<li>Generate MSI for <code>win-arm64</code> installer (#20516)</li>
+<li>update wix package install (#21537)</li>
+<li>Add a PAT for fetching PMC cli (#21503)</li>
+<li>Official PowerShell Package pipeline (#21504)</li>
+</ul>
+
+</details>
+
+[7.4.3]: https://github.com/PowerShell/PowerShell/compare/v7.4.2...v7.4.3
+
+## [7.4.2] - 2024-04-11
+
+### General Cmdlet Updates and Fixes
+
+- Revert "Adjust PUT method behavior to POST one for default content type in WebCmdlets" (#21049)
+- Fix regression with `Get-Content` when `-Tail 0` and `-Wait` are both used (#20734) (Thanks @CarloToso!)
+- Fix `Get-Error` serialization of array values (#21085) (Thanks @jborean93!)
+- Fix a regression in `Format-Table` when header label is empty (#21156)
+
+### Engine Updates and Fixes
+
+- Revert the PR #17856 (Do not preserve temporary results when no need to do so) (#21368)
+- Make sure the assembly/library resolvers are registered at early stage (#21361)
+- Handle the case that `Runspace.DefaultRunspace` is `null` when logging for WDAC Audit (#21344)
+- Fix PowerShell class to support deriving from an abstract class with abstract properties (#21331)
+- Fix the regression when doing type inference for `$_` (#21223) (Thanks @MartinGC94!)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to .NET 8.0.4</p>
+
+</summary>
+
+<ul>
+<li>Revert analyzer package back to stable</li>
+<li>Update SDK, deps and <code>cgmanifest</code> for <code>7.4.2</code></li>
+<li>Revert changes to <code>packaging.psm1</code></li>
+<li>Update <code>PSResourceGet</code> version from <code>1.0.2</code> to <code>1.0.4.1</code> (#21439)</li>
+<li>Verify environment variable for OneBranch before we try to copy (#21441)</li>
+<li>Remove <code>surrogateFile</code> setting of <code>APIScan</code> (#21238)</li>
+<li>Add <code>dotenv</code> install as latest version does not work with current Ruby version (#21239)</li>
+<li>Multiple fixes in official build pipeline (#21408)</li>
+<li>Add back 2 transitive dependency packages (#21415)</li>
+<li>Update <code>PSReadLine</code> to <code>v2.3.5</code> for the next <code>v7.4.x</code> servicing release (#21414)</li>
+<li>PowerShell co-ordinated build OneBranch pipeline (#21364)</li>
+</ul>
+
+</details>
+
+[7.4.2]: https://github.com/PowerShell/PowerShell/compare/v7.4.1...v7.4.2
+
+## [7.4.1] - 2024-01-11
+
+### General Cmdlet Updates and Fixes
+
+- Fix `Group-Object` output using interpolated strings (#20745) (Thanks @mawosoft!)
+- Fix `Start-Process -PassThru` to make sure the `ExitCode` property is accessible for the returned `Process` object (#20749) (#20866) (Thanks @CodeCyclone!)
+- Fix rendering of DisplayRoot for network PSDrive (#20793) (#20863)
+
+### Engine Updates and Fixes
+
+- Ensure filename is not null when logging WDAC ETW events (#20910) (Thanks @jborean93!)
+- Fix four regressions introduced by WDAC audit logging feature (#20913)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+Bump .NET 8 to version 8.0.101
+
+</summary>
+
+<ul>
+<li>Update .NET SDK and dependencies for v7.4.1 (Internal 29142)</li>
+<li>Update cgmanifest for v7.4.1 (#20874)</li>
+<li>Update package dependencies for v7.4.1 (#20871)</li>
+<li>Set the <code>rollForwardOnNoCandidateFx</code> in <code>runtimeconfig.json</code> to roll forward only on minor and patch versions (#20689) (#20865)</li>
+<li>Remove RHEL7 publishing to packages.microsoft.com as it's no longer supported (#20849) (#20864)</li>
+<li>Fix the tab completion tests (#20867)</li>
+</ul>
+
+</details>
+
+[7.4.1]: https://github.com/PowerShell/PowerShell/compare/v7.4.0...v7.4.1
+
+## [7.4.0] - 2023-11-16
+
+### General Cmdlet Updates and Fixes
+
+- Added a missing `ConfigureAwait(false)` call to webcmdlets so they don't block (#20622)
+- Fix `Group-Object` so output uses current culture (#20623)
+- Block getting help from network locations in restricted remoting sessions (#20615)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET 8 to 8.0.0 RTM build</p>
+
+</summary>
+
+<ul>
+<li>Add internal .NET SDK URL parameter to release pipeline (Internal 28474)</li>
+<li>Update the CGManifest file for v7.4.0 release (Internal 28457)</li>
+<li>Fix repository root for the nuget.config (Internal 28456)</li>
+<li>Add internal nuget feed to compliance build (Internal 28449)</li>
+<li>Copy azure blob with PowerShell global tool to private blob and move to CDN during release (Internal 28438)</li>
+<li>Fix release build by making the internal SDK parameter optional (#20658) (Internal 28440)</li>
+<li>Make internal .NET SDK URL as a parameter for release builld (#20655) (Internal 28428)</li>
+<li>Update <code>PSResourceGet</code> version for <code>1.0.1</code> release (#20652) (Internal 28427)</li>
+<li>Bump .NET 8 to 8.0.0 RTM build (Internal 28360)</li>
+<li>Remove Auth header content from ErrorRecord (Internal 28409)</li>
+<li>Fix setting of variable to consume internal SDK source (Internal 28354)</li>
+<li>Bump Microsoft.Management.Infrastructure to v3.0.0 (Internal 28352)</li>
+<li>Bump <code>Microsoft.PowerShell.Native</code> to <code>v7.4.0</code> (#20617) (#20624)</li>
+</ul>
+
+</details>
+
+[7.4.0]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-rc.1...v7.4.0
+
+## [7.4.0-rc.1] - 2023-10-24
+
+### General Cmdlet Updates and Fixes
+
+- Fix `Test-Connection` due to .NET 8 changes (#20369) (#20531)
+- Add telemetry to check for specific tags when importing a module (#20371) (#20540)
+- Fix `Copy-Item` progress to only show completed when all files are copied (#20517) (#20544)
+- Fix `unixmode` to handle `setuid` and `sticky` when file is not an executable (#20366) (#20537)
+- Fix UNC path completion regression (#20419) (#20541)
+- Fix implicit remoting proxy cmdlets to act on common parameters (#20367) (#20530)
+- Fix `Get-Service` non-terminating error message to include category (#20276) (#20529)
+- Fixing regression in DSC (#20268) (#20528)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+
+</summary>
+
+<ul>
+<li>Update ThirdPartyNotices.txt file (Internal 28110)</li>
+<li>Update CGManifest for release</li>
+<li>Fix package version for .NET nuget packages (#20551) (#20552)</li>
+<li>Only registry App Path for release package (#20478) (#20549)</li>
+<li>Bump PSReadLine from 2.2.6 to 2.3.4 (#20305) (#20533)</li>
+<li>Bump Microsoft.Management.Infrastructure (#20511) (#20512) (#20433) (#20434) (#20534) (#20535) (#20545) (#20547)</li>
+<li>Bump to .NET 8 RC2 (#20510) (#20543)</li>
+
+<li>Add SBOM for release pipeline (#20519) (#20548)</li>
+<li>Bump version of <code>Microsoft.PowerShell.PSResourceGet</code> to <code>v1.0.0</code> (#20485) (#20538)</li>
+<li>Bump xunit.runner.visualstudio from 2.5.1 to 2.5.3 (#20486) (#20542)</li>
+<li>Bump JsonSchema.Net from 5.2.5 to 5.2.6 (#20421) (#20532)</li>
+<li>Fix alpine tar package name and do not crossgen alpine fxdependent package (#20459) (#20536)</li>
+<li>Increase timeout when publishing packages to <code>packages.microsoft.com</code> (#20470) (#20539)</li>
+<li>Block any preview vPack release (#20243) (#20526)</li>
+<li>Add surrogate file for compliance scanning (#20423)</li>
+</ul>
+
+</details>
+
+[7.4.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.6...v7.4.0-rc.1
+
+## [7.4.0-preview.6] - 2023-09-28
+
+### General Cmdlet Updates and Fixes
+
+- Set approved experimental features to stable for 7.4 release (#20362)
+- Revert changes to continue using `BinaryFormatter` for `Out-GridView` (#20360)
+- Remove the comment trigger from feedback provider (#20346)
+
+### Tests
+
+- Continued improvement to tests for release automation (#20259)
+- Skip the test on x86 as `InstallDate` is not visible on `Wow64` (#20255)
+- Harden some problematic release tests (#20254)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Move to .NET 8.0.100-rc.1.23463.5</p>
+
+</summary>
+
+<ul>
+<li>Update the regex for package name validation (Internal 27783, 27795)</li>
+<li>Update ThirdPartyNotices.txt (Internal 27772)</li>
+<li>Remove the <code>ref</code> folder before running compliance (#20375)</li>
+<li>Updates RIDs used to generate component Inventory (#20372)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from 4.7.0 to 4.8.0-2.final (#20368)</li>
+<li>Fix the release build by moving to the official .NET 8-rc.1 release build version (#20365)</li>
+<li>Update the experimental feature JSON files (#20363)</li>
+<li>Bump <code>XunitXml.TestLogger</code> from 3.1.11 to 3.1.17 (#20364)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to 0.9.0-rc1 (#20361)</li>
+<li>Update .NET SDK to version 8.0.100-rc.1.23455.8 (#20358)</li>
+<li>Use <code>fxdependent-win-desktop</code> runtime for compliance runs (#20359)</li>
+<li>Add mapping for mariner arm64 stable (#20348)</li>
+<li>Bump <code>xunit.runner.visualstudio</code> from <code>2.5.0</code> to <code>2.5.1</code> (#20357)</li>
+<li>Bump <code>JsonSchema.Net</code> from 5.2.1 to 5.2.5 (#20356)</li>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 17.7.1 to 17.7.2 (#20355)</li>
+<li>Bump Markdig.Signed from 0.32.0 to 0.33.0 (#20354)</li>
+<li>Bump JsonSchema.Net from 5.1.3 to 5.2.1 (#20353)</li>
+<li>Bump actions/checkout from 3 to 4 (#20352)</li>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 17.7.0 to 17.7.1 (#20351)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from 4.7.0-2.final to 4.7.0 (#20350)</li>
+<li>Release build: Change the names of the PATs (#20349)</li>
+<li>Put the calls to <code>Set-AzDoProjectInfo</code> and Set-AzDoAuthToken` in the right order (#20347)</li>
+<li>Bump Microsoft.Management.Infrastructure (continued) (#20262)</li>
+<li>Bump <code>Microsoft.Management.Infrastructure</code> to 3.0.0-preview.2 (#20261)</li>
+<li>Enable <code>vPack</code> provenance data (#20260)</li>
+<li>Start using new packages.microsoft.com cli (#20258)</li>
+<li>Add mariner arm64 to PMC release (#20257)</li>
+<li>Fix typo <code>donet</code> to <code>dotnet</code> in build scripts and pipelines (#20256)</li>
+</ul>
+
+</details>
+
+[7.4.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.5...v7.4.0-preview.6
+
+## [7.4.0-preview.5] - 2023-08-21
+
+### Breaking Changes
+
+- Change how relative paths in `Resolve-Path` are handled when using the `RelativeBasePath` parameter (#19755) (Thanks @MartinGC94!)
+
+### Engine Updates and Fixes
+
+- Fix dynamic parameter completion (#19510) (Thanks @MartinGC94!)
+- Use `OrdinalIgnoreCase` to lookup script breakpoints (#20046) (Thanks @fflaten!)
+- Guard against `null` or blank path components when adding to module path (#19922) (Thanks @stevenebutler!)
+- Fix deadlock when piping to shell associated file extension (#19940)
+- Fix completion regression for filesystem paths with custom `PSDrive` names (#19921) (Thanks @MartinGC94!)
+- Add completion for variables assigned by the `Data` statement (#19831) (Thanks @MartinGC94!)
+- Fix a null reference crash in completion code (#19916) (Thanks @MartinGC94!)
+
+### General Cmdlet Updates and Fixes
+
+- Fix `Out-GridView` by implementing `Clone()` method to replace old use of binary format serialization (#20050)
+- Support Unix domain socket in WebCmdlets (#19343) (Thanks @CarloToso!)
+- Wait-Process: add `-Any` and `-PassThru` parameters (#19423) (Thanks @dwtaber!)
+- Added the switch parameter `-CaseInsensitive` to `Select-Object` and `Get-Unique` cmdlets (#19683) (Thanks @ArmaanMcleod!)
+- `Restore-Computer` and `Stop-Computer` should fail with error when not running via `sudo` on Unix (#19824)
+- Add Help proxy function for non-Windows platforms (#19972)
+- Remove input text from the error message resulted by `SecureString` and `PSCredential` conversion failure (#19977) (Thanks @ArmaanMcleod!)
+- Add `Microsoft.PowerShell.PSResourceGet` to the telemetry module list (#19926)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear, @Molkree, @MartinGC94</p>
+
+</summary>
+
+<ul>
+<li>Fix use of <code>ThrowIf</code> where the arguments were reversed (#20052)</li>
+<li>Fix typo in <code>Logging.Tests.ps1</code> (#20048) (Thanks @eltociear!)</li>
+<li>Apply the <code>InlineAsTypeCheck</code> in the engine code - 2nd pass (#19694) (Thanks @Molkree!)</li>
+<li>Apply the <code>InlineAsTypeCheck</code> rule in the engine code - 1st pass (#19692) (Thanks @Molkree!)</li>
+<li>Remove unused string completion code (#19879) (Thanks @MartinGC94!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Give the `assignPRs` workflow write permissions (#20021)
+
+### Tests
+
+- Additional test hardening for tests which fail in release pass. (#20093)
+- Don't use a completion which has a space in it (#20064)
+- Fixes for release tests (#20028)
+- Remove spelling CI in favor of GitHub Action (#19973)
+- Hide expected error for negative test on windows for script extension (#19929)
+- Add more debugging to try to determine why these test fail in release build. (#19829)
+
+### Build and Packaging Improvements
+
+<ul>
+<li>Update ThirdPartyNotices for 7.4.0-preview.5</li>
+<li>Update <code>PSResourceGet</code> to <code>0.5.24-beta24</code> (#20118)</li>
+<li>Fix build after the change to remove win-arm32 (#20102)</li>
+<li>Add comment about pinned packages (#20096)</li>
+<li>Bump to .NET 8 Preview 7 (#20092)</li>
+<li>Remove <code>Win-Arm32</code> from release build. (#20095)</li>
+<li>Add alpine framework dependent package (#19995)</li>
+<li>Bump JsonSchema.Net from 4.1.8 to 5.1.3 (#20089)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.6.3 to 17.7.0 (#20088)</li>
+<li>Move build to .NET 8 preview 6 (#19991)</li>
+<li>Bump <code>Microsoft.Management.Infrastructure</code> from <code>2.0.0</code> to <code>3.0.0-preview.1</code> (#20081)</li>
+<li>Bump <code>Markdig.Signed</code> from <code>0.31.0</code> to <code>0.32.0</code> (#20076)</li>
+<li>Auto assign PR Maintainer (#20020)</li>
+<li>Delete rule that was supposed to round-robin assign a maintainer (#20019)</li>
+<li>Update the cgmanifest (#20012)</li>
+<li>Update the cgmanifest (#20008)</li>
+<li>Bump JsonSchema.Net from 4.1.7 to 4.1.8 (#20006)</li>
+<li>Bump JsonSchema.Net from 4.1.6 to 4.1.7 (#20000)</li>
+<li>Add mariner arm64 package build to release build (#19946)</li>
+<li>Check for pre-release packages when it's a stable release (#19939)</li>
+<li>Make PR creation tool use <code>--web</code> because it is more reliable (#19944)</li>
+<li>Update to the latest NOTICES file (#19971)</li>
+<li>Update variable used to bypass the blocking check for multiple NuGet feeds for release pipeline (#19963)</li>
+<li>Update variable used to bypass the blocking check for multiple NuGet feeds (#19967)</li>
+<li>Update README.md and metadata.json for release v7.2.13 and v7.3.6 (#19964)</li>
+<li>Don't publish notice on failure because it prevent retry (#19955)</li>
+<li>Change variable used to bypass nuget security scanning (#19954)</li>
+<li>Update the cgmanifest (#19924)</li>
+<li>Publish rpm package for rhel9 (#19750)</li>
+<li>Bump XunitXml.TestLogger from 3.0.78 to 3.1.11 (#19900)</li>
+<li>Bump JsonSchema.Net from 4.1.5 to 4.1.6 (#19885)</li>
+<li>Bump xunit from 2.4.2 to 2.5.0 (#19902)</li>
+<li>Remove <code>HostArchitecture</code> dynamic parameter for <code>osxpkg</code> (#19917)</li>
+<li>FabricBot: Onboarding to GitOps.ResourceManagement because of FabricBot decommissioning (#19905)</li>
+<li>Change variable used to bypass nuget security scanning (#19907)</li>
+<li>Checkout history for markdown lint check (#19908)</li>
+<li>Switch to GitHub Action for linting markdown (#19899)</li>
+<li>Bump xunit.runner.visualstudio from 2.4.5 to 2.5.0 (#19901)</li>
+<li>Add runtime and packaging type info for mariner2 arm64 (#19450)</li>
+<li>Update to the latest NOTICES file (#19856)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update `README.md` and `metadata.json` for `7.4.0-preview.4` release (#19872)
+- Fix grammatical issue in `ADOPTERS.md` (#20037) (Thanks @nikohoffren!)
+- Replace docs.microsoft.com URLs in code with FWLinks (#19996)
+- Change `docs.microsoft.com` to `learn.microsoft.com` (#19994)
+- Update man page to match current help for pwsh (#19993)
+- Merge `7.3.5`, `7.3.6`, `7.2.12` and `7.2.13` changelogs (#19968)
+- Fix ///-comments that violate the docs schema (#19957)
+- Update the link for getting started in `README.md` (#19932)
+- Migrate user docs to the PowerShell-Docs repository (#19871)
+
+[7.4.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.4...v7.4.0-preview.5
+
+## [7.4.0-preview.4] - 2023-06-29
+
+### Breaking Changes
+
+- `Test-Json`: Use `JsonSchema.Net` (`System.Text.Json`) instead of `NJsonSchema` (`Newtonsoft.Json`) (#18141) (Thanks @gregsdennis!)
+- `Test-Connection`: Increase output detail when performing a TCP test (#11452) (Thanks @jackdcasey!)
+
+### Engine Updates and Fixes
+
+- Fix native executables not redirecting to file (#19842)
+- Add a new experimental feature to control native argument passing style on Windows (#18706)
+- Fix `TabExpansion2` variable leak when completing variables (#18763) (Thanks @MartinGC94!)
+- Enable completion of variables across ScriptBlock scopes (#19819) (Thanks @MartinGC94!)
+- Fix completion of the `foreach` statement variable (#19814) (Thanks @MartinGC94!)
+- Fix variable type inference precedence (#18691) (Thanks @MartinGC94!)
+- Fix member completion for PowerShell Enum class (#19740) (Thanks @MartinGC94!)
+- Fix parsing for array literals in index expressions in method calls (#19224) (Thanks @MartinGC94!)
+- Fix incorrect string to type conversion (#19560) (Thanks @MartinGC94!)
+- Fix slow execution when many breakpoints are used (#14953) (Thanks @nohwnd!)
+- Add a public API for getting locations of `PSModulePath` elements (#19422)
+- Add WDAC Audit logging (#19641)
+- Improve path completion (#19489) (Thanks @MartinGC94!)
+- Fix an indexing out of bound error in `CompleteInput` for empty script input (#19501) (Thanks @MartinGC94!)
+- Improve variable completion performance (#19595) (Thanks @MartinGC94!)
+- Allow partial culture matching in `Update-Help` (#18037) (Thanks @dkaszews!)
+- Fix the check when reading input in `NativeCommandProcessor` (#19614)
+- Add support of respecting `$PSStyle.OutputRendering` on the remote host (#19601)
+- Support byte stream piping between native commands and file redirection (#17857)
+
+### General Cmdlet Updates and Fixes
+
+- Disallow negative values for `Get-Content` cmdlet parameters `-Head` and `-Tail` (#19715) (Thanks @CarloToso!)
+- Make `Update-Help` throw proper error when current culture is not associated with a language (#19765) (Thanks @josea!)
+- Do not require activity when creating a completed progress record (#18474) (Thanks @MartinGC94!)
+- WebCmdlets: Add alias for `-TimeoutSec` to `-ConnectionTimeoutSeconds` and add `-OperationTimeoutSeconds` (#19558) (Thanks @stevenebutler!)
+- Avoid checking screen scraping on non-Windows platforms before launching native app (#19812)
+- Add reference to PSResourceGet (#19597)
+- Add `FileNameStar` to `MultipartFileContent` in WebCmdlets (#19467) (Thanks @CarloToso!)
+- Add `ParameterSetName` for the `-Detailed` parameter of `Test-Connection` (#19727)
+- Remove the property disabling optimization (#19701)
+- Filter completion for enum parameter against `ValidateRange` attributes (#17750) (Thanks @fflaten!)
+- Small cleanup `Invoke-RestMethod` (#19490) (Thanks @CarloToso!)
+- Fix wildcard globbing in root of device paths (#19442) (Thanks @MartinGC94!)
+- Add specific error message that creating Junctions requires absolute path (#19409)
+- Fix array type parsing in generic types (#19205) (Thanks @MartinGC94!)
+- Improve the verbose message of WebCmdlets to show correct HTTP version (#19616) (Thanks @CarloToso!)
+- Fix HTTP status from 409 to 429 for WebCmdlets to get retry interval from Retry-After header. (#19622) (Thanks @mkht!)
+- Remove minor versions from `PSCompatibleVersions` (#18635) (Thanks @xtqqczze!)
+- Update `JsonSchema.Net` version to 4.1.0 (#19610) (Thanks @gregsdennis!)
+- Allow combining of `-Skip` and `-SkipLast` parameters in `Select-Object` cmdlet. (#18849) (Thanks @ArmaanMcleod!)
+- Fix constructing `PSModulePath` if a sub-path has trailing separator (#13147)
+- Add `Get-SecureRandom` cmdlet (#19587)
+- Fix `New-Item` to re-create `Junction` when `-Force` is specified (#18311) (Thanks @GigaScratch!)
+- Improve Hashtable key completion for type constrained variable assignments, nested Hashtables and more (#17660) (Thanks @MartinGC94!)
+- `Set-Clipboard -AsOSC52` for remote usage (#18222) (Thanks @dkaszews!)
+- Refactor `MUIFileSearcher.AddFiles` in the help related code (#18825) (Thanks @xtqqczze!)
+- Set `SetLastError` to `true` for symbolic and hard link native APIs (#19566)
+- Fix `Get-AuthenticodeSignature -Content` to not roundtrip the bytes to a Unicode string and then back to bytes (#18774) (Thanks @jborean93!)
+- WebCmdlets: Rename `-TimeoutSec` to `-ConnectionTimeoutSeconds` (with alias) and add `-OperationTimeoutSeconds` (#19558) (Thanks @stevenebutler!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear, @ArmaanMcleod, @turbedi, @CarloToso, @Molkree, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Fix typo in <code>NativeCommandProcessor.cs</code> (#19846) (Thanks @eltociear!)</li>
+<li>Rename file from <code>PingPathCommand.cs</code> to <code>TestPathCommand.cs</code> (#19782) (Thanks @ArmaanMcleod!)</li>
+<li>Make use of the new <code>Random.Shared</code> property (#18417) (Thanks @turbedi!)</li>
+<li>six files (#19695) (Thanks @CarloToso!)</li>
+<li>Apply IDE0019: <code>InlineAsTypeCheck</code> in Microsoft.PowerShell.Commands (#19688)(#19690)(#19687)(#19689) (Thanks @Molkree!)</li>
+<li>Remove <code>PSv2CompletionCompleter</code> as part of the PowerShell v2 code cleanup (#18337) (Thanks @xtqqczze!)</li>
+<li>Enable more nullable annotations in WebCmdlets (#19359) (Thanks @CarloToso!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Add Git mailmap for Andy Jordan (#19469)
+- Add backport function to release tools (#19568)
+
+### Tests
+
+- Improve reliability of the `Ctrl+c` tests for WebCmdlets (#19532) (Thanks @stevenebutler!)
+- Fix logic for `Import-CliXml` test (#19805)
+- Add some debugging to the transcript test for `SilentlyContinue` (#19770)
+- Re-enable `Get-ComputerInfo` pending tests (#19746)
+- Update syslog parser to handle modern formats. (#19737)
+- Pass `-UserScope` as required by `RunUpdateHelpTests` (#13400) (Thanks @yecril71pl!)
+- Change how `isPreview` is determined for default cmdlets tests (#19650)
+- Skip file signature tests on 2012R2 where PKI cmdlet do not work (#19643)
+- Change logic for testing missing or extra cmdlets. (#19635)
+- Fix incorrect test cases in `ExecutionPolicy.Tests.ps1` (#19485) (Thanks @xtqqczze!)
+- Fixing structure typo in test setup (#17458) (Thanks @powercode!)
+- Fix test failures on Windows for time zone and remoting (#19466)
+- Harden 'All approved Cmdlets present' test (#19530)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Updated to .NET 8 Preview 4
+<p>We thank the following contributors!</p>
+<p>@krishnayalavarthi</p>
+
+</summary>
+
+<ul>
+<li>Update to the latest NOTICES file (#19537)(#19820)(#19784)(#19720)(#19644)(#19620)(#19605)(#19546)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.5.0 to 17.6.3 (#19867)(#19762)(#19733)(#19668)(#19613)</li>
+<li>Update the cgmanifest (#19847)(#19800)(#19792)(#19776)(#19763)(#19697)(#19631)</li>
+<li>Bump StyleCop.Analyzers from 1.2.0-beta.406 to 1.2.0-beta.507 (#19837)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 4.6.0-1.final to 4.7.0-2.final (#19838)(#19667)</li>
+<li>Update to .NET 8 Preview 4 (#19696)</li>
+<li>Update experimental-feature JSON files (#19828)</li>
+<li>Bump JsonSchema.Net from 4.1.1 to 4.1.5 (#19790)(#19768)(#19788)</li>
+<li>Update group to assign PRs in <code>fabricbot.json</code> (#19759)</li>
+<li>Add retry on failure for all upload tasks in Azure Pipelines (#19761)</li>
+<li>Bump Microsoft.PowerShell.MarkdownRender from 7.2.0 to 7.2.1 (#19751)(#19752)</li>
+<li>Delete symbols on Linux as well (#19735)</li>
+<li>Update <code>windows.json</code> packaging BOM (#19728)</li>
+<li>Disable SBOM signing for CI and add extra files for packaging tests (#19729)</li>
+<li>Update experimental-feature JSON files (#19698(#19588))</li>
+<li>Add ProductCode in registry for MSI install (#19590)</li>
+<li>Runas format changed (#15434) (Thanks @krishnayalavarthi!)</li>
+<li>For Preview releases, add <code>pwsh-preview.exe</code> alias to MSIX package (#19602)</li>
+<li>Add prompt to fix conflict during backport (#19583)</li>
+<li>Add comment in wix detailing use of <code>UseMU</code> (#19371)</li>
+<li>Verify that packages have license data (#19543)</li>
+<li>Add an explicit manual stage for changelog update (#19551)</li>
+<li>Update the team member list in <code>releaseTools.psm1</code> (#19544)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update `metadata.json` and `README.md` for upcoming releases (#19863)(#19542)
+- Update message to use the actual parameter name (#19851)
+- Update `CONTRIBUTING.md` to include Code of Conduct enforcement (#19810)
+- Update `working-group-definitions.md` (#19809)(#19561)
+- Update `working-group.md` to add section about reporting working group members (#19758)
+- Correct capitalization in readme (#19666) (Thanks @Aishat452!)
+- Updated the public dashboard link (#19634)
+- Fix a typo in `serialization.cs` (#19598) (Thanks @eltociear!)
+
+[7.4.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.3...v7.4.0-preview.4
+
+## [7.4.0-preview.3] - 2023-04-20
+
+### Breaking Changes
+
+- Remove code related to `#requires -pssnapin` (#19320)
+
+### Engine Updates and Fixes
+
+- Change the arrow used in feedback suggestion to a more common Unicode character (#19534)
+- Support trigger registration in feedback provider (#19525)
+- Update the `ICommandPredictor` interface to reduce boilerplate code from predictor implementation (#19414)
+- Fix a crash in the type inference code (#19400) (Thanks @MartinGC94!)
+
+### Performance
+
+- Speed up `Resolve-Path` relative path resolution (#19171) (Thanks @MartinGC94!)
+
+### General Cmdlet Updates and Fixes
+
+- Infer external application output as strings (#19193) (Thanks @MartinGC94!)
+- Fix a race condition in `Add-Type` (#19471)
+- Detect insecure `https-to-http` redirect only if both URIs are absolute (#19468) (Thanks @CarloToso!)
+- Support `Ctrl+c` when connection hangs while reading data in WebCmdlets (#19330) (Thanks @stevenebutler!)
+- Enable type conversion of `AutomationNull` to `$null` for assignment (#19415)
+- Add the parameter `-Environment` to `Start-Process` (#19374)
+- Add the parameter `-RelativeBasePath` to `Resolve-Path` (#19358) (Thanks @MartinGC94!)
+- Exclude redundant parameter aliases from completion results (#19382) (Thanks @MartinGC94!)
+- Allow using a folder path in WebCmdlets' `-OutFile` parameter (#19007) (Thanks @CarloToso!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear, @CarloToso</p>
+
+</summary>
+
+<ul>
+<li>Fix typo in <code>typeDataXmlLoader.cs</code> (#19319) (Thanks @eltociear!)</li>
+<li>Fix typo in <code>Compiler.cs</code> (#19491) (Thanks @eltociear!)</li>
+<li>Inline the <code>GetResponseObject</code> method (#19380) (Thanks @CarloToso!)</li>
+<li>Simplify <code>ContentHelper</code> methods (#19367) (Thanks @CarloToso!)</li>
+<li>Initialize regex lazily in <code>BasicHtmlWebResponseObject</code> (#19361) (Thanks @CarloToso!)</li>
+<li>Fix codefactor issue in if-statement (part 5) (#19286) (Thanks @CarloToso!)</li>
+<li>Add nullable annotations in <code>WebRequestSession.cs</code> (#19291) (Thanks @CarloToso!)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Harden the default command test (#19416)
+- Skip VT100 tests on Windows Server 2012R2 as console does not support it (#19413)
+- Improve package management acceptance tests by not going to the gallery (#19412)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@dkattan</p>
+
+</summary>
+
+<ul>
+<li>Fixing MSI checkbox (#19325)</li>
+<li>Update the experimental feature JSON files (#19297)</li>
+<li>Update the cgmanifest (#19459, #19465)</li>
+<li>Update .NET SDK version to <code>8.0.100-preview.3.23178.7</code> (#19381)</li>
+<li>Force updating the transitive dependency on <code>Microsoft.CSharp</code> (#19514)</li>
+<li>Update <code>DotnetRuntimeMetadata.json</code> to consume the .NET 8.0.0-preview.3 release (#19529)</li>
+<li>Move PSGallery sync to a pool (#19523)</li>
+<li>Fix the regex used for package name check in vPack build (#19511)</li>
+<li>Make the vPack PAT library more obvious (#19505)</li>
+<li>Change <code>Microsoft.CodeAnalysis.CSharp</code> back to 4.5.0 (#19464) (Thanks @dkattan!)</li>
+<li>Update to the latest NOTICES file (#19332)</li>
+<li>Add <code>PoolNames</code> variable group to compliance pipeline (#19408)</li>
+<li>Fix stage dependencies and typo in release build (#19353)</li>
+<li>Fix issues in release build and release pipeline (#19338)</li>
+</ul>
+
+</details>
+
+[7.4.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.2...v7.4.0-preview.3
+
+## [7.4.0-preview.2] - 2023-03-14
+
+### Breaking Changes
+
+- Update some PowerShell APIs to throw `ArgumentException` instead of `ArgumentNullException` when the argument is an empty string (#19215) (Thanks @xtqqczze!)
+- Add the parameter `-ProgressAction` to the common parameters (#18887)
+
+### Engine Updates and Fixes
+
+- Fix `PlainText` output to correctly remove the `Reset` VT sequence without number (#19283)
+- Fix `ConciseView` to handle custom `ParserError` error records (#19239)
+- Fix `VtSubstring` helper method to correctly check characters copied (#19240)
+- Update the `FeedbackProvider` interface to return structured data (#19133)
+- Make the exception error in PowerShell able to associate with the right history entry (#19095)
+- Fix for JEA session leaking functions (#19024)
+- Add WDAC events and system lockdown notification (#18893)
+- Fix support for nanoserver due to lack of AMSI (#18882)
+
+### Performance
+
+- Use interpolated strings (#19002)(#19003)(#18977)(#18980)(#18996)(#18979)(#18997)(#18978)(#18983)(#18992)(#18993)(#18985)(#18988) (Thanks @CarloToso!)
+
+### General Cmdlet Updates and Fixes
+
+- Fix completion for `PSCustomObject` variable properties (#18682) (Thanks @MartinGC94!)
+- Improve type inference for `Get-Random` (#18972) (Thanks @MartinGC94!)
+- Make `-Encoding` parameter able to take `ANSI` encoding in PowerShell (#19298) (Thanks @CarloToso!)
+- Telemetry improvements for tracking experimental feature opt out (#18762)
+- Support HTTP persistent connections in Web Cmdlets (#19249) (Thanks @stevenebutler!)
+- Fix using XML `-Body` in webcmdlets without an encoding (#19281) (Thanks @CarloToso!)
+- Add the `Statement` property to `$MyInvocation` (#19027) (Thanks @IISResetMe!)
+- Fix `Start-Process` `-Wait` with `-Credential` (#19096) (Thanks @jborean93!)
+- Adjust `PUT` method behavior to `POST` one for default content type in WebCmdlets (#19152) (Thanks @CarloToso!)
+- Improve verbose message in web cmdlets when content length is unknown (#19252) (Thanks @CarloToso!)
+- Preserve `WebSession.MaximumRedirection` from changes (#19190) (Thanks @CarloToso!)
+- Take into account `ContentType` from Headers in WebCmdlets (#19227) (Thanks @CarloToso!)
+- Use C# 11 UTF-8 string literals (#19243) (Thanks @turbedi!)
+- Add property assignment completion for enums (#19178) (Thanks @MartinGC94!)
+- Fix class member completion for classes with base types (#19179) (Thanks @MartinGC94!)
+- Add `-Path` and `-LiteralPath` parameters to `Test-Json` cmdlet (#19042) (Thanks @ArmaanMcleod!)
+- Allow to preserve the original HTTP method by adding `-PreserveHttpMethodOnRedirect` to Web cmdlets (#18894) (Thanks @CarloToso!)
+- Webcmdlets display an error on HTTPS to http redirect (#18595) (Thanks @CarloToso!)
+- Build the relative URI for links from the response in `Invoke-WebRequest` (#19092) (Thanks @CarloToso!)
+- Fix redirection for `-CustomMethod` `POST` in WebCmdlets (#19111) (Thanks @CarloToso!)
+- Dispose previous response in Webcmdlets (#19117) (Thanks @CarloToso!)
+- Improve `Invoke-WebRequest` XML and JSON errors format (#18837) (Thanks @CarloToso!)
+- Fix error formatting to remove the unneeded leading newline for concise view (#19080)
+- Add `-NoHeader` parameter to `ConvertTo-Csv` and `Export-Csv` cmdlets (#19108) (Thanks @ArmaanMcleod!)
+- Fix `Start-Process -Credential -Wait` to work on Windows (#19082)
+- Add `ValidateNotNullOrEmpty` to `OutFile` and `InFile` parameters of WebCmdlets (#19044) (Thanks @CarloToso!)
+- Correct spelling of "custom" in event (#19059) (Thanks @spaette!)
+- Ignore expected error for file systems not supporting alternate streams (#19065)
+- Adding missing guard for telemetry opt out to avoid `NullReferenceException` when importing modules (#18949) (Thanks @powercode!)
+- Fix progress calculation divide by zero in Copy-Item (#19038)
+- Add progress to `Copy-Item` (#18735)
+- WebCmdlets parse XML declaration to get encoding value, if present. (#18748) (Thanks @CarloToso!)
+- `HttpKnownHeaderNames` update headers list (#18947) (Thanks @CarloToso!)
+- Fix bug with managing redirection and `KeepAuthorization` in Web cmdlets (#18902) (Thanks @CarloToso!)
+- Fix `Get-Error` to work with strict mode (#18895)
+- Add `AllowInsecureRedirect` switch to Web cmdlets (#18546) (Thanks @CarloToso!)
+- `Invoke-RestMethod` `-FollowRelLink` fix links containing commas (#18829) (Thanks @CarloToso!)
+- Prioritize the default parameter set when completing positional arguments (#18755) (Thanks @MartinGC94!)
+- Add `-CommandWithArgs` parameter to pwsh (#18726)
+- Enable creating composite subsystem implementation in modules (#18888)
+- Fix `Format-Table -RepeatHeader` for property derived tables (#18870)
+- Add `StatusCode` to `HttpResponseException` (#18842) (Thanks @CarloToso!)
+- Fix type inference for all scope variables (#18758) (Thanks @MartinGC94!)
+- Add completion for Using keywords (#16514) (Thanks @MartinGC94!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@CarloToso, @iSazonov, @xtqqczze, @turbedi, @syntax-tm, @eltociear, @ArmaanMcleod</p>
+
+</summary>
+
+<ul>
+<li>Small cleanup in the WebCmdlet code (#19299) (Thanks @CarloToso!)</li>
+<li>Remove unused GUID detection code from console host (#18871) (Thanks @iSazonov!)</li>
+<li>Fix <code>CodeFactor</code> issues in the code base - part 4 (#19270) (Thanks @CarloToso!)</li>
+<li>Fix codefactor if part 3 (#19269) (Thanks @CarloToso!)</li>
+<li>Fix codefactor if part 2 (#19267) (Thanks @CarloToso!)</li>
+<li>Fix codefactor if part 1 (#19266) (Thanks @CarloToso!)</li>
+<li>Remove comment and simplify condition in WebCmdlets (#19251) (Thanks @CarloToso!)</li>
+<li>Small style changes (#19241) (Thanks @CarloToso!)</li>
+<li>Use <code>ArgumentException.ThrowIfNullOrEmpty</code> as appropriate [part 1] (#19215) (Thanks @xtqqczze!)</li>
+<li>Use <code>using</code> variable to reduce the nested level (#19229) (Thanks @CarloToso!)</li>
+<li>Use <code>ArgumentException.ThrowIfNullOrEmpty()</code> in more places (#19213) (Thanks @CarloToso!)</li>
+<li>Replace <code>BitConverter.ToString</code> with <code>Convert.ToHexString</code> where appropriate (#19216) (Thanks @turbedi!)</li>
+<li>Replace <code>Requires.NotNullOrEmpty(string)</code> with <code>ArgumentException.ThrowIfNullOrEmpty</code> (#19197) (Thanks @xtqqczze!)</li>
+<li>Use <code>ArgumentOutOfRangeException.ThrowIfNegativeOrZero</code> when applicable (#19201) (Thanks @xtqqczze!)</li>
+<li>Use <code>CallerArgumentExpression</code> on <code>Requires.NotNull</code> (#19200) (Thanks @xtqqczze!)</li>
+<li>Revert a few change to not use 'ArgumentNullException.ThrowIfNull' (#19151)</li>
+<li>Corrected some minor spelling mistakes (#19176) (Thanks @syntax-tm!)</li>
+<li>Fix a typo in <code>InitialSessionState.cs</code> (#19177) (Thanks @eltociear!)</li>
+<li>Fix a typo in <code>pwsh</code> help content (#19153)</li>
+<li>Revert comment changes in <code>WebRequestPSCmdlet.Common.cs</code> (#19136) (Thanks @CarloToso!)</li>
+<li>Small cleanup webcmdlets (#19128) (Thanks @CarloToso!)</li>
+<li>Merge partials in <code>WebRequestPSCmdlet.Common.cs</code> (#19126) (Thanks @CarloToso!)</li>
+<li>Cleanup WebCmdlets comments (#19124) (Thanks @CarloToso!)</li>
+<li>Added minor readability and refactoring fixes to <code>Process.cs</code> (#19123) (Thanks @ArmaanMcleod!)</li>
+<li>Small changes in Webcmdlets (#19109) (Thanks @CarloToso!)</li>
+<li>Rework <code>SetRequestContent</code> in WebCmdlets (#18964) (Thanks @CarloToso!)</li>
+<li>Small cleanup WebCmdlets (#19030) (Thanks @CarloToso!)</li>
+<li>Update additional interpolated string changes (#19029)</li>
+<li>Revert some of the interpolated string changes (#19018)</li>
+<li>Cleanup <code>StreamHelper.cs</code>, <code>WebRequestPSCmdlet.Common.cs</code> and <code>InvokeRestMethodCommand.Common.cs</code> (#18950) (Thanks @CarloToso!)</li>
+<li>Small cleanup common code of webcmdlets (#18946) (Thanks @CarloToso!)</li>
+<li>Simplification of <code>GetHttpMethod</code> and <code>HttpMethod</code> in WebCmdlets (#18846) (Thanks @CarloToso!)</li>
+<li>Fix typo in <code>ModuleCmdletBase.cs</code> (#18933) (Thanks @eltociear!)</li>
+<li>Fix regression in <code>RemoveNulls</code> (#18881) (Thanks @iSazonov!)</li>
+<li>Replace all <code>NotNull</code> with <code>ArgumentNullException.ThrowIfNull</code> (#18820) (Thanks @CarloToso!)</li>
+<li>Cleanup <code>InvokeRestMethodCommand.Common.cs</code> (#18861) (Thanks @CarloToso!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Add a Mariner install script (#19294)
+- Add tool to trigger license information gathering for NuGet modules (#18827)
+
+### Tests
+
+- Update and enable the test for the type of `$input` (#18968) (Thanks @MartinGC94!)
+- Increase the timeout for creating the `WebListener` (#19268)
+- Increase the timeout when waiting for the event log (#19264)
+- Add Windows ARM64 CI (#19040)
+- Change test so output does not include newline (#19026)
+- Allow system lock down test debug hook to work with new WLDP API (#18962)
+- Add tests for `Allowinsecureredirect` parameter in Web cmdlets (#18939) (Thanks @CarloToso!)
+- Enable `get-help` pattern tests on Unix (#18855) (Thanks @xtqqczze!)
+- Create test to check if WebCmdlets decompress brotli-encoded data (#18905) (Thanks @CarloToso!)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@bergmeister, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Restructure the package build to simplify signing and packaging stages (#19321)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from <code>4.4.0</code> to <code>4.6.0-2.23152.6</code> (#19306)(#19233)</li>
+<li>Test fixes for stabilizing tests (#19068)</li>
+<li>Bump <code>Newtonsoft.Json</code> from <code>13.0.2</code> to <code>13.0.3</code> (#19290)(#19289)</li>
+<li>Fix mariner sudo detection (#19304)</li>
+<li>Add stage for symbols job in Release build (#18937)</li>
+<li>Bump .NET to Preview 2 version (#19305)</li>
+<li>Move workflows that create PRs to private repo (#19276)</li>
+<li>Use reference assemblies generated by dotnet (#19302)</li>
+<li>Update the cgmanifest (#18814)(#19165)(#19296)</li>
+<li>Always regenerate files WXS fragment (#19196)</li>
+<li>MSI installer: Add checkbox and MSI property DISABLE_TELEMETRY to optionally disable telemetry. (#10725) (Thanks @bergmeister!)</li>
+<li>Add <code>-Force</code> to <code>Move-Item</code> to fix the GitHub workflow (#19262)</li>
+<li>Update and remove outdated docs to fix the URL link checks (#19261)</li>
+<li>Bump <code>Markdig.Signed</code> from <code>0.30.4</code> to <code>0.31.0</code> (#19232)</li>
+<li>Add pattern to replace for reference API generation (#19214)</li>
+<li>Split test artifact build into windows and non-windows (#19199)</li>
+<li>Set <code>LangVersion</code> compiler option to <code>11.0</code> (#18877) (Thanks @xtqqczze!)</li>
+<li>Update to .NET 8 preview 1 build (#19194)</li>
+<li>Simplify Windows Packaging CI Trigger YAML (#19160)</li>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> from <code>17.4.0</code> to <code>17.5.0</code> (#18823)(#19191)</li>
+<li>Add URL for all distributions (#19159)</li>
+<li>Bump <code>Microsoft.Extensions.ObjectPool</code> from <code>7.0.1</code> to <code>7.0.3</code> (#18925)(#19155)</li>
+<li>Add verification of R2R at packaging (#19129)</li>
+<li>Allow cross compiling windows (#19119)</li>
+<li>Update CodeQL build agent (#19113)</li>
+<li>Bump <code>XunitXml.TestLogger</code> from <code>3.0.70</code> to <code>3.0.78</code> (#19066)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.Analyzers</code> from <code>3.3.3</code> to <code>3.3.4</code> (#18975)</li>
+<li>Bump <code>BenchmarkDotNet</code> to <code>0.13.3</code> (#18878) (Thanks @xtqqczze!)</li>
+<li>Bump <code>Microsoft.PowerShell.Native</code> from <code>7.4.0-preview.1</code> to <code>7.4.0-preview.2</code> (#18910)</li>
+<li>Add checks for Windows 8.1 and Server 2012 in the MSI installer (#18904)</li>
+<li>Update build to include <code>WinForms</code> / <code>WPF</code> in all Windows builds (#18859)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update to the latest NOTICES file (#19169)(#19309)(#19086)(#19077)
+- Update supported distros in readme (#18667) (Thanks @techguy16!)
+- Remove the 'Code Coverage Status' badge (#19265)
+- Pull in changelogs for `v7.2.10` and `v7.3.3` releases (#19219)
+- Update tools `metadata` and `README` (#18831)(#19204)(#19014)
+- Update a broken link in the `README.md` (#19187)
+- Fix typos in comments (#19064) (Thanks @spaette!)
+- Add `7.2` and `7.3` changelogs (#19025)
+- typos (#19058) (Thanks @spaette!)
+- Fix typo in `dotnet-tools/README.md` (#19021) (Thanks @spaette!)
+- Fix up all comments to be in the proper order with proper spacing (#18619)
+- Changelog for `v7.4.0-preview.1` release (#18835)
+
+[7.4.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.1...v7.4.0-preview.2
+
+## [7.4.0-preview.1] - 2022-12-20
+
+### Engine Updates and Fixes
+
+- Add Instrumentation to `AmsiUtil` and make the init variable readonly (#18727)
+- Fix typo in `OutOfProcTransportManager.cs` (#18766) (Thanks @eltociear!)
+- Allow non-default encodings to be used in user's script/code (#18605)
+- Add `Dim` and `DimOff` to `$PSStyle` (#18653)
+- Change `exec` from alias to function to handle arbitrary arguments (#18567)
+- The command prefix should also be in the error color for `NormalView` (#18555)
+- Skip cloud files marked as "not on disk" during command discovery (#18152)
+- Replace `UTF8Encoding(false)` with `Encoding.Default` (#18356) (Thanks @xtqqczze!)
+- Fix `Switch-Process` to set `termios` appropriate for child process (#18467)
+- On Unix, only explicitly terminate the native process if not in background (#18215)
+- Treat `[NullString]::Value` as the string type when resolving methods (#18080)
+- Improve pseudo binding for dynamic parameters (#18030) (Thanks @MartinGC94!)
+- Make experimental feature `PSAnsiRenderingFileInfo` stable (#18042)
+- Update to use version `2.21.0` of Application Insights. (#17903)
+- Do not preserve temporary results when no need to do so (#17856)
+
+### Performance
+
+- Remove some static constants from `Utils.Separators` (#18154) (Thanks @iSazonov!)
+- Avoid using regular expression when unnecessary in `ScriptWriter` (#18348)
+- Use source generator for `PSVersionInfo` to improve startup time (#15603) (Thanks @iSazonov!)
+- Skip evaluating suggestions at startup (#18232)
+- Avoid using `Regex` when not necessary (#18210)
+
+### General Cmdlet Updates and Fixes
+
+- Update to use `ComputeCore.dll` for PowerShell Direct (#18194)
+- Replace `ArgumentNullException(nameof())` with `ArgumentNullException.ThrowIfNull()` (#18792)(#18784) (Thanks @CarloToso!)
+- Remove `TabExpansion` from remote session configuration (#18795) (Internal 23331)
+- WebCmdlets get Retry-After from headers if status code is 429 (#18717) (Thanks @CarloToso!)
+- Implement `SupportsShouldProcess` in `Stop-Transcript` (#18731) (Thanks @JohnLBevan!)
+- Fix `New-Item -ItemType Hardlink` to resolve target to absolute path and not allow link to itself (#18634)
+- Add output types to Format commands (#18746) (Thanks @MartinGC94!)
+- Fix the process `CommandLine` on Linux (#18710) (Thanks @jborean93!)
+- Fix `SuspiciousContentChecker.Match` to detect a predefined string when the text starts with it (#18693)
+- Switch `$PSNativeCommandUseErrorActionPreference` to `$true` when feature is enabled (#18695)
+- Fix `Start-Job` to check the existence of working directory using the PowerShell way (#18675)
+- Webcmdlets add 308 to redirect codes and small cleanup (#18536) (Thanks @CarloToso!)
+- Ensure `HelpInfo.Category` is consistently a string (#18254)
+- Remove `gcloud` from the legacy list because it's resolved to a .ps1 script (#18575)
+- Add `gcloud` and `sqlcmd` to list to use legacy argument passing (#18559)
+- Fix native access violation (#18545) (#18547) (Thanks @chrullrich!)
+- Fix issue when completing the first command in a script with an empty array expression (#18355) (Thanks @MartinGC94!)
+- Improve type inference of hashtable keys (#17907) (Thanks @MartinGC94!)
+- Fix `Switch-Process` to copy the current env to the new process (#18452)
+- Fix `Switch-Process` error to include the command that is not found (#18443)
+- Update `Out-Printer` to remove all decorating ANSI escape sequences from PowerShell formatting (#18425)
+- Web cmdlets set default charset encoding to `UTF8` (#18219) (Thanks @CarloToso!)
+- Fix incorrect cmdlet name in the script used by `Restart-Computer` (#18374) (Thanks @urizen-source!)
+- Add the function `cd~` (#18308) (Thanks @GigaScratch!)
+- Fix type inference error for empty return statements (#18351) (Thanks @MartinGC94!)
+- Fix the exception reporting in `ConvertFrom-StringData` (#18336) (Thanks @GigaScratch!)
+- Implement `IDisposable` in `NamedPipeClient` (#18341) (Thanks @xtqqczze!)
+- Replace command-error suggestion with new implementation based on subsystem plugin (#18252)
+- Remove the `ProcessorArchitecture` portion from the full name as it's obsolete (#18320)
+- Make the fuzzy searching flexible by passing in the fuzzy matcher (#18270)
+- Add `-FuzzyMinimumDistance` parameter to `Get-Command` (#18261)
+- Improve startup time by triggering initialization of additional types on background thread (#18195)
+- Fix decompression in web cmdlets (#17955) (Thanks @iSazonov!)
+- Add `CustomTableHeaderLabel` formatting to differentiate table header labels that are not property names (#17346)
+- Remove the extra new line form List formatting (#18185)
+- Minor update to the `FileInfo` table formatting on Unix to make it more concise (#18183)
+- Fix Parent property on processes with complex name (#17545) (Thanks @jborean93!)
+- Make PowerShell class not affiliate with `Runspace` when declaring the `NoRunspaceAffinity` attribute (#18138)
+- Complete the progress bar rendering in `Invoke-WebRequest` when downloading is complete or cancelled (#18130)
+- Display download progress in human readable format for `Invoke-WebRequest` (#14611) (Thanks @bergmeister!)
+- Update `WriteConsole` to not use `stackalloc` for buffer with too large size (#18084)
+- Filter out compiler generated types for `Add-Type -PassThru` (#18095)
+- Fixing `CA2014` warnings and removing the warning suppression (#17982) (Thanks @creative-cloud!)
+- Make experimental feature `PSNativeCommandArgumentPassing` stable (#18044)
+- Make experimental feature `PSAMSIMethodInvocationLogging` stable (#18041)
+- Handle `PSObject` argument specially in method invocation logging (#18060)
+- Fix typos in `EventResource.resx` (#18063) (Thanks @eltociear!)
+- Make experimental feature `PSRemotingSSHTransportErrorHandling` stable (#18046)
+- Make experimental feature `PSExec` stable (#18045)
+- Make experimental feature `PSCleanBlock` stable (#18043)
+- Fix error formatting to use color defined in `$PSStyle.Formatting` (#17987)
+- Remove unneeded use of `chmod 777` (#17974)
+- Support mapping foreground/background `ConsoleColor` values to VT escape sequences (#17938)
+- Make `pwsh` server modes implicitly not show banner (#17921)
+- Add output type attributes for `Get-WinEvent` (#17948) (Thanks @MartinGC94!)
+- Remove 1 second minimum delay in `Invoke-WebRequest` for small files, and prevent file-download-error suppression. (#17896) (Thanks @AAATechGuy!)
+- Add completion for values in comparisons when comparing Enums (#17654) (Thanks @MartinGC94!)
+- Fix positional argument completion (#17796) (Thanks @MartinGC94!)
+- Fix member completion in attribute argument (#17902) (Thanks @MartinGC94!)
+- Throw when too many parameter sets are defined (#17881) (Thanks @fflaten!)
+- Limit searching of `charset` attribute in `meta` tag for HTML to first 1024 characters in webcmdlets (#17813)
+- Fix `Update-Help` failing silently with implicit non-US culture. (#17780) (Thanks @dkaszews!)
+- Add the `ValidateNotNullOrWhiteSpace` attribute (#17191) (Thanks @wmentha!)
+- Improve enumeration of inferred types in pipeline (#17799) (Thanks @MartinGC94!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@MartinGC94, @CarloToso, @iSazonov, @xtqqczze, @turbedi, @trossr32, @eltociear, @AtariDreams, @jborean93</p>
+
+</summary>
+
+<ul>
+<li>Add TSAUpload for APIScan (#18446)</li>
+<li>Use Pattern matching in <code>ast.cs</code> (#18794) (Thanks @MartinGC94!)</li>
+<li>Cleanup <code>webrequestpscmdlet.common.cs</code> (#18596) (Thanks @CarloToso!)</li>
+<li>Unify <code>CreateFile</code> <code>pinvoke</code> in SMA (#18751) (Thanks @iSazonov!)</li>
+<li>Cleanup <code>webresponseobject.common</code> (#18785) (Thanks @CarloToso!)</li>
+<li><code>InvokeRestMethodCommand.Common</code> cleanup and merge partials (#18736) (Thanks @CarloToso!)</li>
+<li>Replace <code>GetDirectories</code> in <code>CimDscParser</code> (#14319) (Thanks @xtqqczze!)</li>
+<li>WebResponseObject.Common merge partials atomic commits (#18703) (Thanks @CarloToso!)</li>
+<li>Enable pending test for <code>Start-Process</code> (#18724) (Thanks @iSazonov!)</li>
+<li>Remove one CreateFileW (#18732) (Thanks @iSazonov!)</li>
+<li>Replace <code>DllImport</code> with <code>LibraryImport</code> for WNetAddConnection2 (#18721) (Thanks @iSazonov!)</li>
+<li>Use File.OpenHandle() instead CreateFileW pinvoke (#18722) (Thanks @iSazonov!)</li>
+<li>Replace DllImport with LibraryImport for WNetGetConnection (#18690) (Thanks @iSazonov!)</li>
+<li>Replace <code>DllImport</code> with <code>LibraryImport</code> - 1 (#18603) (Thanks @iSazonov!)</li>
+<li>Replace DllImport with LibraryImport in SMA 3 (#18564) (Thanks @iSazonov!)</li>
+<li>Replace <code>DllImport</code> with <code>LibraryImport</code> in SMA - 7 (#18594) (Thanks @iSazonov!)</li>
+<li>Use static <code>DateTime.UnixEpoch</code> and <code>RandomNumberGenerator.Fill()</code> (#18621) (Thanks @turbedi!)</li>
+<li>Rewrite Get-FileHash to use static HashData methods (#18471) (Thanks @turbedi!)</li>
+<li>Replace DllImport with LibraryImport in SMA 8 (#18599) (Thanks @iSazonov!)</li>
+<li>Replace DllImport with LibraryImport in SMA 4 (#18579) (Thanks @iSazonov!)</li>
+<li>Remove NativeCultureResolver as dead code (#18582) (Thanks @iSazonov!)</li>
+<li>Replace DllImport with LibraryImport in SMA 6 (#18581) (Thanks @iSazonov!)</li>
+<li>Replace DllImport with LibraryImport in SMA 2 (#18543) (Thanks @iSazonov!)</li>
+<li>Use standard SBCS detection (#18593) (Thanks @iSazonov!)</li>
+<li>Remove unused pinvokes in RemoteSessionNamedPipe (#18583) (Thanks @iSazonov!)</li>
+<li>Replace DllImport with LibraryImport in SMA 5 (#18580) (Thanks @iSazonov!)</li>
+<li>Remove SafeRegistryHandle (#18597) (Thanks @iSazonov!)</li>
+<li>Remove <code>ArchitectureSensitiveAttribute</code> from the code base (#18598) (Thanks @iSazonov!)</li>
+<li>Build COM adapter only on Windows (#18590)</li>
+<li>Include timer instantiation for legacy telemetry in conditional compiler statements in Get-Help (#18475) (Thanks @trossr32!)</li>
+<li>Convert <code>DllImport</code> to <code>LibraryImport</code> for recycle bin, clipboard, and computerinfo cmdlets (#18526)</li>
+<li>Replace DllImport with LibraryImport in SMA 1 (#18520) (Thanks @iSazonov!)</li>
+<li>Replace DllImport with LibraryImport in engine (#18496)</li>
+<li>Fix typo in InitialSessionState.cs (#18435) (Thanks @eltociear!)</li>
+<li>Remove remaining unused strings from resx files (#18448)</li>
+<li>Use new LINQ Order() methods instead of OrderBy(static x =&gt; x) (#18395) (Thanks @turbedi!)</li>
+<li>Make use of StringSplitOptions.TrimEntries when possible (#18412) (Thanks @turbedi!)</li>
+<li>Replace some <code>string.Join(string)</code> calls with <code>string.Join(char)</code> (#18411) (Thanks @turbedi!)</li>
+<li>Remove unused strings from FileSystem and Registry providers (#18403)</li>
+<li>Use generic <code>GetValues&lt;T&gt;</code>, <code>GetNames&lt;T&gt;</code> enum methods (#18391) (Thanks @xtqqczze!)</li>
+<li>Remove unused resource strings from <code>SessionStateStrings</code> (#18394)</li>
+<li>Remove unused resource strings in <code>System.Management.Automation</code> (#18388)</li>
+<li>Use <code>Enum.HasFlags</code> part 1 (#18386) (Thanks @xtqqczze!)</li>
+<li>Remove unused strings from parser (#18383)</li>
+<li>Remove unused strings from Utility module (#18370)</li>
+<li>Remove unused console strings (#18369)</li>
+<li>Remove unused strings from <code>ConsoleInfoErrorStrings.resx</code> (#18367)</li>
+<li>Code cleanup in <code>ContentHelper.Common.cs</code> (#18288) (Thanks @CarloToso!)</li>
+<li>Remove <code>FusionAssemblyIdentity</code> and <code>GlobalAssemblyCache</code> as they are not used (#18334) (Thanks @iSazonov!)</li>
+<li>Remove some static initializations in <code>StringManipulationHelper</code> (#18243) (Thanks @xtqqczze!)</li>
+<li>Use <code>MemoryExtensions.IndexOfAny</code> in <code>PSv2CompletionCompleter</code> (#18245) (Thanks @xtqqczze!)</li>
+<li>Use <code>MemoryExtensions.IndexOfAny</code> in <code>WildcardPattern</code> (#18242) (Thanks @xtqqczze!)</li>
+<li>Small cleanup of the stub code (#18301) (Thanks @CarloToso!)</li>
+<li>Fix typo in <code>RemoteRunspacePoolInternal.cs</code> (#18263) (Thanks @eltociear!)</li>
+<li>Some more code cleanup related to the use of <code>PSVersionInfo</code> (#18231)</li>
+<li>Use <code>MemoryExtensions.IndexOfAny</code> in <code>SessionStateInternal</code> (#18244) (Thanks @xtqqczze!)</li>
+<li>Use overload APIs that take <code>char</code> instead of <code>string</code> when it's possible (#18179) (Thanks @iSazonov!)</li>
+<li>Replace <code>UTF8Encoding(false)</code> with <code>Encoding.Default</code> (#18144) (Thanks @xtqqczze!)</li>
+<li>Remove unused variables (#18058) (Thanks @AtariDreams!)</li>
+<li>Fix typo in PowerShell.Core.Instrumentation.man (#17963) (Thanks @eltociear!)</li>
+<li>Migrate <code>WinTrust</code> functions to a common location (#17598) (Thanks @jborean93!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Add a function to get the PR Back-port report (#18299)
+- Add a workaround in automatic rebase workflow to continue on error (#18176)
+- Update list of PowerShell team members in release tools (#17909)
+- Don't block if we fail to create the comment (#17869)
+
+### Tests
+
+- Add `testexe.exe -echocmdline` to output raw command-line received by the process on Windows (#18591)
+- Mark charset test as pending (#18511)
+- Skip output rendering tests on Windows Server 2012 R2 (#18382)
+- Increase timeout to make subsystem tests more reliable (#18380)
+- Add missing -Tag 'CI' to describe blocks. (#18316)
+- Use short path instead of multiple quotes in `Get-Item` test relying on node (#18250)
+- Replace the CIM class used for `-Amended` parameter test (#17884) (Thanks @sethvs!)
+- Stop ongoing progress-bar in `Write-Progress` test (#17880) (Thanks @fflaten!)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+
+</summary>
+
+<ul>
+<li>Fix reference assembly generation logic for <code>Microsoft.PowerShell.Commands.Utility</code> (#18818)</li>
+<li>Update the cgmanifest (#18676)(#18521)(#18415)(#18408)(#18197)(#18111)(#18051)(#17913)(#17867)(#17934)(#18088)</li>
+<li>Bump <code>Microsoft.PowerShell.Native</code> to the latest preview version <code>v7.4.0-preview.1</code> (#18805)</li>
+<li>Remove unnecessary reference to <code>System.Runtime.CompilerServices.Unsafe</code> (#18806)</li>
+<li>Update the release tag in <code>metadata.json</code> for next preview (#18799)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18750)</li>
+<li>Bump .NET SDK to version <code>7.0.101</code> (#18786)</li>
+<li>Bump <code>cirrus-actions/rebase</code> from 1.7 to 1.8 (#18788)</li>
+<li>Bump <code>decode-uri-component</code> from 0.2.0 to 0.2.2 (#18712)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 4.4.0-4.final to 4.4.0 (#18562)</li>
+<li>Bump Newtonsoft.Json from 13.0.1 to 13.0.2 (#18657)</li>
+<li>Apply expected file permissions to Linux files after Authenticode signing (#18643)</li>
+<li>Remove extra quotes after agent moves to pwsh 7.3 (#18577)</li>
+<li>Don't install based on build-id for RPM (#18560)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.3.2 to 17.4.0 (#18487)</li>
+<li>Bump <code>minimatch</code> from 3.0.4 to 3.1.2 (#18514)</li>
+<li>Avoid depending on the pre-generated experimental feature list in private and CI builds (#18484)</li>
+<li>Update <code>release-MsixBundle.yml</code> to add retries (#18465)</li>
+<li>Bump System.Data.SqlClient from 4.8.4 to 4.8.5 in /src/Microsoft.PowerShell.SDK (#18515)</li>
+<li>Bump to use internal .NET 7 GA build (#18508)</li>
+<li>Insert the pre-release nuget feed before building test artifacts (#18507)</li>
+<li>Add test for framework dependent package in release pipeline (#18506) (Internal 23139)</li>
+<li>Update to azCopy 10 (#18509)</li>
+<li>Fix issues with uploading changelog to GitHub release draft (#18504)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18442)</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>Bump <code>Microsoft.PowerShell.Native</code> from 7.3.0-rc.1 to 7.3.0 (#18405)</li>
+<li>Allow two-digit revisions in <code>vPack</code> package validation pattern (#18392)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#18363)</li>
+<li>Bump to .NET 7 RC2 official version (#18328)</li>
+<li>Bump to .NET 7 to version <code>7.0.100-rc.2.22477.20</code> (#18286)</li>
+<li>Replace win7 runtime with win8 and remove APISets (#18304)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18312)</li>
+<li>Recurse the file listing. (#18277)</li>
+<li>Create tasks to collect and publish hashes for build files. (#18276)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18262)</li>
+<li>Remove ETW trace collection and uploading for CLR CAP (#18253)</li>
+<li>Do not cleanup <code>pwsh.deps.json</code> for framework dependent packages (#18226)</li>
+<li>Add branch counter to APIScan build (#18214)</li>
+<li>Remove unnecessary native dependencies from the package (#18213)</li>
+<li>Remove XML files for min-size package (#18189)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18216)</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>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18201)</li>
+<li>Move ApiScan to compliance build (#18191)</li>
+<li>Fix the verbose message when using <code>dotnet-install.sh</code> (#18184)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.3.1 to 17.3.2 (#18163)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18164)</li>
+<li>Make the link to minimal package blob public during release (#18158)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#18147)</li>
+<li>Update MSI exit message (#18137)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 4.4.0-1.final to 4.4.0-2.final (#18132)</li>
+<li>Re-enable building with Ready-to-Run (#18105)</li>
+<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 RC1 build (#18091)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#18096)</li>
+<li>Add schema for cgmanifest.json (#18036)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from 4.3.0-3.final to 4.3.0 (#18012)</li>
+<li>Add XML reference documents to NuPkg files for SDK (#17997)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.3.0 to 17.3.1 (#18000)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17988)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17983)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17945)</li>
+<li>Make sure <code>Security.types.ps1xml</code> gets signed in release build (#17916)</li>
+<li>Make Register Microsoft Update timeout (#17910)</li>
+<li>Merge changes from v7.0.12 v7.2.6 and v7.3.0-preview.7</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.2.0 to 17.3.0 (#17871)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update readme and metadata for releases (#18780)(#18493)(#18393)(#18332)(#18128)(#17870)
+- Remove 'please' and 'Core' from README.md per MS style guide (#18578) (Thanks @Rick-Anderson!)
+- Change unsupported XML documentation tag (#18608)
+- Change public API mention of `monad` to PowerShell (#18491)
+- Update security reporting policy to recommend security portal for more streamlined reporting (#18437)
+- Changelog for v7.3.0 (#18505) (Internal 23161)
+- Replace `msh` in public API comment based documentation with PowerShell equivalent (#18483)
+- Add missing XML doc elements for methods in `RunspaceFactory` (#18450)
+- Changelog for `v7.3.0-rc.1` (#18400)
+- Update changelogs for `v7.2.7` and `v7.0.13` (#18342)
+- Update the changelog for v7.3.0-preview.8 (#18136)
+- Add the `ConfigurationFile` option to the PowerShell help content (#18093)
+- Update help content about the PowerShell flag `-NonInteractive` (#17952)
+
+[7.4.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.8...v7.4.0-preview.1
diff --git a/CHANGELOG/7.5.md b/CHANGELOG/7.5.md
new file mode 100644
index 00000000000..b4f173bcff6
--- /dev/null
+++ b/CHANGELOG/7.5.md
@@ -0,0 +1,951 @@
+# 7.5 Changelog
+
+## [7.5.6]
+
+### General Cmdlet Updates and Fixes
+
+- Delay update notification for one week to ensure all packages become available (#27220)
+
+### Tests
+
+- Fix the `PSNativeCommandArgumentPassing` test (#27166)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET SDK 9.0.313</p>
+
+</summary>
+
+<ul>
+<li>Update branch for the v7.5.6 release (#27268)</li>
+<li>Fix package pipeline by adding in <code>PDP-Media</code> directory (#27256)</li>
+<li>Pin <code>ready-to-merge.yml</code> reusable workflow to commit SHA (#27246)</li>
+<li>[StepSecurity] ci: Harden GitHub Actions tags (#27239)</li>
+<li>Build, package, and create VPack for the PowerShell-LTS store package within the same <code>msixbundle-vpack</code> pipeline (#27240)</li>
+<li>Add comment-based help documentation to <code>build.psm1</code> functions (#27221)</li>
+<li>Separate store package creation, skip polling for store publish, clean up <code>PDP-Media</code> (#27225)</li>
+<li>[StepSecurity] ci: Harden GitHub Actions tokens (#27224)</li>
+<li>Change the display name of "PowerShell-LTS" package to "PowerShell LTS" (#27223)</li>
+<li>Redo windows image fix to use latest image (#27222)</li>
+<li>Bump <code>github/codeql-action</code> from 4.32.4 to 4.35.1 (#27159) (#27170) (#27174)</li>
+<li>Select new MSIX package name (#27172)</li>
+<li>Update the <code>PhoneProductId</code> to be the official LTS id used by Store (#27168)</li>
+<li>release-upload-buildinfo: replace version-comparison channel gating with metadata flags (#27167)</li>
+<li>Create infrastructure to create two msixs and msixbundles for LTS and Stable (#27165)</li>
+<li>Move <code>_GetDependencies</code> MSBuild target from dynamic generation in <code>build.psm1</code> into <code>Microsoft.PowerShell.SDK.csproj</code> (#27164)</li>
+<li>Create Linux LTS deb/rpm packages for LTS releases (#27163)</li>
+<li>Fix the container image for vPack, MSIX vPack and Package pipelines (#27161)</li>
+<li>Create LTS pkg and non-LTS pkg for macOS for LTS releases (#27162)</li>
+<li>Bump actions/dependency-review-action from 4.8.3 to 4.9.0 (#27158)</li>
+<li>Bump actions/upload-artifact from 6 to 7 (#27157)</li>
+<li>Separate "Official" and "NonOfficial" templates for ADO pipelines (#27155)</li>
+</ul>
+
+</details>
+
+[7.5.6]: https://github.com/PowerShell/PowerShell/compare/v7.5.5...v7.5.6
+
+## [7.5.5]
+
+### Engine Updates and Fixes
+
+- Fix up `SSHConnectionInfo` ssh PATH checks (#26165) (Thanks @jborean93!)
+
+### General Cmdlet Updates and Fixes
+
+- Close pipe client handles after creating the child ssh process (#26822)
+- Fix the progress preference variable in script cmdlets (#26791) (Thanks @cmkb3!)
+
+### Tools
+
+- Add merge conflict marker detection to `linux-ci` workflow and refactor existing actions to use reusable `get-changed-files` action (#26812)
+- Add reusable `get-changed-files` action and refactor existing actions (#26811)
+- Create GitHub Copilot setup workflow (#26807)
+- Refactor analyze job to reusable workflow and enable on Windows CI (#26799)
+
+### Tests
+
+- Mark flaky `Update-Help` web tests as pending to unblock CI (#26837)
+- Add GitHub Actions annotations for Pester test failures (#26836)
+- Fix `$PSDefaultParameterValues` leak causing tests to skip unexpectedly (#26823)
+- Fix merge conflict checker for empty file lists and filter `*.cs` files (#26813)
+- Update the `Update-Help` tests to use `-Force` to remove read-only files (#26788)
+- Add markdown link verification for PRs (#26407)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Update to .NET SDK 9.0.312</p>
+<p>We thank the following contributors!</p>
+<p>@kasperk81, @RichardSlater</p>
+
+</summary>
+
+<ul>
+<li>Revert change to module name ThreadJob (#26997)</li>
+<li>Update branch for release (#26990)</li>
+<li>Fix <code>ConvertFrom-ClearlyDefinedCoordinates</code> to handle API object coordinates (#26987)</li>
+<li>Update CGManifests (#26981)</li>
+<li>Hardcode Official templates (#26968)</li>
+<li>Split TPN manifest and Component Governance manifest (#26967)</li>
+<li>Fix a preview detection test for the packaging script (#26966)</li>
+<li>Correct the package name for .deb and .rpm packages (#26964)</li>
+<li>Bring Release Changes from v7.6.0-preview.6 (#26963)</li>
+<li>Merge the v7.6.0-preview.5 release branch back to master (#26958)</li>
+<li>Fix macOS preview package identifier detection to use version string (#26835)</li>
+<li>Update metadata.json to update the Latest attribute with a better name (#26826)</li>
+<li>Remove unused runCodesignValidationInjection variable from pipeline templates (#26825)</li>
+<li>Update <code>Get-ChangeLog</code> to handle backport PRs correctly (#26824)</li>
+<li>Mirror .NET/runtime ICU version range in PowerShell (#26821) (Thanks @kasperk81!)</li>
+<li>Update the macos package name for preview releases to match the previous pattern (#26820)</li>
+<li>Fix condition syntax for StoreBroker package tasks in MSIX pipeline (#26819)</li>
+<li>Fix template path for rebuild branch check in package.yml (#26818)</li>
+<li>Add rebuild branch support with conditional MSIX signing (#26817)</li>
+<li>Move package validation to package pipeline (#26816)</li>
+<li>Optimize/split windows package signing (#26815)</li>
+<li>Improve ADO package build and validation across platforms (#26814)</li>
+<li>Add log grouping to build.psm1 for collapsible GitHub Actions logs (#26810)</li>
+<li>Remove usage of fpm for DEB package generation (#26809)</li>
+<li>Replace fpm with native macOS packaging tools (pkgbuild/productbuild) (#26801)</li>
+<li>Fix build to only enable ready-to-run for the Release configuration (#26798)</li>
+<li>Fix R2R for fxdependent packaging  (#26797)</li>
+<li>Refactor: Centralize xUnit tests into reusable workflow and remove legacy verification (#26794)</li>
+<li>Replace <code>fpm</code> with native <code>rpmbuild</code> for RPM package generation (#26793)</li>
+<li>Add <code>libicu76</code> dependency to support Debian 13 (#26792) (Thanks @RichardSlater!)</li>
+<li>Specify .NET search by build type (#26408)</li>
+<li>Fix buildinfo.json uploading for preview, LTS, and stable releases (#26773)</li>
+<li>Fix path to <code>metadata.json</code> in channel selection script (#26400)</li>
+<li>Separate store automation service endpoints and resolve <code>AppID</code> (#26266)</li>
+<li>Update a few packages to use the right version corresponding to .NET 9 (#26671)</li>
+<li>Add network isolation policy parameter to vPack pipeline (#26393)</li>
+<li>Convert Azure DevOps Linux Packaging pipeline to GitHub Actions workflow (#26391)</li>
+<li>Integrate Windows packaging into windows-ci workflow using reusable workflow (#26390)</li>
+<li>GitHub Workflow cleanup (#26389)</li>
+<li>Update vPack name (#26221)</li>
+</ul>
+
+</details>
+
+[7.5.5]: https://github.com/PowerShell/PowerShell/compare/v7.5.4...v7.5.5
+
+## [7.5.4]
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET SDK 9.0.306</p>
+
+</summary>
+
+<ul>
+<li>[release/v7.5] Update Ev2 Shell Extension Image to AzureLinux 3 for PMC Release (#26032)</li>
+<li>[release/v7.5] Fix variable reference for release environment in pipeline (#26013)</li>
+<li>[release/v7.5] Add v7.5.3 Changelog (#26015)</li>
+<li>[release/v7.5] Add LinuxHost Network configuration to PowerShell Packages pipeline (#26002)</li>
+<li>Backport Release Pipeline Changes (Internal 37168)</li>
+<li>[release/v7.5] Update branch for release (#26195)</li>
+<li>[release/v7.5] Mark the 3 consistently failing tests as pending to unblock PRs (#26196)</li>
+<li>[release/v7.5] add CodeQL suppresion for NativeCommandProcessor (#26173)</li>
+<li>[release/v7.5] add CodeQL suppressions for UpdatableHelp and NativeCommandProcessor methods (#26171)</li>
+<li>[release/v7.5] Remove UseDotnet task and use the dotnet-install script (#26169)</li>
+<li>[release/v7.5] Automate Store Publishing (#26164)</li>
+<li>[release/v7.5] Ensure that socket timeouts are set only during the token validation (#26079)</li>
+<li>[release/v7.5] Suppress false positive PSScriptAnalyzer warnings in tests and build scripts (#26059)</li>
+</ul>
+
+</details>
+
+[7.5.4]: https://github.com/PowerShell/PowerShell/compare/v7.5.3...v7.5.4
+
+
+## [7.5.3]
+
+### General Cmdlet Updates and Fixes
+
+- Fix `Out-GridView` by replacing the use of obsolete `BinaryFormatter` with custom implementation. (#25559)
+- Remove `OnDeserialized` and `Serializable` attributes from `Microsoft.Management.UI.Internal` project (#25831)
+- Make the interface `IDeepCloneable` internal (#25830)
+
+### Tools
+
+- Add CodeQL suppressions (#25972)
+
+### Tests
+
+- Fix updatable help test for new content (#25944)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET SDK 9.0.304</p>
+
+</summary>
+
+<ul>
+<li>Make logical template name consistent between pipelines (#25991)</li>
+<li>Update container images to use mcr.microsoft.com for Linux and Azure Linux (#25986)</li>
+<li>Add build to vPack Pipeline (#25975)</li>
+<li>Remove AsyncSDL from Pipelines Toggle Official/NonOfficial Runs (#25964)</li>
+<li>Update branch for release (#25942)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Fix typo in CHANGELOG for script filename suggestion (#25963)
+
+[7.5.3]: https://github.com/PowerShell/PowerShell/compare/v7.5.2...v7.5.3
+
+## [7.5.2] - 2025-06-24
+
+### Engine Updates and Fixes
+
+- Move .NET method invocation logging to after the needed type conversion is done for method arguments (#25357)
+
+### General Cmdlet Updates and Fixes
+
+- Set standard handles explicitly when starting a process with `-NoNewWindow` (#25324)
+- Make inherited protected internal instance members accessible in class scope. (#25547) (Thanks @mawosoft!)
+- Remove the old fuzzy suggestion and fix the local script filename suggestion (#25330)
+- Fix `PSMethodInvocationConstraints.GetHashCode` method (#25306) (Thanks @crazyjncsu!)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET SDK 9.0.301</p>
+
+</summary>
+
+<ul>
+<li>Correct Capitalization Referencing Templates (#25673)</li>
+<li>Publish <code>.msixbundle</code> package as a VPack (#25621)</li>
+<li>Update ThirdPartyNotices for v7.5.2 (#25658)</li>
+<li>Manually update SqlClient in TestService</li>
+<li>Update cgmanifest</li>
+<li>Update package references</li>
+<li>Update .NET SDK to latest version</li>
+<li>Change linux packaging tests to ubuntu latest (#25639)</li>
+<li>Fix MSIX artifact upload, vPack template, changelog hashes, git tag command (#25633)</li>
+<li>Move MSIXBundle to Packages and Release to GitHub (#25517)</li>
+<li>Use new variables template for vPack (#25435)</li>
+</ul>
+
+</details>
+
+[7.5.2]: https://github.com/PowerShell/PowerShell/compare/v7.5.1...v7.5.2
+
+## [7.5.1]
+
+### Engine Updates and Fixes
+
+- Fallback to AppLocker after `WldpCanExecuteFile` (#25305)
+
+### Code Cleanup
+
+<details>
+
+<ul>
+<li>Cleanup old release pipelines (#25236)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Do not run labels workflow in the internal repository (#25343)
+- Update `CODEOWNERS` (#25321)
+- Check GitHub token availability for `Get-Changelog` (#25328)
+- Update PowerShell team members in `releaseTools.psm1` (#25302)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET SDK 9.0.203</p>
+
+</summary>
+
+<ul>
+<li>Finish 7.5.0 release (#24855)</li>
+<li>Add CodeQL suppressions for PowerShell intended behavior (#25375)</li>
+<li>Update to .NET SDK 9.0.203 (#25373)</li>
+<li>Switch to ubuntu-lastest for CI (#25374)</li>
+<li>Add default .NET install path for SDK validation (#25338)</li>
+<li>Combine GitHub and Nuget Release Stage (#25371)</li>
+<li>Add Windows Store Signing to MSIX bundle (#25370)</li>
+<li>Update test result processing to use NUnitXml format and enhance logging for better clarity (#25344)</li>
+<li>Fix MSIX stage in release pipeline (#25345)</li>
+<li>Make GitHub Workflows work in the internal mirror (#25342)</li>
+<li>Update security extensions (#25322)</li>
+<li>Disable SBOM generation on set variables job in release build (#25340)</li>
+<li>Update GitHub Actions to work in private GitHub repo (#25332)</li>
+<li>Revert &quot;Cleanup old release pipelines (#25201)&quot; (#25335)</li>
+<li>Remove call to NuGet (#25334)</li>
+<li>Simplify PR Template (#25333)</li>
+<li>Update package pipeline windows image version (#25331)</li>
+<li>Skip additional packages when generating component manifest (#25329)</li>
+<li>Only build Linux for packaging changes (#25326)</li>
+<li>Make Component Manifest Updater use neutral target in addition to RID target (#25325)</li>
+<li>Remove Az module installs and AzureRM uninstalls in pipeline (#25327)</li>
+<li>Make sure the vPack pipeline does not produce an empty package (#25320)</li>
+<li>Add *.props and sort path filters for windows CI (#25316)</li>
+<li>Fix V-Pack download package name (#25314)</li>
+<li>Update path filters for Windows CI (#25312)</li>
+<li>Give the pipeline runs meaningful names (#25309)</li>
+<li>Migrate MacOS Signing to OneBranch (#25304)</li>
+<li>Add UseDotnet task for installing dotnet (#25281)</li>
+<li>Remove obsolete template from Windows Packaging CI (#25237)</li>
+<li>Add setup dotnet action to the build composite action (#25235)</li>
+<li>Add GitHub Actions workflow to verify PR labels (#25159)</li>
+<li>Update branch for release  - Transitive - true - minor (#24994)</li>
+<li>Fix GitHub Action filter overmatching (#24958)</li>
+<li>Fix release branch filters (#24959)</li>
+<li>Convert powershell/PowerShell-CI-macos to GitHub Actions (#24954)</li>
+<li>Convert powershell/PowerShell-CI-linux to GitHub Actions (#24946)</li>
+<li>Convert powershell/PowerShell-Windows-CI to GitHub Actions (#24931)</li>
+<li>PMC parse state correctly from update command's response (#24859)</li>
+<li>Add EV2 support for publishing PowerShell packages to PMC (#24856)</li>
+</ul>
+
+</details>
+
+[7.5.1]: https://github.com/PowerShell/PowerShell/compare/v7.5.0...v7.5.1
+
+## [7.5.0]
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 9.0.102</p>
+
+</summary>
+
+<ul>
+<li>Add tool package download in publish nuget stage (#24790) (#24792)</li>
+<li>Fix Changelog content grab during GitHub Release (#24788) (#24791)</li>
+<li>Mark build as latest stable (#24789)</li>
+<li>[release/v7.5] Update branch for release  - Transitive - true - minor (#24786)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to <code>1.1.0</code> (#24767) (#24785)</li>
+<li>Make the <code>AssemblyVersion</code> not change for servicing releases (#24667) (#24783)</li>
+<li>Deploy Box Update (#24632) (#24779)</li>
+<li>Update machine pool for copy blob and upload buildinfo stage (#24587) (#24776)</li>
+<li>Update nuget publish to use Deploy Box (#24596) (#24597)</li>
+<li>Added Deploy Box Product Pathway to GitHub Release and NuGet Release Pipelines (#24583) (#24595)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update `HelpInfoUri` for 7.5 (#24610) (#24777)
+
+[7.5.0]: https://github.com/PowerShell/PowerShell/compare/v7.5.0-rc.1...v7.5.0
+
+## [7.5.0-rc.1] - 2024-11-14
+
+**NOTE:** Due to technical issues, release of packages to packages.microsoft.com ~and release to NuGet.org~ is delayed.
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to .NET 9.0.100</p>
+
+</summary>
+
+<ul>
+<li>Update ThirdPartyNotices file (#24582) (#24536)</li>
+<li>Bump to .NET 9.0.100 (#24576) (#24535)</li>
+<li>Add a way to use only NuGet feed sources (#24528) (#24530)</li>
+<li>Update PSResourceGet to v1.1.0-RC2 (#24512) (#24525)</li>
+<li>Add PMC mapping for debian 12 (bookworm) (#24413) (#24518)</li>
+<li>Bump .NET to 9.0.100-rc.2.24474.11 (#24509) (#24522)</li>
+<li>Keep the roff file when gzipping it. (#24450) (#24520)</li>
+<li>Checkin generated manpage (#24423) (#24519)</li>
+<li>Update PSReadLine to 2.3.6 (#24380) (#24517)</li>
+<li>Download package from package build for generating vpack (#24481) (#24521)</li>
+<li>Delete the msix blob if it's already there (#24353) (#24516)</li>
+<li>Add CodeQL scanning to APIScan build (#24303) (#24515)</li>
+<li>Update vpack pipeline (#24281) (#24514)</li>
+<li>Fix seed max value for Container Linux CI (#24510) (#24511)</li>
+<li>Bring preview.5 release fixes to release/v7.5 (#24379) (#24368)</li>
+<li>Add <code>BaseUrl</code> to <code>buildinfo</code> json file (#24376) (#24377)</li>
+</ul>
+
+</details>
+
+[7.5.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.5.0-preview.5...v7.5.0-rc.1
+
+## [7.5.0-preview.5] - 2024-10-01
+
+### Breaking Changes
+
+- Treat large `Enum` values as numbers in `ConvertTo-Json` (#20999) (#24304)
+
+### Engine Updates and Fixes
+
+- Fix how processor architecture is validated in `Import-Module` (#24265) (#24317)
+
+### Experimental Features
+
+### General Cmdlet Updates and Fixes
+
+- Add `-Force` parameter to `Resolve-Path` and `Convert-Path` cmdlets to support wildcard hidden files (#20981) (#24344)
+- Add telemetry to track the use of features (#24247) (#24331)
+- Treat large `Enum` values as numbers in `ConvertTo-Json` (#20999) (#24304)
+- Make features `PSCommandNotFoundSuggestion`, `PSCommandWithArgs`, and `PSModuleAutoLoadSkipOfflineFiles` stable (#24246) (#24310)
+- Handle global tool when prepending `$PSHome` to `PATH` (#24228) (#24307)
+
+### Tests
+
+- Fix cleanup in `PSResourceGet` test (#24339) (#24345)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK to 9.0.100-rc.1.24452.12</p>
+
+</summary>
+
+<ul>
+<li>Fixed Test Scenario for <code>Compress-PSResource</code> (Internal 32696)</li>
+<li>Add back local NuGet source for test packages (Internal 32693)</li>
+<li>Fix typo in <code>release-MakeBlobPublic.yml</code> (Internal 32689)</li>
+<li>Copy to static site instead of making blob public (#24269) (#24343)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to <code>1.1.0-preview2</code> (#24300) (#24337)</li>
+<li>Remove the MD5 branch in the strong name signing token calculation (#24288) (#24321)</li>
+<li>Update experimental-feature json files (#24271) (#24319)</li>
+<li>Add updated <code>libicu</code> dependency for Debian packages (#24301) (#24324)</li>
+<li>Add mapping to <code>AzureLinux</code> repo (#24290) (#24322)</li>
+<li>Update and add new NuGet package sources for different environments. (#24264) (#24316)</li>
+<li>Bump .NET 9 to <code>9.0.100-rc.1.24452.12</code> (#24273) (#24320)</li>
+<li>Make some release tests run in a hosted pools (#24270) (#24318)</li>
+<li>Do not build the exe for Global tool shim project (#24263) (#24315)</li>
+<li>Delete <code>assets/AppImageThirdPartyNotices.txt</code> (#24256) (#24313)</li>
+<li>Create new pipeline for compliance (#24252) (#24312)</li>
+<li>Add specific path for issues in tsaconfig (#24244) (#24309)</li>
+<li>Use Managed Identity for APIScan authentication (#24243) (#24308)</li>
+<li>Add Windows signing for <code>pwsh.exe</code> (#24219) (#24306)</li>
+<li>Check <code>Create and Submit</code> in vPack build by default (#24181) (#24305)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Delete demos directory (#24258) (#24314)
+
+[7.5.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.5.0-preview.4...v7.5.0-preview.5
+
+## [7.5.0-preview.4] - 2024-08-28
+
+### Engine Updates and Fixes
+
+- RecommendedAction: Explicitly start and stop ANSI Error Color (#24065) (Thanks @JustinGrote!)
+- Improve .NET overload definition of generic methods (#21326) (Thanks @jborean93!)
+- Optimize the `+=` operation for a collection when it's an object array (#23901) (Thanks @jborean93!)
+- Allow redirecting to a variable as experimental feature `PSRedirectToVariable` (#20381)
+
+### General Cmdlet Updates and Fixes
+
+- Change type of `LineNumber` to `ulong` in `Select-String` (#24075) (Thanks @Snowman-25!)
+- Fix `Invoke-RestMethod` to allow `-PassThru` and `-Outfile` work together (#24086) (Thanks @jshigetomi!)
+- Fix Hyper-V Remoting when the module is imported via implicit remoting (#24032) (Thanks @jborean93!)
+- Add `ConvertTo-CliXml` and `ConvertFrom-CliXml` cmdlets (#21063) (Thanks @ArmaanMcleod!)
+- Add `OutFile` property in `WebResponseObject` (#24047) (Thanks @jshigetomi!)
+- Show filename in `Invoke-WebRequest -OutFile -Verbose` (#24041) (Thanks @jshigetomi!)
+- `Set-Acl`: Do not fail on untranslatable SID (#21096) (Thanks @jborean93!)
+- Fix the extent of the parser error when a number constant is invalid (#24024)
+- Fix `Move-Item` to throw error when moving into itself (#24004)
+- Fix up .NET method invocation with `Optional` argument (#21387) (Thanks @jborean93!)
+- Fix progress calculation on `Remove-Item` (#23869) (Thanks @jborean93!)
+- Fix WebCmdlets when `-Body` is specified but `ContentType` is not (#23952) (Thanks @CarloToso!)
+- Enable `-NoRestart` to work with `Register-PSSessionConfiguration` (#23891)
+- Add `IgnoreComments` and `AllowTrailingCommas` options to `Test-Json` cmdlet (#23817) (Thanks @ArmaanMcleod!)
+- Get-Help may report parameters with `ValueFromRemainingArguments` attribute as pipeline-able (#23871)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @eltociear</p>
+
+</summary>
+
+<ul>
+<li>Minor cleanup on local variable names within a method (#24105)</li>
+<li>Remove explicit <code>IDE1005</code> suppressions (#21217) (Thanks @xtqqczze!)</li>
+<li>Fix a typo in <code>WebRequestSession.cs</code> (#23963) (Thanks @eltociear!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- devcontainers: mount workspace in /PowerShell (#23857) (Thanks @rzippo!)
+
+### Tests
+
+- Add debugging to the MTU size test (#21463)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@bosesubham2011</p>
+
+</summary>
+
+<ul>
+<li>Update third party notices (Internal 32128)</li>
+<li>Update cgmanifest (#24163)</li>
+<li>Fixes to Azure Public feed usage (#24149)</li>
+<li>Add support for back porting PRs from GitHub or the Private Azure Repos (#20670)</li>
+<li>Move to <code>9.0.0-preview.6.24327.7</code> (#24133)</li>
+<li>update path (#24134)</li>
+<li>Update to the latest NOTICES file (#24131)</li>
+<li>Fix semver issue with updating cgmanifest (#24132)</li>
+<li>Add ability to capture MSBuild Binary logs when restore fails (#24128)</li>
+<li>add ability to skip windows stage (#24116)</li>
+<li>chore: Refactor Nuget package source creation to use New-NugetPackageSource function (#24104)</li>
+<li>Make Microsoft feeds the default (#24098)</li>
+<li>Cleanup unused csproj (#23951)</li>
+<li>Add script to update SDK version during release (#24034)</li>
+<li>Enumerate over all signed zip packages (#24063)</li>
+<li>Update metadata.json for PowerShell July releases (#24082)</li>
+<li>Add macos signing for package files (#24015)</li>
+<li>Update <code>install-powershell.sh</code> to support azure-linux (#23955) (Thanks @bosesubham2011!)</li>
+<li>Skip build steps that do not have exe packages (#23945)</li>
+<li>Update metadata.json for PowerShell June releases (#23973)</li>
+<li>Create <code>powershell.config.json</code> for <code>PowerShell.Windows.x64</code> global tool (#23941)</li>
+<li>Fix error in the vPack release, debug script that blocked release (#23904)</li>
+<li>Add vPack release (#23898)</li>
+<li>Fix exe signing with third party signing for WiX engine (#23878)</li>
+<li>Update wix installation in CI (#23870)</li>
+<li>Add checkout to fix TSA config paths (#23865)</li>
+<li>Merge the <code>v7.5.0-preview.3</code> release branch to GitHub master branch</li>
+<li>Update <code>metadata.json</code> for the <code>v7.5.0-preview.3</code> release (#23862)</li>
+<li>Bump <code>PSResourceGet</code> to <code>1.1.0-preview1</code> (#24129)</li>
+<li>Bump <code>github/codeql-action</code> from 3.25.8 to 3.26.0 (#23953) (#23999) (#24053) (#24069) (#24095) (#24118)</li>
+<li>Bump <code>actions/upload-artifact</code> from 4.3.3 to 4.3.6 (#24019) (#24113) (#24119)</li>
+<li>Bump <code>agrc/create-reminder-action</code> from 1.1.13 to 1.1.15 (#24029) (#24043)</li>
+<li>Bump <code>agrc/reminder-action</code> from 1.0.12 to 1.0.14 (#24028) (#24042)</li>
+<li>Bump <code>super-linter/super-linter</code> from 5.7.2 to 6.8.0 (#23809) (#23856) (#23894) (#24030) (#24103)</li>
+<li>Bump <code>ossf/scorecard-action</code> from 2.3.1 to 2.4.0 (#23802) (#24096)</li>
+<li>Bump <code>actions/dependency-review-action</code> from 4.3.2 to 4.3.4 (#23897) (#24046)</li>
+<li>Bump <code>actions/checkout</code> from 4.1.5 to 4.1.7 (#23813) (#23947)</li>
+<li>Bump <code>github/codeql-action</code> from 3.25.4 to 3.25.8 (#23801) (#23893)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update docs sample nuget.config (#24109)
+- Update Code of Conduct and Security Policy (#23811)
+- Update working-group-definitions.md for the Security WG (#23884)
+- Fix up broken links in Markdown files (#23863)
+- Update Engine Working Group Members (#23803) (Thanks @kilasuit!)
+- Remove outdated and contradictory information from `README` (#23812)
+
+[7.5.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.5.0-preview.3...v7.5.0-preview.4
+
+## [7.5.0-preview.3] - 2024-05-16
+
+### Breaking Changes
+
+- Remember installation options and used them to initialize options for the next installation (#20420) (Thanks @reduckted!)
+- `ConvertTo-Json`: Serialize `BigInteger` as a number (#21000) (Thanks @jborean93!)
+
+### Engine Updates and Fixes
+
+- Fix generating `OutputType` when running in Constrained Language Mode (#21605)
+- Revert the PR #17856 (Do not preserve temporary results when no need to do so) (#21368)
+- Make sure the assembly/library resolvers are registered at early stage (#21361)
+- Fix PowerShell class to support deriving from an abstract class with abstract properties (#21331)
+- Fix error formatting for pipeline enumeration exceptions (#20211)
+
+### General Cmdlet Updates and Fixes
+
+- Added progress bar for `Remove-Item` cmdlet (#20778) (Thanks @ArmaanMcleod!)
+- Expand `~` to `$home` on Windows with tab completion (#21529)
+- Separate DSC configuration parser check for ARM processor (#21395) (Thanks @dkontyko!)
+- Fix `[semver]` type to pass `semver.org` tests (#21401)
+- Don't complete when declaring parameter name and class member (#21182) (Thanks @MartinGC94!)
+- Add `RecommendedAction` to `ConciseView` of the error reporting (#20826) (Thanks @JustinGrote!)
+- Fix the error when using `Start-Process -Credential` without the admin privilege (#21393) (Thanks @jborean93!)
+- Fix `Test-Path -IsValid` to check for invalid path and filename characters (#21358)
+- Fix build failure due to missing reference in `GlobalToolShim.cs` (#21388)
+- Fix argument passing in `GlobalToolShim` (#21333) (Thanks @ForNeVeR!)
+- Make sure both stdout and stderr can be redirected from a native executable (#20997)
+- Handle the case that `Runspace.DefaultRunspace == null` when logging for WDAC Audit (#21344)
+- Fix a typo in `releaseTools.psm1` (#21306) (Thanks @eltociear!)
+- `Get-Process`: Remove admin requirement for `-IncludeUserName` (#21302) (Thanks @jborean93!)
+- Fall back to type inference when hashtable key-value cannot be retrieved from safe expression (#21184) (Thanks @MartinGC94!)
+- Fix the regression when doing type inference for `$_` (#21223) (Thanks @MartinGC94!)
+- Revert "Adjust PUT method behavior to POST one for default content type in WebCmdlets" (#21049)
+- Fix a regression in `Format-Table` when header label is empty (#21156)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Enable <code>CA1868</code>: Unnecessary call to 'Contains' for sets (#21165) (Thanks @xtqqczze!)</li>
+<li>Remove <code>JetBrains.Annotations</code> attributes (#21246) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Update `metadata.json` and `README.md` (#21454)
+- Skip test on Windows Server 2012 R2 for `no-nl` (#21265)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to .NET 9.0.0-preview.3</p>
+<p>We thank the following contributors!</p>
+<p>@alerickson, @tgauth, @step-security-bot, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Fix PMC publish and the file path for msixbundle</li>
+<li>Fix release version and stage issues in build and packaging</li>
+<li>Add release tag if the environment variable is set</li>
+<li>Update installation on Wix module (#23808)</li>
+<li>Updates to package and release pipelines (#23800)</li>
+<li>Update <code>PSResourceGet</code> to 1.0.5 (#23796)</li>
+<li>Bump <code>actions/upload-artifact</code> from 4.3.2 to 4.3.3 (#21520)</li>
+<li>Bump <code>actions/dependency-review-action</code> from 4.2.5 to 4.3.2 (#21560)</li>
+<li>Bump <code>actions/checkout</code> from 4.1.2 to 4.1.5 (#21613)</li>
+<li>Bump <code>github/codeql-action</code> from 3.25.1 to 3.25.4 (#22071)</li>
+<li>Use feed with Microsoft Wix toolset (#21651) (Thanks @tgauth!)</li>
+<li>Bump to .NET 9 preview 3 (#21782)</li>
+<li>Use <code>PSScriptRoot</code> to find path to Wix module (#21611)</li>
+<li>Create the <code>Windows.x64</code> global tool with shim for signing (#21559)</li>
+<li>Update Wix package install (#21537) (Thanks @tgauth!)</li>
+<li>Add branch counter variables for daily package builds (#21523)</li>
+<li>Use correct signing certificates for RPM and DEBs (#21522)</li>
+<li>Revert to version available on <code>Nuget</code> for <code>Microsoft.CodeAnalysis.Analyzers</code> (#21515)</li>
+<li>Official PowerShell Package pipeline (#21504)</li>
+<li>Add a PAT for fetching PMC cli (#21503)</li>
+<li>Bump <code>ossf/scorecard-action</code> from 2.0.6 to 2.3.1 (#21485)</li>
+<li>Apply security best practices (#21480) (Thanks @step-security-bot!)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.Analyzers</code> (#21449)</li>
+<li>Fix package build to not check some files for a signature. (#21458)</li>
+<li>Update PSResourceGet version from 1.0.2 to 1.0.4.1 (#21439) (Thanks @alerickson!)</li>
+<li>Verify environment variable for OneBranch before we try to copy (#21441)</li>
+<li>Add back two transitive dependency packages (#21415)</li>
+<li>Multiple fixes in official build pipeline (#21408)</li>
+<li>Update <code>PSReadLine</code> to <code>v2.3.5</code> (#21414)</li>
+<li>PowerShell co-ordinated build OneBranch pipeline (#21364)</li>
+<li>Add file description to <code>pwsh.exe</code> (#21352)</li>
+<li>Suppress MacOS package manager output (#21244) (Thanks @xtqqczze!)</li>
+<li>Update <code>metadata.json</code> and <code>README.md</code> (#21264)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update the doc about how to build PowerShell (#21334) (Thanks @ForNeVeR!)
+- Update the member lists for the Engine and Interactive-UX working groups (#20991) (Thanks @kilasuit!)
+- Update CHANGELOG for `v7.2.19`, `v7.3.12` and `v7.4.2` (#21462)
+- Fix grammar in `FAQ.md` (#21468) (Thanks @CodingGod987!)
+- Fix typo in `SessionStateCmdletAPIs.cs` (#21413) (Thanks @eltociear!)
+- Fix typo in a test (#21337) (Thanks @testwill!)
+- Fix typo in `ast.cs` (#21350) (Thanks @eltociear!)
+- Adding Working Group membership template (#21153)
+
+[7.5.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.5.0-preview.2...v7.5.0-preview.3
+
+## [7.5.0-preview.2] - 2024-02-22
+
+### Engine Updates and Fixes
+
+- Fix `using assembly` to use `Path.Combine` when constructing assembly paths (#21169)
+- Validate the value for `using namespace` during semantic checks to prevent declaring invalid namespaces (#21162)
+
+### General Cmdlet Updates and Fixes
+
+- Add `WinGetCommandNotFound` and `CompletionPredictor` modules to track usage (#21040)
+- `ConvertFrom-Json`: Add `-DateKind` parameter (#20925) (Thanks @jborean93!)
+- Add tilde expansion for windows native executables (#20402) (Thanks @domsleee!)
+- Add `DirectoryInfo` to the `OutputType` for `New-Item` (#21126) (Thanks @MartinGC94!)
+- Fix `Get-Error` serialization of array values (#21085) (Thanks @jborean93!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear</p>
+
+</summary>
+
+<ul>
+<li>Fix a typo in <code>CoreAdapter.cs</code> (#21179) (Thanks @eltociear!)</li>
+<li>Remove <code>PSScheduledJob</code> module source code (#21189)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Rewrite the mac syslog tests to make them less flaky (#21174)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Bump to .NET 9 Preview 1</p>
+<p>We thank the following contributors!</p>
+<p>@gregsdennis</p>
+
+</summary>
+
+<ul>
+<li>Bump to .NET 9 Preview 1 (#21229)</li>
+<li>Add dotnet-runtime-9.0 as a dependency for the Mariner package</li>
+<li>Add dotenv install as latest version does not work with current Ruby version (#21239)</li>
+<li>Remove <code>surrogateFile</code> setting of APIScan (#21238)</li>
+<li>Update experimental-feature json files (#21213)</li>
+<li>Update to the latest NOTICES file (#21236)(#21177)</li>
+<li>Update the cgmanifest (#21237)(#21093)</li>
+<li>Update the cgmanifest (#21178)</li>
+<li>Bump XunitXml.TestLogger from 3.1.17 to 3.1.20 (#21207)</li>
+<li>Update versions of PSResourceGet (#21190)</li>
+<li>Generate MSI for <code>win-arm64</code> installer (#20516)</li>
+<li>Bump JsonSchema.Net to v5.5.1 (#21120) (Thanks @gregsdennis!)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update `README.md` and `metadata.json` for v7.5.0-preview.1 release (#21094)
+- Fix incorrect examples in XML docs in `PowerShell.cs` (#21173)
+- Update WG members (#21091)
+- Update changelog for v7.4.1 (#21098)
+
+[7.5.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.5.0-preview.1...v7.5.0-preview.2
+
+## [7.5.0-preview.1] - 2024-01-18
+
+### Breaking Changes
+
+- Fix `-OlderThan` and `-NewerThan` parameters for `Test-Path` when using `PathType` and date range (#20942) (Thanks @ArmaanMcleod!)
+- Previously `-OlderThan` would be ignored if specified together
+- Change `New-FileCatalog -CatalogVersion` default to 2 (#20428) (Thanks @ThomasNieto!)
+
+### General Cmdlet Updates and Fixes
+
+- Fix completion crash for the SCCM provider (#20815, #20919, #20915) (Thanks @MartinGC94!)
+- Fix regression in `Get-Content` when `-Tail 0` and `-Wait` are used together (#20734) (Thanks @CarloToso!)
+- Add `Aliases` to the properties shown up when formatting the help content of the parameter returned by `Get-Help` (#20994)
+- Add implicit localization fallback to `Import-LocalizedData` (#19896) (Thanks @chrisdent-de!)
+- Change `Test-FileCatalog` to use `File.OpenRead` to better handle the case where the file is being used (#20939) (Thanks @dxk3355!)
+- Added `-Module` completion for `Save-Help` and `Update-Help` commands (#20678) (Thanks @ArmaanMcleod!)
+- Add argument completer to `-Verb` for `Start-Process` (#20415) (Thanks @ArmaanMcleod!)
+- Add argument completer to `-Scope` for `*-Variable`, `*-Alias` & `*-PSDrive` commands (#20451) (Thanks @ArmaanMcleod!)
+- Add argument completer to `-Verb` for `Get-Verb` and `Get-Command` (#20286) (Thanks @ArmaanMcleod!)
+- Fixing incorrect formatting string in `CommandSearcher` trace logging (#20928) (Thanks @powercode!)
+- Ensure the filename is not null when logging WDAC ETW events (#20910) (Thanks @jborean93!)
+- Fix four regressions introduced by the WDAC logging feature (#20913)
+- Leave the input, output, and error handles unset when they are not redirected (#20853)
+- Fix `Start-Process -PassThru` to make sure the `ExitCode` property is accessible for the returned `Process` object (#20749) (Thanks @CodeCyclone!)
+- Fix `Group-Object` output using interpolated strings (#20745) (Thanks @mawosoft!)
+- Fix rendering of `DisplayRoot` for network `PSDrive` (#20793)
+- Fix `Invoke-WebRequest` to report correct size when `-Resume` is specified (#20207) (Thanks @LNKLEO!)
+- Add `PSAdapter` and `ConsoleGuiTools` to module load telemetry allow list (#20641)
+- Fix Web Cmdlets to allow `WinForm` apps to work correctly (#20606)
+- Block getting help from network locations in restricted remoting sessions (#20593)
+- Fix `Group-Object` to use current culture for its output (#20608)
+- Add argument completer to `-Version` for `Set-StrictMode` (#20554) (Thanks @ArmaanMcleod!)
+- Fix `Copy-Item` progress to only show completed when all files are copied (#20517)
+- Fix UNC path completion regression (#20419) (Thanks @MartinGC94!)
+- Add telemetry to check for specific tags when importing a module (#20371)
+- Report error if invalid `-ExecutionPolicy` is passed to `pwsh` (#20460)
+- Add `HelpUri` to `Remove-Service` (#20476)
+- Fix `unixmode` to handle `setuid` and `sticky` when file is not an executable (#20366)
+- Fix `Test-Connection` due to .NET 8 changes (#20369)
+- Fix implicit remoting proxy cmdlets to act on common parameters (#20367)
+- Set experimental features to stable for 7.4 release (#20285)
+- Revert changes to continue using `BinaryFormatter` for `Out-GridView` (#20300)
+- Fix `Get-Service` non-terminating error message to include category (#20276)
+- Prevent `Export-CSV` from flushing with every input (#20282) (Thanks @Chris--A!)
+- Fix a regression in DSC (#20268)
+- Include the module version in error messages when module is not found (#20144) (Thanks @ArmaanMcleod!)
+- Add `-Empty` and `-InputObject` parameters to `New-Guid` (#20014) (Thanks @CarloToso!)
+- Remove the comment trigger from feedback provider (#20136)
+- Prevent fallback to file completion when tab completing type names (#20084) (Thanks @MartinGC94!)
+- Add the alias `r` to the parameter `-Recurse` for the `Get-ChildItem` command (#20100) (Thanks @kilasuit!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear, @ImportTaste, @ThomasNieto, @0o001</p>
+
+</summary>
+
+<ul>
+<li>Fix typos in the code base (#20147, #20492, #20632, #21015, #20838) (Thanks @eltociear!)</li>
+<li>Add the missing alias <code>LP</code> to <code>-LiteralPath</code> for some cmdlets (#20820) (Thanks @ImportTaste!)</li>
+<li>Remove parenthesis for empty attribute parameters (#20087) (Thanks @ThomasNieto!)</li>
+<li>Add space around keyword according to the <code>CodeFactor</code> rule (#20090) (Thanks @ThomasNieto!)</li>
+<li>Remove blank lines as instructed by <code>CodeFactor</code> rules (#20086) (Thanks @ThomasNieto!)</li>
+<li>Remove trailing whitespace (#20085) (Thanks @ThomasNieto!)</li>
+<li>Fix typo in error message (#20145) (Thanks @0o001!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Make sure feedback link in the bot's comment is clickable (#20878) (Thanks @floh96!)
+- Fix bot so anyone who comments will remove the "Resolution-No Activity" label (#20788)
+- Fix bot configuration to prevent multiple comments about "no activity" (#20758)
+- Add bot logic for closing GitHub issues after 6 months of "no activity" (#20525)
+- Refactor bot for easier use and updating (#20805)
+- Configure bot to add survey comment for closed issues (#20397)
+
+### Tests
+
+- Suppress error output from `Set-Location` tests (#20499)
+- Fix typo in `FileCatalog.Tests.ps1` (#20329) (Thanks @eltociear!)
+- Continue to improve tests for release automation (#20182)
+- Skip the test on x86 as `InstallDate` is not visible on `Wow64` (#20165)
+- Harden some problematic release tests (#20155)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@alerickson, @Zhoneym, @0o001</p>
+
+</summary>
+
+<ul>
+<li>Bump .NET SDK to 8.0.101 (#21084)</li>
+<li>Update the cgmanifest (#20083, #20436, #20523, #20560, #20627, #20764, #20906, #20933, #20955, #21047)</li>
+<li>Update to the latest NOTICES file (#20074, #20161, #20385, #20453, #20576, #20590, #20880, #20905)</li>
+<li>Bump StyleCop.Analyzers from 1.2.0-beta.507 to 1.2.0-beta.556 (#20953)</li>
+<li>Bump xUnit to 2.6.6 (#21071)</li>
+<li>Bump JsonSchema.Net to 5.5.0 (#21027)</li>
+<li>Fix failures in GitHub action <code>markdown-link-check</code> (#20996)</li>
+<li>Bump xunit.runner.visualstudio to 2.5.6 (#20966)</li>
+<li>Bump github/codeql-action from 2 to 3 (#20927)</li>
+<li>Bump Markdig.Signed to 0.34.0 (#20926)</li>
+<li>Bump Microsoft.ApplicationInsights from 2.21.0 to 2.22.0 (#20888)</li>
+<li>Bump Microsoft.NET.Test.Sdk to 17.8.0 (#20660)</li>
+<li>Update <code>apiscan.yml</code> to have access to the <code>AzDevOpsArtifacts</code> variable group (#20671)</li>
+<li>Set the <code>ollForwardOnNoCandidateFx</code> in <code>runtimeconfig.json</code> to roll forward only on minor and patch versions (#20689)</li>
+<li>Sign the global tool shim executable (#20794)</li>
+<li>Bump actions/github-script from 6 to 7 (#20682)</li>
+<li>Remove RHEL7 publishing to packages.microsoft.com as it's no longer supported (#20849)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp to 4.8.0 (#20751)</li>
+<li>Add internal nuget feed to compliance build (#20669)</li>
+<li>Copy azure blob with PowerShell global tool to private blob and move to CDN during release (#20659)</li>
+<li>Fix release build by making the internal SDK parameter optional (#20658)</li>
+<li>Update PSResourceGet version to 1.0.1 (#20652)</li>
+<li>Make internal .NET SDK URL as a parameter for release builld (#20655)</li>
+<li>Fix setting of variable to consume internal SDK source (#20644)</li>
+<li>Bump Microsoft.Management.Infrastructure to v3.0.0 (#20642)</li>
+<li>Bump Microsoft.PowerShell.Native to v7.4.0 (#20617)</li>
+<li>Bump Microsoft.Security.Extensions from 1.2.0 to 1.3.0 (#20556)</li>
+<li>Fix package version for .NET nuget packages (#20551)</li>
+<li>Add SBOM for release pipeline (#20519)</li>
+<li>Block any preview vPack release (#20243)</li>
+<li>Only registry App Path for release package (#20478)</li>
+<li>Increase timeout when publishing packages to <code>pacakages.microsoft.com</code> (#20470)</li>
+<li>Fix alpine tar package name and do not crossgen alpine fxdependent package (#20459)</li>
+<li>Bump PSReadLine from 2.2.6 to 2.3.4 (#20305)</li>
+<li>Remove the <code>ref</code> folder before running compliance (#20373)</li>
+<li>Updates RIDs used to generate component Inventory (#20370)</li>
+<li>Bump XunitXml.TestLogger from 3.1.11 to 3.1.17 (#20293)</li>
+<li>Update experimental-feature json files (#20335)</li>
+<li>Use <code>fxdependent-win-desktop</code> runtime for compliance runs (#20326)</li>
+<li>Release build: Change the names of the PATs (#20307)</li>
+<li>Add mapping for mariner arm64 stable (#20213)</li>
+<li>Put the calls to <code>Set-AzDoProjectInfo</code> and <code>Set-AzDoAuthToken</code> in the right order (#20306)</li>
+<li>Enable vPack provenance data (#20220)</li>
+<li>Bump actions/checkout from 3 to 4 (#20205)</li>
+<li>Start using new <code>packages.microsoft.com</code> cli (#20140, #20141)</li>
+<li>Add mariner arm64 to PMC release (#20176)</li>
+<li>Fix typo <code>donet</code> to <code>dotnet</code> in build scripts and pipelines (#20122) (Thanks @0o001!)</li>
+<li>Install the pmc cli</li>
+<li>Add skip publish parameter</li>
+<li>Add verbose to clone</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Include information about upgrading in readme (#20993)
+- Expand "iff" to "if-and-only-if" in XML doc content (#20852)
+- Update LTS links in README.md to point to the v7.4 packages (#20839) (Thanks @kilasuit!)
+- Update `README.md` to improve readability (#20553) (Thanks @AnkitaSikdar005!)
+- Fix link in `docs/community/governance.md` (#20515) (Thanks @suravshresth!)
+- Update `ADOPTERS.md` (#20555) (Thanks @AnkitaSikdar005!)
+- Fix a typo in `ADOPTERS.md` (#20504, #20520) (Thanks @shruti-sen2004!)
+- Correct grammatical errors in `README.md` (#20509) (Thanks @alienishi!)
+- Add 7.3 changelog URL to readme (#20473) (Thanks @Saibamen!)
+- Clarify some comments and documentation (#20462) (Thanks @darkstar!)
+
+[7.5.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.4.1...v7.5.0-preview.1
diff --git a/CHANGELOG/7.6.md b/CHANGELOG/7.6.md
new file mode 100644
index 00000000000..cd09b76272c
--- /dev/null
+++ b/CHANGELOG/7.6.md
@@ -0,0 +1,852 @@
+# 7.6 Changelog
+
+## [7.6.1]
+
+### General Cmdlet Updates and Fixes
+
+- Delay update notification for one week to ensure all packages become available (#27215)
+
+### Tests
+
+- Fix the `PSNativeCommandArgumentPassing` test (#27179)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET SDK 10.0.202</p>
+
+</summary>
+
+<ul>
+<li>Fix PMC Repo URL for RHEL10 (#27061) (#27062)</li>
+<li>Update branch for release (#27287)</li>
+<li>Fix package pipeline by adding in PDP-Media directory (#27257)</li>
+<li>Pin ready-to-merge.yml reusable workflow to commit SHA (#27245)</li>
+<li>[StepSecurity] ci: Harden GitHub Actions tags (#27236)</li>
+<li>Build, package, and create VPack for the PowerShell-LTS store package within the same <code>msixbundle-vpack</code> pipeline (#27237)</li>
+<li>Change the display name of PowerShell-LTS package to PowerShell LTS (#27219)</li>
+<li>[StepSecurity] ci: Harden GitHub Actions tokens (#27218)</li>
+<li>Redo windows image fix to use latest image (#27217)</li>
+<li>Add comment-based help documentation to build.psm1 functions (#27216)</li>
+<li>Separate Store Package Creation, Skip Polling for Store Publish, Clean up PDP-Media (#27214)</li>
+<li>Bump github/codeql-action from 4.34.1 to 4.35.1 (#27184)</li>
+<li>Bump github/codeql-action from 4.32.6 to 4.34.1 (#27182)</li>
+<li>Select New MSIX Package Name (#27183)</li>
+<li>Update the PhoneProductId to be the official LTS id used by Store (#27181)</li>
+<li>release-upload-buildinfo: replace version-comparison channel gating with metadata flags (#27180)</li>
+<li>Move <code>_GetDependencies</code> MSBuild target from dynamic generation in <code>build.psm1</code> into <code>Microsoft.PowerShell.SDK.csproj</code> (#27177)</li>
+<li>Separate Official and NonOfficial templates for ADO pipelines (#27176)</li>
+</ul>
+
+</details>
+
+[7.6.1]: https://github.com/PowerShell/PowerShell/compare/v7.6.0...v7.6.1
+
+## [7.6.0]
+
+### General Cmdlet Updates and Fixes
+
+- Update PowerShell Profile DSC resource manifests to allow `null` for content (#26973)
+
+### Tests
+
+- Add GitHub Actions annotations for Pester test failures (#26969)
+- Fix `Import-Module.Tests.ps1` to handle Arm32 platform (#26888)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update to .NET SDK 10.0.201</p>
+
+</summary>
+
+<ul>
+<li>Update v7.6 release branch to use .NET SDK 10.0.201 (#27041)</li>
+<li>Create LTS package and non-LTS package for macOS for LTS releases (#27040)</li>
+<li>Fix the container image for package pipelines (#27020)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> version to 1.2.0 (#27007)</li>
+<li>Update LTS and Stable release settings in metadata (#27006)</li>
+<li>Update branch for release (#26989)</li>
+<li>Fix <code>ConvertFrom-ClearlyDefinedCoordinates</code> to handle API object coordinates (#26986)</li>
+<li>Update NuGet package versions in <code>cgmanifest.json</code> to actually match the branch (#26982)</li>
+<li>Bump actions/upload-artifact from 6 to 7 (#26979)</li>
+<li>Split TPN manifest and Component Governance manifest (#26978)</li>
+<li>Bump github/codeql-action from 4.32.4 to 4.32.6 (#26975)</li>
+<li>Bump actions/dependency-review-action from 4.8.3 to 4.9.0 (#26974)</li>
+<li>Hardcode Official templates (#26972)</li>
+<li>Fix a preview detection test for the packaging script (#26971)</li>
+<li>Add PMC packages for debian13 and rhel10 (#26917)</li>
+<li>Add version in description and pass store task on failure (#26889)</li>
+<li>Exclude .exe packages from publishing to GitHub (#26887)</li>
+<li>Correct the package name for .deb and .rpm packages (#26884)</li>
+</ul>
+
+</details>
+
+[7.6.0]: https://github.com/PowerShell/PowerShell/compare/v7.6.0-rc.1...v7.6.0
+
+## [7.6.0-rc.1] - 2026-02-19
+
+### Tests
+
+- Fix `$PSDefaultParameterValues` leak causing tests to skip unexpectedly (#26705)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Expand to see details.</p>
+
+</summary>
+
+<ul>
+<li>Update branch for release (#26779)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> version to 1.2.0-rc3 (#26767)</li>
+<li>Update <code>Microsoft.PowerShell.Native</code> package version (#26748)</li>
+<li>Move PowerShell build to depend on .NET SDK 10.0.102 (#26717)</li>
+<li>Fix <code>buildinfo.json</code> uploading for preview, LTS, and stable releases (#26715)</li>
+<li>Fix macOS preview package identifier detection to use version string (#26709)</li>
+<li>Update <code>metadata.json</code> to update the Latest attribute with a better name (#26708)</li>
+<li>Remove unused <code>runCodesignValidationInjection</code> variable from pipeline templates (#26707)</li>
+<li>Update <code>Get-ChangeLog</code> to handle backport PRs correctly (#26706)</li>
+<li>Bring release changes from the <code>v7.6.0-preview.6</code> release (#26626)</li>
+<li>Fix the DSC test by skipping <code>AfterAll</code> cleanup if the initial setup in <code>BeforeAll</code> failed (#26622)</li>
+</ul>
+
+</details>
+
+[7.6.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.6.0-preview.6...v7.6.0-rc.1
+
+## [7.6.0-preview.6] - 2025-12-11
+
+### Engine Updates and Fixes
+
+- Properly Expand Aliases to their actual ResolvedCommand (#26571) (Thanks @kilasuit!)
+
+### General Cmdlet Updates and Fixes
+
+- Update `Microsoft.PowerShell.PSResourceGet` to `v1.2.0-preview5` (#26590)
+- Make the experimental feature `PSFeedbackProvider` stable (#26502)
+- Fix a regression in the API `CompletionCompleters.CompleteFilename()` that causes null reference exception (#26487)
+- Add Delimiter parameter to `Get-Clipboard` (#26572) (Thanks @MartinGC94!)
+- Close pipe client handles after creating the child ssh process (#26564)
+- Make some experimental features stable (#26490)
+- DSC v3 resource for PowerShell Profile (#26447)
+
+### Tools
+
+- Add merge conflict marker detection to linux-ci workflow and refactor existing actions to use reusable get-changed-files action (#26530)
+- Add reusable get-changed-files action and refactor existing actions (#26529)
+- Refactor analyze job to reusable workflow and enable on Windows CI (#26494)
+
+### Tests
+
+- Fix merge conflict checker for empty file lists and filter *.cs files (#26556)
+- Add markdown link verification for PRs (#26445)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Expand to see details.</p>
+
+</summary>
+
+<ul>
+<li>Fix template path for rebuild branch check in package.yml (#26560)</li>
+<li>Update the macos package name for preview releases to match the previous pattern (#26576)</li>
+<li>Add rebuild branch support with conditional MSIX signing (#26573)</li>
+<li>Update the WCF packages to the latest version that is compatible with v4.10.3 (#26503)</li>
+<li>Improve ADO package build and validation across platforms (#26532)</li>
+<li>Mirror .NET/runtime ICU version range in PowerShell (#26563) (Thanks @kasperk81!)</li>
+<li>Update the macos package name for preview releases to match the previous pattern (#26562)</li>
+<li>Fix condition syntax for StoreBroker package tasks in MSIX pipeline (#26561)</li>
+<li>Move package validation to package pipeline (#26558)</li>
+<li>Optimize/split windows package signing (#26557)</li>
+<li>Remove usage of fpm for DEB package generation (#26504)</li>
+<li>Add log grouping to build.psm1 for collapsible GitHub Actions logs (#26524)</li>
+<li>Replace fpm with native macOS packaging tools (pkgbuild/productbuild) (#26501)</li>
+<li>Replace fpm with native rpmbuild for RPM package generation (#26441)</li>
+<li>Fix GitHub API rate limit errors in test actions (#26492)</li>
+<li>Convert Azure DevOps Linux Packaging pipeline to GitHub Actions workflow (#26493)</li>
+<li>Refactor: Centralize xUnit tests into reusable workflow and remove legacy verification (#26488)</li>
+<li>Fix build to only enable ready-to-run for the Release configuration (#26481)</li>
+<li>Integrate Windows packaging into windows-ci workflow using reusable workflow (#26468)</li>
+<li>Update outdated package references (#26471)</li>
+<li>GitHub Workflow cleanup (#26439)</li>
+<li>Update PSResourceGet package version to preview4 (#26438)</li>
+<li>Update PSReadLine to v2.4.5 (#26446)</li>
+<li>Add network isolation policy parameter to vPack pipeline (#26444)</li>
+<li>Fix a couple more lint errors</li>
+<li>Fix lint errors in preview.md</li>
+<li>Make MSIX publish stage dependent on SetReleaseTagandContainerName stage</li>
+</ul>
+
+</details>
+
+[7.6.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.6.0-preview.5...v7.6.0-preview.6
+
+## [7.6.0-preview.5] - 2025-09-30
+
+### Engine Updates and Fixes
+
+- Allow opt-out of the named-pipe listener using the environment variable `POWERSHELL_DIAGNOSTICS_OPTOUT` (#26086)
+- Ensure that socket timeouts are set only during the token validation (#26066)
+- Fix race condition in `RemoteHyperVSocket` (#26057)
+- Fix `stderr` output of console host to respect `NO_COLOR` (#24391)
+- Update PSRP protocol to deprecate session key exchange between newer client and server (#25774)
+- Fix the `ssh` PATH check in `SSHConnectionInfo` when the default Runspace is not available (#25780) (Thanks @jborean93!)
+- Adding hex format for native command exit codes (#21067) (Thanks @sba923!)
+- Fix infinite loop crash in variable type inference (#25696) (Thanks @MartinGC94!)
+- Add `PSForEach` and `PSWhere` as aliases for the PowerShell intrinsic methods `Where` and `Foreach` (#25511) (Thanks @powercode!)
+
+### General Cmdlet Updates and Fixes
+
+- Remove `IsScreenReaderActive()` check from `ConsoleHost` (#26118)
+- Fix `ConvertFrom-Json` to ignore comments inside array literals (#14553) (#26050) (Thanks @MatejKafka!)
+- Fix `-Debug` to not trigger the `ShouldProcess` prompt (#26081)
+- Add the parameter `Register-ArgumentCompleter -NativeFallback` to support registering a cover-all completer for native commands (#25230)
+- Change the default feedback provider timeout from 300ms to 1000ms (#25910)
+- Update PATH environment variable for package manager executable on Windows (#25847)
+- Fix `Write-Host` to respect `OutputRendering = PlainText` (#21188)
+- Improve the `$using` expression support in `Invoke-Command` (#24025) (Thanks @jborean93!)
+- Use parameter `HelpMessage` for tool tip in parameter completion (#25108) (Thanks @jborean93!)
+- Revert "Never load a module targeting the PSReadLine module's `SessionState`" (#25792)
+- Fix debug tracing error with magic extents (#25726) (Thanks @jborean93!)
+- Add `MethodInvocation` trace for overload tracing (#21320) (Thanks @jborean93!)
+- Improve verbose and debug logging level messaging in web cmdlets (#25510) (Thanks @JustinGrote!)
+- Fix quoting in completion if the path includes a double quote character (#25631) (Thanks @MartinGC94!)
+- Fix the common parameter `-ProgressAction` for advanced functions (#24591) (Thanks @cmkb3!)
+- Use absolute path in `FileSystemProvider.CreateDirectory` (#24615) (Thanks @Tadas!)
+- Make inherited protected internal instance members accessible in PowerShell class scope (#25245) (Thanks @mawosoft!)
+- Treat `-Target` as literal in `New-Item` (#25186) (Thanks @GameMicrowave!)
+- Remove duplicate modules from completion results (#25538) (Thanks @MartinGC94!)
+- Add completion for variables assigned in `ArrayLiteralAst` and `ParenExpressionAst` (#25303) (Thanks @MartinGC94!)
+- Add support for thousands separators in `[bigint]` casting (#25396) (Thanks @AbishekPonmudi!)
+- Add internal methods to check Preferences (#25514) (Thanks @iSazonov!)
+- Improve debug logging of Web cmdlet request and response (#25479) (Thanks @JustinGrote!)
+- Revert "Allow empty prefix string in 'Import-Module -Prefix' to override default prefix in manifest (#20409)" (#25462) (Thanks @MartinGC94!)
+- Fix the `NullReferenceException` when writing progress records to console from multiple threads (#25440) (Thanks @kborowinski!)
+- Update `Get-Service` to ignore common errors when retrieving non-critical properties for a service (#24245) (Thanks @jborean93!)
+- Add single/double quote support for `Join-String` Argument Completer (#25283) (Thanks @ArmaanMcleod!)
+- Fix tab completion for env/function variables (#25346) (Thanks @jborean93!)
+- Fix `Out-GridView` by replacing use of obsolete `BinaryFormatter` with custom implementation (#25497) (Thanks @mawosoft!)
+- Remove the use of Windows PowerShell ETW provider ID from codebase and update the `PSDiagnostics` module to work for PowerShell 7 (#25590)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @mawosoft, @ArmaanMcleod</p>
+
+</summary>
+
+<ul>
+<li>Enable CA2021: Do not call Enumerable.Cast<T> or Enumerable.OfType<T> with incompatible types (#25813) (Thanks @xtqqczze!)</li>
+<li>Remove some unused <code>ConsoleControl</code> structs (#26063) (Thanks @xtqqczze!)</li>
+<li>Remove unused <code>FileStreamBackReader.NativeMethods</code> type (#26062) (Thanks @xtqqczze!)</li>
+<li>Ensure data-serialization files end with one newline (#26039) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary <code>CS0618</code> suppressions from Variant APIs (#26006) (Thanks @xtqqczze!)</li>
+<li>Ensure <code>.cs</code> files end with exactly one newline (#25968) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA2105</code> rule suppression (#25938) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA1703</code> rule suppression (#25955) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA2240</code> rule suppression (#25957) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA1701</code> rule suppression (#25948) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA2233</code> rule suppression (#25951) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA1026</code> rule suppression (#25934) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA1059</code> rule suppression (#25940) (Thanks @xtqqczze!)</li>
+<li>Remove obsolete <code>CA2118</code> rule suppression (#25924) (Thanks @xtqqczze!)</li>
+<li>Remove redundant <code>System.Runtime.Versioning</code> attributes (#25926) (Thanks @xtqqczze!)</li>
+<li>Seal internal types in <code>Microsoft.PowerShell.Commands.Utility</code> (#25892) (Thanks @xtqqczze!)</li>
+<li>Seal internal types in <code>Microsoft.PowerShell.Commands.Management</code> (#25849) (Thanks @xtqqczze!)</li>
+<li>Make the interface <code>IDeepCloneable</code> internal to minimize confusion (#25552)</li>
+<li>Remove <code>OnDeserialized</code> and <code>Serializable</code> attributes from <code>Microsoft.Management.UI.Internal</code> project (#25548)</li>
+<li>Refactor Tooltip/ListItemText mapping to use <code>CompletionDisplayInfoMapper</code> delegate (#25395) (Thanks @ArmaanMcleod!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Add Codeql Suppressions (#25943, #26132)
+- Update CODEOWNERS to add Justin as a maintainer (#25386)
+- Do not run labels workflow in the internal repository (#25279)
+
+### Tests
+
+- Mark the 3 consistently failing tests as pending to unblock PRs (#26091)
+- Make some tests less noisy on failure (#26035) (Thanks @xtqqczze!)
+- Suppress false positive `PSScriptAnalyzer` warnings in tests and build scripts (#25864)
+- Fix updatable help test for new content (#25819)
+- Add more tests for `PSForEach` and `PSWhere` methods (#25519)
+- Fix the isolated module test that was disabled previously (#25420)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@alerickson, @senerh, @RichardSlater, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Update package references for the master branch (#26124)</li>
+<li>Remove <code>ThreadJob</code> module and update <code>PSReadLine</code> to 2.4.4-beta4 (#26120)</li>
+<li>Automate Store Publishing (#25725)</li>
+<li>Add global config change detection to action (#26082)</li>
+<li>Update outdated package references (#26069)</li>
+<li>Ensure that the workflows are triggered on <code>.globalconfig</code> and other files at the root of the repo (#26034)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to 1.2.0-preview3 (#26056) (Thanks @alerickson!)</li>
+<li>Update metadata for Stable to v7.5.3 and LTS to v7.4.12 (#26054) (Thanks @senerh!)</li>
+<li>Bump github/codeql-action from 3.30.2 to 3.30.3 (#26036)</li>
+<li>Update version for the package <code>Microsoft.PowerShell.Native</code> (#26041)</li>
+<li>Fix the APIScan pipeline (#26016)</li>
+<li>Move PowerShell build to use .NET SDK 10.0.100-rc.1 (#26027)</li>
+<li>fix(apt-package): add libicu76 dependency to support Debian 13 (#25866) (Thanks @RichardSlater!)</li>
+<li>Bump github/codeql-action from 3.30.1 to 3.30.2 (#26029)</li>
+<li>Update Ev2 Shell Extension Image to AzureLinux 3 for PMC Release (#26025)</li>
+<li>Bump github/codeql-action from 3.30.0 to 3.30.1 (#26008)</li>
+<li>Bump actions/github-script from 7 to 8 (#25983)</li>
+<li>Fix variable reference for release environment in pipeline (#26012)</li>
+<li>Add LinuxHost Network configuration to PowerShell Packages pipeline (#26000)</li>
+<li>Make logical template name consistent between pipelines (#25990)</li>
+<li>Update container images to use mcr.microsoft.com for Linux and Azure GǪ (#25981)</li>
+<li>Bump github/codeql-action from 3.29.11 to 3.30.0 (#25966)</li>
+<li>Bump actions/setup-dotnet from 4 to 5 (#25978)</li>
+<li>Add build to vPack Pipeline (#25915)</li>
+<li>Replace <code>DOTNET_SKIP_FIRST_TIME_EXPERIENCE</code> with <code>DOTNET_NOLOGO</code> (#25946) (Thanks @xtqqczze!)</li>
+<li>Bump actions/dependency-review-action from 4.7.2 to 4.7.3 (#25930)</li>
+<li>Bump github/codeql-action from 3.29.10 to 3.29.11 (#25889)</li>
+<li>Remove AsyncSDL from Pipelines Toggle Official/NonOfficial Runs (#25885)</li>
+<li>Specify .NET Search by Build Type (#25837)</li>
+<li>Update PowerShell to use .NET SDK v10-preview.7 (#25876)</li>
+<li>Bump actions/dependency-review-action from 4.7.1 to 4.7.2 (#25882)</li>
+<li>Bump github/codeql-action from 3.29.9 to 3.29.10 (#25881)</li>
+<li>Change the macos runner image to macos 15 large (#25867)</li>
+<li>Bump actions/checkout from 4 to 5 (#25853)</li>
+<li>Bump github/codeql-action from 3.29.7 to 3.29.9 (#25857)</li>
+<li>Update to .NET 10 Preview 6 (#25828)</li>
+<li>Bump agrc/create-reminder-action from 1.1.20 to 1.1.22 (#25808)</li>
+<li>Bump agrc/reminder-action from 1.0.17 to 1.0.18 (#25807)</li>
+<li>Bump github/codeql-action from 3.28.19 to 3.29.5 (#25797)</li>
+<li>Bump super-linter/super-linter from 7.4.0 to 8.0.0 (#25770)</li>
+<li>Update metadata for v7.5.2 and v7.4.11 releases (#25687)</li>
+<li>Correct Capitalization Referencing Templates (#25669)</li>
+<li>Change linux packaging tests to ubuntu latest (#25634)</li>
+<li>Bump github/codeql-action from 3.28.18 to 3.28.19 (#25636)</li>
+<li>Move to .NET 10 preview 4 and update package references (#25602)</li>
+<li>Revert &quot;Add windows signing for pwsh.exe&quot; (#25586)</li>
+<li>Bump ossf/scorecard-action from 2.4.1 to 2.4.2 (#25628)</li>
+<li>Publish <code>.msixbundle</code> package as a VPack (#25612)</li>
+<li>Bump agrc/reminder-action from 1.0.16 to 1.0.17 (#25573)</li>
+<li>Bump agrc/create-reminder-action from 1.1.18 to 1.1.20 (#25572)</li>
+<li>Bump github/codeql-action from 3.28.17 to 3.28.18 (#25580)</li>
+<li>Bump super-linter/super-linter from 7.3.0 to 7.4.0 (#25563)</li>
+<li>Bump actions/dependency-review-action from 4.7.0 to 4.7.1 (#25562)</li>
+<li>Update metadata.json with 7.4.10 (#25554)</li>
+<li>Bump github/codeql-action from 3.28.16 to 3.28.17 (#25508)</li>
+<li>Bump actions/dependency-review-action from 4.6.0 to 4.7.0 (#25529)</li>
+<li>Move MSIXBundle to Packages and Release to GitHub (#25512)</li>
+<li>Update outdated package references (#25506)</li>
+<li>Bump github/codeql-action from 3.28.15 to 3.28.16 (#25429)</li>
+<li>Fix Conditional Parameter to Skip NuGet Publish (#25468)</li>
+<li>Update metadata.json (#25438)</li>
+<li>Fix MSIX artifact upload, vPack template, changelog hashes, git tag command (#25437)</li>
+<li>Use new variables template for vPack (#25434)</li>
+<li>Bump <code>agrc/create-reminder-action</code> from 1.1.17 to 1.1.18 (#25416)</li>
+<li>Add PSScriptAnalyzer (#25423)</li>
+<li>Update outdated package references (#25392)</li>
+<li>Use GitHubReleaseTask instead of custom script (#25398)</li>
+<li>Update APIScan to use new symbols server (#25388)</li>
+<li>Retry ClearlyDefined operations (#25385)</li>
+<li>Update to .NET 10.0.100-preview.3 (#25358)</li>
+<li>Enhance path filters action to set outputs for all changes when not a PR (#25367)</li>
+<li>Combine GitHub and Nuget Release Stage (#25318)</li>
+<li>Add Windows Store Signing to MSIX bundle (#25296)</li>
+<li>Bump skitionek/notify-microsoft-teams from 190d4d92146df11f854709774a4dae6eaf5e2aa3 to e7a2493ac87dad8aa7a62f079f295e54ff511d88 (#25366)</li>
+<li>Add CodeQL suppressions for PowerShell intended behavior (#25359)</li>
+<li>Migrate MacOS Signing to OneBranch (#25295)</li>
+<li>Bump github/codeql-action from 3.28.13 to 3.28.15 (#25290)</li>
+<li>Update test result processing to use NUnitXml format and enhance logging for better clarity (#25288)</li>
+<li>Fix R2R for fxdependent packaging (#26131)</li>
+<li>Remove <code>UseDotnet</code> task and use the <code>dotnet-install</code> script (#26093)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Fix a typo in the 7.4 changelog (#26038) (Thanks @VbhvGupta!)
+- Add 7.4.12 changelog (#26011)
+- Add v7.5.3 changelog (#25994)
+- Fix typo in changelog for script filename suggestion (#25962)
+- Update changelog for v7.5.2 (#25668)
+- Update changelog for v7.4.11 (#25667)
+- Update build documentation with instruction of dev terminal (#25587)
+- Update links and contribution guide in documentation (#25532) (Thanks @JustinGrote!)
+- Add 7.4.10 changelog (#25520)
+- Add 7.5.1 changelog (#25382)
+
+[7.6.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.6.0-preview.4...v7.6.0-preview.5
+
+## [7.6.0-preview.4]
+
+### Breaking Changes
+
+- Fix `WildcardPattern.Escape` to escape lone backticks correctly (#25211) (Thanks @ArmaanMcleod!)
+- Convert `-ChildPath` parameter to `string[]` for `Join-Path` cmdlet (#24677) (Thanks @ArmaanMcleod!)
+
+PowerShell 7.6-preview.4 includes the following updated modules:
+
+- **Microsoft.PowerShell.ThreadJob** v2.2.0
+- **ThreadJob** v2.1.0
+The **ThreadJob** module was renamed to **Microsoft.PowerShell.ThreadJob**. There is no difference
+in the functionality of the module. To ensure backward compatibility for scripts that use the old
+name, the **ThreadJob** v2.1.0 module is a proxy module that points to the
+**Microsoft.PowerShell.ThreadJob** v2.2.0.
+
+### Engine Updates and Fixes
+
+- Add `PipelineStopToken` to `Cmdlet` which will be signaled when the pipeline is stopping (#24620) (Thanks @jborean93!)
+- Fallback to AppLocker after `WldpCanExecuteFile` (#24912)
+- Move .NET method invocation logging to after the needed type conversion is done for method arguments (#25022)
+- Fix share completion with provider and spaces (#19440) (Thanks @MartinGC94!)
+
+### General Cmdlet Updates and Fixes
+
+- Exclude `-OutVariable` assignments within the same `CommandAst` when inferring variables (#25224) (Thanks @MartinGC94!)
+- Fix infinite loop in variable type inference (#25206) (Thanks @MartinGC94!)
+- Update `Microsoft.PowerShell.PSResourceGet` version in `PSGalleryModules.csproj` (#25135)
+- Add tooltips for hashtable key completions (#17864) (Thanks @MartinGC94!)
+- Fix type inference of parameters in classic functions (#25172) (Thanks @MartinGC94!)
+- Improve assignment type inference (#21143) (Thanks @MartinGC94!)
+- Fix `TypeName.GetReflectionType()` to work when the `TypeName` instance represents a generic type definition within a `GenericTypeName` (#24985)
+- Remove the old fuzzy suggestion and fix the local script filename suggestion (#25177)
+- Improve variable type inference (#19830) (Thanks @MartinGC94!)
+- Fix parameter completion when script requirements fail (#17687) (Thanks @MartinGC94!)
+- Improve the completion for attribute arguments (#25129) (Thanks @MartinGC94!)
+- Fix completion that relies on pseudobinding in script blocks (#25122) (Thanks @MartinGC94!)
+- Don't complete duplicate command names (#21113) (Thanks @MartinGC94!)
+- Make `SystemPolicy` public APIs visible but non-op on Unix platforms so that they can be included in `PowerShellStandard.Library` (#25051)
+- Set standard handles explicitly when starting a process with `-NoNewWindow` (#25061)
+- Fix tooltip for variable expansion and include desc (#25112) (Thanks @jborean93!)
+- Add type inference for functions without OutputType attribute and anonymous functions (#21127) (Thanks @MartinGC94!)
+- Add completion for variables assigned by command redirection (#25104) (Thanks @MartinGC94!)
+- Handle type inference for redirected commands (#21131) (Thanks @MartinGC94!)
+- Allow empty prefix string in `Import-Module -Prefix` to override default prefix in manifest (#20409) (Thanks @MartinGC94!)
+- Update variable/property assignment completion so it can fallback to type inference (#21134) (Thanks @MartinGC94!)
+- Use `Get-Help` approach to find `about_*.help.txt` files with correct locale for completions (#24194) (Thanks @MartinGC94!)
+- Use script filepath when completing relative paths for using statements (#20017) (Thanks @MartinGC94!)
+- Fix completion of variables assigned inside Do loops (#25076) (Thanks @MartinGC94!)
+- Fix completion of provider paths when a path returns itself instead of its children (#24755) (Thanks @MartinGC94!)
+- Enable completion of scoped variables without specifying scope (#20340) (Thanks @MartinGC94!)
+- Fix issue with incomplete results when completing paths with wildcards in non-filesystem providers (#24757) (Thanks @MartinGC94!)
+- Allow DSC parsing through OS architecture translation layers (#24852) (Thanks @bdeb1337!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@ArmaanMcleod, @pressRtowin</p>
+
+</summary>
+
+<ul>
+<li>Refactor and add comments to <code>CompletionRequiresQuotes</code> to clarify implementation (#25223) (Thanks @ArmaanMcleod!)</li>
+<li>Add <code>QuoteCompletionText</code> method to CompletionHelpers class (#25180) (Thanks @ArmaanMcleod!)</li>
+<li>Remove CompletionHelpers <code>escape</code> parameter from <code>CompletionRequiresQuotes</code> (#25178) (Thanks @ArmaanMcleod!)</li>
+<li>Refactor CompletionHelpers <code>HandleDoubleAndSingleQuote</code> to have less nesting logic (#25179) (Thanks @ArmaanMcleod!)</li>
+<li>Make the use of Oxford commas consistent (#25139)(#25140)(Thanks @pressRtowin!)</li>
+<li>Move common completion methods to CompletionHelpers class (#25138) (Thanks @ArmaanMcleod!)</li>
+<li>Return <code>Array.Empty</code> instead of collection <code>[]</code> (#25137) (Thanks @ArmaanMcleod!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Check GH token availability for Get-Changelog (#25133)
+
+### Tests
+
+- Add XUnit test for `HandleDoubleAndSingleQuote` in CompletionHelpers class (#25181) (Thanks @ArmaanMcleod!)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Switch to ubuntu-lastest for CI (#25247)</li>
+<li>Update outdated package references (#25026)(#25232)</li>
+<li>Bump <code>Microsoft.PowerShell.ThreadJob</code> and <code>ThreadJob</code> modules (#25232)</li>
+<li>Bump github/codeql-action from 3.27.9 to 3.28.13 (#25218)(#25231)</li>
+<li>Update .NET SDK to <code>10.0.100-preview.2</code> (#25154)(#25225)</li>
+<li>Remove obsolete template from Windows Packaging CI (#25226)</li>
+<li>Bump actions/upload-artifact from 4.5.0 to 4.6.2 (#25220)</li>
+<li>Bump agrc/reminder-action from 1.0.15 to 1.0.16 (#25222)</li>
+<li>Bump actions/checkout from 2 to 4 (#25221)</li>
+<li>Add <code>NoWarn NU1605</code> to System.ServiceModel.* (#25219)</li>
+<li>Bump actions/github-script from 6 to 7 (#25217)</li>
+<li>Bump ossf/scorecard-action from 2.4.0 to 2.4.1 (#25216)</li>
+<li>Bump super-linter/super-linter from 7.2.1 to 7.3.0 (#25215)</li>
+<li>Bump agrc/create-reminder-action from 1.1.16 to 1.1.17 (#25214)</li>
+<li>Remove dependabot updates that don't work (#25213)</li>
+<li>Update GitHub Actions to work in private GitHub repo (#25197)</li>
+<li>Cleanup old release pipelines (#25201)</li>
+<li>Update package pipeline windows image version (#25191)</li>
+<li>Skip additional packages when generating component manifest (#25102)</li>
+<li>Only build Linux for packaging changes (#25103)</li>
+<li>Remove Az module installs and AzureRM uninstalls in pipeline (#25118)</li>
+<li>Add GitHub Actions workflow to verify PR labels (#25145)</li>
+<li>Add back-port workflow using dotnet/arcade (#25106)</li>
+<li>Make Component Manifest Updater use neutral target in addition to RID target (#25094)</li>
+<li>Make sure the vPack pipeline does not produce an empty package (#24988)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Add 7.4.9 changelog (#25169)
+- Create changelog for 7.4.8 (#25089)
+
+[7.6.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.6.0-preview.3...v7.6.0-preview.4
+
+## [7.6.0-preview.3]
+
+### Breaking Changes
+
+- Remove trailing space from event source name (#24192) (Thanks @MartinGC94!)
+
+### General Cmdlet Updates and Fixes
+
+- Add completion single/double quote support for `-Noun` parameter for `Get-Command` (#24977) (Thanks @ArmaanMcleod!)
+- Stringify `ErrorRecord` with empty exception message to empty string (#24949) (Thanks @MatejKafka!)
+- Add completion single/double quote support for `-PSEdition` parameter for `Get-Module` (#24971) (Thanks @ArmaanMcleod!)
+- Error when `New-Item -Force` is passed an invalid directory name (#24936) (Thanks @kborowinski!)
+- Allow `Start-Transcript`to use `$Transcript` which is a `PSObject` wrapped string to specify the transcript path (#24963) (Thanks @kborowinski!)
+- Add quote handling in `Verb`, `StrictModeVersion`, `Scope` & `PropertyType` Argument Completers with single helper method (#24839) (Thanks @ArmaanMcleod!)
+- Improve `Start-Process -Wait` polling efficiency (#24711) (Thanks @jborean93!)
+- Convert `InvalidCommandNameCharacters` in `AnalysisCache` to `SearchValues<char>` for more efficient char searching (#24880) (Thanks @ArmaanMcleod!)
+- Convert `s_charactersRequiringQuotes` in Completion Completers to `SearchValues<char>` for more efficient char searching (#24879) (Thanks @ArmaanMcleod!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @fMichaleczek, @ArmaanMcleod</p>
+
+</summary>
+
+<ul>
+<li>Fix <code>RunspacePool</code>, <code>RunspacePoolInternal</code> and <code>RemoteRunspacePoolInternal</code> <code>IDisposable</code> implementation (#24720) (Thanks @xtqqczze!)</li>
+<li>Remove redundant <code>Attribute</code> suffix (#24940) (Thanks @xtqqczze!)</li>
+<li>Fix formatting of the XML comment for <code>SteppablePipeline.Clean()</code> (#24941)</li>
+<li>Use <code>Environment.ProcessId</code> in <code>SpecialVariables.PID</code> (#24926) (Thanks @fMichaleczek!)</li>
+<li>Replace char[] array in <code>CompletionRequiresQuotes</code> with cached SearchValues<char> (#24907) (Thanks @ArmaanMcleod!)</li>
+<li>Update <code>IndexOfAny</code> calls with invalid path/filename to <code>SearchValues&lt;char&gt;</code> for more efficient char searching (#24896) (Thanks @ArmaanMcleod!)</li>
+<li>Seal internal types in <code>PlatformInvokes</code> (#24826) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Update CODEOWNERS (#24989)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @KyZy7</p>
+
+</summary>
+
+<ul>
+<li>Update branch for release  - Transitive - false - none (#24995)</li>
+<li>Add setup dotnet action to the build composite action (#24996)</li>
+<li>Give the pipeline runs meaningful names (#24987)</li>
+<li>Fix V-Pack download package name (#24866)</li>
+<li>Set <code>LangVersion</code> compiler option to <code>13.0</code> in Test.Common.props (#24621) (Thanks @xtqqczze!)</li>
+<li>Fix release branch filters (#24933)</li>
+<li>Fix GitHub Action filter overmatching (#24929)</li>
+<li>Add UseDotnet task for installing dotnet (#24905)</li>
+<li>Convert powershell/PowerShell-CI-macos to GitHub Actions (#24914)</li>
+<li>Convert powershell/PowerShell-CI-linux to GitHub Actions (#24913)</li>
+<li>Convert powershell/PowerShell-Windows-CI to GitHub Actions (#24899)</li>
+<li>Fix MSIX stage in release pipeline (#24900)</li>
+<li>Update .NET SDK (#24906)</li>
+<li>Update metadata.json (#24862)</li>
+<li>PMC parse state correctly from update command's response (#24850)</li>
+<li>Add EV2 support for publishing PowerShell packages to PMC (#24841)</li>
+<li>Remove AzDO credscan as it is now in GitHub (#24842)</li>
+<li>Add *.props and sort path filters for windows CI  (#24822)</li>
+<li>Use work load identity service connection to download makeappx tool from storage account (#24817)</li>
+<li>Update path filters for Windows CI (#24809)</li>
+<li>Update outdated package references (#24758)</li>
+<li>Update metadata.json (#24787) (Thanks @KyZy7!)</li>
+<li>Add tool package download in publish nuget stage (#24790)</li>
+<li>Fix Changelog content grab during GitHub Release (#24788)</li>
+<li>Update metadata.json (#24764)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to <code>1.1.0</code> (#24767)</li>
+<li>Add a parameter that skips verify packages step (#24763)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Add 7.4.7 Changelog (#24844)
+- Create changelog for v7.5.0 (#24808)
+- Update Changelog for v7.6.0-preview.2 (#24775)
+
+[7.6.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.6.0-preview.2...v7.6.0-preview.3
+
+## [7.6.0-preview.2] - 2025-01-14
+
+### General Cmdlet Updates and Fixes
+
+- Add the `AIShell` module to telemetry collection list (#24747)
+- Add helper in `EnumSingleTypeConverter` to get enum names as array (#17785) (Thanks @fflaten!)
+- Return correct FileName property for `Get-Item` when listing alternate data streams (#18019) (Thanks @kilasuit!)
+- Add `-ExcludeModule` parameter to `Get-Command` (#18955) (Thanks @MartinGC94!)
+- Update Named and Statement block type inference to not consider AssignmentStatements and Increment/decrement operators as part of their output (#21137) (Thanks @MartinGC94!)
+- Update `DnsNameList` for `X509Certificate2` to use `X509SubjectAlternativeNameExtension.EnumerateDnsNames` Method (#24714) (Thanks @ArmaanMcleod!)
+- Add completion of modules by their shortname (#20330) (Thanks @MartinGC94!)
+- Fix `Get-ItemProperty` to report non-terminating error for cast exception (#21115) (Thanks @ArmaanMcleod!)
+- Add `-PropertyType` argument completer for `New-ItemProperty` (#21117) (Thanks @ArmaanMcleod!)
+- Fix a bug in how `Write-Host` handles `XmlNode` object (#24669) (Thanks @brendandburns!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Seal <code>ClientRemoteSessionDSHandlerImpl</code> (#21218) (Thanks @xtqqczze!)</li>
+<li>Seal internal type <code>ClientRemoteSessionDSHandlerImpl</code> (#24705) (Thanks @xtqqczze!)</li>
+<li>Seal classes in <code>RemotingProtocol2</code> (#21164) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Added Justin Chung as PowerShell team memeber on releaseTools.psm1 (#24672)
+
+### Tests
+
+- Skip CIM ETS member test on older Windows platforms (#24681)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Updated SDK to 9.0.101</p>
+
+</summary>
+
+<ul>
+<li>Update branch for release  - Transitive - false - none (#24754)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to <code>1.1.0</code> (#24767)</li>
+<li>Add a parameter that skips verify packages step (#24763)</li>
+<li>Make the <code>AssemblyVersion</code> not change for servicing releases (#24667)</li>
+<li>Fixed release pipeline errors and switched to KS3 (#24751)</li>
+<li>Update outdated package references (#24580)</li>
+<li>Bump actions/upload-artifact from 4.4.3 to 4.5.0 (#24689)</li>
+<li>Update .NET feed with new domain as <code>azureedge</code> is retiring (#24703)</li>
+<li>Bump super-linter/super-linter from 7.2.0 to 7.2.1 (#24678)</li>
+<li>Bump github/codeql-action from 3.27.7 to 3.27.9 (#24674)</li>
+<li>Bump actions/dependency-review-action from 4.4.0 to 4.5.0 (#24607)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update cmdlets WG members (#24275) (Thanks @kilasuit!)
+
+[7.6.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.6.0-preview.1...v7.6.0-preview.2
+
+## [7.6.0-preview.1] - 2024-12-16
+
+### Breaking Changes
+
+- Treat large Enum values as numbers in `ConvertTo-Json` (#20999) (Thanks @jborean93!)
+
+### General Cmdlet Updates and Fixes
+
+- Add proper error for running `Get-PSSession -ComputerName` on Unix (#21009) (Thanks @jborean93!)
+- Resolve symbolic link target relative to the symbolic link instead of the working directory (#15235) (#20943) (Thanks @MatejKafka!)
+- Fix up buffer management getting network roots (#24600) (Thanks @jborean93!)
+- Support `PSObject` wrapped values in `ArgumentToEncodingTransformationAttribute` (#24555) (Thanks @jborean93!)
+- Update PSReadLine to 2.3.6 (#24380)
+- Add telemetry to track the use of features (#24247)
+- Handle global tool specially when prepending `PSHome` to `PATH` (#24228)
+- Fix how processor architecture is validated in `Import-Module` (#24265)
+- Make features `PSCommandNotFoundSuggestion`, `PSCommandWithArgs`, and `PSModuleAutoLoadSkipOfflineFiles` stable (#24246)
+- Write type data to the pipeline instead of collecting it (#24236) (Thanks @MartinGC94!)
+- Add support to `Get-Error` to handle BoundParameters (#20640)
+- Fix `Get-FormatData` to not cast a type incorrectly (#21157)
+- Delay progress bar in `Copy-Item` and `Remove-Item` cmdlets (#24013) (Thanks @TheSpyGod!)
+- Add `-Force` parameter to `Resolve-Path` and `Convert-Path` cmdlets to support wildcard hidden files (#20981) (Thanks @ArmaanMcleod!)
+- Use host exe to determine `$PSHOME` location when `SMA.dll` location is not found (#24072)
+- Fix `Test-ModuleManifest` so it can use a UNC path (#24115)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear, @JayBazuzi</p>
+
+</summary>
+
+<ul>
+<li>Fix typos in <code>ShowModuleControl.xaml.cs</code> (#24248) (Thanks @eltociear!)</li>
+<li>Fix a typo in the build doc (#24172) (Thanks @JayBazuzi!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fix devcontainer extensions key (#24359) (Thanks @ThomasNieto!)
+- Support new backport branch format (#24378)
+- Update markdownLink.yml to not run on release branches (#24323)
+- Remove old code that downloads msix for win-arm64 (#24175)
+
+### Tests
+
+- Fix cleanup in PSResourceGet test (#24339)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@MartinGC94, @jborean93, @xtqqczze, @alerickson, @iSazonov, @rzippo</p>
+
+</summary>
+
+<ul>
+<li>Deploy Box update (#24632)</li>
+<li>Remove Regex use (#24235) (Thanks @MartinGC94!)</li>
+<li>Improve cim ETS member inference completion (#24235) (Thanks @MartinGC94!)</li>
+<li>Emit ProgressRecord in CLIXML minishell output (#21373) (Thanks @jborean93!)</li>
+<li>Assign the value returned by the <code>MaybeAdd</code> method</li> (#24652)
+<li>Add support for interface static abstract props (#21061) (Thanks @jborean93!)</li>
+<li>Change call to optional add in the binder expression (#24451) (Thanks @jborean93!)</li>
+<li>Turn off AMSI member invocation on nix release builds (#24451) (Thanks @jborean93!)</li>
+<li>Bump github/codeql-action from 3.27.0 to 3.27.6 (#24639)</li>
+<li>Update src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs (#24239) (Thanks @jborean93!)</li>
+<li>Apply suggestions from code review (#24239) (Thanks @jborean93!)</li>
+<li>Add remote runspace check for PushRunspace (#24239) (Thanks @jborean93!)</li>
+<li>Set LangVersion compiler option to 13.0 (#24619) (Thanks @xtqqczze!)</li>
+<li>Set <code>LangVersion</code> compiler option to <code>13.0</code> (#24617) (Thanks @xtqqczze!)</li>
+<li>Update metadata.json for PowerShell 7.5 RC1 release (#24589)</li>
+<li>Update nuget publish to use Deploy Box (#24596)</li>
+<li>Added Deploy Box Product Pathway to GitHub Release and NuGet Release Pipelines (#24583)</li>
+<li>Update machine pool for copy blob and upload buildinfo stage (#24587)</li>
+<li>Bump .NET 9 and dependencies (#24573)</li>
+<li>Bump actions/dependency-review-action from 4.3.4 to 4.4.0 (#24503)</li>
+<li>Bump actions/checkout from 4.2.1 to 4.2.2 (#24488)</li>
+<li>Bump agrc/reminder-action from 1.0.14 to 1.0.15 (#24384)</li>
+<li>Bump actions/upload-artifact from 4.4.0 to 4.4.3 (#24410)</li>
+<li>Update branch for release (#24534)</li>
+<li>Revert &quot;Update package references (#24414)&quot; (#24532)</li>
+<li>Add a way to use only NuGet feed sources (#24528)</li>
+<li>Update PSResourceGet to v1.1.0-RC2 (#24512) (Thanks @alerickson!)</li>
+<li>Bump .NET to 9.0.100-rc.2.24474.11 (#24509)</li>
+<li>Fix seed max value for Container Linux CI (#24510)</li>
+<li>Update metadata.json for 7.2.24 and 7.4.6 releases (#24484)</li>
+<li>Download package from package build for generating vpack (#24481)</li>
+<li>Keep the roff file when gzipping it. (#24450)</li>
+<li>Delete the msix blob if it's already there (#24353)</li>
+<li>Add PMC mapping for debian 12 (bookworm) (#24413)</li>
+<li>Checkin generated manpage (#24423)</li>
+<li>Add CodeQL scanning to APIScan build (#24303)</li>
+<li>Update package references (#24414)</li>
+<li>Update vpack pipeline (#24281)</li>
+<li>Bring changes from v7.5.0-preview.5 Release Branch to Master (#24369)</li>
+<li>Bump agrc/create-reminder-action from 1.1.15 to 1.1.16 (#24375)</li>
+<li>Add <code>BaseUrl</code> to <code>buildinfo</code> json file (#24376)</li>
+<li>Update metadata.json (#24352)</li>
+<li>Copy to static site instead of making blob public (#24269)</li>
+<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to <code>1.1.0-preview2</code> (#24300) (Thanks @alerickson!)</li>
+<li>add updated libicu dependency for debian packages (#24301)</li>
+<li>add mapping to azurelinux repo (#24290)</li>
+<li>Remove the MD5 branch in the strong name signing token calculation (#24288)</li>
+<li>Bump .NET 9 to <code>9.0.100-rc.1.24452.12</code> (#24273)</li>
+<li>Ensure the official build files CodeQL issues (#24278)</li>
+<li>Update experimental-feature json files (#24271)</li>
+<li>Make some release tests run in a hosted pools (#24270)</li>
+<li>Do not build the exe for Global tool shim project (#24263)</li>
+<li>Update and add new NuGet package sources for different environments. (#24264)</li>
+<li>Bump skitionek/notify-microsoft-teams (#24261)</li>
+<li>Create new pipeline for compliance  (#24252)</li>
+<li>Capture environment better (#24148)</li>
+<li>Add specific path for issues in tsaconfig (#24244)</li>
+<li>Use Managed Identity for APIScan authentication (#24243)</li>
+<li>Add windows signing for pwsh.exe (#24219)</li>
+<li>Bump super-linter/super-linter from 7.0.0 to 7.1.0 (#24223)</li>
+<li>Update the URLs used in nuget.config files (#24203)</li>
+<li>Check <code>Create and Submit</code> in vPack build by default (#24181)</li>
+<li>Replace <code>PSVersion</code> source generator with incremental one (#23815) (Thanks @iSazonov!)</li>
+<li>Save man files in <code>/usr/share/man</code> instead of <code>/usr/local/share/man</code> (#23855) (Thanks @rzippo!)</li>
+<li>Bump super-linter/super-linter from 6.8.0 to 7.0.0 (#24169)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Updated Third Party Notices (#24666)
+- Update `HelpInfoUri` for 7.5 (#24610)
+- Update changelog for v7.4.6 release (#24496)
+- Update to the latest NOTICES file (#24259)
+- Update the changelog `preview.md` (#24213)
+- Update changelog readme with 7.4 (#24182) (Thanks @ThomasNieto!)
+- Fix Markdown linting error (#24204)
+- Updated changelog for v7.2.23 (#24196) (Internal 32131)
+- Update changelog and `metadata.json` for v7.4.5 release (#24183)
+- Bring 7.2 changelogs back to master (#24158)
+
+[7.6.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.5.0-rc.1...v7.6.0-preview.1
diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md
index 6595191ce38..c20cd311ff5 100644
--- a/CHANGELOG/README.md
+++ b/CHANGELOG/README.md
@@ -1,10 +1,11 @@
 # Changelogs
 
-* [Current preview changelog](preview.md)
-* [7.3 changelog](7.3.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)
-* [6.1 changelog](6.1.md)
-* [6.0 changelog](6.0.md)
+- [Current preview changelog](preview.md)
+- [7.4 changelog](7.4.md)
+- [7.3 changelog](7.3.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)
+- [6.1 changelog](6.1.md)
+- [6.0 changelog](6.0.md)
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index d8ba3d0958e..8e97635bada 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,967 +1,2 @@
-# Current preview release
+# Preview Changelog
 
-## [7.4.0-rc.1] - 2023-10-24
-
-### General Cmdlet Updates and Fixes
-
-- Fix `Test-Connection` due to .NET 8 changes (#20369) (#20531)
-- Add telemetry to check for specific tags when importing a module (#20371) (#20540)
-- Fix `Copy-Item` progress to only show completed when all files are copied (#20517) (#20544)
-- Fix `unixmode` to handle `setuid` and `sticky` when file is not an executable (#20366) (#20537)
-- Fix UNC path completion regression (#20419) (#20541)
-- Fix implicit remoting proxy cmdlets to act on common parameters (#20367) (#20530)
-- Fix `Get-Service` non-terminating error message to include category (#20276) (#20529)
-- Fixing regression in DSC (#20268) (#20528)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-
-</summary>
-
-<ul>
-<li>Update ThirdPartyNotices.txt file (Internal 28110)</li>
-<li>Update CGManifest for release</li>
-<li>Fix package version for .NET nuget packages (#20551) (#20552)</li>
-<li>Only registry App Path for release package (#20478) (#20549)</li>
-<li>Bump PSReadLine from 2.2.6 to 2.3.4 (#20305) (#20533)</li>
-<li>Bump Microsoft.Management.Infrastructure (#20511) (#20512) (#20433) (#20434) (#20534) (#20535) (#20545) (#20547)</li>
-<li>Bump to .NET 8 RC2 (#20510) (#20543)</li>
-
-<li>Add SBOM for release pipeline (#20519) (#20548)</li>
-<li>Bump version of <code>Microsoft.PowerShell.PSResourceGet</code> to <code>v1.0.0</code> (#20485) (#20538)</li>
-<li>Bump xunit.runner.visualstudio from 2.5.1 to 2.5.3 (#20486) (#20542)</li>
-<li>Bump JsonSchema.Net from 5.2.5 to 5.2.6 (#20421) (#20532)</li>
-<li>Fix alpine tar package name and do not crossgen alpine fxdependent package (#20459) (#20536)</li>
-<li>Increase timeout when publishing packages to <code>packages.microsoft.com</code> (#20470) (#20539)</li>
-<li>Block any preview vPack release (#20243) (#20526)</li>
-<li>Add surrogate file for compliance scanning (#20423)</li>
-</ul>
-
-</details>
-
-[7.4.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.6...v7.4.0-rc.1
-
-## [7.4.0-preview.6] - 2023-09-28
-
-### General Cmdlet Updates and Fixes
-
-- Set approved experimental features to stable for 7.4 release (#20362)
-- Revert changes to continue using `BinaryFormatter` for `Out-GridView` (#20360)
-- Remove the comment trigger from feedback provider (#20346)
-
-### Tests
-
-- Continued improvement to tests for release automation (#20259)
-- Skip the test on x86 as `InstallDate` is not visible on `Wow64` (#20255)
-- Harden some problematic release tests (#20254)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>Move to .NET 8.0.100-rc.1.23463.5</p>
-
-</summary>
-
-<ul>
-<li>Update the regex for package name validation (Internal 27783, 27795)</li>
-<li>Update ThirdPartyNotices.txt (Internal 27772)</li>
-<li>Remove the <code>ref</code> folder before running compliance (#20375)</li>
-<li>Updates RIDs used to generate component Inventory (#20372)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from 4.7.0 to 4.8.0-2.final (#20368)</li>
-<li>Fix the release build by moving to the official .NET 8-rc.1 release build version (#20365)</li>
-<li>Update the experimental feature JSON files (#20363)</li>
-<li>Bump <code>XunitXml.TestLogger</code> from 3.1.11 to 3.1.17 (#20364)</li>
-<li>Update <code>Microsoft.PowerShell.PSResourceGet</code> to 0.9.0-rc1 (#20361)</li>
-<li>Update .NET SDK to version 8.0.100-rc.1.23455.8 (#20358)</li>
-<li>Use <code>fxdependent-win-desktop</code> runtime for compliance runs (#20359)</li>
-<li>Add mapping for mariner arm64 stable (#20348)</li>
-<li>Bump <code>xunit.runner.visualstudio</code> from <code>2.5.0</code> to <code>2.5.1</code> (#20357)</li>
-<li>Bump <code>JsonSchema.Net</code> from 5.2.1 to 5.2.5 (#20356)</li>
-<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 17.7.1 to 17.7.2 (#20355)</li>
-<li>Bump Markdig.Signed from 0.32.0 to 0.33.0 (#20354)</li>
-<li>Bump JsonSchema.Net from 5.1.3 to 5.2.1 (#20353)</li>
-<li>Bump actions/checkout from 3 to 4 (#20352)</li>
-<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 17.7.0 to 17.7.1 (#20351)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from 4.7.0-2.final to 4.7.0 (#20350)</li>
-<li>Release build: Change the names of the PATs (#20349)</li>
-<li>Put the calls to <code>Set-AzDoProjectInfo</code> and Set-AzDoAuthToken` in the right order (#20347)</li>
-<li>Bump Microsoft.Management.Infrastructure (continued) (#20262)</li>
-<li>Bump <code>Microsoft.Management.Infrastructure</code> to 3.0.0-preview.2 (#20261)</li>
-<li>Enable <code>vPack</code> provenance data (#20260)</li>
-<li>Start using new packages.microsoft.com cli (#20258)</li>
-<li>Add mariner arm64 to PMC release (#20257)</li>
-<li>Fix typo <code>donet</code> to <code>dotnet</code> in build scripts and pipelines (#20256)</li>
-</ul>
-
-</details>
-
-[7.4.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.5...v7.4.0-preview.6
-
-## [7.4.0-preview.5] - 2023-08-21
-
-### Breaking Changes
-
-- Change how relative paths in `Resolve-Path` are handled when using the `RelativeBasePath` parameter (#19755) (Thanks @MartinGC94!)
-
-### Engine Updates and Fixes
-
-- Fix dynamic parameter completion (#19510) (Thanks @MartinGC94!)
-- Use `OrdinalIgnoreCase` to lookup script breakpoints (#20046) (Thanks @fflaten!)
-- Guard against `null` or blank path components when adding to module path (#19922) (Thanks @stevenebutler!)
-- Fix deadlock when piping to shell associated file extension (#19940)
-- Fix completion regression for filesystem paths with custom `PSDrive` names (#19921) (Thanks @MartinGC94!)
-- Add completion for variables assigned by the `Data` statement (#19831) (Thanks @MartinGC94!)
-- Fix a null reference crash in completion code (#19916) (Thanks @MartinGC94!)
-
-### General Cmdlet Updates and Fixes
-
-- Fix `Out-GridView` by implementing `Clone()` method to replace old use of binary format serialization (#20050)
-- Support Unix domain socket in WebCmdlets (#19343) (Thanks @CarloToso!)
-- Wait-Process: add `-Any` and `-PassThru` parameters (#19423) (Thanks @dwtaber!)
-- Added the switch parameter `-CaseInsensitive` to `Select-Object` and `Get-Unique` cmdlets (#19683) (Thanks @ArmaanMcleod!)
-- `Restore-Computer` and `Stop-Computer` should fail with error when not running via `sudo` on Unix (#19824)
-- Add Help proxy function for non-Windows platforms (#19972)
-- Remove input text from the error message resulted by `SecureString` and `PSCredential` conversion failure (#19977) (Thanks @ArmaanMcleod!)
-- Add `Microsoft.PowerShell.PSResourceGet` to the telemetry module list (#19926)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@eltociear, @Molkree, @MartinGC94</p>
-
-</summary>
-
-<ul>
-<li>Fix use of <code>ThrowIf</code> where the arguments were reversed (#20052)</li>
-<li>Fix typo in <code>Logging.Tests.ps1</code> (#20048) (Thanks @eltociear!)</li>
-<li>Apply the <code>InlineAsTypeCheck</code> in the engine code - 2nd pass (#19694) (Thanks @Molkree!)</li>
-<li>Apply the <code>InlineAsTypeCheck</code> rule in the engine code - 1st pass (#19692) (Thanks @Molkree!)</li>
-<li>Remove unused string completion code (#19879) (Thanks @MartinGC94!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Give the `assignPRs` workflow write permissions (#20021)
-
-### Tests
-
-- Additional test hardening for tests which fail in release pass. (#20093)
-- Don't use a completion which has a space in it (#20064)
-- Fixes for release tests (#20028)
-- Remove spelling CI in favor of GitHub Action (#19973)
-- Hide expected error for negative test on windows for script extension (#19929)
-- Add more debugging to try to determine why these test fail in release build. (#19829)
-
-### Build and Packaging Improvements
-
-<ul>
-<li>Update ThirdPartyNotices for 7.4.0-preview.5</li>
-<li>Update <code>PSResourceGet</code> to <code>0.5.24-beta24</code> (#20118)</li>
-<li>Fix build after the change to remove win-arm32 (#20102)</li>
-<li>Add comment about pinned packages (#20096)</li>
-<li>Bump to .NET 8 Preview 7 (#20092)</li>
-<li>Remove <code>Win-Arm32</code> from release build. (#20095)</li>
-<li>Add alpine framework dependent package (#19995)</li>
-<li>Bump JsonSchema.Net from 4.1.8 to 5.1.3 (#20089)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.6.3 to 17.7.0 (#20088)</li>
-<li>Move build to .NET 8 preview 6 (#19991)</li>
-<li>Bump <code>Microsoft.Management.Infrastructure</code> from <code>2.0.0</code> to <code>3.0.0-preview.1</code> (#20081)</li>
-<li>Bump <code>Markdig.Signed</code> from <code>0.31.0</code> to <code>0.32.0</code> (#20076)</li>
-<li>Auto assign PR Maintainer (#20020)</li>
-<li>Delete rule that was supposed to round-robin assign a maintainer (#20019)</li>
-<li>Update the cgmanifest (#20012)</li>
-<li>Update the cgmanifest (#20008)</li>
-<li>Bump JsonSchema.Net from 4.1.7 to 4.1.8 (#20006)</li>
-<li>Bump JsonSchema.Net from 4.1.6 to 4.1.7 (#20000)</li>
-<li>Add mariner arm64 package build to release build (#19946)</li>
-<li>Check for pre-release packages when it's a stable release (#19939)</li>
-<li>Make PR creation tool use <code>--web</code> because it is more reliable (#19944)</li>
-<li>Update to the latest NOTICES file (#19971)</li>
-<li>Update variable used to bypass the blocking check for multiple NuGet feeds for release pipeline (#19963)</li>
-<li>Update variable used to bypass the blocking check for multiple NuGet feeds (#19967)</li>
-<li>Update README.md and metadata.json for release v7.2.13 and v7.3.6 (#19964)</li>
-<li>Don't publish notice on failure because it prevent retry (#19955)</li>
-<li>Change variable used to bypass nuget security scanning (#19954)</li>
-<li>Update the cgmanifest (#19924)</li>
-<li>Publish rpm package for rhel9 (#19750)</li>
-<li>Bump XunitXml.TestLogger from 3.0.78 to 3.1.11 (#19900)</li>
-<li>Bump JsonSchema.Net from 4.1.5 to 4.1.6 (#19885)</li>
-<li>Bump xunit from 2.4.2 to 2.5.0 (#19902)</li>
-<li>Remove <code>HostArchitecture</code> dynamic parameter for <code>osxpkg</code> (#19917)</li>
-<li>FabricBot: Onboarding to GitOps.ResourceManagement because of FabricBot decommissioning (#19905)</li>
-<li>Change variable used to bypass nuget security scanning (#19907)</li>
-<li>Checkout history for markdown lint check (#19908)</li>
-<li>Switch to GitHub Action for linting markdown (#19899)</li>
-<li>Bump xunit.runner.visualstudio from 2.4.5 to 2.5.0 (#19901)</li>
-<li>Add runtime and packaging type info for mariner2 arm64 (#19450)</li>
-<li>Update to the latest NOTICES file (#19856)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update `README.md` and `metadata.json` for `7.4.0-preview.4` release (#19872)
-- Fix grammatical issue in `ADOPTERS.md` (#20037) (Thanks @nikohoffren!)
-- Replace docs.microsoft.com URLs in code with FWLinks (#19996)
-- Change `docs.microsoft.com` to `learn.microsoft.com` (#19994)
-- Update man page to match current help for pwsh (#19993)
-- Merge `7.3.5`, `7.3.6`, `7.2.12` and `7.2.13` changelogs (#19968)
-- Fix ///-comments that violate the docs schema (#19957)
-- Update the link for getting started in `README.md` (#19932)
-- Migrate user docs to the PowerShell-Docs repository (#19871)
-
-[7.4.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.4...v7.4.0-preview.5
-
-## [7.4.0-preview.4] - 2023-06-29
-
-### Breaking Changes
-
-- `Test-Json`: Use `JsonSchema.Net` (`System.Text.Json`) instead of `NJsonSchema` (`Newtonsoft.Json`) (#18141) (Thanks @gregsdennis!)
-- `Test-Connection`: Increase output detail when performing a TCP test (#11452) (Thanks @jackdcasey!)
-
-### Engine Updates and Fixes
-
-- Fix native executables not redirecting to file (#19842)
-- Add a new experimental feature to control native argument passing style on Windows (#18706)
-- Fix `TabExpansion2` variable leak when completing variables (#18763) (Thanks @MartinGC94!)
-- Enable completion of variables across ScriptBlock scopes (#19819) (Thanks @MartinGC94!)
-- Fix completion of the `foreach` statement variable (#19814) (Thanks @MartinGC94!)
-- Fix variable type inference precedence (#18691) (Thanks @MartinGC94!)
-- Fix member completion for PowerShell Enum class (#19740) (Thanks @MartinGC94!)
-- Fix parsing for array literals in index expressions in method calls (#19224) (Thanks @MartinGC94!)
-- Fix incorrect string to type conversion (#19560) (Thanks @MartinGC94!)
-- Fix slow execution when many breakpoints are used (#14953) (Thanks @nohwnd!)
-- Add a public API for getting locations of `PSModulePath` elements (#19422)
-- Add WDAC Audit logging (#19641)
-- Improve path completion (#19489) (Thanks @MartinGC94!)
-- Fix an indexing out of bound error in `CompleteInput` for empty script input (#19501) (Thanks @MartinGC94!)
-- Improve variable completion performance (#19595) (Thanks @MartinGC94!)
-- Allow partial culture matching in `Update-Help` (#18037) (Thanks @dkaszews!)
-- Fix the check when reading input in `NativeCommandProcessor` (#19614)
-- Add support of respecting `$PSStyle.OutputRendering` on the remote host (#19601)
-- Support byte stream piping between native commands and file redirection (#17857)
-
-### General Cmdlet Updates and Fixes
-
-- Disallow negative values for `Get-Content` cmdlet parameters `-Head` and `-Tail`  (#19715) (Thanks @CarloToso!)
-- Make `Update-Help` throw proper error when current culture is not associated with a language (#19765) (Thanks @josea!)
-- Do not require activity when creating a completed progress record (#18474) (Thanks @MartinGC94!)
-- WebCmdlets: Add alias for `-TimeoutSec` to `-ConnectionTimeoutSeconds` and add `-OperationTimeoutSeconds` (#19558) (Thanks @stevenebutler!)
-- Avoid checking screen scraping on non-Windows platforms before launching native app (#19812)
-- Add reference to PSResourceGet (#19597)
-- Add `FileNameStar` to `MultipartFileContent` in WebCmdlets (#19467) (Thanks @CarloToso!)
-- Add `ParameterSetName` for the `-Detailed` parameter of `Test-Connection` (#19727)
-- Remove the property disabling optimization (#19701)
-- Filter completion for enum parameter against `ValidateRange` attributes (#17750) (Thanks @fflaten!)
-- Small cleanup `Invoke-RestMethod` (#19490) (Thanks @CarloToso!)
-- Fix wildcard globbing in root of device paths (#19442) (Thanks @MartinGC94!)
-- Add specific error message that creating Junctions requires absolute path (#19409)
-- Fix array type parsing in generic types (#19205) (Thanks @MartinGC94!)
-- Improve the verbose message of WebCmdlets to show correct HTTP version (#19616) (Thanks @CarloToso!)
-- Fix HTTP status from 409 to 429 for WebCmdlets to get retry interval from Retry-After header. (#19622) (Thanks @mkht!)
-- Remove minor versions from `PSCompatibleVersions` (#18635) (Thanks @xtqqczze!)
-- Update `JsonSchema.Net` version to 4.1.0 (#19610) (Thanks @gregsdennis!)
-- Allow combining of `-Skip` and `-SkipLast` parameters in `Select-Object` cmdlet. (#18849) (Thanks @ArmaanMcleod!)
-- Fix constructing `PSModulePath` if a sub-path has trailing separator (#13147)
-- Add `Get-SecureRandom` cmdlet (#19587)
-- Fix `New-Item` to re-create `Junction` when `-Force` is specified (#18311) (Thanks @GigaScratch!)
-- Improve Hashtable key completion for type constrained variable assignments, nested Hashtables and more (#17660) (Thanks @MartinGC94!)
-- `Set-Clipboard -AsOSC52` for remote usage (#18222) (Thanks @dkaszews!)
-- Refactor `MUIFileSearcher.AddFiles` in the help related code (#18825) (Thanks @xtqqczze!)
-- Set `SetLastError` to `true` for symbolic and hard link native APIs (#19566)
-- Fix `Get-AuthenticodeSignature -Content` to not roundtrip the bytes to a Unicode string and then back to bytes (#18774) (Thanks @jborean93!)
-- WebCmdlets: Rename `-TimeoutSec` to `-ConnectionTimeoutSeconds` (with alias) and add `-OperationTimeoutSeconds` (#19558) (Thanks @stevenebutler!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@eltociear, @ArmaanMcleod, @turbedi, @CarloToso, @Molkree, @xtqqczze</p>
-
-</summary>
-
-<ul>
-<li>Fix typo in <code>NativeCommandProcessor.cs</code> (#19846) (Thanks @eltociear!)</li>
-<li>Rename file from <code>PingPathCommand.cs</code> to <code>TestPathCommand.cs</code> (#19782) (Thanks @ArmaanMcleod!)</li>
-<li>Make use of the new <code>Random.Shared</code> property (#18417) (Thanks @turbedi!)</li>
-<li>six files (#19695) (Thanks @CarloToso!)</li>
-<li>Apply IDE0019: <code>InlineAsTypeCheck</code> in Microsoft.PowerShell.Commands (#19688)(#19690)(#19687)(#19689) (Thanks @Molkree!)</li>
-<li>Remove <code>PSv2CompletionCompleter</code> as part of the PowerShell v2 code cleanup (#18337) (Thanks @xtqqczze!)</li>
-<li>Enable more nullable annotations in WebCmdlets (#19359) (Thanks @CarloToso!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Add Git mailmap for Andy Jordan (#19469)
-- Add backport function to release tools (#19568)
-
-### Tests
-
-- Improve reliability of the `Ctrl+c` tests for WebCmdlets (#19532) (Thanks @stevenebutler!)
-- Fix logic for `Import-CliXml` test (#19805)
-- Add some debugging to the transcript test for `SilentlyContinue` (#19770)
-- Re-enable `Get-ComputerInfo` pending tests (#19746)
-- Update syslog parser to handle modern formats. (#19737)
-- Pass `-UserScope` as required by `RunUpdateHelpTests` (#13400) (Thanks @yecril71pl!)
-- Change how `isPreview` is determined for default cmdlets tests (#19650)
-- Skip file signature tests on 2012R2 where PKI cmdlet do not work (#19643)
-- Change logic for testing missing or extra cmdlets. (#19635)
-- Fix incorrect test cases in `ExecutionPolicy.Tests.ps1` (#19485) (Thanks @xtqqczze!)
-- Fixing structure typo in test setup (#17458) (Thanks @powercode!)
-- Fix test failures on Windows for time zone and remoting (#19466)
-- Harden 'All approved Cmdlets present' test (#19530)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-<p>Updated to .NET 8 Preview 4
-<p>We thank the following contributors!</p>
-<p>@krishnayalavarthi</p>
-
-</summary>
-
-<ul>
-<li>Update to the latest NOTICES file (#19537)(#19820)(#19784)(#19720)(#19644)(#19620)(#19605)(#19546)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.5.0 to 17.6.3 (#19867)(#19762)(#19733)(#19668)(#19613)</li>
-<li>Update the cgmanifest (#19847)(#19800)(#19792)(#19776)(#19763)(#19697)(#19631)</li>
-<li>Bump StyleCop.Analyzers from 1.2.0-beta.406 to 1.2.0-beta.507 (#19837)</li>
-<li>Bump Microsoft.CodeAnalysis.CSharp from 4.6.0-1.final to 4.7.0-2.final (#19838)(#19667)</li>
-<li>Update to .NET 8 Preview 4 (#19696)</li>
-<li>Update experimental-feature json files (#19828)</li>
-<li>Bump JsonSchema.Net from 4.1.1 to 4.1.5 (#19790)(#19768)(#19788)</li>
-<li>Update group to assign PRs in <code>fabricbot.json</code> (#19759)</li>
-<li>Add retry on failure for all upload tasks in Azure Pipelines (#19761)</li>
-<li>Bump Microsoft.PowerShell.MarkdownRender from 7.2.0 to 7.2.1 (#19751)(#19752)</li>
-<li>Delete symbols on Linux as well (#19735)</li>
-<li>Update <code>windows.json</code> packaging BOM (#19728)</li>
-<li>Disable SBOM signing for CI and add extra files for packaging tests (#19729)</li>
-<li>Update experimental-feature json files (#19698(#19588))</li>
-<li>Add ProductCode in registry for MSI install (#19590)</li>
-<li>Runas format changed (#15434) (Thanks @krishnayalavarthi!)</li>
-<li>For Preview releases, add <code>pwsh-preview.exe</code> alias to MSIX package (#19602)</li>
-<li>Add prompt to fix conflict during backport (#19583)</li>
-<li>Add comment in wix detailing use of <code>UseMU</code> (#19371)</li>
-<li>Verify that packages have license data (#19543)</li>
-<li>Add an explicit manual stage for changelog update (#19551)</li>
-<li>Update the team member list in <code>releaseTools.psm1</code> (#19544)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update `metadata.json` and `README.md` for upcoming releases (#19863)(#19542)
-- Update message to use the actual parameter name (#19851)
-- Update `CONTRIBUTING.md` to include Code of Conduct enforcement (#19810)
-- Update `working-group-definitions.md` (#19809)(#19561)
-- Update `working-group.md` to add section about reporting working group members (#19758)
-- Correct capitalization in readme (#19666) (Thanks @Aishat452!)
-- Updated the public dashboard link (#19634)
-- Fix a typo in `serialization.cs` (#19598) (Thanks @eltociear!)
-
-[7.4.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.3...v7.4.0-preview.4
-
-## [7.4.0-preview.3] - 2023-04-20
-
-### Breaking Changes
-
-- Remove code related to `#requires -pssnapin` (#19320)
-
-### Engine Updates and Fixes
-
-- Change the arrow used in feedback suggestion to a more common Unicode character (#19534)
-- Support trigger registration in feedback provider (#19525)
-- Update the `ICommandPredictor` interface to reduce boilerplate code from predictor implementation (#19414)
-- Fix a crash in the type inference code (#19400) (Thanks @MartinGC94!)
-
-### Performance
-
-- Speed up `Resolve-Path` relative path resolution (#19171) (Thanks @MartinGC94!)
-
-### General Cmdlet Updates and Fixes
-
-- Infer external application output as strings (#19193) (Thanks @MartinGC94!)
-- Fix a race condition in `Add-Type` (#19471)
-- Detect insecure `https-to-http` redirect only if both URIs are absolute (#19468) (Thanks @CarloToso!)
-- Support `Ctrl+c` when connection hangs while reading data in WebCmdlets (#19330) (Thanks @stevenebutler!)
-- Enable type conversion of `AutomationNull` to `$null` for assignment (#19415)
-- Add the parameter `-Environment` to `Start-Process` (#19374)
-- Add the parameter `-RelativeBasePath` to `Resolve-Path` (#19358) (Thanks @MartinGC94!)
-- Exclude redundant parameter aliases from completion results (#19382) (Thanks @MartinGC94!)
-- Allow using a folder path in WebCmdlets' `-OutFile` parameter (#19007) (Thanks @CarloToso!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@eltociear, @CarloToso</p>
-
-</summary>
-
-<ul>
-<li>Fix typo in <code>typeDataXmlLoader.cs</code> (#19319) (Thanks @eltociear!)</li>
-<li>Fix typo in <code>Compiler.cs</code> (#19491) (Thanks @eltociear!)</li>
-<li>Inline the <code>GetResponseObject</code> method (#19380) (Thanks @CarloToso!)</li>
-<li>Simplify <code>ContentHelper</code> methods (#19367) (Thanks @CarloToso!)</li>
-<li>Initialize regex lazily in <code>BasicHtmlWebResponseObject</code> (#19361) (Thanks @CarloToso!)</li>
-<li>Fix codefactor issue in if-statement (part 5) (#19286) (Thanks @CarloToso!)</li>
-<li>Add nullable annotations in <code>WebRequestSession.cs</code> (#19291) (Thanks @CarloToso!)</li>
-</ul>
-
-</details>
-
-### Tests
-
-- Harden the default command test (#19416)
-- Skip VT100 tests on Windows Server 2012R2 as console does not support it (#19413)
-- Improve package management acceptance tests by not going to the gallery (#19412)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@dkattan</p>
-
-</summary>
-
-<ul>
-<li>Fixing MSI checkbox (#19325)</li>
-<li>Update the experimental feature JSON files (#19297)</li>
-<li>Update the cgmanifest (#19459, #19465)</li>
-<li>Update .NET SDK version to <code>8.0.100-preview.3.23178.7</code> (#19381)</li>
-<li>Force updating the transitive dependency on <code>Microsoft.CSharp</code> (#19514)</li>
-<li>Update <code>DotnetRuntimeMetadata.json</code> to consume the .NET 8.0.0-preview.3 release (#19529)</li>
-<li>Move PSGallery sync to a pool (#19523)</li>
-<li>Fix the regex used for package name check in vPack build (#19511)</li>
-<li>Make the vPack PAT library more obvious (#19505)</li>
-<li>Change <code>Microsoft.CodeAnalysis.CSharp</code> back to 4.5.0 (#19464) (Thanks @dkattan!)</li>
-<li>Update to the latest NOTICES file (#19332)</li>
-<li>Add <code>PoolNames</code> variable group to compliance pipeline (#19408)</li>
-<li>Fix stage dependencies and typo in release build (#19353)</li>
-<li>Fix issues in release build and release pipeline (#19338)</li>
-</ul>
-
-</details>
-
-[7.4.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.2...v7.4.0-preview.3
-
-## [7.4.0-preview.2] - 2023-03-14
-
-### Breaking Changes
-
-- Update some PowerShell APIs to throw `ArgumentException` instead of `ArgumentNullException` when the argument is an empty string (#19215) (Thanks @xtqqczze!)
-- Add the parameter `-ProgressAction` to the common parameters (#18887)
-
-### Engine Updates and Fixes
-
-- Fix `PlainText` output to correctly remove the `Reset` VT sequence without number (#19283)
-- Fix `ConciseView` to handle custom `ParserError` error records (#19239)
-- Fix `VtSubstring` helper method to correctly check characters copied (#19240)
-- Update the `FeedbackProvider` interface to return structured data (#19133)
-- Make the exception error in PowerShell able to associate with the right history entry (#19095)
-- Fix for JEA session leaking functions (#19024)
-- Add WDAC events and system lockdown notification (#18893)
-- Fix support for nanoserver due to lack of AMSI (#18882)
-
-### Performance
-
-- Use interpolated strings (#19002)(#19003)(#18977)(#18980)(#18996)(#18979)(#18997)(#18978)(#18983)(#18992)(#18993)(#18985)(#18988) (Thanks @CarloToso!)
-
-### General Cmdlet Updates and Fixes
-
-- Fix completion for `PSCustomObject` variable properties (#18682) (Thanks @MartinGC94!)
-- Improve type inference for `Get-Random` (#18972) (Thanks @MartinGC94!)
-- Make `-Encoding` parameter able to take `ANSI` encoding in PowerShell (#19298) (Thanks @CarloToso!)
-- Telemetry improvements for tracking experimental feature opt out (#18762)
-- Support HTTP persistent connections in Web Cmdlets (#19249) (Thanks @stevenebutler!)
-- Fix using xml `-Body` in webcmdlets without an encoding (#19281) (Thanks @CarloToso!)
-- Add the `Statement` property to `$MyInvocation` (#19027) (Thanks @IISResetMe!)
-- Fix `Start-Process` `-Wait` with `-Credential` (#19096) (Thanks @jborean93!)
-- Adjust `PUT` method behavior to `POST` one for default content type in WebCmdlets (#19152) (Thanks @CarloToso!)
-- Improve verbose message in web cmdlets when content length is unknown (#19252) (Thanks @CarloToso!)
-- Preserve `WebSession.MaximumRedirection` from changes (#19190) (Thanks @CarloToso!)
-- Take into account `ContentType` from Headers in WebCmdlets (#19227) (Thanks @CarloToso!)
-- Use C# 11 UTF-8 string literals (#19243) (Thanks @turbedi!)
-- Add property assignment completion for enums (#19178) (Thanks @MartinGC94!)
-- Fix class member completion for classes with base types (#19179) (Thanks @MartinGC94!)
-- Add `-Path` and `-LiteralPath` parameters to `Test-Json` cmdlet (#19042) (Thanks @ArmaanMcleod!)
-- Allow to preserve the original HTTP method by adding `-PreserveHttpMethodOnRedirect` to Web cmdlets (#18894) (Thanks @CarloToso!)
-- Webcmdlets display an error on HTTPS to http redirect (#18595) (Thanks @CarloToso!)
-- Build the relative URI for links from the response in `Invoke-WebRequest` (#19092) (Thanks @CarloToso!)
-- Fix redirection for `-CustomMethod` `POST` in WebCmdlets (#19111) (Thanks @CarloToso!)
-- Dispose previous response in Webcmdlets (#19117) (Thanks @CarloToso!)
-- Improve `Invoke-WebRequest` xml and json errors format (#18837) (Thanks @CarloToso!)
-- Fix error formatting to remove the unneeded leading newline for concise view (#19080)
-- Add `-NoHeader` parameter to `ConvertTo-Csv` and `Export-Csv` cmdlets (#19108) (Thanks @ArmaanMcleod!)
-- Fix `Start-Process -Credential -Wait` to work on Windows (#19082)
-- Add `ValidateNotNullOrEmpty` to `OutFile` and `InFile` parameters of WebCmdlets (#19044) (Thanks @CarloToso!)
-- Correct spelling of "custom" in event (#19059) (Thanks @spaette!)
-- Ignore expected error for file systems not supporting alternate streams (#19065)
-- Adding missing guard for telemetry opt out to avoid `NullReferenceException` when importing modules (#18949) (Thanks @powercode!)
-- Fix progress calculation divide by zero in Copy-Item (#19038)
-- Add progress to `Copy-Item` (#18735)
-- WebCmdlets parse XML declaration to get encoding value, if present. (#18748) (Thanks @CarloToso!)
-- `HttpKnownHeaderNames` update headers list  (#18947) (Thanks @CarloToso!)
-- Fix bug with managing redirection and `KeepAuthorization` in Web cmdlets (#18902) (Thanks @CarloToso!)
-- Fix `Get-Error` to work with strict mode (#18895)
-- Add `AllowInsecureRedirect` switch to Web cmdlets (#18546) (Thanks @CarloToso!)
-- `Invoke-RestMethod` `-FollowRelLink` fix links containing commas (#18829) (Thanks @CarloToso!)
-- Prioritize the default parameter set when completing positional arguments (#18755) (Thanks @MartinGC94!)
-- Add `-CommandWithArgs` parameter to pwsh (#18726)
-- Enable creating composite subsystem implementation in modules (#18888)
-- Fix `Format-Table -RepeatHeader` for property derived tables (#18870)
-- Add `StatusCode` to `HttpResponseException` (#18842) (Thanks @CarloToso!)
-- Fix type inference for all scope variables (#18758) (Thanks @MartinGC94!)
-- Add completion for Using keywords (#16514) (Thanks @MartinGC94!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@CarloToso, @iSazonov, @xtqqczze, @turbedi, @syntax-tm, @eltociear, @ArmaanMcleod</p>
-
-</summary>
-
-<ul>
-<li>Small cleanup in the WebCmdlet code (#19299) (Thanks @CarloToso!)</li>
-<li>Remove unused GUID detection code from console host (#18871) (Thanks @iSazonov!)</li>
-<li>Fix <code>CodeFactor</code> issues in the code base - part 4 (#19270) (Thanks @CarloToso!)</li>
-<li>Fix codefactor if part 3 (#19269) (Thanks @CarloToso!)</li>
-<li>Fix codefactor if part 2 (#19267) (Thanks @CarloToso!)</li>
-<li>Fix codefactor if part 1 (#19266) (Thanks @CarloToso!)</li>
-<li>Remove comment and simplify condition in WebCmdlets (#19251) (Thanks @CarloToso!)</li>
-<li>Small style changes (#19241) (Thanks @CarloToso!)</li>
-<li>Use <code>ArgumentException.ThrowIfNullOrEmpty</code> as appropriate [part 1] (#19215) (Thanks @xtqqczze!)</li>
-<li>Use <code>using</code> variable to reduce the nested level (#19229) (Thanks @CarloToso!)</li>
-<li>Use <code>ArgumentException.ThrowIfNullOrEmpty()</code> in more places (#19213) (Thanks @CarloToso!)</li>
-<li>Replace <code>BitConverter.ToString</code> with <code>Convert.ToHexString</code> where appropriate (#19216) (Thanks @turbedi!)</li>
-<li>Replace <code>Requires.NotNullOrEmpty(string)</code> with <code>ArgumentException.ThrowIfNullOrEmpty</code> (#19197) (Thanks @xtqqczze!)</li>
-<li>Use <code>ArgumentOutOfRangeException.ThrowIfNegativeOrZero</code> when applicable (#19201) (Thanks @xtqqczze!)</li>
-<li>Use <code>CallerArgumentExpression</code> on <code>Requires.NotNull</code> (#19200) (Thanks @xtqqczze!)</li>
-<li>Revert a few change to not use 'ArgumentNullException.ThrowIfNull' (#19151)</li>
-<li>Corrected some minor spelling mistakes (#19176) (Thanks @syntax-tm!)</li>
-<li>Fix a typo in <code>InitialSessionState.cs</code> (#19177) (Thanks @eltociear!)</li>
-<li>Fix a typo in <code>pwsh</code> help content (#19153)</li>
-<li>Revert comment changes in <code>WebRequestPSCmdlet.Common.cs</code> (#19136) (Thanks @CarloToso!)</li>
-<li>Small cleanup webcmdlets (#19128) (Thanks @CarloToso!)</li>
-<li>Merge partials in <code>WebRequestPSCmdlet.Common.cs</code> (#19126) (Thanks @CarloToso!)</li>
-<li>Cleanup WebCmdlets comments (#19124) (Thanks @CarloToso!)</li>
-<li>Added minor readability and refactoring fixes to <code>Process.cs</code> (#19123) (Thanks @ArmaanMcleod!)</li>
-<li>Small changes in Webcmdlets (#19109) (Thanks @CarloToso!)</li>
-<li>Rework <code>SetRequestContent</code> in WebCmdlets (#18964) (Thanks @CarloToso!)</li>
-<li>Small cleanup WebCmdlets (#19030) (Thanks @CarloToso!)</li>
-<li>Update additional interpolated string changes (#19029)</li>
-<li>Revert some of the interpolated string changes (#19018)</li>
-<li>Cleanup <code>StreamHelper.cs</code>, <code>WebRequestPSCmdlet.Common.cs</code> and <code>InvokeRestMethodCommand.Common.cs</code> (#18950) (Thanks @CarloToso!)</li>
-<li>Small cleanup common code of webcmdlets (#18946) (Thanks @CarloToso!)</li>
-<li>Simplification of <code>GetHttpMethod</code> and <code>HttpMethod</code> in WebCmdlets (#18846) (Thanks @CarloToso!)</li>
-<li>Fix typo in <code>ModuleCmdletBase.cs</code> (#18933) (Thanks @eltociear!)</li>
-<li>Fix regression in <code>RemoveNulls</code> (#18881) (Thanks @iSazonov!)</li>
-<li>Replace all <code>NotNull</code> with <code>ArgumentNullException.ThrowIfNull</code> (#18820) (Thanks @CarloToso!)</li>
-<li>Cleanup <code>InvokeRestMethodCommand.Common.cs</code> (#18861) (Thanks @CarloToso!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Add a Mariner install script (#19294)
-- Add tool to trigger license information gathering for NuGet modules (#18827)
-
-### Tests
-
-- Update and enable the test for the type of `$input` (#18968) (Thanks @MartinGC94!)
-- Increase the timeout for creating the `WebListener` (#19268)
-- Increase the timeout when waiting for the event log (#19264)
-- Add Windows ARM64 CI (#19040)
-- Change test so output does not include newline (#19026)
-- Allow system lock down test debug hook to work with new WLDP API (#18962)
-- Add tests for `Allowinsecureredirect` parameter in Web cmdlets (#18939) (Thanks @CarloToso!)
-- Enable `get-help` pattern tests on Unix (#18855) (Thanks @xtqqczze!)
-- Create test to check if WebCmdlets decompress brotli-encoded data (#18905) (Thanks @CarloToso!)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@bergmeister, @xtqqczze</p>
-
-</summary>
-
-<ul>
-<li>Restructure the package build to simplify signing and packaging stages (#19321)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from <code>4.4.0</code> to <code>4.6.0-2.23152.6</code> (#19306)(#19233)</li>
-<li>Test fixes for stabilizing tests (#19068)</li>
-<li>Bump <code>Newtonsoft.Json</code> from <code>13.0.2</code> to <code>13.0.3</code> (#19290)(#19289)</li>
-<li>Fix mariner sudo detection (#19304)</li>
-<li>Add stage for symbols job in Release build (#18937)</li>
-<li>Bump .NET to Preview 2 version (#19305)</li>
-<li>Move workflows that create PRs to private repo (#19276)</li>
-<li>Use reference assemblies generated by dotnet (#19302)</li>
-<li>Update the cgmanifest (#18814)(#19165)(#19296)</li>
-<li>Always regenerate files WXS fragment (#19196)</li>
-<li>MSI installer: Add checkbox and MSI property DISABLE_TELEMETRY to optionally disable telemetry. (#10725) (Thanks @bergmeister!)</li>
-<li>Add <code>-Force</code> to <code>Move-Item</code> to fix the GitHub workflow (#19262)</li>
-<li>Update and remove outdated docs to fix the URL link checks (#19261)</li>
-<li>Bump <code>Markdig.Signed</code> from <code>0.30.4</code> to <code>0.31.0</code> (#19232)</li>
-<li>Add pattern to replace for reference API generation (#19214)</li>
-<li>Split test artifact build into windows and non-windows (#19199)</li>
-<li>Set <code>LangVersion</code> compiler option to <code>11.0</code> (#18877) (Thanks @xtqqczze!)</li>
-<li>Update to .NET 8 preview 1 build (#19194)</li>
-<li>Simplify Windows Packaging CI Trigger YAML (#19160)</li>
-<li>Bump <code>Microsoft.NET.Test.Sdk</code> from <code>17.4.0</code> to <code>17.5.0</code> (#18823)(#19191)</li>
-<li>Add URL for all distributions (#19159)</li>
-<li>Bump <code>Microsoft.Extensions.ObjectPool</code> from <code>7.0.1</code> to <code>7.0.3</code> (#18925)(#19155)</li>
-<li>Add verification of R2R at packaging (#19129)</li>
-<li>Allow cross compiling windows (#19119)</li>
-<li>Update CodeQL build agent (#19113)</li>
-<li>Bump <code>XunitXml.TestLogger</code> from <code>3.0.70</code> to <code>3.0.78</code> (#19066)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.Analyzers</code> from <code>3.3.3</code> to <code>3.3.4</code> (#18975)</li>
-<li>Bump <code>BenchmarkDotNet</code> to <code>0.13.3</code> (#18878) (Thanks @xtqqczze!)</li>
-<li>Bump <code>Microsoft.PowerShell.Native</code> from <code>7.4.0-preview.1</code> to <code>7.4.0-preview.2</code> (#18910)</li>
-<li>Add checks for Windows 8.1 and Server 2012 in the MSI installer (#18904)</li>
-<li>Update build to include <code>WinForms</code> / <code>WPF</code> in all Windows builds (#18859)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update to the latest NOTICES file (#19169)(#19309)(#19086)(#19077)
-- Update supported distros in Readme (#18667) (Thanks @techguy16!)
-- Remove the 'Code Coverage Status' badge (#19265)
-- Pull in changelogs for `v7.2.10` and `v7.3.3` releases (#19219)
-- Update tools `metadata` and `README` (#18831)(#19204)(#19014)
-- Update a broken link in the `README.md` (#19187)
-- Fix typos in comments (#19064) (Thanks @spaette!)
-- Add `7.2` and `7.3` changelogs (#19025)
-- typos (#19058) (Thanks @spaette!)
-- Fix typo in `dotnet-tools/README.md` (#19021) (Thanks @spaette!)
-- Fix up all comments to be in the proper order with proper spacing (#18619)
-- Changelog for `v7.4.0-preview.1` release (#18835)
-
-[7.4.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.4.0-preview.1...v7.4.0-preview.2
-
-## [7.4.0-preview.1] - 2022-12-20
-
-### Engine Updates and Fixes
-
-- Add Instrumentation to `AmsiUtil` and make the init variable readonly (#18727)
-- Fix typo in `OutOfProcTransportManager.cs` (#18766) (Thanks @eltociear!)
-- Allow non-default encodings to be used in user's script/code (#18605)
-- Add `Dim` and `DimOff` to `$PSStyle` (#18653)
-- Change `exec` from alias to function to handle arbitrary arguments (#18567)
-- The command prefix should also be in the error color for `NormalView` (#18555)
-- Skip cloud files marked as "not on disk" during command discovery (#18152)
-- Replace `UTF8Encoding(false)` with `Encoding.Default` (#18356) (Thanks @xtqqczze!)
-- Fix `Switch-Process` to set `termios` appropriate for child process (#18467)
-- On Unix, only explicitly terminate the native process if not in background (#18215)
-- Treat `[NullString]::Value` as the string type when resolving methods (#18080)
-- Improve pseudo binding for dynamic parameters (#18030) (Thanks @MartinGC94!)
-- Make experimental feature `PSAnsiRenderingFileInfo` stable (#18042)
-- Update to use version `2.21.0` of Application Insights. (#17903)
-- Do not preserve temporary results when no need to do so (#17856)
-
-### Performance
-
-- Remove some static constants from `Utils.Separators` (#18154) (Thanks @iSazonov!)
-- Avoid using regular expression when unnecessary in `ScriptWriter` (#18348)
-- Use source generator for `PSVersionInfo` to improve startup time (#15603) (Thanks @iSazonov!)
-- Skip evaluating suggestions at startup (#18232)
-- Avoid using `Regex` when not necessary (#18210)
-
-### General Cmdlet Updates and Fixes
-
-- Update to use `ComputeCore.dll` for PowerShell Direct (#18194)
-- Replace `ArgumentNullException(nameof())` with `ArgumentNullException.ThrowIfNull()` (#18792)(#18784) (Thanks @CarloToso!)
-- Remove `TabExpansion` from remote session configuration (#18795) (Internal 23331)
-- WebCmdlets get Retry-After from headers if status code is 429 (#18717) (Thanks @CarloToso!)
-- Implement `SupportsShouldProcess` in `Stop-Transcript` (#18731) (Thanks @JohnLBevan!)
-- Fix `New-Item -ItemType Hardlink` to resolve target to absolute path and not allow link to itself (#18634)
-- Add output types to Format commands (#18746) (Thanks @MartinGC94!)
-- Fix the process `CommandLine` on Linux (#18710) (Thanks @jborean93!)
-- Fix `SuspiciousContentChecker.Match` to detect a predefined string when the text starts with it (#18693)
-- Switch `$PSNativeCommandUseErrorActionPreference` to `$true` when feature is enabled (#18695)
-- Fix `Start-Job` to check the existence of working directory using the PowerShell way (#18675)
-- Webcmdlets add 308 to redirect codes and small cleanup (#18536) (Thanks @CarloToso!)
-- Ensure `HelpInfo.Category` is consistently a string (#18254)
-- Remove `gcloud` from the legacy list because it's resolved to a .ps1 script (#18575)
-- Add `gcloud` and `sqlcmd` to list to use legacy argument passing (#18559)
-- Fix native access violation (#18545) (#18547) (Thanks @chrullrich!)
-- Fix issue when completing the first command in a script with an empty array expression (#18355) (Thanks @MartinGC94!)
-- Improve type inference of hashtable keys (#17907) (Thanks @MartinGC94!)
-- Fix `Switch-Process` to copy the current env to the new process (#18452)
-- Fix `Switch-Process` error to include the command that is not found (#18443)
-- Update `Out-Printer` to remove all decorating ANSI escape sequences from PowerShell formatting (#18425)
-- Web cmdlets set default charset encoding to `UTF8` (#18219) (Thanks @CarloToso!)
-- Fix incorrect cmdlet name in the script used by `Restart-Computer` (#18374) (Thanks @urizen-source!)
-- Add the function `cd~` (#18308) (Thanks @GigaScratch!)
-- Fix type inference error for empty return statements (#18351) (Thanks @MartinGC94!)
-- Fix the exception reporting in `ConvertFrom-StringData` (#18336) (Thanks @GigaScratch!)
-- Implement `IDisposable` in `NamedPipeClient` (#18341) (Thanks @xtqqczze!)
-- Replace command-error suggestion with new implementation based on subsystem plugin (#18252)
-- Remove the `ProcessorArchitecture` portion from the full name as it's obsolete (#18320)
-- Make the fuzzy searching flexible by passing in the fuzzy matcher (#18270)
-- Add `-FuzzyMinimumDistance` parameter to `Get-Command` (#18261)
-- Improve startup time by triggering initialization of additional types on background thread (#18195)
-- Fix decompression in web cmdlets (#17955) (Thanks @iSazonov!)
-- Add `CustomTableHeaderLabel` formatting to differentiate table header labels that are not property names (#17346)
-- Remove the extra new line form List formatting (#18185)
-- Minor update to the `FileInfo` table formatting on Unix to make it more concise (#18183)
-- Fix Parent property on processes with complex name (#17545) (Thanks @jborean93!)
-- Make PowerShell class not affiliate with `Runspace` when declaring the `NoRunspaceAffinity` attribute (#18138)
-- Complete the progress bar rendering in `Invoke-WebRequest` when downloading is complete or cancelled (#18130)
-- Display download progress in human readable format for `Invoke-WebRequest` (#14611) (Thanks @bergmeister!)
-- Update `WriteConsole` to not use `stackalloc` for buffer with too large size (#18084)
-- Filter out compiler generated types for `Add-Type -PassThru` (#18095)
-- Fixing `CA2014` warnings and removing the warning suppression (#17982) (Thanks @creative-cloud!)
-- Make experimental feature `PSNativeCommandArgumentPassing` stable (#18044)
-- Make experimental feature `PSAMSIMethodInvocationLogging` stable (#18041)
-- Handle `PSObject` argument specially in method invocation logging (#18060)
-- Fix typos in `EventResource.resx` (#18063) (Thanks @eltociear!)
-- Make experimental feature `PSRemotingSSHTransportErrorHandling` stable (#18046)
-- Make experimental feature `PSExec` stable (#18045)
-- Make experimental feature `PSCleanBlock` stable (#18043)
-- Fix error formatting to use color defined in `$PSStyle.Formatting` (#17987)
-- Remove unneeded use of `chmod 777` (#17974)
-- Support mapping foreground/background `ConsoleColor` values to VT escape sequences (#17938)
-- Make `pwsh` server modes implicitly not show banner (#17921)
-- Add output type attributes for `Get-WinEvent` (#17948) (Thanks @MartinGC94!)
-- Remove 1 second minimum delay in `Invoke-WebRequest` for small files, and prevent file-download-error suppression. (#17896) (Thanks @AAATechGuy!)
-- Add completion for values in comparisons when comparing Enums (#17654) (Thanks @MartinGC94!)
-- Fix positional argument completion (#17796) (Thanks @MartinGC94!)
-- Fix member completion in attribute argument (#17902) (Thanks @MartinGC94!)
-- Throw when too many parameter sets are defined (#17881) (Thanks @fflaten!)
-- Limit searching of `charset` attribute in `meta` tag for HTML to first 1024 characters in webcmdlets (#17813)
-- Fix `Update-Help` failing silently with implicit non-US culture. (#17780) (Thanks @dkaszews!)
-- Add the `ValidateNotNullOrWhiteSpace` attribute (#17191) (Thanks @wmentha!)
-- Improve enumeration of inferred types in pipeline (#17799) (Thanks @MartinGC94!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@MartinGC94, @CarloToso, @iSazonov, @xtqqczze, @turbedi, @trossr32, @eltociear, @AtariDreams, @jborean93</p>
-
-</summary>
-
-<ul>
-<li>Add TSAUpload for APIScan (#18446)</li>
-<li>Use Pattern matching in <code>ast.cs</code> (#18794) (Thanks @MartinGC94!)</li>
-<li>Cleanup <code>webrequestpscmdlet.common.cs</code> (#18596) (Thanks @CarloToso!)</li>
-<li>Unify <code>CreateFile</code> <code>pinvoke</code> in SMA (#18751) (Thanks @iSazonov!)</li>
-<li>Cleanup <code>webresponseobject.common</code> (#18785) (Thanks @CarloToso!)</li>
-<li><code>InvokeRestMethodCommand.Common</code> cleanup and merge partials (#18736) (Thanks @CarloToso!)</li>
-<li>Replace <code>GetDirectories</code> in <code>CimDscParser</code> (#14319) (Thanks @xtqqczze!)</li>
-<li>WebResponseObject.Common merge partials atomic commits (#18703) (Thanks @CarloToso!)</li>
-<li>Enable pending test for <code>Start-Process</code> (#18724) (Thanks @iSazonov!)</li>
-<li>Remove one CreateFileW (#18732) (Thanks @iSazonov!)</li>
-<li>Replace <code>DllImport</code> with <code>LibraryImport</code> for WNetAddConnection2 (#18721) (Thanks @iSazonov!)</li>
-<li>Use File.OpenHandle() instead CreateFileW pinvoke (#18722) (Thanks @iSazonov!)</li>
-<li>Replace DllImport with LibraryImport for WNetGetConnection (#18690) (Thanks @iSazonov!)</li>
-<li>Replace <code>DllImport</code> with <code>LibraryImport</code> - 1 (#18603) (Thanks @iSazonov!)</li>
-<li>Replace DllImport with LibraryImport in SMA 3 (#18564) (Thanks @iSazonov!)</li>
-<li>Replace <code>DllImport</code> with <code>LibraryImport</code> in SMA - 7 (#18594) (Thanks @iSazonov!)</li>
-<li>Use static <code>DateTime.UnixEpoch</code> and <code>RandomNumberGenerator.Fill()</code> (#18621) (Thanks @turbedi!)</li>
-<li>Rewrite Get-FileHash to use static HashData methods (#18471) (Thanks @turbedi!)</li>
-<li>Replace DllImport with LibraryImport in SMA 8 (#18599) (Thanks @iSazonov!)</li>
-<li>Replace DllImport with LibraryImport in SMA 4 (#18579) (Thanks @iSazonov!)</li>
-<li>Remove NativeCultureResolver as dead code (#18582) (Thanks @iSazonov!)</li>
-<li>Replace DllImport with LibraryImport in SMA 6 (#18581) (Thanks @iSazonov!)</li>
-<li>Replace DllImport with LibraryImport in SMA 2 (#18543) (Thanks @iSazonov!)</li>
-<li>Use standard SBCS detection (#18593) (Thanks @iSazonov!)</li>
-<li>Remove unused pinvokes in RemoteSessionNamedPipe (#18583) (Thanks @iSazonov!)</li>
-<li>Replace DllImport with LibraryImport in SMA 5 (#18580) (Thanks @iSazonov!)</li>
-<li>Remove SafeRegistryHandle (#18597) (Thanks @iSazonov!)</li>
-<li>Remove <code>ArchitectureSensitiveAttribute</code> from the code base (#18598) (Thanks @iSazonov!)</li>
-<li>Build COM adapter only on Windows (#18590)</li>
-<li>Include timer instantiation for legacy telemetry in conditional compiler statements in Get-Help (#18475) (Thanks @trossr32!)</li>
-<li>Convert <code>DllImport</code> to <code>LibraryImport</code> for recycle bin, clipboard, and computerinfo cmdlets (#18526)</li>
-<li>Replace DllImport with LibraryImport in SMA 1 (#18520) (Thanks @iSazonov!)</li>
-<li>Replace DllImport with LibraryImport in engine (#18496)</li>
-<li>Fix typo in InitialSessionState.cs (#18435) (Thanks @eltociear!)</li>
-<li>Remove remaining unused strings from resx files (#18448)</li>
-<li>Use new LINQ Order() methods instead of OrderBy(static x =&gt; x) (#18395) (Thanks @turbedi!)</li>
-<li>Make use of StringSplitOptions.TrimEntries when possible (#18412) (Thanks @turbedi!)</li>
-<li>Replace some <code>string.Join(string)</code> calls with <code>string.Join(char)</code> (#18411) (Thanks @turbedi!)</li>
-<li>Remove unused strings from FileSystem and Registry providers (#18403)</li>
-<li>Use generic <code>GetValues&lt;T&gt;</code>, <code>GetNames&lt;T&gt;</code> enum methods (#18391) (Thanks @xtqqczze!)</li>
-<li>Remove unused resource strings from <code>SessionStateStrings</code> (#18394)</li>
-<li>Remove unused resource strings in <code>System.Management.Automation</code> (#18388)</li>
-<li>Use <code>Enum.HasFlags</code> part 1 (#18386) (Thanks @xtqqczze!)</li>
-<li>Remove unused strings from parser (#18383)</li>
-<li>Remove unused strings from Utility module (#18370)</li>
-<li>Remove unused console strings (#18369)</li>
-<li>Remove unused strings from <code>ConsoleInfoErrorStrings.resx</code> (#18367)</li>
-<li>Code cleanup in <code>ContentHelper.Common.cs</code> (#18288) (Thanks @CarloToso!)</li>
-<li>Remove <code>FusionAssemblyIdentity</code> and <code>GlobalAssemblyCache</code> as they are not used (#18334) (Thanks @iSazonov!)</li>
-<li>Remove some static initializations in <code>StringManipulationHelper</code> (#18243) (Thanks @xtqqczze!)</li>
-<li>Use <code>MemoryExtensions.IndexOfAny</code> in <code>PSv2CompletionCompleter</code> (#18245) (Thanks @xtqqczze!)</li>
-<li>Use <code>MemoryExtensions.IndexOfAny</code> in <code>WildcardPattern</code> (#18242) (Thanks @xtqqczze!)</li>
-<li>Small cleanup of the stub code (#18301) (Thanks @CarloToso!)</li>
-<li>Fix typo in <code>RemoteRunspacePoolInternal.cs</code> (#18263) (Thanks @eltociear!)</li>
-<li>Some more code cleanup related to the use of <code>PSVersionInfo</code> (#18231)</li>
-<li>Use <code>MemoryExtensions.IndexOfAny</code> in <code>SessionStateInternal</code> (#18244) (Thanks @xtqqczze!)</li>
-<li>Use overload APIs that take <code>char</code> instead of <code>string</code> when it's possible (#18179) (Thanks @iSazonov!)</li>
-<li>Replace <code>UTF8Encoding(false)</code> with <code>Encoding.Default</code> (#18144) (Thanks @xtqqczze!)</li>
-<li>Remove unused variables (#18058) (Thanks @AtariDreams!)</li>
-<li>Fix typo in PowerShell.Core.Instrumentation.man (#17963) (Thanks @eltociear!)</li>
-<li>Migrate <code>WinTrust</code> functions to a common location (#17598) (Thanks @jborean93!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Add a function to get the PR Back-port report (#18299)
-- Add a workaround in automatic rebase workflow to continue on error (#18176)
-- Update list of PowerShell team members in release tools (#17909)
-- Don't block if we fail to create the comment (#17869)
-
-### Tests
-
-- Add `testexe.exe -echocmdline` to output raw command-line received by the process on Windows (#18591)
-- Mark charset test as pending (#18511)
-- Skip output rendering tests on Windows Server 2012 R2 (#18382)
-- Increase timeout to make subsystem tests more reliable (#18380)
-- Add missing -Tag 'CI' to describe blocks. (#18316)
-- Use short path instead of multiple quotes in `Get-Item` test relying on node (#18250)
-- Replace the CIM class used for `-Amended` parameter test (#17884) (Thanks @sethvs!)
-- Stop ongoing progress-bar in `Write-Progress` test (#17880) (Thanks @fflaten!)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-
-</summary>
-
-<ul>
-<li>Fix reference assembly generation logic for <code>Microsoft.PowerShell.Commands.Utility</code> (#18818)</li>
-<li>Update the cgmanifest (#18676)(#18521)(#18415)(#18408)(#18197)(#18111)(#18051)(#17913)(#17867)(#17934)(#18088)</li>
-<li>Bump <code>Microsoft.PowerShell.Native</code> to the latest preview version <code>v7.4.0-preview.1</code> (#18805)</li>
-<li>Remove unnecessary reference to <code>System.Runtime.CompilerServices.Unsafe</code> (#18806)</li>
-<li>Update the release tag in <code>metadata.json</code> for next preview (#18799)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18750)</li>
-<li>Bump .NET SDK to version <code>7.0.101</code> (#18786)</li>
-<li>Bump <code>cirrus-actions/rebase</code> from 1.7 to 1.8 (#18788)</li>
-<li>Bump <code>decode-uri-component</code> from 0.2.0 to 0.2.2 (#18712)</li>
-<li>Bump Microsoft.CodeAnalysis.CSharp from 4.4.0-4.final to 4.4.0 (#18562)</li>
-<li>Bump Newtonsoft.Json from 13.0.1 to 13.0.2 (#18657)</li>
-<li>Apply expected file permissions to Linux files after Authenticode signing (#18643)</li>
-<li>Remove extra quotes after agent moves to pwsh 7.3 (#18577)</li>
-<li>Don't install based on build-id for RPM (#18560)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.3.2 to 17.4.0 (#18487)</li>
-<li>Bump <code>minimatch</code> from 3.0.4 to 3.1.2 (#18514)</li>
-<li>Avoid depending on the pre-generated experimental feature list in private and CI builds (#18484)</li>
-<li>Update <code>release-MsixBundle.yml</code> to add retries (#18465)</li>
-<li>Bump System.Data.SqlClient from 4.8.4 to 4.8.5 in /src/Microsoft.PowerShell.SDK (#18515)</li>
-<li>Bump to use internal .NET 7 GA build (#18508)</li>
-<li>Insert the pre-release nuget feed before building test artifacts (#18507)</li>
-<li>Add test for framework dependent package in release pipeline (#18506) (Internal 23139)</li>
-<li>Update to azCopy 10 (#18509)</li>
-<li>Fix issues with uploading changelog to GitHub release draft (#18504)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18442)</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>Bump <code>Microsoft.PowerShell.Native</code> from 7.3.0-rc.1 to 7.3.0 (#18405)</li>
-<li>Allow two-digit revisions in <code>vPack</code> package validation pattern (#18392)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#18363)</li>
-<li>Bump to .NET 7 RC2 official version (#18328)</li>
-<li>Bump to .NET 7 to version <code>7.0.100-rc.2.22477.20</code> (#18286)</li>
-<li>Replace win7 runtime with win8 and remove APISets (#18304)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18312)</li>
-<li>Recurse the file listing. (#18277)</li>
-<li>Create tasks to collect and publish hashes for build files. (#18276)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18262)</li>
-<li>Remove ETW trace collection and uploading for CLR CAP (#18253)</li>
-<li>Do not cleanup <code>pwsh.deps.json</code> for framework dependent packages (#18226)</li>
-<li>Add branch counter to APIScan build (#18214)</li>
-<li>Remove unnecessary native dependencies from the package (#18213)</li>
-<li>Remove XML files for min-size package (#18189)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18216)</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>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18201)</li>
-<li>Move ApiScan to compliance build (#18191)</li>
-<li>Fix the verbose message when using <code>dotnet-install.sh</code> (#18184)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.3.1 to 17.3.2 (#18163)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#18164)</li>
-<li>Make the link to minimal package blob public during release (#18158)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#18147)</li>
-<li>Update MSI exit message (#18137)</li>
-<li>Bump Microsoft.CodeAnalysis.CSharp from 4.4.0-1.final to 4.4.0-2.final (#18132)</li>
-<li>Re-enable building with Ready-to-Run (#18105)</li>
-<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 RC1 build (#18091)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#18096)</li>
-<li>Add schema for cgmanifest.json (#18036)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> from 4.3.0-3.final to 4.3.0 (#18012)</li>
-<li>Add XML reference documents to NuPkg files for SDK (#17997)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.3.0 to 17.3.1 (#18000)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17988)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17983)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17945)</li>
-<li>Make sure <code>Security.types.ps1xml</code> gets signed in release build (#17916)</li>
-<li>Make Register Microsoft Update timeout (#17910)</li>
-<li>Merge changes from v7.0.12 v7.2.6 and v7.3.0-preview.7</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.2.0 to 17.3.0 (#17871)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update readme and metadata for releases (#18780)(#18493)(#18393)(#18332)(#18128)(#17870)
-- Remove 'please' and 'Core' from README.md per MS style guide (#18578) (Thanks @Rick-Anderson!)
-- Change unsupported XML documentation tag (#18608)
-- Change public API mention of `monad` to PowerShell (#18491)
-- Update security reporting policy to recommend security portal for more streamlined reporting (#18437)
-- Changelog for v7.3.0 (#18505) (Internal 23161)
-- Replace `msh` in public API comment based documentation with PowerShell equivalent (#18483)
-- Add missing XML doc elements for methods in `RunspaceFactory` (#18450)
-- Changelog for `v7.3.0-rc.1` (#18400)
-- Update changelogs for `v7.2.7` and `v7.0.13` (#18342)
-- Update the changelog for v7.3.0-preview.8 (#18136)
-- Add the `ConfigurationFile` option to the PowerShell help content (#18093)
-- Update help content about the PowerShell flag `-NonInteractive` (#17952)
-
-[7.4.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.8...v7.4.0-preview.1
diff --git a/CHANGELOG/v7.7/dependencychanges.json b/CHANGELOG/v7.7/dependencychanges.json
new file mode 100644
index 00000000000..21cd1577251
--- /dev/null
+++ b/CHANGELOG/v7.7/dependencychanges.json
@@ -0,0 +1,15 @@
+[
+  {
+    "ChangeType": "NonSecurity",
+    "Branch": "master",
+    "PackageId": ".NET SDK",
+    "FromVersion": "11.0.100-preview.2.26159.112",
+    "ToVersion": "11.0.100-preview.3.26207.106",
+    "VulnerabilityId": [],
+    "Severity": [],
+    "VulnerableRanges": [],
+    "AdvisoryUrls": [],
+    "Justification": "Updated .NET SDK. Building with the latest SDK is required.",
+    "TimestampUtc": "2026-04-17T17:16:15.7099916Z"
+  }
+]
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 90768d1293e..686e5e7a090 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,8 +1,10 @@
-# Code of Conduct
+# Microsoft Open Source Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
-For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 
-[conduct-code]: https://opensource.microsoft.com/codeofconduct/
-[conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
-[conduct-email]: mailto:opencode@microsoft.com
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
+- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)
diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 5b6ac60b802..f8288b53b67 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "8.0.1xx-rc2",
+    "channel": "9.0.1xx-preview6",
     "quality": "daily",
     "qualityFallback": "preview",
-    "packageVersionPattern": "8.0.0-rc.2",
-    "sdkImageVersion": "8.0.100",
-    "nextChannel": "8.0.1xx-rc2",
+    "packageVersionPattern": "9.0.0-preview.6",
+    "sdkImageVersion": "11.0.100-preview.3.26207.106",
+    "nextChannel": "9.0.0-preview.7",
     "azureFeed": "",
-    "sdkImageOverride": "8.0.100-rc.2.23502.2"
+    "sdkImageOverride": ""
   },
   "internalfeed": {
     "url": ""
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 72fbf3c86a8..d71432aed2f 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -58,6 +58,11 @@
       <PSCoreFileVersion Condition = "'$(ReleaseTagSemVersionPart)' != ''">$(ReleaseTagVersionPart).$(ReleaseTagSemVersionPart)</PSCoreFileVersion>
       <!-- Create the version if we have a release build -->
       <PSCoreFileVersion Condition = "'$(PSCoreFileVersion)' == ''">$(ReleaseTagVersionPart).$(GAIncrementValue)</PSCoreFileVersion>
+      <!-- Set 'FileVersion' and 'AssemblyVersion' explicitly:
+           - make 'FileVersion' the same as 'PSCoreFileVersion'
+           - make 'AssemblyVersion' be the 'PSCoreFileVersion' with the 'Build' field set to 0, so the assembly version doesn't change for servicing releases -->
+      <FileVersion>$(PSCoreFileVersion)</FileVersion>
+      <AssemblyVersion>$([System.Version]::Parse($(PSCoreFileVersion)).Major).$([System.Version]::Parse($(PSCoreFileVersion)).Minor).0.$([System.Version]::Parse($(PSCoreFileVersion)).Revision)</AssemblyVersion>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -84,7 +89,7 @@
       -->
 
       <!--
-            Here we define explicitly 'Version' to set 'FileVersion' and 'AssemblyVersion' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'.
+            Here we define explicitly 'Version' to set 'FileVersion' and 'AssemblyVersion' when they are not explicitly set.
             Here we define explicitly 'InformationalVersion' because by default it is defined as 'Version' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'.
       -->
       <Version>$(PSCoreFileVersion)</Version>
@@ -137,9 +142,10 @@
     <Product>PowerShell</Product>
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
+    <AssemblyTitle>PowerShell 7</AssemblyTitle>
 
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFramework>net11.0</TargetFramework>
+    <LangVersion>preview</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -157,7 +163,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
-    <IsWindows Condition="'$(IsWindows)' =='true' or ( '$(IsWindows)' == '' and '$(OS)' == 'Windows_NT')">true</IsWindows>
+    <IsWindows Condition="'$(IsWindows)' == 'true' or ('$(IsWindows)' == '' and '$(OS)' == 'Windows_NT')">true</IsWindows>
   </PropertyGroup>
 
   <!-- Define non-windows, all configuration properties -->
@@ -170,10 +176,43 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <!-- Define all OS, release configuration properties -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <!-- Define properties for Framework dependent deployments in Packages
+        https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#apphostdotnetsearch
+        For FxDependent, we want to search for the apphost in the Environment or global location,
+        as this was not causing any issues.
+        For FxDependentDeployment, we want to search ONLY in global location.
+        For SelfContained, we want to search in the app local location.
+  -->
+  <PropertyGroup Condition=" '$(AppDeployment)' == 'FxDependent' ">
+    <!-- Specify both to keep existing behavior because we have not had complaints about this scenario -->
+    <AppHostDotNetSearch>EnvironmentVariable;Global</AppHostDotNetSearch>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishReadyToRunEmitSymbols>false</PublishReadyToRunEmitSymbols>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(AppDeployment)' == 'FxDependentDeployment' ">
+    <!-- If we specify Environment too, it searches that first, no matter what order we specify-->
+    <AppHostDotNetSearch>Global</AppHostDotNetSearch>
+  </PropertyGroup>
+
+  <!-- Enable ready-to-run only for Release configuration -->
+  <PropertyGroup Condition=" '$(AppDeployment)' == 'FxDependentDeployment' And '$(Configuration)' == 'Release' ">
     <PublishReadyToRun>true</PublishReadyToRun>
     <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(AppDeployment)' == 'SelfContained' ">
+    <AppHostDotNetSearch>AppLocal</AppHostDotNetSearch>
+  </PropertyGroup>
+
+  <!-- Enable ready-to-run only for Release configuration -->
+  <PropertyGroup Condition=" '$(AppDeployment)' == 'SelfContained' And '$(Configuration)' == 'Release' ">
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
+  </PropertyGroup>
+
+  <!-- Define all OS, release configuration properties -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <Optimize>true</Optimize>
     <DebugType>portable</DebugType>
   </PropertyGroup>
diff --git a/PowerShell.sln b/PowerShell.sln
index 224d27ab3fc..4938316281d 100644
--- a/PowerShell.sln
+++ b/PowerShell.sln
@@ -31,6 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "powershell-unix", "src\powe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnit.tests", "test\xUnit\xUnit.tests.csproj", "{08704934-9764-48CE-86DB-BCF0A1CF7899}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PSVersionInfoGenerator", "src\System.Management.Automation\SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj", "{B22424E8-0516-4FC3-A9CB-D84D15EF0589}"
+EndProject
 # Configuration mapping comment
 # All global configurations must be mapped to project configurations
 #
diff --git a/README.md b/README.md
index 7c0e79ac67e..a7b31c475f8 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@ Welcome to the PowerShell GitHub Community!
 for dealing with structured data (e.g. JSON, CSV, XML, etc.), REST APIs, and object models.
 It includes a command-line shell, an associated scripting language, and a framework for processing cmdlets.
 
-[logo]: https://raw.githubusercontent.com/PowerShell/PowerShell/master/assets/ps_black_64.svg?sanitize=true
+[logo]: assets/ps_black_64.svg?sanitize=true
 
-## Windows PowerShell vs. PowerShell Core
+## Windows PowerShell vs. PowerShell 7+
 
-Although this repository started as a fork of the Windows PowerShell codebase, changes made in this repository are not automatically ported back to Windows PowerShell 5.1.
-This also means that [issues tracked here][issues] are only for PowerShell Core 6 and higher.
+Although this repository started as a fork of the Windows PowerShell codebase, changes made in this repository are not ported back to Windows PowerShell 5.1.
+This also means that [issues tracked here][issues] are only for PowerShell 7.x and higher.
 Windows PowerShell specific issues should be reported with the [Feedback Hub app][feedback-hub], by choosing "Apps > PowerShell" in the category.
 
 [issues]: https://github.com/PowerShell/PowerShell/issues
@@ -24,115 +24,13 @@ If you are new to PowerShell and want to learn more, we recommend reviewing the
 
 ## Get PowerShell
 
-You can download and install a PowerShell package for any of the following platforms.
-
-| Supported Platform                         | Download (LTS)          | Downloads (stable)      | Downloads (preview)   | How to Install                |
-| -------------------------------------------| ------------------------| ------------------------| ----------------------| ------------------------------|
-| [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 22.04][corefx-linux]               | [.deb][lts-deb]         | [.deb][rl-ubuntu22]     | [.deb][pv-deb]        | [Instructions][in-ubuntu22]   |
-| [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]         | N/A                     | N/A                   | [Instructions][in-ubuntu16]   |
-| [Debian 10][corefx-linux]                  | [.deb][lts-deb]         | [.deb][rl-debian10]     | [.deb][pv-deb]        | [Instructions][in-deb10]      |
-| [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 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 11+ (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.**
-
-| Platform                 | Downloads (stable)      | Downloads (preview)           | How to Install                |
-| -------------------------| ------------------------| ----------------------------- | ------------------------------|
-| Arch Linux               |                         |                               | [Instructions][in-archlinux]  |
-| Kali Linux               | [.deb][rl-deb]          | [.deb][pv-deb]                | [Instructions][in-kali]       |
-| Many Linux distributions | [Snapcraft][rl-snap]    | [Snapcraft][pv-snap]          |                               |
-
-You can also download the PowerShell binary archives for Windows, macOS, and Linux.
-
-| 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 (x64)    | [64-bit][rl-macos-tar]                              | [64-bit][pv-macos-tar]                          | [Instructions][in-tar-macos]                   |
-| macOS (arm64)  | [64-bit][rl-macos-tar-arm64]                        | [64-bit][pv-macos-tar-arm64]                    | [Instructions][in-tar-macos]                   |
-| Linux          | [64-bit][rl-linux-tar]                              | [64-bit][pv-linux-tar]                          | [Instructions][in-tar-linux]                   |
-| Windows (ARM)  | [64-bit][rl-winarm64] (preview)                     | [64-bit][pv-winarm64]                           | [Instructions][in-arm]                         |
-| Raspbian (ARM) | [32-bit][rl-arm32]/[64-bit][rl-arm64]               | [32-bit][pv-arm32]/[64-bit][pv-arm64]           | [Instructions][in-raspbian]                    |
-
-[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.17/PowerShell-7.2.17-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.17/PowerShell-7.2.17-win-x64.msi
-[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.17/powershell-lts_7.2.17-1.deb_amd64.deb
-[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.17/powershell-lts-7.2.17-1.rh.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.17/powershell-lts-7.2.17-osx-x64.pkg
-[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.17/powershell-lts-7.2.17-osx-arm64.pkg
-
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x86.msi
-[rl-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell_7.4.0-1.deb_amd64.deb
-[rl-ubuntu22]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell_7.4.0-1.deb_amd64.deb
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell_7.4.0-1.deb_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell_7.4.0-1.deb_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell_7.4.0-1.deb_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell_7.4.0-1.deb_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-1.rh.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-1.rh.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-osx-x64.pkg
-[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-osx-arm64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-osx-x64.tar.gz
-[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-osx-arm64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-linux-arm64.tar.gz
-[rl-snap]: https://snapcraft.io/powershell
-
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/PowerShell-7.4.0-rc.1-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/PowerShell-7.4.0-rc.1-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-preview_7.4.0-rc.1-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-preview-7.4.0_rc.1-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-7.4.0-rc.1-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-7.4.0-rc.1-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/PowerShell-7.4.0-rc.1-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/PowerShell-7.4.0-rc.1-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/PowerShell-7.4.0-rc.1-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-7.4.0-rc.1-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-7.4.0-rc.1-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-7.4.0-rc.1-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-7.4.0-rc.1-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.4.0-rc.1/powershell-7.4.0-rc.1-linux-arm64.tar.gz
-[pv-snap]: https://snapcraft.io/powershell-preview
-
-[in-windows]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows
-[in-ubuntu16]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#ubuntu-1604
-[in-ubuntu18]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#ubuntu-1804
-[in-ubuntu20]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#ubuntu-2004
-[in-ubuntu22]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-on-linux?view=powershell-7.3#ubuntu
-[in-deb10]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#debian-10
-[in-centos]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#centos-7
-[in-rhel7]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#red-hat-enterprise-linux-rhel-7
-[in-opensuse]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#opensuse
-[in-fedora]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#fedora
-[in-archlinux]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#arch-linux
-[in-macos]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-macos
-[in-docker]: https://github.com/PowerShell/PowerShell-Docker
-[in-kali]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#kali
-[in-windows-zip]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows#zip
-[in-tar-linux]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#binary-archives
-[in-tar-macos]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-macos#binary-archives
-[in-raspbian]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell-core-on-linux#raspbian
-[in-arm]: https://learn.microsoft.com/powershell/scripting/install/powershell-core-on-arm
-[corefx-win]:https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#windows
-[corefx-linux]:https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux
-[corefx-macos]:https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#macos
-
-To install a specific version, visit [releases](https://github.com/PowerShell/PowerShell/releases).
+PowerShell is supported on Windows, macOS, and a variety of Linux platforms. For
+more information, see [Installing PowerShell](https://learn.microsoft.com/powershell/scripting/install/installing-powershell).
+
+## Upgrading PowerShell
+
+For best results when upgrading, you should use the same install method you used when you first
+installed PowerShell. The update method is different for each platform and install method.
 
 ## Community Dashboard
 
@@ -158,43 +56,33 @@ Want to chat with other members of the PowerShell community?
 
 There are dozens of topic-specific channels on our community-driven PowerShell Virtual User Group, which you can join on:
 
-* [Gitter](https://gitter.im/PowerShell/PowerShell)
 * [Discord](https://discord.gg/PowerShell)
 * [IRC](https://web.libera.chat/#powershell) on Libera.Chat
 * [Slack](https://aka.ms/psslack)
 
-## Add-ons and libraries
-
-[Awesome PowerShell](https://github.com/janikvonrotz/awesome-powershell) has a great curated list of add-ons and resources.
+## Developing and Contributing
 
-## Building the Repository
+Want to contribute to PowerShell? Please start with the [Contribution Guide][] to learn how to develop and contribute.
 
-| Linux                    | Windows                    | macOS                   |
-|--------------------------|----------------------------|------------------------|
-| [Instructions][bd-linux] | [Instructions][bd-windows] | [Instructions][bd-macOS] |
+If you are developing .NET Core C# applications targeting PowerShell Core, [check out our FAQ][] to learn more about the PowerShell SDK NuGet package.
 
-If you have any problems building, consult the developer [FAQ][].
+Also, make sure to check out our [PowerShell-RFC repository](https://github.com/powershell/powershell-rfc) for request-for-comments (RFC) documents to submit and give comments on proposed and future designs.
 
-### Build status of nightly builds
+[Contribution Guide]: .github/CONTRIBUTING.md
+[check out our FAQ]: docs/FAQ.md#where-do-i-get-the-powershell-core-sdk-package
 
-| Azure CI (Windows)                       | Azure CI (Linux)                               | Azure CI (macOS)                               | CodeFactor Grade         |
-|:-----------------------------------------|:-----------------------------------------------|:-----------------------------------------------|:-------------------------|
-| [![windows-nightly-image][]][windows-nightly-site] | [![linux-nightly-image][]][linux-nightly-site] | [![macOS-nightly-image][]][macos-nightly-site] | [![cf-image][]][cf-site] |
+## Building PowerShell
 
-[bd-linux]: https://github.com/PowerShell/PowerShell/tree/master/docs/building/linux.md
-[bd-windows]: https://github.com/PowerShell/PowerShell/tree/master/docs/building/windows-core.md
-[bd-macOS]: https://github.com/PowerShell/PowerShell/tree/master/docs/building/macos.md
+| Linux                    | Windows                    | macOS                   |
+|--------------------------|----------------------------|------------------------|
+| [Instructions][bd-linux] | [Instructions][bd-windows] | [Instructions][bd-macOS] |
 
-[FAQ]: https://github.com/PowerShell/PowerShell/tree/master/docs/FAQ.md
+If you have any problems building PowerShell, please start by consulting the developer [FAQ].
 
-[windows-nightly-site]: https://powershell.visualstudio.com/PowerShell/_build?definitionId=32
-[linux-nightly-site]: https://powershell.visualstudio.com/PowerShell/_build?definitionId=23
-[macos-nightly-site]: https://powershell.visualstudio.com/PowerShell/_build?definitionId=24
-[windows-nightly-image]: https://powershell.visualstudio.com/PowerShell/_apis/build/status/PowerShell-CI-Windows-daily
-[linux-nightly-image]: https://powershell.visualstudio.com/PowerShell/_apis/build/status/PowerShell-CI-linux-daily?branchName=master
-[macOS-nightly-image]: https://powershell.visualstudio.com/PowerShell/_apis/build/status/PowerShell-CI-macos-daily?branchName=master
-[cf-site]: https://www.codefactor.io/repository/github/powershell/powershell
-[cf-image]: https://www.codefactor.io/repository/github/powershell/powershell/badge
+[bd-linux]: docs/building/linux.md
+[bd-windows]: docs/building/windows-core.md
+[bd-macOS]: docs/building/macos.md
+[FAQ]: docs/FAQ.md
 
 ## Downloading the Source Code
 
@@ -206,16 +94,6 @@ git clone https://github.com/PowerShell/PowerShell.git
 
 For more information, see [working with the PowerShell repository](https://github.com/PowerShell/PowerShell/tree/master/docs/git).
 
-## Developing and Contributing
-
-Please look into the [Contribution Guide][]  to know how to develop and contribute.
-If you are developing .NET Core C# applications targeting PowerShell Core, [check out our FAQ][] to learn more about the PowerShell SDK NuGet package.
-
-Also, make sure to check out our [PowerShell-RFC repository](https://github.com/powershell/powershell-rfc) for request-for-comments (RFC) documents to submit and give comments on proposed and future designs.
-
-[Contribution Guide]: https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md
-[check out our FAQ]: https://github.com/PowerShell/PowerShell/tree/master/docs/FAQ.md#where-do-i-get-the-powershell-core-sdk-package
-
 ## Support
 
 For support, see the [Support Section][].
@@ -228,12 +106,14 @@ PowerShell is licensed under the [MIT license][].
 
 [MIT license]: https://github.com/PowerShell/PowerShell/tree/master/LICENSE.txt
 
-### Windows Docker Files and Images
+### Docker Containers
 
-License: By requesting and using the Container OS Image for Windows containers, you acknowledge, understand, and consent to the Supplemental License Terms available on Docker Hub:
+> [!Important]
+> The PowerShell container images are now [maintained by the .NET team](https://github.com/PowerShell/Announcements/issues/75). The containers at `mcr.microsoft.com/powershell` are currently not maintained.
 
-- [Windows Server Core](https://hub.docker.com/r/microsoft/windowsservercore/)
-- [Nano Server](https://hub.docker.com/r/microsoft/nanoserver/)
+License: By requesting and using the Container OS Image for Windows containers, you acknowledge, understand, and consent to the Supplemental License Terms available on [Microsoft Artifact Registry][mcr].
+
+[mcr]: https://mcr.microsoft.com/en-us/product/powershell/tags
 
 ### Telemetry
 
@@ -242,16 +122,14 @@ topic to read details about telemetry gathered by PowerShell.
 
 ## Governance
 
-The governance policy for the PowerShell project is described [here][].
+The governance policy for the PowerShell project is described the [PowerShell Governance][gov] document.
+
+[gov]: https://github.com/PowerShell/PowerShell/blob/master/docs/community/governance.md
 
-[here]: https://github.com/PowerShell/PowerShell/blob/master/docs/community/governance.md
+## [Code of Conduct](CODE_OF_CONDUCT.md)
 
-## [Code of Conduct][conduct-md]
+Please see our [Code of Conduct](CODE_OF_CONDUCT.md) before participating in this project.
 
-This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
-For more information, see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
+## [Security Policy](.github/SECURITY.md)
 
-[conduct-code]: https://opensource.microsoft.com/codeofconduct/
-[conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
-[conduct-email]: mailto:opencode@microsoft.com
-[conduct-md]: https://github.com/PowerShell/PowerShell/tree/master/CODE_OF_CONDUCT.md
+For any security issues, please see our [Security Policy](.github/SECURITY.md).
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 41d8275fc5b..8abff24592f 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -17,125 +17,7 @@ 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
-
-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.
-
----------------------------------------------------------
-
----------------------------------------------------------
-
-Markdig.Signed 0.33.0 - BSD-2-Clause
+Markdig.Signed 0.42.0 - BSD-2-Clause
 
 
 
@@ -153,10 +35,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ---------------------------------------------------------
 
-JetBrains.Annotations 2021.2.0 - MIT
+Humanizer.Core 2.14.1 - MIT
 
 
-Copyright (c) 2016 JetBrains http://www.jetbrains.com
+Copyright .NET Foundation and Contributors
+Copyright (c) .NET Foundation and Contributors
 
 MIT License
 
@@ -172,15 +55,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Json.More.Net 1.9.0 - MIT
+Json.More.Net 2.1.1 - MIT
 
 
-(c) Microsoft 2023
-Copyright (c) 2022 Greg Dennis
+Copyright (c) .NET Foundation and Contributors
 
 MIT License
 
-Copyright (c) 2022 Greg Dennis
+Copyright (c) .NET Foundation and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -205,15 +87,14 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-JsonPointer.Net 3.0.3 - MIT
+JsonPointer.Net 5.3.1 - MIT
 
 
-(c) Microsoft 2023
-Copyright (c) 2022 Greg Dennis
+Copyright (c) .NET Foundation and Contributors
 
 MIT License
 
-Copyright (c) 2022 Greg Dennis
+Copyright (c) .NET Foundation and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -238,25 +119,39 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-JsonSchema.Net 5.2.6 - MIT
+JsonSchema.Net 7.4.0 - MIT
 
 
+Copyright (c) .NET Foundation and Contributors
 
 MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) .NET Foundation and Contributors
 
-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.ApplicationInsights 2.21.0 - MIT
+Microsoft.ApplicationInsights 2.23.0 - MIT
 
 
 (c) Microsoft Corporation
@@ -275,45 +170,66 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.Bcl.AsyncInterfaces 5.0.0 - MIT
+Microsoft.Bcl.AsyncInterfaces 9.0.9 - MIT
 
 
-(c) Microsoft Corporation.
+Copyright (c) 2021
+Copyright (c) Six Labors
+(c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
+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) 2015-2018, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
+Copyright (c) The Internet Society 1997
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2011-2015 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).
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+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) 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) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+Portions (c) International Organization for Standardization 1986
+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
 
 The MIT License (MIT)
 
@@ -344,7 +260,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.Common 4.7.0 - MIT
+Microsoft.CodeAnalysis.Common 4.14.0 - MIT
 
 
 (c) Microsoft Corporation
@@ -364,32 +280,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.CSharp 4.7.0 - MIT
+Microsoft.CodeAnalysis.CSharp 4.14.0 - MIT
 
 
 (c) Microsoft Corporation
 Copyright (c) Microsoft Corporation
+ACopyright (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.Management.Infrastructure 2.0.0 - MIT
-
-
-(c) Microsoft Corporation.
 
 MIT License
 
@@ -405,10 +305,41 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.Management.Infrastructure.Runtime.Unix 2.0.0 - MIT
+Microsoft.Extensions.ObjectPool 9.0.9 - MIT
 
 
-(c) Microsoft Corporation.
+Copyright Jorn Zaefferer
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright (c) 2015, Google Inc.
+Copyright (c) 2019 David Fowler
+Copyright (c) HTML5 Boilerplate
+Copyright 2019 The gRPC Authors
+Copyright (c) 2016 Richard Morris
+Copyright (c) 1998 John D. Polstra
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2013 - 2018 AngleSharp
+Copyright (c) 2000-2013 Julian Seward
+Copyright (c) 2011-2021 Twitter, Inc.
+Copyright (c) 2014-2018 Michael Daines
+Copyright (c) 1996-1998 John D. Polstra
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) .NET Foundation Contributors
+Copyright (c) 2011-2021 The Bootstrap Authors
+Copyright (c) 2019-2023 The Bootstrap Authors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019-2020 West Wind Technologies
+Copyright (c) 2007 John Birrell (jb@freebsd.org)
+Copyright (c) 2011 Alex MacCaw (info@eribium.org)
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+Copyright (c) 2010-2019 Google LLC. http://angular.io/license
+Copyright (c) 2011 Nicolas Gallagher (nicolas@nicolasgallagher.com)
+Copyright (c) 1989, 1993 The Regents of the University of California
+Copyright (c) 1990, 1993 The Regents of the University of California
+Copyright OpenJS Foundation and other contributors, https://openjsf.org
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 MIT License
 
@@ -444,27 +375,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.PowerShell.Native 7.3.2 - 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.3.0 - MIT
+Microsoft.Security.Extensions 1.4.0 - MIT
 
 
 (c) Microsoft Corporation
@@ -484,110 +395,66 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.Win32.Registry 4.7.0 - MIT
-
-
-(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.
-
-
----------------------------------------------------------
-
----------------------------------------------------------
-
-Microsoft.Win32.Registry.AccessControl 7.0.0 - MIT
+Microsoft.Win32.Registry.AccessControl 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -618,57 +485,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Win32.SystemEvents 7.0.0 - MIT
+Microsoft.Win32.SystemEvents 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -699,57 +575,119 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Windows.Compatibility 7.0.5 - MIT
+Microsoft.Windows.Compatibility 9.0.9 - MIT
 
 
 (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.
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Newtonsoft.Json 13.0.4 - 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)
+
+Copyright (c) 2007 James Newton-King
+
+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.android-arm.runtime.native.System.IO.Ports 9.0.9 - MIT
+
+
+Copyright (c) 2021
+Copyright (c) Six Labors
+(c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -780,91 +718,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Newtonsoft.Json 13.0.3 - 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)
-
-Copyright (c) 2007 James Newton-King
-
-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.linux-arm.runtime.native.System.IO.Ports 7.0.0 - MIT
+runtime.android-arm64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -895,57 +808,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.linux-arm64.runtime.native.System.IO.Ports 7.0.0 - MIT
+runtime.android-x64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -976,57 +898,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.linux-x64.runtime.native.System.IO.Ports 7.0.0 - MIT
+runtime.android-x86.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1057,29 +988,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.native.System.Data.SqlClient.sni 4.7.0 - MIT
+runtime.linux-arm.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
+Copyright (c) 2021
+Copyright (c) Six Labors
+(c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2018 Nemanja Mijailovic
+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) 2015-2018, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+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) 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) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Portions (c) International Organization for Standardization 1986
+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
 
 The MIT License (MIT)
 
@@ -1110,57 +1078,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.native.System.IO.Ports 7.0.0 - MIT
+runtime.linux-arm64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1191,57 +1168,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.osx-arm64.runtime.native.System.IO.Ports 7.0.0 - MIT
+runtime.linux-bionic-arm64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1272,57 +1258,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.osx-x64.runtime.native.System.IO.Ports 7.0.0 - MIT
+runtime.linux-bionic-x64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1353,57 +1348,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.CodeDom 7.0.0 - MIT
+runtime.linux-musl-arm.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1434,57 +1438,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Collections.Immutable 7.0.0 - MIT
+runtime.linux-musl-arm64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1515,57 +1528,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ComponentModel.Composition 7.0.0 - MIT
+runtime.linux-musl-x64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1596,57 +1618,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ComponentModel.Composition.Registration 7.0.0 - MIT
+runtime.linux-x64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1677,57 +1708,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Configuration.ConfigurationManager 7.0.0 - MIT
+runtime.maccatalyst-arm64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1758,57 +1798,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.Odbc 7.0.0 - MIT
+runtime.maccatalyst-x64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -1839,57 +1888,21 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.OleDb 7.0.0 - MIT
+runtime.native.System.Data.SqlClient.sni 4.4.0 - MIT
 
 
+(c) 2022 GitHub, Inc.
 (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
+Copyright (c) 1991-2017 Unicode, Inc.
 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) 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 (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)
 
@@ -1920,29 +1933,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.SqlClient 4.8.5 - MIT
+runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
+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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2018 Nemanja Mijailovic
+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) 2015-2018, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
-Portions (c) International Organization
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+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) 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
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Portions (c) International Organization for Standardization 1986
+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
 
 The MIT License (MIT)
 
@@ -1973,57 +2023,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.DiagnosticSource 7.0.2 - MIT
+runtime.osx-arm64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2054,57 +2113,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.EventLog 7.0.0 - MIT
+runtime.osx-x64.runtime.native.System.IO.Ports 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2135,57 +2203,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.PerformanceCounter 7.0.0 - MIT
+System.CodeDom 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2216,57 +2293,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices 7.0.1 - MIT
+System.ComponentModel.Composition 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2297,57 +2383,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.AccountManagement 7.0.1 - MIT
+System.ComponentModel.Composition.Registration 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2378,57 +2473,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.Protocols 7.0.1 - MIT
+System.Configuration.ConfigurationManager 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2459,57 +2563,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Drawing.Common 7.0.0 - MIT
+System.Data.Odbc 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2540,57 +2653,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Formats.Asn1 7.0.0 - MIT
+System.Data.OleDb 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2621,57 +2743,85 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Packaging 7.0.0 - MIT
+System.Data.SqlClient 4.9.0 - MIT
+
+
+(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.
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Diagnostics.EventLog 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2702,57 +2852,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Ports 7.0.0 - MIT
+System.Diagnostics.PerformanceCounter 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2783,57 +2942,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Management 7.0.2 - MIT
+System.DirectoryServices 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2864,57 +3032,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Net.Http.WinHttpHandler 7.0.0 - MIT
+System.DirectoryServices.AccountManagement 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -2945,25 +3122,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Numerics.Vectors 4.5.0 - MIT
+System.DirectoryServices.Protocols 9.0.9 - MIT
 
 
-(c) 2023 GitHub, Inc.
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
+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) 1991-2017 Unicode, Inc.
+Copyright (c) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 1991-2022 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2018 Nemanja Mijailovic
+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) 2015-2018, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
-Portions (c) International Organization
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+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) 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
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Portions (c) International Organization for Standardization 1986
+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
 
 The MIT License (MIT)
 
@@ -2994,12 +3212,12 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Private.ServiceModel 4.10.3 - MIT
+System.Drawing.Common 9.0.9 - MIT
 
 
 (c) Microsoft Corporation
+Copyright (c) Sven Groot (Ookii.org) 2009
 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)
 
@@ -3025,62 +3243,70 @@ 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.Reflection.Context 7.0.0 - MIT
+System.IO.Packaging 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -3111,29 +3337,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Reflection.DispatchProxy 4.7.1 - MIT
+System.IO.Ports 9.0.9 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
+Copyright (c) 2021
+Copyright (c) Six Labors
+(c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2018 Nemanja Mijailovic
+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) 2015-2018, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+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) 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) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Portions (c) International Organization for Standardization 1986
+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
 
 The MIT License (MIT)
 
@@ -3164,57 +3427,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Reflection.Metadata 7.0.0 - MIT
+System.Management 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -3245,57 +3517,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Runtime.Caching 7.0.0 - MIT
+System.Net.Http.WinHttpHandler 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -3326,46 +3607,12 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Runtime.CompilerServices.Unsafe 6.0.0 - MIT
+System.Private.ServiceModel 4.10.3 - 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).
+(c) Microsoft Corporation
 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
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3396,46 +3643,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.AccessControl 6.0.0 - MIT
+System.Reflection.Context 9.0.9 - MIT
 
 
-(c) Microsoft Corporation.
+Copyright (c) 2021
+Copyright (c) Six Labors
+(c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
+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) 2015-2018, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
+Copyright (c) The Internet Society 1997
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2011-2015 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).
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+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) 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) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+Portions (c) International Organization for Standardization 1986
+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
 
 The MIT License (MIT)
 
@@ -3466,57 +3733,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Pkcs 7.0.3 - MIT
+System.Runtime.Caching 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -3547,57 +3823,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.ProtectedData 7.0.1 - MIT
+System.Security.Cryptography.Pkcs 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -3628,57 +3913,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Xml 7.0.1 - MIT
+System.Security.Cryptography.ProtectedData 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -3709,57 +4003,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Permissions 7.0.0 - MIT
+System.Security.Cryptography.Xml 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -3790,45 +4093,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Principal.Windows 5.0.0 - MIT
+System.Security.Permissions 9.0.9 - MIT
 
 
-(c) Microsoft Corporation.
+Copyright (c) 2021
+Copyright (c) Six Labors
+(c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
+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) 2015-2018, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
+Copyright (c) The Internet Society 1997
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2011-2015 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).
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
+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) 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) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+Portions (c) International Organization for Standardization 1986
+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
 
 The MIT License (MIT)
 
@@ -4039,138 +4363,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Syndication 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)
-
-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.ServiceProcess.ServiceController 7.0.1 - MIT
+System.ServiceModel.Syndication 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -4201,57 +4453,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Speech 7.0.0 - MIT
+System.ServiceProcess.ServiceController 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -4282,57 +4543,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Text.Encoding.CodePages 7.0.0 - MIT
+System.Speech 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
@@ -4363,131 +4633,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Text.Encodings.Web 7.0.0 - MIT
+System.Threading.AccessControl 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
-
-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.Text.Json 6.0.2 - 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)
 
@@ -4518,90 +4723,12 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Threading.AccessControl 7.0.1 - MIT
+System.Web.Services.Description 8.1.2 - 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)
-
 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.Web.Services.Description 4.10.0 - MIT
-
-
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) Provided
 
 The MIT License (MIT)
 
@@ -4632,57 +4759,66 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Windows.Extensions 7.0.0 - MIT
+System.Windows.Extensions 9.0.9 - MIT
 
 
+Copyright (c) 2021
+Copyright (c) Six Labors
 (c) Microsoft Corporation
+Copyright (c) 2022 FormatJS
 Copyright (c) Andrew Arnott
 Copyright 2019 LLVM Project
+Copyright (c) 1998 Microsoft
 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) 2015 Andrew Gallant
+Copyright (c) 2022, Wojciech Mula
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2022, Geoff Langdale
 Copyright (c) 2005-2020 Rich Felker
+Copyright (c) 2012-2021 Yann Collet
 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 (c) 2018 Nemanja Mijailovic
 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) 2015-2018, 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) 2011-2015 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
+(c) 1995-2024 Jean-loup Gailly and Mark Adler
 Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2006 Jb Evain (jbevain@gmail.com)
 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
+Portions (c) International Organization for Standardization 1986
+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)
 
diff --git a/assets/AppImageThirdPartyNotices.txt b/assets/AppImageThirdPartyNotices.txt
deleted file mode 100644
index d492e7c3b53..00000000000
--- a/assets/AppImageThirdPartyNotices.txt
+++ /dev/null
@@ -1,506 +0,0 @@
-------------------------------------------- START OF THIRD PARTY NOTICE -----------------------------------------
-
- This file is based on or incorporates material from the projects listed below (Third Party IP). The original copyright notice and the license under which Microsoft received such Third Party IP, are set forth below. Such licenses and notices are provided for informational purposes only. Microsoft licenses the Third Party IP to you under the licensing terms for the Microsoft product. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise.
-
-
-
-
-Copyright (c) 1991-2016 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in http://www.unicode.org/copyright.html
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
-
----------------------
-
-Third-Party Software Licenses
-
-This section contains third-party software notices and/or additional
-terms for licensed third-party software components included within ICU
-libraries.
-
-1. ICU License - ICU 1.8.1 to ICU 57.1
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1995-2016 International Business Machines Corporation and others
-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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-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
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-All trademarks and registered trademarks mentioned herein are the
-property of their respective owners.
-
-2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
-
- #     The Google Chrome software developed by Google is licensed under
- # the BSD license. Other software included in this distribution is
- # provided under other licenses, as set forth below.
- #
- #  The BSD License
- #  https://opensource.org/licenses/bsd-license.php
- #  Copyright (C) 2006-2008, Google Inc.
- #
- #  All rights reserved.
- #
- #  Redistribution and use in source and binary forms, with or without
- # modification, are permitted provided that the following conditions are met:
- #
- #  Redistributions of source code must retain the above copyright notice,
- # this list of conditions and the following disclaimer.
- #  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.
- #  Neither the name of  Google Inc. nor the names of its
- # contributors may be used to endorse or promote products derived from
- # this software without specific prior written permission.
- #
- #
- #  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 word list in cjdict.txt are generated by combining three word lists
- # listed below with further processing for compound word breaking. The
- # frequency is generated with an iterative training against Google web
- # corpora.
- #
- #  * Libtabe (Chinese)
- #    - https://sourceforge.net/project/?group_id=1519
- #    - Its license terms and conditions are shown below.
- #
- #  * IPADIC (Japanese)
- #    - http://chasen.aist-nara.ac.jp/chasen/distribution.html
- #    - Its license terms and conditions are shown below.
- #
- #  ---------COPYING.libtabe ---- BEGIN--------------------
- #
- #  /*
- #   * Copyrighy (c) 1999 TaBE Project.
- #   * Copyright (c) 1999 Pai-Hsiang Hsiao.
- #   * All rights reserved.
- #   *
- #   * Redistribution and use in source and binary forms, with or without
- #   * modification, are permitted provided that the following conditions
- #   * are met:
- #   *
- #   * . Redistributions of source code must retain the above copyright
- #   *   notice, this list of conditions and the following disclaimer.
- #   * . 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.
- #   * . Neither the name of the TaBE Project nor the names of its
- #   *   contributors may be used to endorse or promote products derived
- #   *   from this software without specific prior written permission.
- #   *
- #   * 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
- #   * REGENTS 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.
- #   */
- #
- #  /*
- #   * Copyright (c) 1999 Computer Systems and Communication Lab,
- #   *                    Institute of Information Science, Academia
- #       *                    Sinica. All rights reserved.
- #   *
- #   * Redistribution and use in source and binary forms, with or without
- #   * modification, are permitted provided that the following conditions
- #   * are met:
- #   *
- #   * . Redistributions of source code must retain the above copyright
- #   *   notice, this list of conditions and the following disclaimer.
- #   * . 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.
- #   * . Neither the name of the Computer Systems and Communication Lab
- #   *   nor the names of its contributors may be used to endorse or
- #   *   promote products derived from this software without specific
- #   *   prior written permission.
- #   *
- #   * 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
- #   * REGENTS 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.
- #   */
- #
- #  Copyright 1996 Chih-Hao Tsai @ Beckman Institute,
- #      University of Illinois
- #  c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
- #
- #  ---------------COPYING.libtabe-----END--------------------------------
- #
- #
- #  ---------------COPYING.ipadic-----BEGIN-------------------------------
- #
- #  Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
- #  and Technology.  All Rights Reserved.
- #
- #  Use, reproduction, and distribution of this software is permitted.
- #  Any copy of this software, whether in its original form or modified,
- #  must include both the above copyright notice and the following
- #  paragraphs.
- #
- #  Nara Institute of Science and Technology (NAIST),
- #  the copyright holders, disclaims all warranties with regard to this
- #  software, including all implied warranties of merchantability and
- #  fitness, in no event shall NAIST be liable for
- #  any special, indirect or consequential damages or any damages
- #  whatsoever resulting from loss of use, data or profits, whether in an
- #  action of contract, negligence or other tortuous action, arising out
- #  of or in connection with the use or performance of this software.
- #
- #  A large portion of the dictionary entries
- #  originate from ICOT Free Software.  The following conditions for ICOT
- #  Free Software applies to the current dictionary as well.
- #
- #  Each User may also freely distribute the Program, whether in its
- #  original form or modified, to any third party or parties, PROVIDED
- #  that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
- #  on, or be attached to, the Program, which is distributed substantially
- #  in the same form as set out herein and that such intended
- #  distribution, if actually made, will neither violate or otherwise
- #  contravene any of the laws and regulations of the countries having
- #  jurisdiction over the User or the intended distribution itself.
- #
- #  NO WARRANTY
- #
- #  The program was produced on an experimental basis in the course of the
- #  research and development conducted during the project and is provided
- #  to users as so produced on an experimental basis.  Accordingly, the
- #  program is provided without any warranty whatsoever, whether express,
- #  implied, statutory or otherwise.  The term "warranty" used herein
- #  includes, but is not limited to, any warranty of the quality,
- #  performance, merchantability and fitness for a particular purpose of
- #  the program and the nonexistence of any infringement or violation of
- #  any right of any third party.
- #
- #  Each user of the program will agree and understand, and be deemed to
- #  have agreed and understood, that there is no warranty whatsoever for
- #  the program and, accordingly, the entire risk arising from or
- #  otherwise connected with the program is assumed by the user.
- #
- #  Therefore, neither ICOT, the copyright holder, or any other
- #  organization that participated in or was otherwise related to the
- #  development of the program and their respective officials, directors,
- #  officers and other employees shall be held liable for any and all
- #  damages, including, without limitation, general, special, incidental
- #  and consequential damages, arising out of or otherwise in connection
- #  with the use or inability to use the program or any product, material
- #  or result produced or otherwise obtained by using the program,
- #  regardless of whether they have been advised of, or otherwise had
- #  knowledge of, the possibility of such damages at any time during the
- #  project or thereafter.  Each user will be deemed to have agreed to the
- #  foregoing by his or her commencement of use of the program.  The term
- #  "use" as used herein includes, but is not limited to, the use,
- #  modification, copying and distribution of the program and the
- #  production of secondary products from the program.
- #
- #  In the case where the program, whether in its original form or
- #  modified, was distributed or delivered to or received by a user from
- #  any person, organization or entity other than ICOT, unless it makes or
- #  grants independently of ICOT any specific warranty to the user in
- #  writing, such person, organization or entity, will also be exempted
- #  from and not be held liable to the user for any such damages as noted
- #  above as far as the program is concerned.
- #
- #  ---------------COPYING.ipadic-----END----------------------------------
-
-3. Lao Word Break Dictionary Data (laodict.txt)
-
- #  Copyright (c) 2013 International Business Machines Corporation
- #  and others. All Rights Reserved.
- #
- # Project: https://code.google.com/p/lao-dictionary/
- # Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt
- # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt
- #              (copied below)
- #
- #  This file is derived from the above dictionary, with slight
- #  modifications.
- #  ----------------------------------------------------------------------
- #  Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
- #  All rights reserved.
- #
- #  Redistribution and use in source and binary forms, with or without
- #  modification,
- #  are permitted provided that the following conditions are met:
- #
- #
- # Redistributions of source code must retain the above copyright notice, this
- #  list of conditions and the following disclaimer. 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 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.
- #  --------------------------------------------------------------------------
-
-4. Burmese Word Break Dictionary Data (burmesedict.txt)
-
- #  Copyright (c) 2014 International Business Machines Corporation
- #  and others. All Rights Reserved.
- #
- #  This list is part of a project hosted at:
- #    github.com/kanyawtech/myanmar-karen-word-lists
- #
- #  --------------------------------------------------------------------------
- #  Copyright (c) 2013, LeRoy Benjamin Sharon
- #  All rights reserved.
- #
- #  Redistribution and use in source and binary forms, with or without
- #  modification, are permitted provided that the following conditions
- #  are met: Redistributions of source code must retain the above
- #  copyright notice, this list of conditions and the following
- #  disclaimer.  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.
- #
- #    Neither the name Myanmar Karen Word Lists, nor the names of its
- #    contributors may be used to endorse or promote products derived
- #    from this software without specific prior written permission.
- #
- #  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.
- #  --------------------------------------------------------------------------
-
-5. Time Zone Database
-
-  ICU uses the public domain data and code derived from Time Zone
-Database for its time zone support. The ownership of the TZ database
-is explained in BCP 175: Procedure for Maintaining the Time Zone
-Database section 7.
-
- # 7.  Database Ownership
- #
- #    The TZ database itself is not an IETF Contribution or an IETF
- #    document.  Rather it is a pre-existing and regularly updated work
- #    that is in the public domain, and is intended to remain in the
- #    public domain.  Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do
- #    not apply to the TZ Database or contributions that individuals make
- #    to it.  Should any claims be made and substantiated against the TZ
- #    Database, the organization that is providing the IANA
- #    Considerations defined in this RFC, under the memorandum of
- #    understanding with the IETF, currently ICANN, may act in accordance
- #    with all competent court orders.  No ownership claims will be made
- #    by ICANN or the IETF Trust on the database or the code.  Any person
- #    making a contribution to the database or code waives all rights to
- #    future claims in that contribution or in the TZ Database.
-
-
-8. liblzma
-
-XZ Utils Licensing
-==================
-
-    Different licenses apply to different files in this package. Here
-    is a rough summary of which licenses apply to which parts of this
-    package (but check the individual files to be sure!):
-
-      - liblzma is in the public domain.
-
-      - xz, xzdec, and lzmadec command line tools are in the public
-        domain unless GNU getopt_long had to be compiled and linked
-        in from the lib directory. The getopt_long code is under
-        GNU LGPLv2.1+.
-
-      - The scripts to grep, diff, and view compressed files have been
-        adapted from gzip. These scripts and their documentation are
-        under GNU GPLv2+.
-
-      - All the documentation in the doc directory and most of the
-        XZ Utils specific documentation files in other directories
-        are in the public domain.
-
-      - Translated messages are in the public domain.
-
-      - The build system contains public domain files, and files that
-        are under GNU GPLv2+ or GNU GPLv3+. None of these files end up
-        in the binaries being built.
-
-      - Test files and test code in the tests directory, and debugging
-        utilities in the debug directory are in the public domain.
-
-      - The extra directory may contain public domain files, and files
-        that are under various free software licenses.
-
-    You can do whatever you want with the files that have been put into
-    the public domain. If you find public domain legally problematic,
-    take the previous sentence as a license grant. If you still find
-    the lack of copyright legally problematic, you have too many
-    lawyers.
-
-    As usual, this software is provided "as is", without any warranty.
-
-    If you copy significant amounts of public domain code from XZ Utils
-    into your project, acknowledging this somewhere in your software is
-    polite (especially if it is proprietary, non-free software), but
-    naturally it is not legally required. Here is an example of a good
-    notice to put into "about box" or into documentation:
-
-        This software includes code from XZ Utils <https://tukaani.org/xz/>.
-
-    The following license texts are included in the following files:
-      - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1
-      - COPYING.GPLv2: GNU General Public License version 2
-      - COPYING.GPLv3: GNU General Public License version 3
-
-    Note that the toolchain (compiler, linker etc.) may add some code
-    pieces that are copyrighted. Thus, it is possible that e.g. liblzma
-    binary wouldn't actually be in the public domain in its entirety
-    even though it contains no copyrighted code from the XZ Utils source
-    package.
-
-    If you have questions, don't hesitate to ask the author(s) for more
-    information.
-
-
-BSD License
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-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 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.
-
-9. libunwind
-
-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.
-
-Provided for Informational Purposes Only
-
-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.
-
-
-
-
------------------------------------------------ END OF THIRD PARTY NOTICE ------------------------------------------
diff --git a/assets/AppxManifest.xml b/assets/AppxManifest.xml
index c646bcdf94b..50a8c7af45d 100644
--- a/assets/AppxManifest.xml
+++ b/assets/AppxManifest.xml
@@ -48,4 +48,5 @@
     <rescap:Capability Name="packageManagement" />
     <rescap:Capability Name="packageQuery" />
   </Capabilities>
+  <mp:PhoneIdentity PhoneProductId="$PHONEPRODUCTID$" PhonePublisherId="95d94207-0c7c-47ed-82db-d75c81153c35" />
 </Package>
diff --git a/assets/MicrosoftUpdate/RegisterMicrosoftUpdate.ps1 b/assets/MicrosoftUpdate/RegisterMicrosoftUpdate.ps1
deleted file mode 100644
index db756063da4..00000000000
--- a/assets/MicrosoftUpdate/RegisterMicrosoftUpdate.ps1
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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://learn.microsoft.com/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/manpage/pwsh.1 b/assets/manpage/pwsh.1
new file mode 100644
index 00000000000..14c191241a9
--- /dev/null
+++ b/assets/manpage/pwsh.1
@@ -0,0 +1,10 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PWSH" "1" "October 2023" "" ""
+.
+.SH "NAME"
+\fBpwsh\fR \- PowerShell command\-line shell and \.NET REPL
+.
+.SH "SYNOPSIS"
+\fBpwsh\fR [\fB\-Login\fR] [ [\fB\-File\fR] \fIfilePath\fR [args] ] [\fB\-Command\fR { \- | \fIscript\-block\fR [\fB\-args\fR \fIarg\-array\fR] | \fIstring\fR [\fICommandParameters\fR] } ] [\fB\-ConfigurationFile\fR \fIfilePath\fR] [\fB\-ConfigurationName\fR \fIstring\fR] [\fB\-CustomPipeName\fR \fIstring\fR] [\fB\-EncodedArguments\fR \fIBase64EncodedArguments\fR] [\fB\-EncodedCommand\fR \fIBase64EncodedCommand\fR] [\fB\-ExecutionPolicy\fR \fIExecutionPolicy\fR] [\fB\-Help\fR] [\fB\-InputFormat\fR {Text | XML}] [\fB\-Interactive\fR] [\fB\-MTA\fR] [\fB\-NoExit\fR] [\fB\-NoLogo\fR] [\fB\-NonInteractive\fR] [\fB\-NoProfile\fR] [\fB\-NoProfileLoadTime\fR] [\fB\-OutputFormat\fR {Text | XML}] [\fB\-SettingsFile\fR \fIfilePath\fR] [\fB\-SSHServerMode\fR] [\fB\-STA\fR] [\fB\-Version\fR] [\fB\-WindowStyle\fR
diff --git a/assets/pwsh.1.ronn b/assets/manpage/pwsh.1.ronn
similarity index 98%
rename from assets/pwsh.1.ronn
rename to assets/manpage/pwsh.1.ronn
index 13126164551..98320cc60c8 100644
--- a/assets/pwsh.1.ronn
+++ b/assets/manpage/pwsh.1.ronn
@@ -40,7 +40,7 @@ Some parameters have abbreviated forms
 * `-Command` | `-c`:
   Executes the specified commands (and any parameters) as though they were
   typed at the PowerShell command prompt, and then exits, unless NoExit is
-  specified. The value of Command can be `-`, a string or a script block. If
+  specified. The value of Command can be `-`, a string, or a script block. If
   the value of Command is `-`, the command text is read from standard input. If
   the value of Command is a script block, the script block must be enclosed in
   braces (`{}`). You can specify a script block only when running PowerShell in
@@ -171,7 +171,7 @@ Some parameters have abbreviated forms
 
 * `-WindowStyle` | `-w`
   Sets the window style for the session. Valid values are Normal, Minimized,
-  Maximized and Hidden. This parameter only applies to Windows. Using this
+  Maximized, and Hidden. This parameter only applies to Windows. Using this
   parameter on non-Windows platforms results in an error.
 
 * `-WorkingDirectory` | `-wd` | `-wo`
diff --git a/assets/wix/ExeLicense.rtf b/assets/wix/ExeLicense.rtf
deleted file mode 100644
index 09b0b1402a5..00000000000
--- a/assets/wix/ExeLicense.rtf
+++ /dev/null
@@ -1,206 +0,0 @@
-{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}
-{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
-{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
-{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1032\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f1033\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\f1035\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f1036\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f1037\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\f1038\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f1039\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f1040\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\f1372\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f1373\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f1375\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f1376\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}
-{\f1379\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f1380\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f1402\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f1403\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}
-{\f1405\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f1406\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f1407\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f1408\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}
-{\f1409\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f1410\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}
-{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}
-{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
-{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
-{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
-{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
-\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;\chyperlink\ctint255\cshade255\red5\green99\blue193;\red96\green94\blue92;\red225\green223\blue221;}
-{\*\defchp \f31506\fs24 }{\*\defpap \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 
-\af0\afs24\alang1025 \ltrch\fcs0 \f31506\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \sunhideused \spriority1 Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
-\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs24\alang1025 \ltrch\fcs0 \f31506\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*
-\cs15 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf19 \sbasedon10 \sunhideused \styrsid11998831 Hyperlink;}{\*\cs16 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \cf20\chshdng0\chcfpat0\chcbpat21 \sbasedon10 \ssemihidden \sunhideused \styrsid11998831 
-Unresolved Mention;}{\s17\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext17 \ssemihidden \sunhideused \styrsid11998831 Normal (Web);}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid203718\rsid534261\rsid10121125\rsid11155465
-\rsid11998831\rsid15422468\rsid15613908}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Travis Plunk}{\operator Travis Plunk}
-{\creatim\yr2021\mo2\dy19\hr9\min23}{\revtim\yr2021\mo2\dy19\hr12\min33}{\version4}{\edmins5}{\nofpages1}{\nofwords75}{\nofchars430}{\nofcharsws504}{\vern6021}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
-\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
-\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\noxlattoyen
-\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1
-\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
-\asianbrkrule\rsidroot11998831\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0
-{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang 
-{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang 
-{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
-\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15422468 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \f31506\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 
-\ltrch\fcs0 \insrsid15422468\charrsid15422468 This application is licensed under the\~}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11155465 HYPERLINK "https://aka.ms/PowerShellLicense"}{\rtlch\fcs1 \af0 \ltrch\fcs0 
-\insrsid11155465\charrsid15422468 {\*\datafield 
-00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b5a000000680074007400700073003a002f002f0061006b0061002e006d0073002f0050006f007700650072005300680065006c006c004c006900630065006e00730065000000795881f43b1d7f48af2c825dc4852763
-0000000085ab000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs15\ul\cf19\insrsid15422468\charrsid15422468 MIT License}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15422468\charrsid15422468 
-.
-\par You may review the\~}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11155465 HYPERLINK "https://aka.ms/PowerShellThirdPartyNotices"}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11155465\charrsid15422468 {\*\datafield 
-00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b6e000000680074007400700073003a002f002f0061006b0061002e006d0073002f0050006f007700650072005300680065006c006c0054006800690072006400500061007200740079004e006f007400690063006500
-73000000795881f43b1d7f48af2c825dc48527630000000085ab000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs15\ul\cf19\insrsid15422468\charrsid15422468 ThirdPartyNotices}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 
-\ltrch\fcs0 \insrsid15422468\charrsid15422468 .
-\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15422468\charrsid15422468 This application collects telemetry under the\~}{\field\fldedit{\*\fldinst {\rtlch\fcs1 
-\af0 \ltrch\fcs0 \insrsid534261 HYPERLINK "https://aka.ms/PrivacyPolicy"}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid534261 {\*\datafield 
-00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b52000000680074007400700073003a002f002f0061006b0061002e006d0073002f00500072006900760061006300790050006f006c006900630079000000795881f43b1d7f48af2c825dc48527630000000085ab0000}
-}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs15\ul\cf19\insrsid15422468\charrsid15422468 Microsoft Privacy Statement}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15422468\charrsid15422468 
-. To opt out, see\~}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11155465 HYPERLINK "https://aka.ms/PowerShellTelemetryOptOut" \\o "Original URL:https://github.com/PowerShell/PowerS
-hell/blob/master/README.md#telemetryClick to follow link."}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11155465\charrsid15422468 {\*\datafield 
-10d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b6a000000680074007400700073003a002f002f0061006b0061002e006d0073002f0050006f007700650072005300680065006c006c00540065006c0065006d0065007400720079004f00700074004f00750074000000
-795881f43b1d7f48af2c825dc48527630000000085ab000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs15\ul\cf19\insrsid15422468\charrsid15422468 here}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 
-\insrsid15422468\charrsid15422468 .}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11998831 
-\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
-9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
-5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
-b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
-0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
-a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
-c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
-0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
-a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
-6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
-4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
-4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f
-7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd
-ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d
-7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b
-d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52
-fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71
-b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b
-fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567
-9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd
-79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf
-5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2
-d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1
-738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68
-2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac
-5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a
-b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9
-493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2
-be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f
-f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64
-7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e
-b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4
-6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd
-f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d
-7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39
-4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf
-1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a
-faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2
-67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9
-416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27
-1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b
-8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4
-8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65
-2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36
-3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e
-3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985
-0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000
-0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000
-000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000
-7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000
-000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000
-000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000}
-{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
-617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
-6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
-656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
-{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
-\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;
-\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;
-\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;
-\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;
-\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;
-\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
-\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
-\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
-\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
-\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
-\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
-\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
-\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
-\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
-\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore }}
\ No newline at end of file
diff --git a/assets/wix/Product.wxs b/assets/wix/Product.wxs
deleted file mode 100644
index 6f34a33849e..00000000000
--- a/assets/wix/Product.wxs
+++ /dev/null
@@ -1,465 +0,0 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <!-- The URL for add/remove programs -->
-  <!-- TBD:Point to the actual release -->
-  <?define InfoURL="https://github.com/PowerShell/PowerShell" ?>
-  <?define ProductSimpleVersionWithNameAndOptionalArchitecture = "$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))"?>
-  <?if $(var.IsPreview)=True?>
-    <?define PwshPath = "[VersionFolder]preview"?>
-    <?define IconPath = "assets\Powershell_av_colors.ico"?>
-  <?else?>
-    <?define PwshPath = "[VersionFolder]"?>
-    <?define IconPath = "assets\Powershell_black.ico"?>
-  <?endif?>
-  <!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. -->
-  <?if $(sys.BUILDARCH)=x64?>
-    <?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(var.SimpleProductVersion)"?>
-    <?define UpgradeCodePreview = "39243d76-adaf-42b1-94fb-16ecf83237c8"?>
-    <?define UpgradeCodeRelease = "31ab5147-9a97-4452-8443-d9709f0516e1"?>
-    <?if $(var.IsPreview)=True?>
-      <?define UpgradeCode = $(var.UpgradeCodePreview)?>
-    <?else?>
-      <?define UpgradeCode = $(var.UpgradeCodeRelease)?>
-    <?endif?>
-  <?else?>
-    <?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))"?>
-    <?define UpgradeCodePreview = "86abcfbd-1ccc-4a88-b8b2-0facfde29094"?>
-    <?define UpgradeCodeRelease = "1d00683b-0f84-4db8-a64f-2f98ad42fe06"?>
-    <?if $(var.IsPreview)=True?>
-      <?define UpgradeCode = $(var.UpgradeCodePreview)?>
-    <?else?>
-      <?define UpgradeCode = $(var.UpgradeCodeRelease)?>
-    <?endif?>
-  <?endif?>
-  <!-- Explorer context submenu entries. The ampersand denotes the keyboard shortcut. -->
-  <?define ExplorerContextSubMenuDialogText = "Open &here"?>
-  <?define ExplorerContextSubMenuElevatedDialogText = "Open here as &Administrator"?>
-  <!-- ps1 context submenu entries. -->
-  <?define PowerShellFileContextSubMenuDialogText = "Run with $(var.ProductName) $(var.SimpleProductVersion)"?>
-  <Product
-    Id="*"
-    Name="PowerShell $(var.SimpleProductVersion)-$(sys.BUILDARCH)"
-    Language="1033"
-    Version="$(var.ProductVersion)"
-    Manufacturer="Microsoft Corporation"
-    UpgradeCode="$(var.UpgradeCode)">
-    <!-- Properties About The Package -->
-    <Package Id="*" Keywords="Installer" Platform="$(sys.BUILDARCH)" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Description="PowerShell package" Comments="PowerShell for every system" />
-    <!-- Add PowerShell icon for executable -->
-    <Icon Id="PowerShellExe.ico" SourceFile="$(var.IconPath)" />
-    <!-- Add PowerShell icon in Add/Remove Programs -->
-    <Property Id="ARPPRODUCTICON" Value="PowerShellExe.ico" />
-    <!-- Set properties for add/remove programs -->
-    <Property Id="ARPHELPLINK" Value="$(var.InfoURL)" />
-    <!-- custom images -->
-    <WixVariable Id="WixUIBannerBmp" Value="assets\wix\WixUIBannerBmp.png" />
-    <WixVariable Id="WixUIDialogBmp" Value="assets\wix\WixUIDialogBmp.png" />
-    <WixVariable Id="WixUIExclamationIco" Value="assets\wix\WixUIInfoIco.png" />
-    <WixVariable Id="WixUIInfoIco" Value="assets\ps_black_32x32.ico" />
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Open $(var.ProductName)" />
-    <!-- Default value of Checkbox of starting PowerShell after installation -->
-    <Property Id="WixShellExecTarget" Value="[VersionFolder]pwsh.exe"/>
-    <!-- This changes the default setting from "reinstall if the file is a newer version" to "reinstall if the file is a different version" -->
-    <Property Id="REINSTALLMODE" Value="dmus"/>
-    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
-
-    <SetProperty Id="RegisterManifest"
-                 Before="RegisterManifest"
-                 Sequence="execute"
-                 Value="&quot;[VersionFolder]pwsh.exe&quot; -NoProfile -ExecutionPolicy Bypass -File &quot;[VersionFolder]RegisterManifest.ps1&quot;" />
-    <CustomAction Id="RegisterManifest"
-                  BinaryKey="WixCA"
-                  DllEntry="CAQuietExec"
-                  Execute="deferred"
-                  Return="ignore"
-                  Impersonate="no" />
-    <SetProperty Id="EnablePSRemoting"
-                 Before="EnablePSRemoting"
-                 Sequence="execute"
-                 Value="&quot;[VersionFolder]pwsh.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;Enable-PSRemoting&quot;" />
-    <CustomAction Id="EnablePSRemoting"
-                  BinaryKey="WixCA"
-                  DllEntry="CAQuietExec"
-                  Execute="deferred"
-                  Return="ignore"
-                  Impersonate="no" />
-    <SetProperty Id="EnableMU"
-                 Before="EnableMU"
-                 Sequence="execute"
-                 Value="&quot;[VersionFolder]pwsh.exe&quot; -NoProfile -ExecutionPolicy Bypass -File &quot;[VersionFolder]RegisterMicrosoftUpdate.ps1&quot;" />
-    <CustomAction Id="EnableMU"
-                  BinaryKey="WixCA"
-                  DllEntry="CAQuietExec"
-                  Execute="deferred"
-                  Return="ignore"
-                  Impersonate="no" />
-    <InstallExecuteSequence>
-      <!-- Do not remove shortcuts on upgrade to preserve user shortcuts pinned to Taskbar, see https://stackoverflow.com/a/33402698/1810304 -->
-      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE</RemoveShortcuts>
-      <Custom Action="RegisterManifest" After="InstallFiles">
-        <![CDATA[NOT Installed AND (REGISTER_MANIFEST=1)]]>
-      </Custom>
-      <Custom Action="EnablePSRemoting" After="InstallFiles">
-        <![CDATA[NOT Installed AND (ENABLE_PSREMOTING=1)]]>
-      </Custom>
-      <Custom Action="EnableMU" After="InstallFiles">
-        <![CDATA[NOT Installed AND (ENABLE_MU=1)]]>
-      </Custom>
-    </InstallExecuteSequence>
-    <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="{\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"  />
-        <!-- Button row -->
-        <!-- Checkbox to allow starting PowerShell after the installation (in UI mode only) -->
-        <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(var.ProductName)" >
-          <Condition Action="show">NOT Installed</Condition>
-        </Control>
-        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
-        <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
-        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
-      </Dialog>
-      <InstallUISequence>
-          <Show Dialog="MyExitDialog" OnExit="success" />
-      </InstallUISequence>
-      <AdminUISequence>
-          <Show Dialog="MyExitDialog" OnExit="success" />
-      </AdminUISequence>
-      <Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-    </UI>
-    <UI>
-      <Publish Dialog="MyExitDialog" Control="Finish" Order="1" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT=1</Publish>
-    </UI>
-    <!-- Prerequisites -->
-    <Condition Message="Supported only on Windows 8.1 and above">
-      <![CDATA[ Installed OR MsiNTProductType <> 1 OR VersionNT >= 603 ]]>
-    </Condition>
-    <Condition Message="Supported only on Windows Server 2012 and above">
-      <![CDATA[ Installed OR MsiNTProductType = 1 OR VersionNT >= 602 ]]>
-    </Condition>
-    <!-- Information About When Older Versions Are Trying To Be Installed-->
-    <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of $(var.ProductName) is already installed." />
-    <!-- Embed Cabinet Files in Product-->
-    <MediaTemplate EmbedCab="yes" />
-    <!-- In Your Wix Setup Project, Add A Reference To WixUIExtension.dll -->
-    <UIRef Id="CustomWixUI_InstallDir" />
-    <!-- Features are mandatory.  Need At Least One. -->
-    <Feature Id="ProductFeature" Title="PowerShell" Level="1">
-      <ComponentGroupRef Id="ApplicationFiles"/>
-      <ComponentRef Id="ApplicationProgramsMenuShortcut"/>
-      <ComponentRef Id="MURegistryEntries"/>
-      <ComponentRef Id="RegistryEntries"/>
-      <?if $(var.IsPreview)!=True?>
-      <ComponentRef Id="AppPath"/>
-      <?endif?>
-      <ComponentRef Id="SetPath"/>
-      <ComponentRef Id="Telemetry"/>
-      <ComponentRef Id="DisableTelemetry"/>
-      <ComponentRef Id="ExplorerContextMenu"/>
-      <ComponentRef Id="PowerShellFileContextMenu"/>
-    </Feature>
-    <!-- We need to show EULA, and provide option to customize download location -->
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
-    <!-- Need to get the Windows product name from the registry -->
-    <Property Id="WINDOWS_PRODUCT_NAME">
-      <RegistrySearch Id="ProductName" Root="HKLM" Type="raw" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="ProductName" />
-    </Property>
-    <!-- Prerequisite check for Windows Universal C runtime -->
-    <Property Id="UNIVERSAL_C_RUNTIME_INSTALLED" Secure="yes">
-      <DirectorySearch Id="WindowsDirectory" Path="[WindowsFolder]">
-        <DirectorySearch Id="System32" Path="System32">
-          <FileSearch Id="ucrtbase" Name="ucrtbase.dll"/>
-        </DirectorySearch>
-      </DirectorySearch>
-    </Property>
-    <Condition Message="$(var.ProductName) requires the Universal C Runtime to be installed to enable remoting over WinRM. You can find a download link to it here: https://aka.ms/pscore6-prereq">
-      <![CDATA[Installed OR UNIVERSAL_C_RUNTIME_INSTALLED]]>
-    </Condition>
-    <!-- Prerequisite check for Windows Management Framework -->
-    <Property Id="PWRSHPLUGIN_VERSION" Secure="yes">
-      <DirectorySearchRef Id="System32" Parent="WindowsDirectory" Path="System32">
-        <FileSearch Id="pwrshplugin" Name="pwrshplugin.dll" MinVersion="6.3.9600.16383"/>
-      </DirectorySearchRef>
-    </Property>
-    <Condition Message="$(var.ProductName) requires the Windows Management Framework 4.0 or newer to be installed to enable remoting over WinRM. You can find download links here: https://aka.ms/pscore6-prereq">
-      <![CDATA[Installed OR PWRSHPLUGIN_VERSION ]]>
-    </Condition>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="$(var.ProductProgFilesDir)">
-        <Directory Id="INSTALLFOLDER" Name="PowerShell">
-          <Directory Id="VersionFolder" Name="$(var.SimpleProductVersion)">
-            <Component Id="Telemetry" Guid="{80520f20-471d-4d08-adc8-bab637627b39}" KeyPath="yes">
-              <!-- Should retain component GUID since this is a shared, non-file, non-registry resource. -->
-              <Environment Id="PowerShellDistributionChannel" Action="create" Name="POWERSHELL_DISTRIBUTION_CHANNEL" Permanent="no" System="yes" Value="MSI:[WINDOWS_PRODUCT_NAME]"/>
-            </Component>
-            <Component Id="MURegistryEntries">
-              <Condition>USE_MU=1</Condition>
-              <!-- Create registry key to allow opt-out of MU servicing without opting out of MU completely.  We don't want to uninstall because it's used by both Preview and Stable and the detection relies on PS7 being installed for this to take effect. -->
-              <RegistryKey Root="HKLM" Key="Software\Microsoft\PowerShellCore" Action="create" ForceCreateOnInstall="yes">
-                  <RegistryValue Type="integer" Value="1" Name="UseMU"  KeyPath="yes"/>
-              </RegistryKey>
-            </Component>
-            <Component Id="RegistryEntries">
-              <!-- create key for easy detection of a particular version of a powershell core package
-                    The upgrade code is used in the key because it will change when we allow SxS       -->
-              <RegistryKey Root="HKLM" Key="Software\Microsoft\PowerShellCore\InstalledVersions\$(var.UpgradeCode)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-                  <RegistryValue Type="string" Value="$(var.ProductSemanticVersion)" Name="SemanticVersion" KeyPath="yes"/>
-                  <RegistryValue Type="string" Value="[VersionFolder]" Name="InstallLocation" />
-                  <RegistryValue Type="string" Value="[ProductCode]" Name="ProductCode" />
-              </RegistryKey>
-
-            </Component>
-            <?if $(var.IsPreview)!=True?>
-            <Component Id="AppPath">
-              <!-- register ourselves in application registry so can be started using just Win+R `pwsh.exe` -->
-              <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\pwsh.exe" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-                  <!-- As a shared path, the last one to install will overwrite any previous value. It also needs to be in its own component to properly ref-count and be removed when appropriate. -->
-                  <RegistryValue Type="string" Value="[VersionFolder]pwsh.exe" KeyPath="yes"/>
-              </RegistryKey>
-            </Component>
-            <?endif?>
-            <Component Id="DisableTelemetry" Guid="{E86F5C91-3721-4C5C-A31F-1F0A5A468573}" KeyPath="yes">
-              <Condition>DISABLE_TELEMETRY</Condition>
-              <Environment Id="PowerShellTelemetryOptout" Action="set" Name="POWERSHELL_TELEMETRY_OPTOUT" Permanent="no" System="yes" Value="1"/>
-            </Component>
-            <!-- add ourselves to %PATH% so pwsh.exe can be started from Windows PowerShell or cmd.exe -->
-            <Component Id="SetPath">
-              <Condition>ADD_PATH=1</Condition>
-              <Environment Id="PATH" Action="set" Name="PATH" Part="last" Permanent="no" System="yes" Value="$(var.PwshPath)"/>
-              <!-- Can't use a shared component GUID here either since the path we add to PATH varies on the actual directory path. Use a key that represents this same path. -->
-              <RegistryKey Root="HKLM" Key="Software\Microsoft\PowerShellCore\InstalledVersions\$(var.UpgradeCode)">
-                <RegistryValue Type="string" Name="InstallDir" Value="[VersionFolder]" KeyPath="yes"/>
-              </RegistryKey>
-            </Component>
-            <!-- Explorer context menu with 2 submenus to open PowerShell normally or as an Administrator.
-                 See https://blogs.msdn.microsoft.com/andrew_richards/2017/03/01/enhancing-the-open-command-prompt-here-shift-right-click-context-menu-experience/ for details -->
-            <Component Id="ExplorerContextMenu">
-              <Condition>ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL</Condition>
-              <!-- When clicking on background in Explorer -->
-              <RegistryKey Root="HKCR" Key="Directory\Background\shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextMenuDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe"/>
-                <RegistryValue Type="string" Name="ExtendedSubCommandsKey" Value="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)" KeyPath="yes"/>
-              </RegistryKey>
-              <!-- When clicking on Drive in Explorer -->
-              <RegistryKey Root="HKCR" Key="Drive\shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextMenuDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe"/>
-                <RegistryValue Type="string" Name="ExtendedSubCommandsKey" Value="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)"/>
-              </RegistryKey>
-              <!-- When clicking on Desktop background in Explorer -->
-              <RegistryKey Root="HKCR" Key="DesktopBackground\shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextMenuDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe"/>
-                <RegistryValue Type="string" Name="ExtendedSubCommandsKey" Value="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)"/>
-              </RegistryKey>
-              <!-- When clicking on folder in Explorer -->
-              <RegistryKey Root="HKCR" Key="Directory\shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextMenuDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe"/>
-                <RegistryValue Type="string" Name="ExtendedSubCommandsKey" Value="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)"/>
-              </RegistryKey>
-              <!-- When being in a Library folder in Explorer -->
-              <RegistryKey Root="HKCR" Key="LibraryFolder\background\shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextMenuDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe"/>
-                <RegistryValue Type="string" Name="ExtendedSubCommandsKey" Value="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)"/>
-              </RegistryKey>
-              <!-- Sub menus to open PowerShell at the current location either as a normal shell or as Administrator -->
-              <RegistryKey Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\openpwsh">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextSubMenuDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe"/>
-              </RegistryKey>
-              <RegistryKey Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\openpwsh\command">
-                <RegistryValue Type="string" Value="[VersionFolder]pwsh.exe -NoExit -RemoveWorkingDirectoryTrailingCharacter -WorkingDirectory &quot;%V!&quot; -Command &quot;$host.UI.RawUI.WindowTitle = '$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))'&quot;"/>
-              </RegistryKey>
-              <RegistryKey Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\runas">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextSubMenuElevatedDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe"/>
-                <RegistryValue Type="string" Value="" Name="HasLUAShield"/>
-              </RegistryKey>
-              <RegistryKey Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\runas\command">
-                <RegistryValue Type="string" Value="[VersionFolder]pwsh.exe -NoExit -RemoveWorkingDirectoryTrailingCharacter -WorkingDirectory &quot;%V!&quot; -Command &quot;$host.UI.RawUI.WindowTitle = '$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))'&quot;"/>
-              </RegistryKey>
-              <RemoveRegistryKey Id="RemoveOldOpenKey" Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\open" Action="removeOnInstall"/>
-            </Component>
-            <Component Id="PowerShellFileContextMenu">
-              <Condition>ADD_FILE_CONTEXT_MENU_RUNPOWERSHELL</Condition>
-              <!-- When right-clicking ps1 file -->
-              <RegistryKey Root="HKCR" Key="Microsoft.PowerShellScript.1\Shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">
-                <RegistryValue Type="string" Name="MUIVerb" Value="$(var.PowerShellFileContextSubMenuDialogText)"/>
-                <RegistryValue Type="string" Name="Icon" Value="[VersionFolder]pwsh.exe" KeyPath="yes"/>
-                <RegistryKey Key="Command">
-                  <RegistryValue Type="string" Value="[VersionFolder]pwsh.exe -Command &quot;$host.UI.RawUI.WindowTitle = '$(var.ProductName) $(var.SimpleProductVersion) ($(sys.BUILDARCH))'; &amp; '%1'&quot;"/>
-                </RegistryKey>
-              </RegistryKey>
-            </Component>
-          </Directory>
-        </Directory>
-      </Directory>
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)">
-          <Component Id="ApplicationProgramsMenuShortcut">
-            <Shortcut Id="PowerShell_ProgramsMenuShortcut"
-                      Name="$(var.ProductSimpleVersionWithNameAndOptionalArchitecture)"
-                      Description="$(var.ProductSimpleVersionWithNameAndOptionalArchitecture)"
-                      Target="[VersionFolder]pwsh.exe"
-                      Arguments="-WorkingDirectory ~" />
-            <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
-            <!-- HKMU is HKLM when installing perMachine and HKCU when installing perUser-->
-            <RegistryValue Root="HKMU" Key="Software\Microsoft\PowerShellCore\ProgramsMenuShortcut\$(var.SimpleProductVersion)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-          </Component>
-        </Directory>
-      </Directory>
-    </Directory>
-  </Product>
-
-<!-- Explorer Context Menu Dialog -->
-<Fragment>
- <UI>
-    <Property Id="REGISTER_MANIFEST" Value="1" />
-    <Property Id="ADD_PATH" Value="1" />
-    <Dialog Id="ExplorerContextMenuDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
-      <!-- Banner -->
-      <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="yes" Text="!(loc.InstallDirDlgBannerBitmap)"/>
-      <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Optional Actions" TabSkip="yes" />
-      <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Initialization and Customization" TabSkip="yes" />
-      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" 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="AddToPathCheckBox" Type="CheckBox" X="20" Y="60" Width="290" Height="17" Property="ADD_PATH" CheckBoxValue="0" Text="Add $(var.ProductName) to Path Environment Variable"/>
-      <Control Id="RegisterManifestCheckBox" Type="CheckBox" X="20" Y="80" Width="290" Height="17" Property="REGISTER_MANIFEST" CheckBoxValue="0" Text="Register Windows Event Logging Manifest"/>
-      <Control Id="EnablePSRemotingCheckBox" Type="CheckBox" X="20" Y="100" Width="290" Height="17" Property="ENABLE_PSREMOTING" CheckBoxValue="0" Text="Enable $(var.ProductName) remoting"/>
-      <Control Id="DisableTelemetry" Type="CheckBox" X="20" Y="120" Width="290" Height="17" Property="DISABLE_TELEMETRY" CheckBoxValue="0" Text="Disable Telemetry (Reboot or Restart of processes may be required)" ToolTip="Sets environment variable POWERSHELL_TELEMETRY_OPTOUT to 1, see https://go.microsoft.com/fwlink/?linkid=2242006"/>
-      <Control Id="ContextMenuOpenPowerShell" Type="CheckBox" X="20" Y="140" Width="290" Height="17" Property="ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL" CheckBoxValue="0" Text="Add '$(var.ExplorerContextSubMenuDialogText)' context menus to Explorer"/>
-      <Control Id="ContextMenuRunPowerShell" Type="CheckBox" X="20" Y="160" Width="290" Height="17" Property="ADD_FILE_CONTEXT_MENU_RUNPOWERSHELL" CheckBoxValue="0" Text="Add '$(var.PowerShellFileContextSubMenuDialogText)' context menu for PowerShell files"/>
-      <Control Id="LicenseLink" Type="Hyperlink" X="20" Y="190" Width="214" Height="17">
-        <Text><![CDATA[<a href="https://github.com/PowerShell/PowerShell/blob/master/LICENSE.txt">The application is distributed under the MIT license.</a>]]></Text>
-      </Control>
-      <Control Id="TpnLink" Type="Hyperlink" X="20" Y="210" Width="290" Height="17">
-        <Text><![CDATA[<a href="https://github.com/PowerShell/PowerShell/blob/master/ThirdPartyNotices.txt">Please review the ThirdPartyNotices.txt</a>]]></Text>
-      </Control>
-      <!-- divider and bottom buttons -->
-      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"/>
-      <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)"/>
-      <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Cancel="yes" Default="yes" Text="!(loc.WixUINext)"/>
-      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-      </Control>
-    </Dialog>
-  </UI>
-</Fragment>
-
-<!-- Microsoft Update Menu Dialog -->
-<Fragment>
- <UI>
-    <Property Id="USE_MU" Value="1" />
-    <Property Id="ENABLE_MU" Value="1" />
-    <Dialog Id="MuDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
-      <!-- Banner -->
-      <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="yes" Text="!(loc.InstallDirDlgBannerBitmap)"/>
-      <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="30" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Use Microsoft Update to help keep your computer secure and up to date" TabSkip="yes" />
-      <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 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.">
-        <Condition Action="hide"><![CDATA[ENABLE_MU="1" OR USE_MU<>"1"]]></Condition>
-        <Condition Action="show"><![CDATA[ENABLE_MU<>"1" AND USE_MU="1"]]></Condition>
-      </Control>
-      <Control Id="MuFAQ" Type="Hyperlink" X="20" Y="190" Width="214" Height="17">
-        <Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-FAQ">See the Microsoft Update FAQ</a>]]></Text>
-      </Control>
-      <Control Id="PrivacyLink" Type="Hyperlink" X="20" Y="210" Width="290" Height="17">
-        <Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-Privacy-Statement">Read the Microsoft Update Privacy Statement</a>]]></Text>
-      </Control>
-      <!-- divider and bottom buttons -->
-      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"/>
-      <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)"/>
-      <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Cancel="yes" Default="yes" Text="!(loc.WixUINext)"/>
-      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-      </Control>
-    </Dialog>
-  </UI>
-</Fragment>
-<!-- Customized version of WixUI_InstallDir, which is necessary to add custom dialogs. https://github.com/wixtoolset/wix3/blob/master/src/ext/UIExtension/wixlib/WixUI_InstallDir.wxs -->
-<Fragment>
-  <UI Id="CustomWixUI_InstallDir">
-      <!--
-      First-time install dialog sequence:
-      - WixUI_WelcomeDlg
-      - WixUI_InstallDirDlg
-      - ExplorerContextMenuDialog
-      - MuDialog
-      - WixUI_VerifyReadyDlg
-      - WixUI_DiskCostDlg
-      Maintenance dialog sequence:
-      - WixUI_MaintenanceWelcomeDlg
-      - WixUI_MaintenanceTypeDlg
-      - WixUI_InstallDirDlg
-      - WixUI_VerifyReadyDlg
-      Patch dialog sequence:
-      - WixUI_WelcomeDlg
-      - WixUI_VerifyReadyDlg
-      -->
-
-      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-      <Property Id="WixUI_Mode" Value="InstallDir" />
-
-      <DialogRef Id="BrowseDlg" />
-      <DialogRef Id="DiskCostDlg" />
-      <DialogRef Id="ErrorDlg" />
-      <DialogRef Id="FatalError" />
-      <DialogRef Id="FilesInUse" />
-      <DialogRef Id="MsiRMFilesInUse" />
-      <DialogRef Id="PrepareDlg" />
-      <DialogRef Id="ProgressDlg" />
-      <DialogRef Id="ResumeDlg" />
-      <DialogRef Id="UserExit" />
-      <DialogRef Id="ExplorerContextMenuDialog" />
-
-
-      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
-
-      <Publish Dialog="ExplorerContextMenuDialog" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-      <Publish Dialog="ExplorerContextMenuDialog" Control="Next" Event="NewDialog" Value="MuDialog">1</Publish>
-      <Publish Dialog="MuDialog" Control="Back" Event="NewDialog" Value="ExplorerContextMenuDialog">1</Publish>
-      <Publish Dialog="MuDialog" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="2">1</Publish>
-
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ExplorerContextMenuDialog" Order="5">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MuDialog" Order="1">NOT Installed</Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
-
-      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-      <Property Id="ARPNOMODIFY" Value="1" />
-    </UI>
-    <UIRef Id="WixUI_Common" />
-  </Fragment>
-
-</Wix>
diff --git a/assets/wix/WixUIBannerBmp.png b/assets/wix/WixUIBannerBmp.png
deleted file mode 100644
index 2a1922c1d7c..00000000000
Binary files a/assets/wix/WixUIBannerBmp.png and /dev/null differ
diff --git a/assets/wix/WixUIDialogBmp.png b/assets/wix/WixUIDialogBmp.png
deleted file mode 100644
index 57cf3734c17..00000000000
Binary files a/assets/wix/WixUIDialogBmp.png and /dev/null differ
diff --git a/assets/wix/WixUIInfoIco.png b/assets/wix/WixUIInfoIco.png
deleted file mode 100644
index cb705d5f33f..00000000000
Binary files a/assets/wix/WixUIInfoIco.png and /dev/null differ
diff --git a/assets/wix/bundle.wxs b/assets/wix/bundle.wxs
deleted file mode 100644
index dc577cb36b0..00000000000
--- a/assets/wix/bundle.wxs
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-  <!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. -->
-  <?if $(sys.BUILDARCH)=x64?>
-    <?define UpgradeCodePreview = "3C90221B-D500-43C6-A4A6-0BE6C2C1B317"?>
-    <?define UpgradeCodeRelease = "7A804CBB-648E-4276-9A58-081862DB1B99"?>
-    <?if $(var.IsPreview)=True?>
-      <?define UpgradeCode = $(var.UpgradeCodePreview)?>
-    <?else?>
-      <?define UpgradeCode = $(var.UpgradeCodeRelease)?>
-    <?endif?>
-  <?else?>
-    <?define UpgradeCodePreview = "4A699A9C-E904-4024-BCD2-44E098A8C6BD"?>
-    <?define UpgradeCodeRelease = "ED46CB02-64B3-43FD-A63E-6CF269D8C21C"?>
-    <?if $(var.IsPreview)=True?>
-      <?define UpgradeCode = $(var.UpgradeCodePreview)?>
-    <?else?>
-      <?define UpgradeCode = $(var.UpgradeCodeRelease)?>
-    <?endif?>
-  <?endif?>
-
-  <Bundle Name="PowerShell $(var.WindowsVersion)-$(sys.BUILDARCH)" Version="$(var.WindowsVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)">
-    <!-- See https://wixtoolset.org/documentation/manual/v3/bundle/wixstdba/ for a list of WiX standard bootstrapper types. -->
-    <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
-      <bal:WixStandardBootstrapperApplication LicenseFile="assets\wix\ExeLicense.rtf" LogoFile="assets\ps_black_32x32.ico" />
-    </BootstrapperApplicationRef>
-    <Chain>
-      <MsiPackage SourceFile="$(var.TargetPath)" Compressed="yes" />
-    </Chain>
-  </Bundle>
-</Wix>
diff --git a/build.psm1 b/build.psm1
index 55110cd9cf6..d353eb251e5 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 param(
-    # Skips a check that prevents building PowerShell on unsupported Linux distributions
+    # Skips a check that prevents building PowerShell on unsupported Linux distributions.
     [parameter(Mandatory = $false)][switch]$SkipLinuxDistroCheck = $false
 )
 
@@ -11,7 +11,7 @@ param(
 # CI runs with PowerShell 5.0, so don't use features like ?: && ||
 Set-StrictMode -Version 3.0
 
-# On Unix paths is separated by colon
+# On Unix paths is separated by colon.
 # On Windows paths is separated by semicolon
 $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator
 $script:Options = $null
@@ -35,6 +35,16 @@ $tagsUpToDate = $false
 # This function is used during the setup phase in tools/ci.psm1
 function Sync-PSTags
 {
+    <#
+    .SYNOPSIS
+        Syncs git tags from the PowerShell/PowerShell upstream remote.
+    .DESCRIPTION
+        Ensures that tags from the PowerShell/PowerShell upstream remote have been fetched.
+        Functions like Get-PSCommitId and Get-PSLatestTag require tags to be current.
+        This is called during the setup phase in tools/ci.psm1.
+    .PARAMETER AddRemoteIfMissing
+        If specified, adds the upstream remote automatically when it is not present.
+    #>
     param(
         [Switch]
         $AddRemoteIfMissing
@@ -78,6 +88,15 @@ function Sync-PSTags
 # Gets the latest tag for the current branch
 function Get-PSLatestTag
 {
+    <#
+    .SYNOPSIS
+        Gets the latest git tag reachable from the current HEAD.
+    .DESCRIPTION
+        Returns the most recent annotated git tag. Run Sync-PSTags first to ensure tags
+        are up to date; otherwise a warning is emitted.
+    .OUTPUTS
+        System.String. The latest tag string, e.g. 'v7.5.0'.
+    #>
     [CmdletBinding()]
     param()
     # This function won't always return the correct value unless tags have been sync'ed
@@ -92,6 +111,17 @@ function Get-PSLatestTag
 
 function Get-PSVersion
 {
+    <#
+    .SYNOPSIS
+        Returns the PowerShell version string for the current commit.
+    .DESCRIPTION
+        Derives the version from the latest git tag, optionally omitting the commit-ID suffix.
+    .PARAMETER OmitCommitId
+        When specified, returns only the bare version (e.g. '7.5.0') from the latest tag,
+        without the commit-count and hash suffix appended by git describe.
+    .OUTPUTS
+        System.String. A version string such as '7.5.0' or '7.5.0-15-gabcdef1234'.
+    #>
     [CmdletBinding()]
     param(
         [switch]
@@ -109,6 +139,16 @@ function Get-PSVersion
 
 function Get-PSCommitId
 {
+    <#
+    .SYNOPSIS
+        Returns the PowerShell commit-ID string produced by git describe.
+    .DESCRIPTION
+        Returns the full git describe string including the tag, number of commits since
+        the tag, and the abbreviated commit hash (e.g. 'v7.5.0-15-gabcdef1234567890').
+        Run Sync-PSTags first; otherwise a warning is emitted.
+    .OUTPUTS
+        System.String. A git describe string such as 'v7.5.0-15-gabcdef1234567890'.
+    #>
     [CmdletBinding()]
     param()
     # This function won't always return the correct value unless tags have been sync'ed
@@ -123,6 +163,19 @@ function Get-PSCommitId
 
 function Get-EnvironmentInformation
 {
+    <#
+    .SYNOPSIS
+        Collects information about the current operating environment.
+    .DESCRIPTION
+        Returns a PSCustomObject containing OS-identity flags, architecture, admin status,
+        NuGet package root paths, and Linux distribution details. The object is used
+        throughout the build module to make platform-conditional decisions.
+    .OUTPUTS
+        System.Management.Automation.PSCustomObject. An object with properties such as
+        IsWindows, IsLinux, IsMacOS, IsAdmin, OSArchitecture, and distribution-specific flags
+        (IsUbuntu, IsDebian, IsRedHatFamily, etc.).
+    #>
+    param()
     $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]) {
@@ -179,6 +232,8 @@ function Get-EnvironmentInformation
         $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 += @{'IsUbuntu22' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '22.04'}
+        $environment += @{'IsUbuntu24' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '24.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'}
@@ -191,6 +246,7 @@ function Get-EnvironmentInformation
         $environment += @{'IsRedHatFamily' = $environment.IsCentOS -or $environment.IsFedora -or $environment.IsRedHat}
         $environment += @{'IsSUSEFamily' = $environment.IsSLES -or $environment.IsOpenSUSE}
         $environment += @{'IsAlpine' = $LinuxInfo.ID -match 'alpine'}
+        $environment += @{'IsMariner' = $LinuxInfo.ID -match 'mariner' -or $LinuxInfo.ID -match 'azurelinux'}
 
         # Workaround for temporary LD_LIBRARY_PATH hack for Fedora 24
         # https://github.com/PowerShell/PowerShell/issues/2511
@@ -204,7 +260,8 @@ function Get-EnvironmentInformation
             $environment.IsUbuntu -or
             $environment.IsRedHatFamily -or
             $environment.IsSUSEFamily -or
-            $environment.IsAlpine)
+            $environment.IsAlpine -or
+            $environment.IsMariner)
         ) {
             if ($SkipLinuxDistroCheck) {
                 Write-Warning "The current OS : $($LinuxInfo.ID) is not supported for building PowerShell."
@@ -277,6 +334,54 @@ function Test-IsReleaseCandidate
 $optimizedFddRegex = 'fxdependent-(linux|win|win7|osx)-(x64|x86|arm64|arm)'
 
 function Start-PSBuild {
+    <#
+    .SYNOPSIS
+        Builds PowerShell from source using dotnet publish.
+    .DESCRIPTION
+        Compiles the PowerShell source tree for the specified runtime and configuration.
+        Optionally restores NuGet packages, regenerates resources, generates the type catalog,
+        and restores Gallery modules. Saves build options so subsequent commands can reuse them.
+    .PARAMETER StopDevPowerShell
+        Stops any running dev pwsh process before building to prevent file-in-use errors.
+    .PARAMETER Restore
+        Forces NuGet package restore even when packages already exist.
+    .PARAMETER Output
+        Path to the output directory. Defaults to the standard build location.
+    .PARAMETER ResGen
+        Regenerates C# bindings for resx resource files before building.
+    .PARAMETER TypeGen
+        Regenerates the CorePsTypeCatalog.cs type-catalog file before building.
+    .PARAMETER Clean
+        Runs 'git clean -fdX' to remove untracked and ignored files before building.
+    .PARAMETER PSModuleRestore
+        Restores PowerShell Gallery modules to the build output directory (legacy parameter set).
+    .PARAMETER NoPSModuleRestore
+        Skips restoring PowerShell Gallery modules to the build output directory.
+    .PARAMETER CI
+        Indicates a CI build; restores the Pester module to the output directory.
+    .PARAMETER ForMinimalSize
+        Produces a build optimized for minimal binary size (linux-x64, win7-x64, or osx-x64 only).
+    .PARAMETER SkipExperimentalFeatureGeneration
+        Skips the step that runs the built pwsh to produce the experimental-features list.
+    .PARAMETER SMAOnly
+        Rebuilds only System.Management.Automation.dll for rapid engine iteration.
+    .PARAMETER UseNuGetOrg
+        Uses nuget.org instead of the private PowerShell feed for package restore.
+    .PARAMETER Runtime
+        The .NET runtime identifier (RID) to target, e.g. 'win7-x64' or 'linux-x64'.
+    .PARAMETER Configuration
+        The build configuration: Debug, Release, CodeCoverage, or StaticAnalysis.
+    .PARAMETER ReleaseTag
+        A git tag in 'vX.Y.Z[-preview.N|-rc.N]' format to embed as the release version.
+    .PARAMETER Detailed
+        Passes '--verbosity d' to dotnet for detailed build output.
+    .PARAMETER InteractiveAuth
+        Passes '--interactive' to dotnet restore for interactive feed authentication.
+    .PARAMETER SkipRoslynAnalyzers
+        Skips Roslyn analyzer execution during the build.
+    .PARAMETER PSOptionsPath
+        When supplied, saves the resolved build options to this JSON file path.
+    #>
     [CmdletBinding(DefaultParameterSetName="Default")]
     param(
         # When specified this switch will stops running dev powershell
@@ -305,6 +410,9 @@ function Start-PSBuild {
         # it's useful for development, to do a quick changes in the engine
         [switch]$SMAOnly,
 
+        # Use nuget.org instead of the PowerShell specific feed
+        [switch]$UseNuGetOrg,
+
         # 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.
@@ -346,8 +454,8 @@ function Start-PSBuild {
         $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 ($Runtime -eq "linux-arm" -and $environment.IsLinux -and -not $environment.IsUbuntu -and -not $environment.IsMariner) {
+        throw "Cross compiling for linux-arm is only supported on AzureLinux/Ubuntu environment"
     }
 
     if ("win-arm","win-arm64" -contains $Runtime -and -not $environment.IsWindows) {
@@ -360,6 +468,12 @@ function Start-PSBuild {
         }
     }
 
+    if ($UseNuGetOrg) {
+        Switch-PSNugetConfig -Source Public
+    } else {
+        Write-Verbose -Message "Using default feeds which are Microsoft, use `-UseNuGetOrg` to switch to Public feeds" -Verbose
+    }
+
     function Stop-DevPowerShell {
         Get-Process pwsh* |
             Where-Object {
@@ -372,7 +486,7 @@ function Start-PSBuild {
     }
 
     if ($Clean) {
-        Write-Log -message "Cleaning your working directory. You can also do it with 'git clean -fdX --exclude .vs/PowerShell/v16/Server/sqlite3'"
+        Write-LogGroupStart -Title "Cleaning your working directory"
         Push-Location $PSScriptRoot
         try {
             # Excluded sqlite3 folder is due to this Roslyn issue: https://github.com/dotnet/roslyn/issues/23060
@@ -380,6 +494,7 @@ function Start-PSBuild {
             # 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 {
+            Write-LogGroupEnd -Title "Cleaning your working directory"
             Pop-Location
         }
     }
@@ -479,13 +594,24 @@ Fix steps:
         $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) -and $Options.Runtime -notmatch $optimizedFddRegex) {
-        $Arguments += "/property:PublishReadyToRun=false"
+    # We pass in the AppDeployment property to indicate which type of deployment we are doing.
+    # This allows the PowerShell.Common.props to set the correct properties for the build.
+    $AppDeployment = if(($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) -and $Options.Runtime -notmatch $optimizedFddRegex) {
+        # Global and zip files
+        "FxDependent"
+    }
+    elseif($Options.Runtime -like 'fxdependent*' -and $Options.Runtime -match $optimizedFddRegex) {
+        # These are Optimized and must come from the correct version of the runtime.
+        # Global
+        "FxDependentDeployment"
+    }
+    else {
+        # The majority of our packages
+        # AppLocal
+        "SelfContained"
     }
 
+    $Arguments += "/property:AppDeployment=$AppDeployment"
     $Arguments += "--configuration", $Options.Configuration
     $Arguments += "--framework", $Options.Framework
 
@@ -512,7 +638,9 @@ Fix steps:
     }
 
     # handle Restore
+    Write-LogGroupStart -Title "Restore NuGet Packages"
     Restore-PSPackage -Options $Options -Force:$Restore -InteractiveAuth:$InteractiveAuth
+    Write-LogGroupEnd -Title "Restore NuGet Packages"
 
     # handle ResGen
     # Heuristic to run ResGen on the fresh machine
@@ -542,6 +670,7 @@ Fix steps:
         $publishPath = $Options.Output
     }
 
+    Write-LogGroupStart -Title "Build PowerShell"
     try {
         # Relative paths do not work well if cwd is not changed to project
         Push-Location $Options.Top
@@ -576,6 +705,13 @@ Fix steps:
 
             try {
                 Push-Location $globalToolSrcFolder
+
+                if ($Options.Runtime -like 'fxdependent*') {
+                    if ($Arguments -contains '/property:UseAppHost=true') {
+                        $Arguments = @($Arguments | Where-Object { $_ -notlike '/property:UseAppHost=true' })
+                    }
+                }
+
                 if ($Arguments -notcontains '--output') {
                     $Arguments += "--output", $publishPath
                 }
@@ -589,6 +725,7 @@ Fix steps:
     } finally {
         Pop-Location
     }
+    Write-LogGroupEnd -Title "Build PowerShell"
 
     # 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) {
@@ -596,6 +733,7 @@ Fix steps:
     }
 
     # publish reference assemblies
+    Write-LogGroupStart -Title "Publish Reference Assemblies"
     try {
         Push-Location "$PSScriptRoot/src/TypeCatalogGen"
         $refAssemblies = Get-Content -Path $incFileName | Where-Object { $_ -like "*microsoft.netcore.app*" } | ForEach-Object { $_.TrimEnd(';') }
@@ -609,6 +747,7 @@ Fix steps:
     } finally {
         Pop-Location
     }
+    Write-LogGroupEnd -Title "Publish Reference Assemblies"
 
     if ($ReleaseTag) {
         $psVersion = $ReleaseTag
@@ -651,10 +790,13 @@ Fix steps:
     # download modules from powershell gallery.
     #   - PowerShellGet, PackageManagement, Microsoft.PowerShell.Archive
     if ($PSModuleRestore) {
+        Write-LogGroupStart -Title "Restore PowerShell Modules"
         Restore-PSModuleToBuild -PublishPath $publishPath
+        Write-LogGroupEnd -Title "Restore PowerShell Modules"
     }
 
     # publish powershell.config.json
+    Write-LogGroupStart -Title "Generate PowerShell Configuration"
     $config = [ordered]@{}
 
     if ($Options.Runtime -like "*win*") {
@@ -697,11 +839,16 @@ Fix steps:
     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
+    } else {
+        Write-Warning "No powershell.config.json generated for $publishPath"
     }
+    Write-LogGroupEnd -Title "Generate PowerShell Configuration"
 
     # Restore the Pester module
     if ($CI) {
+        Write-LogGroupStart -Title "Restore Pester Module"
         Restore-PSPester -Destination (Join-Path $publishPath "Modules")
+        Write-LogGroupEnd -Title "Restore Pester Module"
     }
 
     Clear-NativeDependencies -PublishFolder $publishPath
@@ -716,8 +863,84 @@ Fix steps:
     }
 }
 
+function Switch-PSNugetConfig {
+    <#
+    .SYNOPSIS
+        Switches the NuGet configuration between public, private, and NuGet.org-only sources.
+    .DESCRIPTION
+        Regenerates nuget.config files in the repository root, src/Modules, and test/tools/Modules
+        to point to the specified feed source. Optionally stores authenticated credentials.
+    .PARAMETER Source
+        The feed set to activate: 'Public' (nuget.org + dotnet feed), 'Private' (PowerShell ADO
+        feed), or 'NuGetOnly' (nuget.org only).
+    .PARAMETER UserName
+        Username for authenticated private feed access.
+    .PARAMETER ClearTextPAT
+        Personal access token in clear text for authenticated private feed access.
+    #>
+    param(
+        [Parameter(Mandatory = $true, ParameterSetName = 'user')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'nouser')]
+        [ValidateSet('Public', 'Private', 'NuGetOnly')]
+        [string] $Source,
+
+        [Parameter(Mandatory = $true, ParameterSetName = 'user')]
+        [string] $UserName,
+
+        [Parameter(Mandatory = $true, ParameterSetName = 'user')]
+        [string] $ClearTextPAT
+    )
+
+    Clear-PipelineNugetAuthentication
+
+    $extraParams = @()
+    if ($UserName) {
+        $extraParams = @{
+            UserName     = $UserName
+            ClearTextPAT = $ClearTextPAT
+        }
+    }
+
+    $dotnetSdk = [NugetPackageSource] @{Url = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v2'; Name = 'dotnet' }
+    $gallery = [NugetPackageSource] @{Url = 'https://www.powershellgallery.com/api/v2/'; Name = 'psgallery' }
+    $nugetorg = [NugetPackageSource] @{Url = 'https://api.nuget.org/v3/index.json'; Name = 'nuget.org' }
+    if ( $Source -eq 'Public') {
+        New-NugetConfigFile -NugetPackageSource $nugetorg, $dotnetSdk   -Destination "$PSScriptRoot/" @extraParams
+        New-NugetConfigFile -NugetPackageSource $gallery                -Destination "$PSScriptRoot/src/Modules/" @extraParams
+        New-NugetConfigFile -NugetPackageSource $gallery                -Destination "$PSScriptRoot/test/tools/Modules/" @extraParams
+    } elseif ( $Source -eq 'NuGetOnly') {
+        New-NugetConfigFile -NugetPackageSource $nugetorg   -Destination "$PSScriptRoot/" @extraParams
+        New-NugetConfigFile -NugetPackageSource $gallery                -Destination "$PSScriptRoot/src/Modules/" @extraParams
+        New-NugetConfigFile -NugetPackageSource $gallery                -Destination "$PSScriptRoot/test/tools/Modules/" @extraParams
+    } elseif ( $Source -eq 'Private') {
+        $powerShellPackages = [NugetPackageSource] @{Url = 'https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json'; Name = 'powershell' }
+
+        New-NugetConfigFile -NugetPackageSource $powerShellPackages -Destination "$PSScriptRoot/" @extraParams
+        New-NugetConfigFile -NugetPackageSource $powerShellPackages -Destination "$PSScriptRoot/src/Modules/" @extraParams
+        New-NugetConfigFile -NugetPackageSource $powerShellPackages -Destination "$PSScriptRoot/test/tools/Modules/" @extraParams
+    } else {
+        throw "Unknown source: $Source"
+    }
+
+    if ($UserName -or $ClearTextPAT) {
+        Set-PipelineNugetAuthentication
+    }
+}
+
 function Test-ShouldGenerateExperimentalFeatures
 {
+    <#
+    .SYNOPSIS
+        Determines whether experimental-feature JSON files should be generated on this host.
+    .DESCRIPTION
+        Returns $true only when the current runtime identifier matches the host OS and
+        architecture, the build is not a release build (PS_RELEASE_BUILD not set), and the
+        runtime is not fxdependent.
+    .PARAMETER Runtime
+        The .NET runtime identifier (RID) being targeted by the build.
+    .OUTPUTS
+        System.Boolean. $true if the experimental-feature list should be generated.
+    #>
     param(
         [Parameter(Mandatory)]
         $Runtime
@@ -757,6 +980,23 @@ function Test-ShouldGenerateExperimentalFeatures
 
 function Restore-PSPackage
 {
+    <#
+    .SYNOPSIS
+        Restores NuGet packages for the PowerShell project directories.
+    .DESCRIPTION
+        Runs 'dotnet restore' on the main PowerShell project directories with up to five
+        retries on transient failures. Honors the target runtime identifier and build verbosity.
+    .PARAMETER ProjectDirs
+        Explicit list of project directories to restore. Defaults to the standard PS project set.
+    .PARAMETER Options
+        PSOptions object specifying runtime and configuration. Defaults to Get-PSOptions.
+    .PARAMETER Force
+        Forces restore even when project.assets.json already exists.
+    .PARAMETER InteractiveAuth
+        Passes '--interactive' to dotnet restore for interactive feed authentication.
+    .PARAMETER PSModule
+        Restores in PSModule mode, omitting the runtime argument.
+    #>
     [CmdletBinding()]
     param(
         [ValidateNotNullOrEmpty()]
@@ -776,7 +1016,7 @@ function Restore-PSPackage
 
     if (-not $ProjectDirs)
     {
-        $ProjectDirs = @($Options.Top, "$PSScriptRoot/src/TypeCatalogGen", "$PSScriptRoot/src/ResGen", "$PSScriptRoot/src/Modules")
+        $ProjectDirs = @($Options.Top, "$PSScriptRoot/src/TypeCatalogGen", "$PSScriptRoot/src/ResGen", "$PSScriptRoot/src/Modules", "$PSScriptRoot/tools/wix")
 
         if ($Options.Runtime -like 'fxdependent*') {
             $ProjectDirs += "$PSScriptRoot/src/Microsoft.PowerShell.GlobalTool.Shim"
@@ -819,6 +1059,10 @@ function Restore-PSPackage
             $RestoreArguments += "--interactive"
         }
 
+        if ($env:ENABLE_MSBUILD_BINLOGS -eq 'true') {
+            $RestoreArguments += '-bl'
+        }
+
         $ProjectDirs | ForEach-Object {
             $project = $_
             Write-Log -message "Run dotnet restore $project $RestoreArguments"
@@ -836,6 +1080,23 @@ function Restore-PSPackage
                     $retryCount++
                     if($retryCount -ge $maxTries)
                     {
+                        if ($env:ENABLE_MSBUILD_BINLOGS -eq 'true') {
+                            if ( Test-Path ./msbuild.binlog ) {
+                                if (!(Test-Path $env:OB_OUTPUTDIRECTORY -PathType Container)) {
+                                    $null = New-Item -path $env:OB_OUTPUTDIRECTORY -ItemType Directory -Force -Verbose
+                                }
+
+                                $projectName = Split-Path -Leaf -Path $project
+                                $binlogFileName = "${projectName}.msbuild.binlog"
+                                if ($IsMacOS) {
+                                    $resolvedPath = (Resolve-Path -Path ./msbuild.binlog).ProviderPath
+                                    Write-Host "##vso[artifact.upload containerfolder=$binLogFileName;artifactname=$binLogFileName]$resolvedPath"
+                                } else {
+                                    Copy-Item -Path ./msbuild.binlog -Destination "$env:OB_OUTPUTDIRECTORY/${projectName}.msbuild.binlog" -Verbose
+                                }
+                            }
+                        }
+
                         throw
                     }
                     continue
@@ -850,6 +1111,16 @@ function Restore-PSPackage
 
 function Restore-PSModuleToBuild
 {
+    <#
+    .SYNOPSIS
+        Copies PowerShell Gallery modules from the NuGet cache into the build output Modules folder.
+    .DESCRIPTION
+        Resolves Gallery module packages referenced in PSGalleryModules.csproj and copies
+        them to the Modules subdirectory of the specified publish path. Also removes
+        .nupkg.metadata files left behind by the restore.
+    .PARAMETER PublishPath
+        The PowerShell build output directory whose Modules sub-folder receives the modules.
+    #>
     param(
         [Parameter(Mandatory)]
         [string]
@@ -866,6 +1137,14 @@ function Restore-PSModuleToBuild
 
 function Restore-PSPester
 {
+    <#
+    .SYNOPSIS
+        Downloads and saves the Pester module (v4.x) from the PowerShell Gallery.
+    .DESCRIPTION
+        Uses Save-Module to install Pester up to version 4.99 into the target directory.
+    .PARAMETER Destination
+        Directory to save Pester into. Defaults to the Modules folder of the current build output.
+    #>
     param(
         [ValidateNotNullOrEmpty()]
         [string] $Destination = ([IO.Path]::Combine((Split-Path (Get-PSOptions -DefaultToNew).Output), "Modules"))
@@ -874,6 +1153,15 @@ function Restore-PSPester
 }
 
 function Compress-TestContent {
+    <#
+    .SYNOPSIS
+        Compresses the test directory into a zip archive for distribution.
+    .DESCRIPTION
+        Publishes PSTestTools and then zips the entire test/ directory to the given
+        destination path using System.IO.Compression.ZipFile.
+    .PARAMETER Destination
+        The path of the output zip file to create.
+    #>
     [CmdletBinding()]
     param(
         $Destination
@@ -888,13 +1176,37 @@ function Compress-TestContent {
 }
 
 function New-PSOptions {
+    <#
+    .SYNOPSIS
+        Creates a new PSOptions hashtable describing a PowerShell build configuration.
+    .DESCRIPTION
+        Computes the output path, project directory, and framework for a PowerShell build
+        based on the supplied runtime and configuration. The resulting hashtable is consumed
+        by Start-PSBuild, Restore-PSPackage, and related functions.
+    .PARAMETER Configuration
+        The build configuration: Debug (default), Release, CodeCoverage, or StaticAnalysis.
+    .PARAMETER Framework
+        The target .NET framework moniker. Defaults to 'net11.0'.
+    .PARAMETER Runtime
+        The .NET runtime identifier (RID). Detected automatically via 'dotnet --info' if omitted.
+    .PARAMETER Output
+        Optional path to the output directory. The executable name is appended automatically.
+    .PARAMETER SMAOnly
+        Targets only the System.Management.Automation project rather than the full host.
+    .PARAMETER PSModuleRestore
+        Indicates whether Start-PSBuild should restore PowerShell Gallery modules.
+    .PARAMETER ForMinimalSize
+        Produces a build targeting minimal binary size.
+    .OUTPUTS
+        System.Collections.Hashtable. A hashtable with build option properties.
+    #>
     [CmdletBinding()]
     param(
         [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')]
         [string]$Configuration,
 
-        [ValidateSet("net8.0")]
-        [string]$Framework = "net8.0",
+        [ValidateSet("net11.0")]
+        [string]$Framework = "net11.0",
 
         # These are duplicated from Start-PSBuild
         # We do not use ValidateScript since we want tab completion
@@ -1035,6 +1347,17 @@ function New-PSOptions {
 
 # Get the Options of the last build
 function Get-PSOptions {
+    <#
+    .SYNOPSIS
+        Returns the PSOptions from the most recent Start-PSBuild call.
+    .DESCRIPTION
+        Retrieves the script-level $script:Options object. If no build has been run and
+        -DefaultToNew is specified, returns a fresh object from New-PSOptions.
+    .PARAMETER DefaultToNew
+        When specified, returns default options from New-PSOptions if no build has occurred.
+    .OUTPUTS
+        System.Collections.Hashtable. The current PSOptions hashtable, or $null.
+    #>
     param(
         [Parameter(HelpMessage='Defaults to New-PSOption if a build has not occurred.')]
         [switch]
@@ -1050,6 +1373,15 @@ function Get-PSOptions {
 }
 
 function Set-PSOptions {
+    <#
+    .SYNOPSIS
+        Stores the supplied PSOptions as the active build options.
+    .DESCRIPTION
+        Writes the options hashtable to the script-scoped $script:Options variable,
+        making it available to subsequent Get-PSOptions calls.
+    .PARAMETER Options
+        The PSOptions hashtable to store.
+    #>
     param(
         [PSObject]
         $Options
@@ -1059,6 +1391,17 @@ function Set-PSOptions {
 }
 
 function Get-PSOutput {
+    <#
+    .SYNOPSIS
+        Returns the path to the PowerShell executable produced by the build.
+    .DESCRIPTION
+        Looks up the Output path from the supplied options hashtable, the cached
+        script-level options, or a fresh New-PSOptions call, in that order of precedence.
+    .PARAMETER Options
+        An explicit options hashtable. If omitted, the most recent build options are used.
+    .OUTPUTS
+        System.String. The full path to the built pwsh or pwsh.exe executable.
+    #>
     [CmdletBinding()]param(
         [hashtable]$Options
     )
@@ -1072,6 +1415,21 @@ function Get-PSOutput {
 }
 
 function Get-PesterTag {
+    <#
+    .SYNOPSIS
+        Scans the Pester test tree and returns a summary of all tags in use.
+    .DESCRIPTION
+        Parses every *.tests.ps1 file under the specified base directory using the
+        PowerShell AST, validates that each Describe block has exactly one priority tag
+        (CI, Feature, or Scenario), and returns a summary object with tag counts and
+        any validation warnings.
+    .PARAMETER testbase
+        Root directory to search for test files.
+        Defaults to '$PSScriptRoot/test/powershell'.
+    .OUTPUTS
+        PSCustomObject (DescribeTagsInUse). Properties are tag names mapped to usage
+        counts, plus 'Result' (Pass/Fail) and 'Warnings' (string[]).
+    #>
     param ( [Parameter(Position=0)][string]$testbase = "$PSScriptRoot/test/powershell" )
     $alltags = @{}
     $warnings = @()
@@ -1138,6 +1496,14 @@ function Get-PesterTag {
 # testing PowerShell remote custom connections.
 function Publish-CustomConnectionTestModule
 {
+    <#
+    .SYNOPSIS
+        Builds and publishes the Microsoft.PowerShell.NamedPipeConnection test module.
+    .DESCRIPTION
+        Invokes the module's own build.ps1 script, copies the output to
+        test/tools/Modules, and then runs a clean build to remove intermediate artifacts.
+    #>
+    Write-LogGroupStart -Title "Publish-CustomConnectionTestModule"
     $sourcePath = "${PSScriptRoot}/test/tools/NamedPipeConnection"
     $outPath = "${PSScriptRoot}/test/tools/NamedPipeConnection/out/Microsoft.PowerShell.NamedPipeConnection"
     $publishPath = "${PSScriptRoot}/test/tools/Modules"
@@ -1162,25 +1528,44 @@ function Publish-CustomConnectionTestModule
     finally {
         Pop-Location
     }
+
+    Write-LogGroupEnd -Title "Publish-CustomConnectionTestModule"
 }
 
 function Publish-PSTestTools {
+    <#
+    .SYNOPSIS
+        Builds and publishes all test tool projects to their bin directories.
+    .DESCRIPTION
+        Runs 'dotnet publish' for each test tool project (TestAlc, TestExe, UnixSocket,
+        WebListener, and on Windows TestService), copies Gallery test modules, and
+        publishes the NamedPipeConnection module. The tool bin directories are added to PATH
+        so that tests can locate the executables.
+    .PARAMETER runtime
+        The .NET runtime identifier (RID) used when publishing executables.
+        Defaults to the runtime from the current build options.
+    #>
     [CmdletBinding()]
     param(
         [string]
         $runtime
     )
 
+    Write-LogGroupStart -Title "Publish-PSTestTools"
     Find-Dotnet
 
     $tools = @(
         @{ Path="${PSScriptRoot}/test/tools/TestAlc";     Output="library" }
         @{ Path="${PSScriptRoot}/test/tools/TestExe";     Output="exe" }
-        @{ Path="${PSScriptRoot}/test/tools/TestService"; Output="exe" }
         @{ Path="${PSScriptRoot}/test/tools/UnixSocket";  Output="exe" }
         @{ Path="${PSScriptRoot}/test/tools/WebListener"; Output="exe" }
     )
 
+    # This is a windows service, so it only works on windows
+    if ($environment.IsWindows) {
+        $tools += @{ Path = "${PSScriptRoot}/test/tools/TestService"; Output = "exe" }
+    }
+
     $Options = Get-PSOptions -DefaultToNew
 
     # Publish tools so it can be run by tests
@@ -1238,9 +1623,20 @@ function Publish-PSTestTools {
 
     # Publish the Microsoft.PowerShell.NamedPipeConnection module
     Publish-CustomConnectionTestModule
+    Write-LogGroupEnd -Title "Publish-PSTestTools"
 }
 
 function Get-ExperimentalFeatureTests {
+    <#
+    .SYNOPSIS
+        Returns a mapping of experimental feature names to their associated test files.
+    .DESCRIPTION
+        Reads test/tools/TestMetadata.json and extracts the ExperimentalFeatures section,
+        returning a hashtable where keys are feature names and values are arrays of test paths.
+    .OUTPUTS
+        System.Collections.Hashtable. Keys are experimental feature names; values are
+        arrays of test file paths.
+    #>
     $testMetadataFile = Join-Path $PSScriptRoot "test/tools/TestMetadata.json"
     $metadata = Get-Content -Path $testMetadataFile -Raw | ConvertFrom-Json | ForEach-Object -MemberName ExperimentalFeatures
     $features = $metadata | Get-Member -MemberType NoteProperty | ForEach-Object -MemberName Name
@@ -1253,6 +1649,57 @@ function Get-ExperimentalFeatureTests {
 }
 
 function Start-PSPester {
+    <#
+    .SYNOPSIS
+        Runs the Pester test suite against the built PowerShell.
+    .DESCRIPTION
+        Launches the built pwsh process with the Pester module and runs the specified
+        test paths. Automatically adjusts tag exclusions based on the current elevation
+        level, and emits NUnit XML results that are optionally published to Azure DevOps
+        or GitHub Actions.
+    .PARAMETER Path
+        One or more test file or directory paths to run. Defaults to test/powershell.
+    .PARAMETER OutputFormat
+        The Pester output format. Defaults to 'NUnitXml'.
+    .PARAMETER OutputFile
+        Path for the XML results file. Defaults to 'pester-tests.xml'.
+    .PARAMETER ExcludeTag
+        Tags to exclude from the run. Defaults to 'Slow'; adjusted for elevation level.
+    .PARAMETER Tag
+        Tags to include in the run. Defaults to 'CI' and 'Feature'.
+    .PARAMETER ThrowOnFailure
+        Throws an exception after the run if any tests failed.
+    .PARAMETER BinDir
+        Directory containing the built pwsh executable. Defaults to the current build output.
+    .PARAMETER powershell
+        Full path to the pwsh executable used for running tests.
+    .PARAMETER Pester
+        Path to the Pester module directory.
+    .PARAMETER Unelevate
+        Runs tests in an unelevated child process on Windows.
+    .PARAMETER Quiet
+        Suppresses most Pester output.
+    .PARAMETER Terse
+        Shows compact pass/fail indicators instead of full output lines.
+    .PARAMETER PassThru
+        Returns the Pester result object to the caller.
+    .PARAMETER Sudo
+        Runs tests under sudo on Unix (PassThru parameter set).
+    .PARAMETER IncludeFailingTest
+        Includes tests from tools/failingTests.
+    .PARAMETER IncludeCommonTests
+        Includes tests from test/common.
+    .PARAMETER ExperimentalFeatureName
+        Enables the named experimental feature for this test run via a temporary config file.
+    .PARAMETER Title
+        Title for the published test results. Defaults to 'PowerShell 7 Tests'.
+    .PARAMETER Wait
+        Waits for a debugger to attach before starting Pester (Debug builds only).
+    .PARAMETER SkipTestToolBuild
+        Skips rebuilding test tool executables before running tests.
+    .PARAMETER UseNuGetOrg
+        Switches NuGet config to public feeds before running tests.
+    #>
     [CmdletBinding(DefaultParameterSetName='default')]
     param(
         [Parameter(Position=0)]
@@ -1282,9 +1729,14 @@ function Start-PSPester {
         [Parameter(ParameterSetName='Wait', Mandatory=$true,
             HelpMessage='Wait for the debugger to attach to PowerShell before Pester starts.  Debug builds only!')]
         [switch]$Wait,
-        [switch]$SkipTestToolBuild
+        [switch]$SkipTestToolBuild,
+        [switch]$UseNuGetOrg
     )
 
+    if ($UseNuGetOrg) {
+        Switch-PSNugetConfig -Source Public
+    }
+
     if (-not (Get-Module -ListAvailable -Name $Pester -ErrorAction SilentlyContinue | Where-Object { $_.Version -ge "4.2" } ))
     {
         Restore-PSPester
@@ -1297,7 +1749,7 @@ function Start-PSPester {
 
     if($IncludeCommonTests.IsPresent)
     {
-        $path = += "$PSScriptRoot/test/common"
+        $path += "$PSScriptRoot/test/common"
     }
 
     # we need to do few checks and if user didn't provide $ExcludeTag explicitly, we should alternate the default
@@ -1613,6 +2065,20 @@ function Start-PSPester {
 
 function Publish-TestResults
 {
+    <#
+    .SYNOPSIS
+        Publishes test result files to Azure DevOps or GitHub Actions.
+    .DESCRIPTION
+        In an Azure DevOps build (TF_BUILD), uploads the result file via a ##vso command
+        and attaches it as a build artifact. In GitHub Actions, copies the file to the
+        testResults directory under $env:RUNNER_WORKSPACE. Does nothing outside of CI environments.
+    .PARAMETER Title
+        The run title shown in the CI testing tab.
+    .PARAMETER Path
+        Path to the NUnit or XUnit result file to publish.
+    .PARAMETER Type
+        The result file format: 'NUnit' (default) or 'XUnit'.
+    #>
     param(
         [Parameter(Mandatory)]
         [string]
@@ -1658,11 +2124,32 @@ function Publish-TestResults
 
         $resolvedPath = (Resolve-Path -Path $Path).ProviderPath
         Write-Host "##vso[artifact.upload containerfolder=testResults;artifactname=testResults]$resolvedPath"
+    } elseif ($env:GITHUB_WORKFLOW -and $env:RUNNER_WORKSPACE) {
+        # In GitHub Actions
+        $destinationPath = Join-Path -Path $env:RUNNER_WORKSPACE -ChildPath 'testResults'
+
+        # Create the folder if it does not exist
+        if (!(Test-Path -Path $destinationPath)) {
+            $null = New-Item -ItemType Directory -Path $destinationPath -Force
+        }
+
+        Copy-Item -Path $Path -Destination $destinationPath -Force -Verbose
     }
 }
 
 function script:Start-UnelevatedProcess
 {
+    <#
+    .SYNOPSIS
+        Starts a process at an unelevated trust level on Windows.
+    .DESCRIPTION
+        Uses runas.exe /trustlevel:0x20000 to launch a process without elevation.
+        Only supported on Windows and non-arm64 architectures.
+    .PARAMETER process
+        The path to the executable to start.
+    .PARAMETER arguments
+        Arguments to pass to the executable.
+    #>
     param(
         [string]$process,
         [string[]]$arguments
@@ -1673,7 +2160,7 @@ function script:Start-UnelevatedProcess
         throw "Start-UnelevatedProcess is currently not supported on non-Windows platforms"
     }
 
-    if (-not $environment.OSArchitecture -eq 'arm64')
+    if ($environment.OSArchitecture -eq 'arm64')
     {
         throw "Start-UnelevatedProcess is currently not supported on arm64 platforms"
     }
@@ -1683,6 +2170,18 @@ function script:Start-UnelevatedProcess
 
 function Show-PSPesterError
 {
+    <#
+    .SYNOPSIS
+        Outputs a formatted error block for a single Pester test failure.
+    .DESCRIPTION
+        Accepts either an XmlElement from a NUnit result file or a PSCustomObject from
+        a Pester PassThru result, and writes a structured description/name/message/stack-trace
+        block to the log output.
+    .PARAMETER testFailure
+        An XML test-case element from a Pester NUnit result file (xml parameter set).
+    .PARAMETER testFailureObject
+        A Pester test-result PSCustomObject from a PassThru run (object parameter set).
+    #>
     [CmdletBinding(DefaultParameterSetName='xml')]
     param (
         [Parameter(ParameterSetName='xml',Mandatory)]
@@ -1710,17 +2209,105 @@ function Show-PSPesterError
         throw 'Unknown Show-PSPester parameter set'
     }
 
-    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 $stack_trace
+    # Empty line at the end is intentional formatting
+    Write-Log -isError -message @"
+Description: $description
+Name:        $name
+message:
+$message
+stack-trace:
+$stack_trace
+
+"@
 
 }
 
+function Get-PesterFailureFileInfo
+{
+    <#
+    .SYNOPSIS
+        Parses a Pester stack-trace string and returns the source file path and line number.
+    .DESCRIPTION
+        Tries several common stack-trace formats produced by Pester 4 and Pester 5 (on
+        both Windows and Unix) and returns a hashtable with File and Line keys.
+        Returns $null values for both keys when no pattern matches.
+    .PARAMETER StackTraceString
+        The raw stack trace text from a Pester test failure.
+    .OUTPUTS
+        System.Collections.Hashtable. A hashtable with 'File' (string) and 'Line' (string).
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string]$StackTraceString
+    )
+
+    # Parse stack trace to extract file path and line number
+    # Common patterns:
+    # "at line: 123 in C:\path\to\file.ps1" (Pester 4)
+    # "at C:\path\to\file.ps1:123"
+    # "at <ScriptBlock>, C:\path\to\file.ps1: line 123"
+    # "at 1 | Should -Be 2, /path/to/file.ps1:123" (Pester 5)
+    # "at 1 | Should -Be 2, C:\path\to\file.ps1:123" (Pester 5 Windows)
+
+    $result = @{
+        File = $null
+        Line = $null
+    }
+
+    if ([string]::IsNullOrWhiteSpace($StackTraceString)) {
+        return $result
+    }
+
+    # Try pattern: "at line: 123 in <path>" (Pester 4)
+    if ($StackTraceString -match 'at line:\s*(\d+)\s+in\s+(.+?)(?:\r|\n|$)') {
+        $result.Line = $matches[1]
+        $result.File = $matches[2].Trim()
+        return $result
+    }
+
+    # Try pattern: ", <path>:123" (Pester 5 format)
+    # This handles both Unix paths (/path/file.ps1:123) and Windows paths (C:\path\file.ps1:123)
+    if ($StackTraceString -match ',\s*((?:[A-Za-z]:)?[\/\\].+?\.ps[m]?1):(\d+)') {
+        $result.File = $matches[1].Trim()
+        $result.Line = $matches[2]
+        return $result
+    }
+
+    # Try pattern: "at <path>:123" (without comma)
+    # Handle both absolute Unix and Windows paths
+    if ($StackTraceString -match 'at\s+((?:[A-Za-z]:)?[\/\\][^,]+?\.ps[m]?1):(\d+)(?:\r|\n|$)') {
+        $result.File = $matches[1].Trim()
+        $result.Line = $matches[2]
+        return $result
+    }
+
+    # Try pattern: "<path>: line 123"
+    if ($StackTraceString -match '((?:[A-Za-z]:)?[\/\\][^,]+?\.ps[m]?1):\s*line\s+(\d+)(?:\r|\n|$)') {
+        $result.File = $matches[1].Trim()
+        $result.Line = $matches[2]
+        return $result
+    }
+
+    # Try to extract just the file path if no line number found
+    if ($StackTraceString -match '(?:at\s+|in\s+)?((?:[A-Za-z]:)?[\/\\].+?\.ps[m]?1)') {
+        $result.File = $matches[1].Trim()
+    }
+
+    return $result
+}
+
 function Test-XUnitTestResults
 {
+    <#
+    .SYNOPSIS
+        Validates an xUnit XML result file and throws if any tests failed.
+    .DESCRIPTION
+        Parses the specified xUnit result file, logs description, name, message, and
+        stack trace for each failed test, then throws an exception summarizing the count.
+    .PARAMETER TestResultsFile
+        Path to the xUnit XML result file to validate.
+    #>
     param(
         [Parameter(Mandatory)]
         [ValidateNotNullOrEmpty()]
@@ -1755,13 +2342,17 @@ function Test-XUnitTestResults
         $message = $failure.failure.message
         $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 $stack_trace
-        Write-Log -isError -message " "
+        # Empty line at the end is intentional formatting
+        Write-Log -isError -message         @"
+        Description: $description
+        Name:        $name
+        message:
+        $message
+        stack-trace:
+        $stack_trace
+
+"@
+
     }
 
     throw "$($results.assemblies.assembly.failed) tests failed"
@@ -1772,6 +2363,23 @@ function Test-XUnitTestResults
 # Throw if a test failed
 function Test-PSPesterResults
 {
+    <#
+    .SYNOPSIS
+        Validates Pester test results and throws if any tests failed.
+    .DESCRIPTION
+        In file mode, reads a NUnit XML result file and logs each failure before throwing.
+        In object mode, inspects a Pester PassThru result object. Optionally permits
+        empty result sets.
+    .PARAMETER TestResultsFile
+        Path to the NUnit XML result file. Defaults to 'pester-tests.xml'.
+    .PARAMETER TestArea
+        Label for the test area, used in error messages. Defaults to 'test/powershell'.
+    .PARAMETER ResultObject
+        A Pester PassThru result object to inspect instead of parsing a file.
+    .PARAMETER CanHaveNoResult
+        When specified with ResultObject, suppresses the 'NO TESTS RUN' exception for
+        zero-count results.
+    #>
     [CmdletBinding(DefaultParameterSetName='file')]
     param(
         [Parameter(ParameterSetName='file')]
@@ -1797,7 +2405,8 @@ function Test-PSPesterResults
         $x = [xml](Get-Content -Raw $testResultsFile)
         if ([int]$x.'test-results'.failures -gt 0)
         {
-            Write-Log -isError -message "TEST FAILURES"
+            Write-LogGroupStart -Title 'TEST FAILURES'
+
             # switch between methods, SelectNode is not available on dotnet core
             if ( "System.Xml.XmlDocumentXPathExtensions" -as [Type] )
             {
@@ -1811,6 +2420,8 @@ function Test-PSPesterResults
             {
                 Show-PSPesterError -testFailure $testfail
             }
+
+            Write-LogGroupEnd -Title 'TEST FAILURES'
             throw "$($x.'test-results'.failures) tests in $TestArea failed"
         }
     }
@@ -1831,11 +2442,12 @@ function Test-PSPesterResults
         }
         elseif ($ResultObject.FailedCount -gt 0)
         {
-            Write-Log -isError -message 'TEST FAILURES'
+            Write-LogGroupStart -Title 'TEST FAILURES'
 
             $ResultObject.TestResult | Where-Object {$_.Passed -eq $false} | ForEach-Object {
                 Show-PSPesterError -testFailureObject $_
             }
+            Write-LogGroupEnd -Title 'TEST FAILURES'
 
             throw "$($ResultObject.FailedCount) tests in $TestArea failed"
         }
@@ -1843,8 +2455,24 @@ function Test-PSPesterResults
 }
 
 function Start-PSxUnit {
+    <#
+    .SYNOPSIS
+        Runs the xUnit tests for the PowerShell engine.
+    .DESCRIPTION
+        Executes 'dotnet test' in the test/xUnit directory against the built PowerShell
+        binaries. On Unix, copies native libraries and required dependencies into the test
+        output directory. Publishes results to CI when not in debug-logging mode.
+    .PARAMETER xUnitTestResultsFile
+        Path for the xUnit XML result file. Defaults to 'xUnitResults.xml'.
+    .PARAMETER DebugLogging
+        Enables detailed console test output instead of writing an XML result file.
+    .PARAMETER Filter
+        An xUnit filter expression to restrict which tests are run.
+    #>
     [CmdletBinding()]param(
-        [string] $xUnitTestResultsFile = "xUnitResults.xml"
+        [string] $xUnitTestResultsFile = "xUnitResults.xml",
+        [switch] $DebugLogging,
+        [string] $Filter
     )
 
     # Add .NET CLI tools to PATH
@@ -1902,9 +2530,28 @@ function Start-PSxUnit {
 
         # We run the xUnit tests sequentially to avoid race conditions caused by manipulating the config.json file.
         # xUnit tests run in parallel by default. To make them run sequentially, we need to define the 'xunit.runner.json' file.
-        dotnet test --configuration $Options.configuration --test-adapter-path:. "--logger:xunit;LogFilePath=$xUnitTestResultsFile"
+        $extraParams = @()
+        if($Filter) {
+            $extraParams += @(
+                '--filter'
+                $Filter
+            )
+        }
 
-        Publish-TestResults -Path $xUnitTestResultsFile -Type 'XUnit' -Title 'Xunit Sequential'
+        if($DebugLogging) {
+            $extraParams += @(
+                "--logger:console;verbosity=detailed"
+            )
+        } else {
+            $extraParams += @(
+                "--logger:xunit;LogFilePath=$xUnitTestResultsFile"
+            )
+        }
+        dotnet test @extraParams --configuration $Options.configuration --test-adapter-path:.
+
+        if(!$DebugLogging){
+            Publish-TestResults -Path $xUnitTestResultsFile -Type 'XUnit' -Title 'Xunit Sequential'
+        }
     }
     finally {
         $env:DOTNET_ROOT = $originalDOTNET_ROOT
@@ -1913,6 +2560,29 @@ function Start-PSxUnit {
 }
 
 function Install-Dotnet {
+    <#
+    .SYNOPSIS
+        Installs the .NET SDK using the official install script.
+    .DESCRIPTION
+        Downloads and runs dotnet-install.sh (Linux/macOS) or dotnet-install.ps1 (Windows)
+        to install the specified SDK version into the user-local dotnet installation directory.
+    .PARAMETER Channel
+        The release channel to install from when no explicit version is given.
+    .PARAMETER Version
+        The exact SDK version to install. Defaults to the version required by this repository.
+    .PARAMETER Quality
+        The quality level (e.g. 'GA', 'preview') used when installing by channel.
+    .PARAMETER RemovePreviousVersion
+        Attempts to uninstall previously installed dotnet packages before installing.
+    .PARAMETER NoSudo
+        Omits sudo from install commands, useful inside containers running as root.
+    .PARAMETER InstallDir
+        Custom installation directory for the .NET SDK.
+    .PARAMETER AzureFeed
+        Override URL for the Azure CDN feed used to download the SDK.
+    .PARAMETER FeedCredential
+        Credential token for accessing a private Azure feed.
+    #>
     [CmdletBinding()]
     param(
         [string]$Channel = $dotnetCLIChannel,
@@ -1925,14 +2595,15 @@ function Install-Dotnet {
         [string]$FeedCredential
     )
 
+    Write-LogGroupStart -Title "Install .NET SDK $Version"
     Write-Verbose -Verbose "In install-dotnet"
 
     # 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://dot.net/v1"
-    $installObtainUrl = "https://dotnet.microsoft.com/download/dotnet/scripts/v1"
+    $installObtainUrl = "https://builds.dotnet.microsoft.com/dotnet/scripts/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
@@ -2023,7 +2694,6 @@ function Install-Dotnet {
             $installArgs += @{ SkipNonVersionedFiles = $true }
 
             $installArgs | Out-String | Write-Verbose -Verbose
-
             & ./$installScript @installArgs
         }
         else {
@@ -2060,66 +2730,69 @@ function Install-Dotnet {
             }
         }
     }
+    Write-LogGroupEnd -Title "Install .NET SDK $Version"
 }
 
 function Get-RedHatPackageManager {
+    <#
+    .SYNOPSIS
+        Returns the install command prefix for the available Red Hat-family package manager.
+    .DESCRIPTION
+        Detects whether yum, dnf, or tdnf is installed and returns the corresponding
+        install command string for use in bootstrapping scripts.
+    .OUTPUTS
+        System.String. A package-manager install command such as 'dnf install -y -q'.
+    #>
     if ($environment.IsCentOS -or (Get-Command -Name yum -CommandType Application -ErrorAction SilentlyContinue)) {
         "yum install -y -q"
     } elseif ($environment.IsFedora -or (Get-Command -Name dnf -CommandType Application -ErrorAction SilentlyContinue)) {
         "dnf install -y -q"
+    } elseif ($environment.IsMariner -or (Get-Command -Name Test-DscConfiguration -CommandType Application -ErrorAction SilentlyContinue)) {
+        "tdnf install -y -q"
     } else {
         throw "Error determining package manager for this distribution."
     }
 }
 
-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 {
+    <#
+    .SYNOPSIS
+        Installs build dependencies for PowerShell.
+    .DESCRIPTION
+        Depending on the selected scenario, installs native OS packages, the required
+        .NET SDK, Windows packaging tools (WiX), and/or .NET global tools (dotnet-format).
+        Supports Linux, macOS, and Windows.
+    .PARAMETER Channel
+        The .NET SDK release channel to use when installing by channel.
+    .PARAMETER Version
+        The exact .NET SDK version to install. Defaults to the required version.
+    .PARAMETER NoSudo
+        Omits sudo from native-package install commands, useful inside containers.
+    .PARAMETER BuildLinuxArm
+        Installs Linux ARM cross-compilation dependencies (Ubuntu/AzureLinux only).
+    .PARAMETER Force
+        Forces .NET SDK reinstallation even if the correct version is already present.
+    .PARAMETER Scenario
+        What to install: 'Package' (packaging tools), 'DotNet' (.NET SDK),
+        'Both' (Package + DotNet), 'Tools' (.NET global tools), or 'All' (everything).
+    #>
     [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
+        [switch]$Force,
+        [Parameter(Mandatory = $true)]
+        # Package: Install dependencies for packaging tools (rpmbuild, dpkg-deb, pkgbuild, WiX)
+        # DotNet: Install the .NET SDK
+        # Both: Package and DotNet scenarios
+        # Tools: Install .NET global tools (e.g., dotnet-format)
+        # All: Install all dependencies (packaging, .NET SDK, and tools)
+        [ValidateSet("Package", "DotNet", "Both", "Tools", "All")]
+        [string]$Scenario = "Package"
     )
 
     Write-Log -message "Installing PowerShell build dependencies"
@@ -2132,12 +2805,14 @@ function Start-PSBootstrap {
 
     try {
         if ($environment.IsLinux -or $environment.IsMacOS) {
+            Write-LogGroupStart -Title "Install Native Dependencies"
             # 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"
+            if ($BuildLinuxArm -and $environment.IsLinux -and -not $environment.IsUbuntu -and -not $environment.IsMariner) {
+                Write-Error "Cross compiling for linux-arm is only supported on AzureLinux/Ubuntu environment"
+                Write-LogGroupEnd -Title "Install Native Dependencies"
                 return
             }
 
@@ -2152,7 +2827,9 @@ function Start-PSBootstrap {
                 elseif ($environment.IsUbuntu18) { $Deps += "libicu60"}
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev", "rpm", "g++", "make" }
+                # Note: ruby-dev, libffi-dev, g++, and make are no longer needed for DEB packaging
+                # DEB packages now use native dpkg-deb (pre-installed)
+                if ($Scenario -eq 'Both' -or $Scenario -eq 'Package') { $Deps += "groff", "rpm" }
 
                 # Install dependencies
                 # change the fontend from apt-get to noninteractive
@@ -2168,7 +2845,7 @@ function Start-PSBootstrap {
                     # change the apt frontend back to the original
                     $env:DEBIAN_FRONTEND=$originalDebianFrontEnd
                 }
-            } elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
+            } elseif ($environment.IsLinux -and ($environment.IsRedHatFamily -or $environment.IsMariner)) {
                 # Build tools
                 $Deps += "which", "curl", "wget"
 
@@ -2176,7 +2853,9 @@ function Start-PSBootstrap {
                 $Deps += "libicu", "openssl-libs"
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff", 'libffi-devel', "gcc-c++" }
+                # Note: ruby-devel and libffi-devel are no longer needed
+                # RPM packages use rpmbuild, DEB packages use dpkg-deb
+                if ($Scenario -eq 'Both' -or $Scenario -eq 'Package') { $Deps += "rpm-build", "groff" }
 
                 $PackageManager = Get-RedHatPackageManager
 
@@ -2197,7 +2876,8 @@ function Start-PSBootstrap {
                 $Deps += "wget"
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel', "gcc" }
+                # Note: ruby-devel and libffi-devel are no longer needed for packaging
+                if ($Scenario -eq 'Both' -or $Scenario -eq 'Package') { $Deps += "rpmbuild", "groff" }
 
                 $PackageManager = "zypper --non-interactive install"
                 $baseCommand = "$sudo $PackageManager"
@@ -2214,9 +2894,9 @@ function Start-PSBootstrap {
                 }
             } elseif ($environment.IsMacOS) {
                 if ($environment.UsingHomebrew) {
-                    $PackageManager = "brew"
+                    $baseCommand = "brew install --quiet"
                 } elseif ($environment.UsingMacports) {
-                    $PackageManager = "$sudo port"
+                    $baseCommand = "$sudo port -q install"
                 }
 
                 # wget for downloading dotnet
@@ -2227,7 +2907,7 @@ function Start-PSBootstrap {
 
                 # Install dependencies
                 # ignore exitcode, because they may be already installed
-                Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
+                Start-NativeExecution ([ScriptBlock]::Create("$baseCommand $Deps")) -IgnoreExitcode
             } elseif ($environment.IsLinux -and $environment.IsAlpine) {
                 $Deps += 'libunwind', 'libcurl', 'bash', 'build-base', 'git', 'curl', 'wget'
 
@@ -2236,54 +2916,86 @@ function Start-PSBootstrap {
                 }
             }
 
-            # Install [fpm](https://github.com/jordansissel/fpm) and [ronn](https://github.com/rtomayko/ronn)
-            if ($Package) {
-                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"
+            if ($Scenario -in 'All', 'Both', 'Package') {
+                # For RPM-based systems, ensure rpmbuild is available
+                if ($environment.IsLinux -and ($environment.IsRedHatFamily -or $environment.IsSUSEFamily -or $environment.IsMariner)) {
+                    Write-Verbose -Verbose "Checking for rpmbuild..."
+                    if (!(Get-Command rpmbuild -ErrorAction SilentlyContinue)) {
+                        Write-Warning "rpmbuild not found. Installing rpm-build package..."
+                        Start-NativeExecution -sb ([ScriptBlock]::Create("$sudo $PackageManager install -y rpm-build")) -IgnoreExitcode
+                    }
+                }
+
+                # For Debian-based systems and Mariner, ensure dpkg-deb is available
+                if ($environment.IsLinux -and ($environment.IsDebianFamily -or $environment.IsMariner)) {
+                    Write-Verbose -Verbose "Checking for dpkg-deb..."
+                    if (!(Get-Command dpkg-deb -ErrorAction SilentlyContinue)) {
+                        Write-Warning "dpkg-deb not found. Installing dpkg package..."
+                        if ($environment.IsMariner) {
+                            # For Mariner (Azure Linux), install the extended repo first to access dpkg.
+                            Write-Verbose -verbose "BEGIN: /etc/os-release content:"
+                            Get-Content /etc/os-release | Write-Verbose -verbose
+                            Write-Verbose -verbose "END: /etc/os-release content"
+
+                            Write-Verbose -Verbose "Installing azurelinux-repos-extended for Mariner..."
+
+                            Start-NativeExecution -sb ([ScriptBlock]::Create("$sudo $PackageManager azurelinux-repos-extended")) -IgnoreExitcode -Verbose
+                            Start-NativeExecution -sb ([ScriptBlock]::Create("$sudo $PackageManager dpkg")) -IgnoreExitcode -Verbose
+                        } else {
+                            Start-NativeExecution -sb ([ScriptBlock]::Create("$sudo apt-get install -y dpkg")) -IgnoreExitcode
+                        }
+                    }
+                }
             }
+            Write-LogGroupEnd -Title "Install Native Dependencies"
         }
 
-        Write-Verbose -Verbose "Calling Find-Dotnet from Start-PSBootstrap"
+        if ($Scenario -in 'All', 'Both', 'DotNet') {
+            Write-LogGroupStart -Title "Install .NET SDK"
 
-        # Try to locate dotnet-SDK before installing it
-        Find-Dotnet
+            Write-Verbose -Verbose "Calling Find-Dotnet from Start-PSBootstrap"
 
-        Write-Verbose -Verbose "Back from calling Find-Dotnet from Start-PSBootstrap"
+            # Try to locate dotnet-SDK before installing it
+            Find-Dotnet
 
-        # Install dotnet-SDK
-        $dotNetExists = precheck 'dotnet' $null
-        $dotNetVersion = [string]::Empty
-        if($dotNetExists) {
-            $dotNetVersion = Find-RequiredSDK $dotnetCLIRequiredVersion
-        }
+            Write-Verbose -Verbose "Back from calling Find-Dotnet from Start-PSBootstrap"
 
-        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."
+            # Install dotnet-SDK
+            $dotNetExists = precheck 'dotnet' $null
+            $dotNetVersion = [string]::Empty
+            if($dotNetExists) {
+                $dotNetVersion = Find-RequiredSDK $dotnetCLIRequiredVersion
             }
 
-            $DotnetArguments = @{ Channel=$Channel; Version=$Version; NoSudo=$NoSudo }
+            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."
+                }
 
-            if ($dotnetAzureFeed) {
-                $null = $DotnetArguments.Add("AzureFeed", $dotnetAzureFeed)
-                $null = $DotnetArguments.Add("FeedCredential", $dotnetAzureFeedSecret)
-            }
+                $DotnetArguments = @{ Channel=$Channel; Version=$Version; NoSudo=$NoSudo }
 
-            Install-Dotnet @DotnetArguments
-        }
-        else {
-            Write-Log -message "dotnet is already installed.  Skipping installation."
+                if ($dotnetAzureFeed) {
+                    $null = $DotnetArguments.Add("AzureFeed", $dotnetAzureFeed)
+                    $null = $DotnetArguments.Add("FeedCredential", $dotnetAzureFeedSecret)
+                }
+
+                Install-Dotnet @DotnetArguments
+            }
+            else {
+                Write-Log -message "dotnet is already installed.  Skipping installation."
+            }
+            Write-LogGroupEnd -Title "Install .NET SDK"
         }
 
         # Install Windows dependencies if `-Package` or `-BuildWindowsNative` is specified
         if ($environment.IsWindows) {
+            Write-LogGroupStart -Title "Install Windows Dependencies"
             ## The VSCode build task requires 'pwsh.exe' to be found in Path
             if (-not (Get-Command -Name pwsh.exe -CommandType Application -ErrorAction Ignore))
             {
@@ -2291,6 +3003,32 @@ function Start-PSBootstrap {
                 $psInstallFile = [System.IO.Path]::Combine($PSScriptRoot, "tools", "install-powershell.ps1")
                 & $psInstallFile -AddToPath
             }
+            Write-LogGroupEnd -Title "Install Windows Dependencies"
+        }
+
+        # Ensure dotnet is available
+        Find-Dotnet
+
+        if (-not $env:TF_BUILD) {
+            if ($Scenario -in 'All', 'Tools') {
+                Write-LogGroupStart -Title "Install .NET Global Tools"
+                Write-Log -message "Installing .NET global tools"
+
+                # Install dotnet-format
+                Write-Verbose -Verbose "Installing dotnet-format global tool"
+                Start-NativeExecution {
+                    dotnet tool install --global dotnet-format
+                }
+                Write-LogGroupEnd -Title "Install .NET Global Tools"
+            }
+        }
+
+        if ($env:TF_BUILD) {
+            Write-LogGroupStart -Title "Capture NuGet Sources"
+            Write-Verbose -Verbose "--- Start - Capturing nuget sources"
+            dotnet nuget list source --format detailed
+            Write-Verbose -Verbose "--- End   - Capturing nuget sources"
+            Write-LogGroupEnd -Title "Capture NuGet Sources"
         }
     } finally {
         Pop-Location
@@ -2300,6 +3038,17 @@ function Start-PSBootstrap {
 ## If the required SDK version is found, return it.
 ## Otherwise, return the latest installed SDK version that can be found.
 function Find-RequiredSDK {
+    <#
+    .SYNOPSIS
+        Returns the installed .NET SDK version that best satisfies the required version.
+    .DESCRIPTION
+        Lists installed SDKs with 'dotnet --list-sdks'. Returns the required version
+        string if it is installed; otherwise returns the newest installed SDK version.
+    .PARAMETER requiredSdkVersion
+        The exact .NET SDK version string to search for.
+    .OUTPUTS
+        System.String. The matched or newest installed SDK version string.
+    #>
     param(
         [Parameter(Mandatory, Position = 0)]
         [string] $requiredSdkVersion
@@ -2324,6 +3073,28 @@ function Find-RequiredSDK {
 }
 
 function Start-DevPowerShell {
+    <#
+    .SYNOPSIS
+        Launches a PowerShell session using the locally built pwsh.
+    .DESCRIPTION
+        Starts a new pwsh process from the build output directory, optionally setting
+        the DEVPATH environment variable, redirecting PSModulePath to the built Modules
+        directory, and loading or suppressing the user profile.
+    .PARAMETER ArgumentList
+        Additional arguments passed to the pwsh process.
+    .PARAMETER LoadProfile
+        When specified, the user profile is loaded (by default -noprofile is prepended).
+    .PARAMETER Configuration
+        Build configuration whose output directory to use (ConfigurationParamSet).
+    .PARAMETER BinDir
+        Explicit path to the directory containing the pwsh binary (BinDirParamSet).
+    .PARAMETER NoNewWindow
+        Runs pwsh in the current console window instead of a new one.
+    .PARAMETER Command
+        A command string passed to pwsh via -command.
+    .PARAMETER KeepPSModulePath
+        Preserves the existing PSModulePath instead of redirecting it to the build output.
+    #>
     [CmdletBinding(DefaultParameterSetName='ConfigurationParamSet')]
     param(
         [string[]]$ArgumentList = @(),
@@ -2391,6 +3162,16 @@ function Start-DevPowerShell {
 
 function Start-TypeGen
 {
+    <#
+    .SYNOPSIS
+        Generates the CorePsTypeCatalog type-catalog file.
+    .DESCRIPTION
+        Invokes the TypeCatalogGen .NET tool to produce CorePsTypeCatalog.cs, which maps
+        .NET types to their containing assemblies. The output .inc file name varies by
+        runtime to allow simultaneous builds on Windows and WSL.
+    .PARAMETER IncFileName
+        Name of the .inc file listing dependent assemblies. Defaults to 'powershell.inc'.
+    #>
     [CmdletBinding()]
     param
     (
@@ -2401,38 +3182,17 @@ function Start-TypeGen
     # Add .NET CLI tools to PATH
     Find-Dotnet
 
-    # This custom target depends on 'ResolveAssemblyReferencesDesignTime', whose definition can be found in the sdk folder.
-    # To find the available properties of '_ReferencesFromRAR' when switching to a new dotnet sdk, follow the steps below:
-    #   1. create a dummy project using the new dotnet sdk.
-    #   2. build the dummy project with this command:
-    #      dotnet msbuild .\dummy.csproj /t:ResolveAssemblyReferencesDesignTime /fileLogger /noconsolelogger /v:diag
-    #   3. search '_ReferencesFromRAR' in the produced 'msbuild.log' file. You will find the properties there.
-    $GetDependenciesTargetPath = "$PSScriptRoot/src/Microsoft.PowerShell.SDK/obj/Microsoft.PowerShell.SDK.csproj.TypeCatalog.targets"
-    $GetDependenciesTargetValue = @'
-<Project>
-    <Target Name="_GetDependencies"
-            DependsOnTargets="ResolveAssemblyReferencesDesignTime">
-        <ItemGroup>
-            <_RefAssemblyPath Include="%(_ReferencesFromRAR.OriginalItemSpec)%3B" Condition=" '%(_ReferencesFromRAR.NuGetPackageId)' != 'Microsoft.Management.Infrastructure' "/>
-        </ItemGroup>
-        <WriteLinesToFile File="$(_DependencyFile)" Lines="@(_RefAssemblyPath)" Overwrite="true" />
-    </Target>
-</Project>
-'@
-    New-Item -ItemType Directory -Path (Split-Path -Path $GetDependenciesTargetPath -Parent) -Force > $null
-    Set-Content -Path $GetDependenciesTargetPath -Value $GetDependenciesTargetValue -Force -Encoding Ascii
-
     Push-Location "$PSScriptRoot/src/Microsoft.PowerShell.SDK"
     try {
         $ps_inc_file = "$PSScriptRoot/src/TypeCatalogGen/$IncFileName"
-        dotnet msbuild .\Microsoft.PowerShell.SDK.csproj /t:_GetDependencies "/property:DesignTimeBuild=true;_DependencyFile=$ps_inc_file" /nologo
+        Start-NativeExecution { dotnet msbuild .\Microsoft.PowerShell.SDK.csproj /t:_GetDependencies "/property:DesignTimeBuild=true;_DependencyFile=$ps_inc_file" /nologo }
     } finally {
         Pop-Location
     }
 
     Push-Location "$PSScriptRoot/src/TypeCatalogGen"
     try {
-        dotnet run ../System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs $IncFileName
+        Start-NativeExecution { dotnet run ../System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs $IncFileName }
     } finally {
         Pop-Location
     }
@@ -2440,6 +3200,13 @@ function Start-TypeGen
 
 function Start-ResGen
 {
+    <#
+    .SYNOPSIS
+        Regenerates C# resource bindings from resx files.
+    .DESCRIPTION
+        Runs the ResGen .NET tool in src/ResGen to produce strongly-typed resource classes
+        for all resx files in the PowerShell project.
+    #>
     [CmdletBinding()]
     param()
 
@@ -2454,7 +3221,75 @@ function Start-ResGen
     }
 }
 
+function Add-PSEnvironmentPath {
+    <#
+    .SYNOPSIS
+        Adds a path to the process PATH and persists to GitHub Actions workflow if running in GitHub Actions
+    .PARAMETER Path
+        Path to add to PATH
+    .PARAMETER Prepend
+        If specified, prepends the path instead of appending
+    #>
+    param (
+        [Parameter(Mandatory)]
+        [string]$Path,
+
+        [switch]$Prepend
+    )
+
+    # Set in current process
+    if ($Prepend) {
+        $env:PATH = $Path + [IO.Path]::PathSeparator + $env:PATH
+    } else {
+        $env:PATH += [IO.Path]::PathSeparator + $Path
+    }
+
+    # Persist to GitHub Actions workflow if running in GitHub Actions
+    if ($env:GITHUB_ACTIONS -eq 'true') {
+        Write-Verbose -Verbose "Adding $Path to GITHUB_PATH"
+        Add-Content -Path $env:GITHUB_PATH -Value $Path
+    }
+}
+
+function Set-PSEnvironmentVariable {
+    <#
+    .SYNOPSIS
+        Sets an environment variable in the process and persists to GitHub Actions workflow if running in GitHub Actions
+    .PARAMETER Name
+        The name of the environment variable
+    .PARAMETER Value
+        The value of the environment variable
+    #>
+    param (
+        [Parameter(Mandatory)]
+        [string]$Name,
+
+        [Parameter(Mandatory)]
+        [string]$Value
+    )
+
+    # Set in current process
+    Set-Item -Path "env:$Name" -Value $Value
+
+    # Persist to GitHub Actions workflow if running in GitHub Actions
+    if ($env:GITHUB_ACTIONS -eq 'true') {
+        Write-Verbose -Verbose "Setting $Name in GITHUB_ENV"
+        Add-Content -Path $env:GITHUB_ENV -Value "$Name=$Value"
+    }
+}
+
 function Find-Dotnet {
+    <#
+    .SYNOPSIS
+        Ensures the required .NET SDK is available on PATH.
+    .DESCRIPTION
+        Checks whether the dotnet currently on PATH can locate the required SDK version.
+        If not, prepends the user-local dotnet installation directory to PATH.
+        Optionally sets DOTNET_ROOT and adds the global tools directory to PATH.
+    .PARAMETER SetDotnetRoot
+        When specified, sets the DOTNET_ROOT environment variable and adds the
+        .NET global tools path to PATH.
+    #>
     param (
         [switch] $SetDotnetRoot
     )
@@ -2484,25 +3319,40 @@ function Find-Dotnet {
         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
+            Add-PSEnvironmentPath -Path $dotnetPath -Prepend
 
             if ($SetDotnetRoot) {
                 Write-Verbose -Verbose "Setting DOTNET_ROOT to $dotnetPath"
-                $env:DOTNET_ROOT = $dotnetPath
+                Set-PSEnvironmentVariable -Name 'DOTNET_ROOT' -Value $dotnetPath
             }
         } elseif ($SetDotnetRoot) {
             Write-Verbose -Verbose "Expected dotnet version found, setting DOTNET_ROOT to $dotnetPath"
-            $env:DOTNET_ROOT = $dotnetPath
+            Set-PSEnvironmentVariable -Name 'DOTNET_ROOT' -Value $dotnetPath
         }
     }
     else {
         Write-Warning "Could not find 'dotnet', appending $dotnetPath to PATH."
-        $env:PATH += [IO.Path]::PathSeparator + $dotnetPath
+        Add-PSEnvironmentPath -Path $dotnetPath
+
+        if ($SetDotnetRoot) {
+            Write-Verbose -Verbose "Setting DOTNET_ROOT to $dotnetPath"
+            Set-PSEnvironmentVariable -Name 'DOTNET_ROOT' -Value $dotnetPath
+        }
     }
 
     if (-not (precheck 'dotnet' "Still could not find 'dotnet', restoring PATH.")) {
+        # Give up, restore original PATH.  There is nothing to persist since we didn't make a change.
         $env:PATH = $originalPath
     }
+    elseif ($SetDotnetRoot) {
+        # If we found dotnet, also add the global tools path to PATH
+        # Add .NET global tools to PATH when setting up the environment
+        $dotnetToolsPath = Join-Path $dotnetPath "tools"
+        if (Test-Path $dotnetToolsPath) {
+            Write-Verbose -Verbose "Adding .NET tools path to PATH: $dotnetToolsPath"
+            Add-PSEnvironmentPath -Path $dotnetToolsPath
+        }
+    }
 }
 
 <#
@@ -2536,6 +3386,14 @@ function Convert-TxtResourceToXml
 }
 
 function script:Use-MSBuild {
+    <#
+    .SYNOPSIS
+        Ensures that the msbuild command is available in the current scope.
+    .DESCRIPTION
+        If msbuild is not found in PATH, creates a script-scoped alias pointing to the
+        .NET Framework 4 MSBuild at its standard Windows location. Throws if neither
+        location provides a usable msbuild.
+    #>
     # TODO: we probably should require a particular version of msbuild, if we are taking this dependency
     # msbuild v14 and msbuild v4 behaviors are different for XAML generation
     $frameworkMsBuildLocation = "${env:SystemRoot}\Microsoft.Net\Framework\v4.0.30319\msbuild"
@@ -2555,6 +3413,18 @@ function script:Use-MSBuild {
 
 function script:Write-Log
 {
+    <#
+    .SYNOPSIS
+        Writes a colored message to the host, with optional error annotation.
+    .DESCRIPTION
+        In GitHub Actions, error messages are emitted as workflow error annotations
+        using the '::error::' command. Normal messages are written in green; errors
+        in red. Console colors are reset after each call.
+    .PARAMETER message
+        The text to write.
+    .PARAMETER isError
+        When specified, writes the message as an error (red / GitHub Actions annotation).
+    #>
     param
     (
         [Parameter(Position=0, Mandatory)]
@@ -2565,7 +3435,13 @@ function script:Write-Log
     )
     if ($isError)
     {
-        Write-Host -Foreground Red $message
+        if ($env:GITHUB_WORKFLOW) {
+            # https://github.com/actions/toolkit/issues/193#issuecomment-605394935
+            $escapedMessage = $message -replace "`n", "%0A" -replace "`r"
+            Write-Host "::error::${escapedMessage}"
+        } else {
+            Write-Host -Foreground Red $message
+        }
     }
     else
     {
@@ -2574,7 +3450,104 @@ function script:Write-Log
     #reset colors for older package to at return to default after error message on a compilation error
     [console]::ResetColor()
 }
+
+function script:Write-LogGroup {
+    <#
+    .SYNOPSIS
+        Emits a titled group of log messages wrapped in log-group markers.
+    .DESCRIPTION
+        Calls Write-LogGroupStart, writes each message line via Write-Log, then calls
+        Write-LogGroupEnd. In GitHub Actions this creates a collapsible group; on other
+        hosts it adds BEGIN/END banners.
+    .PARAMETER Message
+        One or more message lines to write inside the group.
+    .PARAMETER Title
+        The title displayed for the log group.
+    #>
+    param
+    (
+        [Parameter(Position = 0, Mandatory)]
+        [ValidateNotNullOrEmpty()]
+        [string[]] $Message,
+        [Parameter(Mandatory)]
+        [string] $Title
+    )
+
+
+    Write-LogGroupStart -Title $Title
+
+    foreach ($line in $Message) {
+        Write-Log -Message $line
+    }
+
+    Write-LogGroupEnd -Title $Title
+}
+
+$script:logGroupColor = [System.ConsoleColor]::Cyan
+
+function script:Write-LogGroupStart {
+    <#
+    .SYNOPSIS
+        Opens a collapsible log group section.
+    .DESCRIPTION
+        In GitHub Actions emits '::group::<Title>'. On other hosts writes a colored
+        begin banner using the script-level log group color.
+    .PARAMETER Title
+        The label for the group.
+    #>
+    param
+    (
+        [Parameter(Mandatory)]
+        [string] $Title
+    )
+
+    if ($env:GITHUB_WORKFLOW) {
+        Write-Host "::group::${Title}"
+    }
+    else {
+        Write-Host -ForegroundColor $script:logGroupColor "=== BEGIN: $Title ==="
+    }
+}
+
+function script:Write-LogGroupEnd {
+    <#
+    .SYNOPSIS
+        Closes a collapsible log group section.
+    .DESCRIPTION
+        In GitHub Actions emits '::endgroup::'. On other hosts writes a colored
+        end banner using the script-level log group color.
+    .PARAMETER Title
+        The group label (used only in non-GitHub-Actions output).
+    #>
+    param
+    (
+        [Parameter(Mandatory)]
+        [string] $Title
+    )
+
+    if ($env:GITHUB_WORKFLOW) {
+        Write-Host "::endgroup::"
+    }
+    else {
+        Write-Host -ForegroundColor $script:logGroupColor "==== END: $Title ===="
+    }
+}
+
 function script:precheck([string]$command, [string]$missedMessage) {
+    <#
+    .SYNOPSIS
+        Tests whether a command exists on PATH and optionally emits a warning if missing.
+    .DESCRIPTION
+        Uses Get-Command to locate the specified command. Returns $true if found,
+        $false otherwise. If the command is absent and a message is provided,
+        Write-Warning is called with that message.
+    .PARAMETER command
+        The command name to look for.
+    .PARAMETER missedMessage
+        Warning text to emit when the command is not found. Pass $null to suppress it.
+    .OUTPUTS
+        System.Boolean. $true when the command is found; $false otherwise.
+    #>
     $c = Get-Command $command -ErrorAction Ignore
     if (-not $c) {
         if (-not [string]::IsNullOrEmpty($missedMessage))
@@ -2590,6 +3563,13 @@ function script:precheck([string]$command, [string]$missedMessage) {
 # Cleans the PowerShell repo - everything but the root folder
 function Clear-PSRepo
 {
+    <#
+    .SYNOPSIS
+        Cleans all subdirectories of the PowerShell repository using 'git clean -fdX'.
+    .DESCRIPTION
+        Iterates over every top-level directory under the repository root and removes all
+        files that are not tracked by git, including ignored files.
+    #>
     [CmdletBinding()]
     param()
 
@@ -2602,6 +3582,20 @@ function Clear-PSRepo
 # Install PowerShell modules such as PackageManagement, PowerShellGet
 function Copy-PSGalleryModules
 {
+    <#
+    .SYNOPSIS
+        Copies PowerShell Gallery modules from the NuGet cache to a Modules directory.
+    .DESCRIPTION
+        Reads the PackageReference items in the specified csproj file, resolves each
+        package from the NuGet global cache, and copies it to the destination directory.
+        Package nupkg and metadata files are excluded from the copy.
+    .PARAMETER CsProjPath
+        Path to the csproj file whose PackageReference items describe Gallery modules.
+    .PARAMETER Destination
+        Destination Modules directory. Must end with 'Modules'.
+    .PARAMETER Force
+        Forces NuGet package restore even if packages are already present.
+    #>
     [CmdletBinding()]
     param(
         [Parameter(Mandatory=$true)]
@@ -2661,6 +3655,22 @@ function Copy-PSGalleryModules
 
 function Merge-TestLogs
 {
+    <#
+    .SYNOPSIS
+        Merges xUnit and NUnit test log files into a single xUnit XML file.
+    .DESCRIPTION
+        Converts NUnit Pester logs to xUnit assembly format and appends them, along with
+        any additional xUnit logs, to the primary xUnit log. The merged result is saved
+        to the specified output path.
+    .PARAMETER XUnitLogPath
+        Path to the primary xUnit XML log file.
+    .PARAMETER NUnitLogPath
+        One or more NUnit (Pester) XML log file paths to merge in.
+    .PARAMETER AdditionalXUnitLogPath
+        Optional additional xUnit XML log files to append.
+    .PARAMETER OutputLogPath
+        Path for the merged xUnit output file.
+    #>
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $true)]
@@ -2702,6 +3712,23 @@ function Merge-TestLogs
 }
 
 function ConvertFrom-PesterLog {
+    <#
+    .SYNOPSIS
+        Converts Pester NUnit XML log files to xUnit assembly format.
+    .DESCRIPTION
+        Accepts one or more NUnit log files produced by Pester, or existing xUnit logs,
+        and converts them to an in-memory xUnit assembly object model. If multiple logs
+        are provided and -MultipleLog is not set, they are combined into a single
+        assemblies object.
+    .PARAMETER Logfile
+        Path(s) to the NUnit or xUnit log file(s) to convert. Accepts pipeline input.
+    .PARAMETER IncludeEmpty
+        When specified, includes test assemblies that contain zero test cases.
+    .PARAMETER MultipleLog
+        When specified, returns one assemblies object per log file instead of combining.
+    .OUTPUTS
+        assemblies. One or more xUnit assemblies objects containing converted test data.
+    #>
     [CmdletBinding()]
     param (
         [Parameter(ValueFromPipeline = $true, Mandatory = $true, Position = 0)]
@@ -2709,21 +3736,6 @@ function ConvertFrom-PesterLog {
         [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 {
@@ -3070,6 +4082,17 @@ assembly
 
 # Save PSOptions to be restored by Restore-PSOptions
 function Save-PSOptions {
+    <#
+    .SYNOPSIS
+        Persists the current PSOptions to a JSON file.
+    .DESCRIPTION
+        Serializes the current build options (or the supplied Options object) to JSON
+        and writes them to the specified path. Defaults to psoptions.json in the repo root.
+    .PARAMETER PSOptionsPath
+        Path to the JSON file to write. Defaults to '$PSScriptRoot/psoptions.json'.
+    .PARAMETER Options
+        PSOptions object to save. Defaults to the current build options.
+    #>
     param(
         [ValidateScript({$parent = Split-Path $_;if($parent){Test-Path $parent}else{return $true}})]
         [ValidateNotNullOrEmpty()]
@@ -3087,6 +4110,17 @@ function Save-PSOptions {
 # Restore PSOptions
 # Optionally remove the PSOptions file
 function Restore-PSOptions {
+    <#
+    .SYNOPSIS
+        Loads saved PSOptions from a JSON file and makes them the active build options.
+    .DESCRIPTION
+        Reads the JSON file produced by Save-PSOptions, reconstructs a PSOptions
+        hashtable, and stores it via Set-PSOptions. Optionally deletes the file afterward.
+    .PARAMETER PSOptionsPath
+        Path to the JSON file to read. Defaults to '$PSScriptRoot/psoptions.json'.
+    .PARAMETER Remove
+        When specified, deletes the JSON file after loading.
+    #>
     param(
         [ValidateScript({Test-Path $_})]
         [string]
@@ -3119,6 +4153,31 @@ function Restore-PSOptions {
 
 function New-PSOptionsObject
 {
+    <#
+    .SYNOPSIS
+        Constructs the PSOptions hashtable from individual build-option components.
+    .DESCRIPTION
+        Assembles the hashtable consumed by Start-PSBuild, Restore-PSPackage, and related
+        commands. Prefer New-PSOptions, which auto-computes fields such as the output path.
+    .PARAMETER RootInfo
+        PSCustomObject with repo root path validation metadata.
+    .PARAMETER Top
+        Path to the top-level project directory (pwsh source directory).
+    .PARAMETER Runtime
+        The .NET runtime identifier (RID) for the build.
+    .PARAMETER Configuration
+        The build configuration: Debug, Release, CodeCoverage, or StaticAnalysis.
+    .PARAMETER PSModuleRestore
+        Whether Gallery modules should be restored to the build output.
+    .PARAMETER Framework
+        The target .NET framework moniker, e.g. 'net11.0'.
+    .PARAMETER Output
+        Full path to the output pwsh executable.
+    .PARAMETER ForMinimalSize
+        Whether this is a minimal-size build.
+    .OUTPUTS
+        System.Collections.Hashtable. A PSOptions hashtable.
+    #>
     param(
         [PSCustomObject]
         $RootInfo,
@@ -3289,6 +4348,17 @@ $script:RESX_TEMPLATE = @'
 '@
 
 function Get-UniquePackageFolderName {
+    <#
+    .SYNOPSIS
+        Returns a unique temporary folder path for a test package under the specified root.
+    .DESCRIPTION
+        Tries the path '<Root>/TestPackage' first, then appends a random numeric suffix
+        until an unused path is found. Throws if a unique name cannot be found in 10 tries.
+    .PARAMETER Root
+        The parent directory under which the unique folder name is generated.
+    .OUTPUTS
+        System.String. A path under Root that does not yet exist.
+    #>
     param(
         [Parameter(Mandatory)] $Root
     )
@@ -3315,6 +4385,18 @@ function Get-UniquePackageFolderName {
 
 function New-TestPackage
 {
+    <#
+    .SYNOPSIS
+        Creates a zip archive containing all test content and test tools.
+    .DESCRIPTION
+        Builds and publishes test tools, copies the test directory, assets directory,
+        and resx resource directories into a temporary staging folder, then zips the
+        staging folder to TestPackage.zip in the specified destination directory.
+    .PARAMETER Destination
+        Directory where the TestPackage.zip file is created.
+    .PARAMETER Runtime
+        The .NET runtime identifier (RID) used when publishing test tool executables.
+    #>
     [CmdletBinding()]
     param(
         [Parameter(Mandatory = $true)]
@@ -3385,61 +4467,230 @@ function New-TestPackage
     [System.IO.Compression.ZipFile]::CreateFromDirectory($packageRoot, $packagePath)
 }
 
-function New-NugetConfigFile
-{
+class NugetPackageSource {
+    [string] $Url
+    [string] $Name
+}
+
+function New-NugetPackageSource {
+    <#
+    .SYNOPSIS
+        Creates a NugetPackageSource object with the given URL and name.
+    .PARAMETER Url
+        The NuGet feed URL.
+    .PARAMETER Name
+        The feed name used as the key in nuget.config.
+    .OUTPUTS
+        NugetPackageSource. An object with Url and Name properties.
+    #>
+    param(
+        [Parameter(Mandatory = $true)] [string]$Url,
+        [Parameter(Mandatory = $true)] [string] $Name
+    )
+
+    return [NugetPackageSource] @{Url = $Url; Name = $Name }
+}
+
+$script:NuGetEndpointCredentials = [System.Collections.Generic.Dictionary[String,System.Object]]::new()
+function New-NugetConfigFile {
+    <#
+    .SYNOPSIS
+        Generates a nuget.config file at the specified destination.
+    .DESCRIPTION
+        Creates a nuget.config XML file with the supplied package sources and optional
+        credentials. The generated file is marked as skip-worktree in git to prevent
+        accidental commits of feed credentials.
+    .PARAMETER NugetPackageSource
+        One or more NugetPackageSource objects defining the feeds to include.
+    .PARAMETER Destination
+        Directory where nuget.config is written.
+    .PARAMETER UserName
+        Username for authenticated feed access.
+    .PARAMETER ClearTextPAT
+        Personal access token in clear text for authenticated feed access.
+    #>
     param(
-        [Parameter(Mandatory=$true)] [string] $NugetFeedUrl,
-        [Parameter(Mandatory=$true)] [string] $FeedName,
-        [Parameter(Mandatory=$true)] [string] $UserName,
-        [Parameter(Mandatory=$true)] [string] $ClearTextPAT,
-        [Parameter(Mandatory=$true)] [string] $Destination
+        [Parameter(Mandatory = $true, ParameterSetName ='user')]
+        [Parameter(Mandatory = $true, ParameterSetName ='nouser')]
+        [NugetPackageSource[]] $NugetPackageSource,
+
+        [Parameter(Mandatory = $true)] [string] $Destination,
+
+        [Parameter(Mandatory = $true, ParameterSetName = 'user')]
+        [string] $UserName,
+
+        [Parameter(Mandatory = $true, ParameterSetName = 'user')]
+        [string] $ClearTextPAT
     )
 
-    $nugetConfigTemplate = @'
+    $nugetConfigHeaderTemplate = @'
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />
+'@
+
+    $nugetPackageSourceTemplate = @'
     <add key="[FEEDNAME]" value="[FEED]" />
+'@
+    $nugetPackageSourceFooterTemplate = @'
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
+'@
+    $nugetCredentialsTemplate = @'
   <packageSourceCredentials>
     <[FEEDNAME]>
       <add key="Username" value="[USERNAME]" />
       <add key="ClearTextPassword" value="[PASSWORD]" />
     </[FEEDNAME]>
   </packageSourceCredentials>
+'@
+    $nugetConfigFooterTemplate = @'
 </configuration>
 '@
+    $content = $nugetConfigHeaderTemplate
+    $feedNamePostfix = ''
+    if ($UserName) {
+        $feedNamePostfix += '-' + $UserName.Replace('@', '-').Replace('.', '-')
+    }
+
+    [NugetPackageSource]$source = $null
+    $newLine = [Environment]::NewLine
+    foreach ($source in $NugetPackageSource) {
+        $content += $newLine + $nugetPackageSourceTemplate.Replace('[FEED]', $source.Url).Replace('[FEEDNAME]', $source.Name + $feedNamePostfix)
+    }
+
+    $content += $newLine + $nugetPackageSourceFooterTemplate
+
+    if ($UserName -or $ClearTextPAT) {
+        foreach ($source in $NugetPackageSource) {
+            if (!$script:NuGetEndpointCredentials.ContainsKey($source.Url)) {
+                $script:NuGetEndpointCredentials.Add($source.Url, @{
+                        endpoint = $source.Url
+                        username = $UserName
+                        password = $ClearTextPAT
+                    })
+            }
+        }
+    }
 
-    $content = $nugetConfigTemplate.Replace('[FEED]', $NugetFeedUrl).Replace('[FEEDNAME]', $FeedName).Replace('[USERNAME]', $UserName).Replace('[PASSWORD]', $ClearTextPAT)
+    $content += $newLine + $nugetConfigFooterTemplate
 
     Set-Content -Path (Join-Path $Destination 'nuget.config') -Value $content -Force
+
+    # Set the nuget.config file to be skipped by git
+    push-location $Destination
+    try {
+        git update-index --skip-worktree (Join-Path $Destination 'nuget.config')
+    } finally {
+        pop-location
+    }
+}
+
+function Clear-PipelineNugetAuthentication {
+    <#
+    .SYNOPSIS
+        Clears cached NuGet feed credentials used by the pipeline.
+    .DESCRIPTION
+        Removes all entries from the script-scoped NuGetEndpointCredentials dictionary.
+    #>
+    $script:NuGetEndpointCredentials.Clear()
+}
+
+function Set-PipelineNugetAuthentication {
+    <#
+    .SYNOPSIS
+        Publishes cached NuGet feed credentials to the Azure DevOps pipeline.
+    .DESCRIPTION
+        Serializes the script-scoped NuGetEndpointCredentials dictionary to JSON and sets
+        the VSS_NUGET_EXTERNAL_FEED_ENDPOINTS pipeline variable so that subsequent NuGet
+        operations authenticate automatically.
+    #>
+    $endpointcredentials = @()
+
+    foreach ($key in $script:NuGetEndpointCredentials.Keys) {
+        $endpointcredentials += $script:NuGetEndpointCredentials[$key]
+    }
+
+    $json = @{
+        endpointCredentials = $endpointcredentials
+    } | convertto-json -Compress
+    Set-PipelineVariable -Name 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' -Value $json
 }
 
 function Set-CorrectLocale
 {
+    <#
+    .SYNOPSIS
+        Configures the Linux locale to en_US.UTF-8 for consistent build behavior.
+    .DESCRIPTION
+        On Ubuntu 20+ systems, generates the en_US.UTF-8 locale and sets LC_ALL and LANG
+        environment variables. Skips execution on non-Linux platforms and Ubuntu versions
+        earlier than 20.
+    #>
+    Write-LogGroupStart -Title "Set-CorrectLocale"
+
     if (-not $IsLinux)
     {
+        Write-LogGroupEnd -Title "Set-CorrectLocale"
         return
     }
 
     $environment = Get-EnvironmentInformation
-    if ($environment.IsUbuntu -and $environment.IsUbuntu20)
-    {
+    if ($environment.IsUbuntu16 -or $environment.IsUbuntu18) {
+        Write-Verbose -Message "Don't set locale before Ubuntu 20" -Verbose
+        Write-LogGroupEnd -Title "Set-CorrectLocale"
+        Write-Locale
+        return
+    }
+
+    if ($environment.IsUbuntu) {
+        Write-Log -Message "Setting locale to en_US.UTF-8"
         $env:LC_ALL = 'en_US.UTF-8'
         $env:LANG = 'en_US.UTF-8'
         sudo locale-gen $env:LANG
-        sudo update-locale
+        if ($environment.IsUbuntu20) {
+            Write-Log -Message "Updating locale for Ubuntu 20"
+            sudo update-locale
+        } else {
+            Write-Log -Message "Updating locale for Ubuntu 22 and newer"
+            sudo update-locale LANG=$env:LANG LC_ALL=$env:LC_ALL
+        }
+    }
+
+    Write-LogGroupEnd -Title "Set-CorrectLocale"
+    Write-Locale
+
+}
+
+function Write-Locale {
+    <#
+    .SYNOPSIS
+        Writes the current system locale settings to the log output.
+    .DESCRIPTION
+        Runs the 'locale' command on Linux or macOS and writes the output inside a
+        collapsible log group. Does nothing on Windows.
+    #>
+    if (-not $IsLinux -and -not $IsMacOS) {
+        Write-Verbose -Message "only supported on Linux and macOS" -Verbose
+        return
     }
 
     # Output the locale to log it
-    locale
+    $localOutput = & locale
+    Write-LogGroup -Title "Capture Locale" -Message $localOutput
 }
 
 function Install-AzCopy {
+    <#
+    .SYNOPSIS
+        Downloads and installs AzCopy v10 on Windows.
+    .DESCRIPTION
+        Downloads the AzCopy v10 zip archive from the official Microsoft URL and extracts
+        it to the Agent tools directory. Skips installation if AzCopy is already present.
+    #>
     $testPath = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
     if (Test-Path $testPath) {
         Write-Verbose "AzCopy already installed" -Verbose
@@ -3454,6 +4705,15 @@ function Install-AzCopy {
 }
 
 function Find-AzCopy {
+    <#
+    .SYNOPSIS
+        Locates the AzCopy executable on the system.
+    .DESCRIPTION
+        Searches several well-known installation paths for AzCopy.exe and falls back to
+        Get-Command if none of the paths contain the executable.
+    .OUTPUTS
+        System.String. The full path to the AzCopy executable.
+    #>
     $searchPaths = @('$(Agent.ToolsDirectory)\azcopy10\AzCopy.exe', "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe", "C:\azcopy10\AzCopy.exe")
 
     foreach ($filter in $searchPaths) {
@@ -3469,6 +4729,16 @@ function Find-AzCopy {
 
 function Clear-NativeDependencies
 {
+    <#
+    .SYNOPSIS
+        Removes unnecessary native dependency files from the publish output.
+    .DESCRIPTION
+        Strips architecture-specific DiaSym reader DLLs that are not needed for the
+        target runtime from both the publish folder and the pwsh.deps.json manifest.
+        Skips fxdependent runtimes where no cleanup is needed.
+    .PARAMETER PublishFolder
+        Path to the publish output directory containing pwsh.deps.json.
+    #>
     param(
         [Parameter(Mandatory=$true)] [string] $PublishFolder
     )
@@ -3503,7 +4773,7 @@ function Clear-NativeDependencies
     $filesToDeleteWinDesktop = @()
 
     $deps = Get-Content "$PublishFolder/pwsh.deps.json" -Raw | ConvertFrom-Json -Depth 20
-    $targetRuntime = ".NETCoreApp,Version=v8.0/$($script:Options.Runtime)"
+    $targetRuntime = ".NETCoreApp,Version=v11.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*'
@@ -3532,3 +4802,58 @@ function Clear-NativeDependencies
 
     $deps | ConvertTo-Json -Depth 20 | Set-Content "$PublishFolder/pwsh.deps.json" -Force
 }
+
+
+function Update-DotNetSdkVersion {
+<#
+    .SYNOPSIS
+        Updates the .NET SDK version in global.json and DotnetRuntimeMetadata.json.
+    .DESCRIPTION
+        Queries the official .NET SDK feed for the latest version in the current channel
+        and writes the new version to global.json and DotnetRuntimeMetadata.json.
+    #>
+    param()
+    $globalJsonPath = "$PSScriptRoot/global.json"
+    $globalJson = get-content $globalJsonPath | convertfrom-json
+    $oldVersion = $globalJson.sdk.version
+    $versionParts = $oldVersion -split '\.'
+    $channel = $versionParts[0], $versionParts[1] -join '.'
+    Write-Verbose "channel: $channel" -Verbose
+    $azure_feed = 'https://builds.dotnet.microsoft.com/dotnet'
+    $version_file_url = "$azure_feed/Sdk/$channel/latest.version"
+    $version = Invoke-RestMethod $version_file_url
+    Write-Verbose "updating from: $oldVersion to: $version" -Verbose
+    $globalJson.sdk.version = $version
+    $globalJson | convertto-json | out-file $globalJsonPath
+    $dotnetRuntimeMetaPath = "$psscriptroot\DotnetRuntimeMetadata.json"
+    $dotnetRuntimeMeta = get-content $dotnetRuntimeMetaPath | convertfrom-json
+    $dotnetRuntimeMeta.sdk.sdkImageVersion = $version
+    $dotnetRuntimeMeta | ConvertTo-Json | Out-File $dotnetRuntimeMetaPath
+}
+
+function Set-PipelineVariable {
+    <#
+    .SYNOPSIS
+        Sets an Azure DevOps pipeline variable and the corresponding environment variable.
+    .DESCRIPTION
+        Emits a ##vso[task.setvariable] logging command so that subsequent pipeline steps
+        can access the variable, and also sets it in the current process environment.
+    .PARAMETER Name
+        The pipeline variable name.
+    .PARAMETER Value
+        The value to assign.
+    #>
+    param(
+        [parameter(Mandatory)]
+        [string] $Name,
+        [parameter(Mandatory)]
+        [string] $Value
+    )
+
+    $vstsCommandString = "vso[task.setvariable variable=$Name]$Value"
+    Write-Verbose -Verbose -Message ("sending " + $vstsCommandString)
+    Write-Host "##$vstsCommandString"
+
+    # also set in the current session
+    Set-Item -Path "env:$Name" -Value $Value
+}
diff --git a/demos/Apache/Apache/Apache.psm1 b/demos/Apache/Apache/Apache.psm1
deleted file mode 100644
index 5f980f26bae..00000000000
--- a/demos/Apache/Apache/Apache.psm1
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-#Region utility functions
-
-$global:sudocmd = "sudo"
-
-Function GetApacheCmd{
-    if (Test-Path "/usr/sbin/apache2ctl"){
-        $cmd = "/usr/sbin/apache2ctl"
-    }elseif(Test-Path "/usr/sbin/httpd"){
-        $cmd = "/usr/sbin/httpd"
-    }else{
-        Write-Error "Unable to find httpd or apache2ctl program. Unable to continue"
-        exit -1
-    }
-    $cmd
-}
-
-Function GetApacheVHostDir{
-    if (Test-Path "/etc/httpd/conf.d"){
-        Return "/etc/httpd/conf.d/"
-    }
-    if (Test-Path "/etc/apache2/sites-enabled"){
-        Return "/etc/apache2/sites-enabled"
-    }
-}
-
-Function CleanInputString([string]$inputStr){
-    $outputStr = $inputStr.Trim().Replace('`n','').Replace('\n','')
-    $outputStr
-}
-
-#EndRegion utility functions
-
-#Region Class specifications
-
-Class ApacheModule{
-        [string]$ModuleName
-
-        ApacheModule([string]$aModule){
-            $this.ModuleName = $aModule
-        }
-}
-
-Class ApacheVirtualHost{
-        [string]$ServerName
-        [string]$DocumentRoot
-        [string]$VirtualHostIPAddress = "*"
-        [string[]]$ServerAliases
-        [int]$VirtualHostPort = "80"
-        [string]$ServerAdmin
-        [string]$CustomLogPath
-        [string]$ErrorLogPath
-        [string]$ConfigurationFile
-
-        #region class constructors
-        ApacheVirtualHost([string]$ServerName, [string]$ConfFile, [string]$VirtualHostIPAddress,[int]$VirtualHostPort){
-            $this.ServerName = $ServerName
-            $this.ConfigurationFile = $ConfFile
-            $this.VirtualHostIPAddress = $VirtualHostIPAddress
-            $this.VirtualHostPort = $VirtualHostPort
-        }
-
-        #Full specification
-        ApacheVirtualHost([string]$ServerName, [string]$DocumentRoot, [string[]]$ServerAliases, [string]$ServerAdmin, [string]$CustomLogPath, [string]$ErrorLogPath, [string]$VirtualHostIPAddress, [int]$VirtualHostPort, [string]$ConfigurationFile){
-            $this.ServerName = $ServerName
-            $this.DocumentRoot = $DocumentRoot
-            $this.ServerAliases = $ServerAliases
-            $this.ServerAdmin = $ServerAdmin
-            $this.CustomLogPath = $CustomLogPath
-            $this.ErrorLogPath = $ErrorLogPath
-            $this.VirtualHostIPAddress = $VirtualHostIPAddress
-            $this.VirtualHostPort = $VirtualHostPort
-            $this.ConfigurationFile = $ConfigurationFile
-        }
-
-        #Default Port and IP
-        #endregion
-
-        #region class methods
-        Save($ConfigurationFile){
-            if (!(Test-Path $this.DocumentRoot)){ New-Item -Type Directory $this.DocumentRoot }
-
-            $VHostsDirectory = GetApacheVHostDir
-            if (!(Test-Path $VHostsDirectory)){
-                Write-Error "Specified virtual hosts directory does not exist: $VHostsDirectory"
-                exit 1
-            }
-            $VHostIPAddress = $this.VirtualHostIPAddress
-            [string]$VhostPort = $this.VirtualHostPort
-            $VHostDef = "<VirtualHost " + "$VHostIPAddress" + ":" + $VHostPort + " >`n"
-            $vHostDef += "DocumentRoot " + $this.DocumentRoot + "`n"
-            ForEach ($Alias in $this.ServerAliases){
-                if ($Alias.trim() -ne ""){
-                    $vHostDef += "ServerAlias " + $Alias + "`n"
-                }
-            }
-            $vHostDef += "ServerName " + $this.ServerName +"`n"
-            if ($this.ServerAdmin.Length -gt 1){$vHostDef += "ServerAdmin " + $this.ServerAdmin +"`n"}
-            if ($this.CustomLogPath -like "*/*"){$vHostDef += "CustomLog " + $this.CustomLogPath +"`n"}
-            if ($this.ErrorLogPath -like "*/*"){$vHostDef += "ErrorLog " + $this.ErrorLogpath +"`n"}
-            $vHostDef += "</VirtualHost>"
-            $filName = $ConfigurationFile
-            $VhostDef | Out-File "/tmp/${filName}" -Force -Encoding:ascii
-            & $global:sudocmd "mv" "/tmp/${filName}" "${VhostsDirectory}/${filName}"
-            Write-Information "Restarting Apache HTTP Server"
-            Restart-ApacheHTTPServer
-        }
-
-        #endregion
-}
-
-#EndRegion Class Specifications
-
-Function New-ApacheVHost {
-    [CmdletBinding()]
-    param(
-        [parameter (Mandatory = $true)][string]$ServerName,
-        [parameter (Mandatory = $true)][string]$DocumentRoot,
-        [string]$VirtualHostIPAddress,
-        [string[]]$ServerAliases,
-        [int]$VirtualHostPort,
-        [string]$ServerAdmin,
-        [string]$CustomLogPath,
-        [string]$ErrorLogPath
-        )
-
-        $NewConfFile = $VHostsDirectory + "/" + $ServerName + ".conf"
-        if(!($VirtualHostIPAddress)){$VirtualHostIPAddress = "*"}
-        if(!($VirtualHostPort)){$VirtualHostPort = "80"}
-        $newVHost = [ApacheVirtualHost]::new("$ServerName","$DocumentRoot","$ServerAliases","$ServerAdmin","$CustomLogPath","$ErrorLogPath","$VirtualHostIPAddress",$VirtualHostPort,"$NewConfFile")
-        $newVHost.Save("$ServerName.conf")
-}
-
-Function GetVHostProps([string]$ConfFile,[string]$ServerName,[string]$Listener){
-    $confContents = Get-Content $ConfFile
-    [boolean]$Match = $false
-    $DocumentRoot = ""
-    $CustomLogPath = ""
-    $ErrorLogPath = ""
-    $ServerAdmin = ""
-    ForEach ($confline in $confContents){
-        if ($confLine -like "<VirtualHost*${Listener}*"){
-            $Match = $true
-        }
-        if($Match){
-            Switch -wildcard  ($confline) {
-                "*DocumentRoot*"{$DocumentRoot = $confline.split()[1].trim()}
-                "*CustomLog*"{$CustomLogPath = $confline.split()[1].trim()}
-                "*ErrorLog*"{$ErrorLogPath = $confline.split()[1].trim()}
-                "*ServerAdmin*"{$ServerAdmin = $confline.split()[1].trim()}
-               #Todo: Server aliases
-            }
-            if($confline -like "*</VirtualHost>*"){
-                $Match = $false
-            }
-        }
-    }
-    @{"DocumentRoot" = "$DocumentRoot"; "CustomLogPath" = "$CustomLogPath"; "ErrorLogPath" = "$ErrorLogPath"; "ServerAdmin" = $ServerAdmin}
-
-}
-
-Function Get-ApacheVHost{
-    $cmd = GetApacheCmd
-
-    $Vhosts = @()
-    $res = & $global:sudocmd $cmd -t -D DUMP_VHOSTS
-
-    ForEach ($line in $res){
-        $ServerName = $null
-        if ($line -like "*:*.conf*"){
-            $RMatch = $line -match "(?<Listen>.*:[0-9]*)(?<ServerName>.*)\((?<ConfFile>.*)\)"
-            $ListenAddress = $Matches.Listen.trim()
-            $ServerName = $Matches.ServerName.trim()
-            $ConfFile = $Matches.ConfFile.trim().split(":")[0].Replace('(','')
-        }else{
-            if ($line.trim().split()[0] -like "*:*"){
-                $ListenAddress = $line.trim().split()[0]
-            }elseif($line -like "*.conf*"){
-                if ($line -like "*default*"){
-                    $ServerName = "_Default"
-                    $ConfFile = $line.trim().split()[3].split(":")[0].Replace('(','')
-                }elseif($line -like "*namevhost*"){
-                    $ServerName = $line.trim().split()[3]
-                    $ConfFile = $line.trim().split()[4].split(":")[0].Replace('(','')
-                }
-            }
-        }
-
-        if ($null -ne $ServerName){
-            $vHost = [ApacheVirtualHost]::New($ServerName, $ConfFile, $ListenAddress.Split(":")[0],$ListenAddress.Split(":")[1])
-            $ExtProps = GetVHostProps $ConfFile $ServerName $ListenAddress
-            $vHost.DocumentRoot = $ExtProps.DocumentRoot
-            #Custom log requires additional handling. NYI
-            #$vHost.CustomLogPath = $ExtProps.CustomLogPath
-            $vHost.ErrorLogPath = $ExtProps.ErrorLogPath
-            $vHost.ServerAdmin = $ExtProps.ServerAdmin
-            $Vhosts += $vHost
-            }
-        }
-
-    Return $Vhosts
-    }
-
-Function Restart-ApacheHTTPServer{
-  [CmdletBinding()]
-  Param(
-   [switch]$Graceful
-   )
-
-    if ($null -eq $Graceful){$Graceful = $false}
-    $cmd = GetApacheCmd
-        if ($Graceful){
-                & $global:sudocmd $cmd  -k graceful
-        }else{
-                & $global:sudocmd $cmd  -k restart
-        }
-
-}
-
-Function Get-ApacheModule{
-    $cmd = GetApacheCmd
-
-        $ApacheModules = @()
-
-        $Results = & $global:sudocmd $cmd -M |grep -v Loaded
-
-        Foreach ($mod in $Results){
-        $modInst = [ApacheModule]::new($mod.trim())
-        $ApacheModules += ($modInst)
-        }
-
-    $ApacheModules
-
-}
diff --git a/demos/Apache/apache-demo.ps1 b/demos/Apache/apache-demo.ps1
deleted file mode 100644
index 299ce0cc0de..00000000000
--- a/demos/Apache/apache-demo.ps1
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-Import-Module $PSScriptRoot/Apache/Apache.psm1
-
-#list Apache Modules
-Write-Host -Foreground Blue "Get installed Apache Modules like *proxy* and Sort by name"
-Get-ApacheModule | Where-Object {$_.ModuleName -like "*proxy*"} | Sort-Object ModuleName | Out-Host
-
-#Graceful restart of Apache
-Write-Host -Foreground Blue "Restart Apache Server gracefully"
-Restart-ApacheHTTPServer -Graceful | Out-Host
-
-#Enumerate current virtual hosts (web sites)
-Write-Host -Foreground Blue "Enumerate configured Apache Virtual Hosts"
-Get-ApacheVHost |Out-Host
-
-#Add a new virtual host
-Write-Host -Foreground Yellow "Create a new Apache Virtual Host"
-New-ApacheVHost -ServerName "mytestserver" -DocumentRoot /var/www/html/mytestserver -VirtualHostIPAddress * -VirtualHostPort 8090 | Out-Host
-
-#Enumerate new set of virtual hosts
-Write-Host -Foreground Blue "Enumerate Apache Virtual Hosts Again"
-Get-ApacheVHost |Out-Host
-
-#Cleanup
-Write-Host -Foreground Blue "Remove demo virtual host"
-if (Test-Path "/etc/httpd/conf.d"){
-    & sudo rm "/etc/httpd/conf.d/mytestserver.conf"
-}
-if (Test-Path "/etc/apache2/sites-enabled"){
-    & sudo rm "/etc/apache2/sites-enabled/mytestserver.conf"
-}
diff --git a/demos/Apache/readme.md b/demos/Apache/readme.md
deleted file mode 100644
index 30e36b3811a..00000000000
--- a/demos/Apache/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-## Apache Management Demo
-
-This demo shows management of Apache HTTP Server with PowerShell cmdlets implemented in a script module.
-
-- **Get-ApacheVHost**: Enumerate configured Apache Virtual Host (website) instances as objects.
-- **Get-ApacheModule**: Enumerate loaded Apache modules
-- **Restart-ApacheHTTPserver**: Restart the Apache web server
-- **New-ApacheVHost**: Create a new Apache Virtual Host (website) based on supplied parameters
-
-
-## Prerequisites ##
-- Install PowerShell
-- Install Apache packages
-	- `sudo apt-get install apache2`
-	- `sudo yum install httpd`
-
-
-Note: Management of Apache requires privileges. The user must have authorization to elevate with sudo. You will be prompted for a sudo password when running the demo.
\ No newline at end of file
diff --git a/demos/Azure/Azure-Demo.ps1 b/demos/Azure/Azure-Demo.ps1
deleted file mode 100644
index 22b316686a7..00000000000
--- a/demos/Azure/Azure-Demo.ps1
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-### The techniques used in this demo are documented at
-### https://azure.microsoft.com/documentation/articles/powershell-azure-resource-manager/
-
-### Import AzureRM.Profile.NetCore.Preview and AzureRM.Resources.NetCore.Preview modules.
-### AzureRM.NetCore.Preview is a wrapper module that pulls in these modules
-###
-### Because of issue https://github.com/PowerShell/PowerShell/issues/1618,
-### currently you will not be able to use "Install-Module AzureRM.NetCore.Preview" from
-### PowerShellGallery. You can use the following workaround until the issue is fixed:
-###
-### Install-Package -Name AzureRM.NetCore.Preview -Source https://www.powershellgallery.com/api/v2 -ProviderName NuGet -ExcludeVersion -Destination <Folder you want this to be installed>
-###
-### Ensure $env:PSModulePath is updated with the location you used to install.
-Import-Module AzureRM.NetCore.Preview
-
-### Supply your Azure Credentials
-Login-AzureRmAccount
-
-### Specify a name for Azure Resource Group
-$resourceGroupName = "PSAzDemo" + (New-Guid | ForEach-Object guid) -replace "-",""
-$resourceGroupName
-
-### Create a new Azure Resource Group
-New-AzureRmResourceGroup -Name $resourceGroupName -Location "West US"
-
-### Deploy an Ubuntu 14.04 VM using Resource Manager cmdlets
-### Template is available at
-### http://armviz.io/#/?load=https:%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-vm-simple-linux%2Fazuredeploy.json
-$dnsLabelPrefix = $resourceGroupName | ForEach-Object tolower
-$dnsLabelPrefix
-
-#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Demo/doc secret.")]
-$password = ConvertTo-SecureString -String "PowerShellRocks!" -AsPlainText -Force
-New-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateFile ./Compute-Linux.json -adminUserName psuser -adminPassword $password -dnsLabelPrefix $dnsLabelPrefix
-
-### Monitor the status of the deployment
-Get-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName
-
-### Discover the resources we created by the previous deployment
-Find-AzureRmResource -ResourceGroupName $resourceGroupName | Select-Object Name,ResourceType,Location
-
-### Get the state of the VM we created
-### Notice: The VM is in running state
-Get-AzureRmResource -ResourceName MyUbuntuVM -ResourceType Microsoft.Compute/virtualMachines -ResourceGroupName $resourceGroupName -ODataQuery '$expand=instanceView' | ForEach-Object properties | ForEach-Object instanceview | ForEach-Object statuses
-
-### Discover the operations we can perform on the compute resource
-### Notice: Operations like "Power Off Virtual Machine", "Start Virtual Machine", "Create Snapshot", "Delete Snapshot", "Delete Virtual Machine"
-Get-AzureRmProviderOperation -OperationSearchString Microsoft.Compute/* | Select-Object OperationName,Operation
-
-### Power Off the Virtual Machine we created
-Invoke-AzureRmResourceAction -ResourceGroupName $resourceGroupName -ResourceType Microsoft.Compute/virtualMachines -ResourceName MyUbuntuVM -Action poweroff
-
-### Check the VM state again. It should be stopped now.
-Get-AzureRmResource -ResourceName MyUbuntuVM -ResourceType Microsoft.Compute/virtualMachines -ResourceGroupName $resourceGroupName -ODataQuery '$expand=instanceView' | ForEach-Object properties | ForEach-Object instanceview | ForEach-Object statuses
-
-### As you know, you may still be incurring charges even if the VM is in stopped state
-### Deallocate the resource to avoid this charge
-Invoke-AzureRmResourceAction -ResourceGroupName $resourceGroupName -ResourceType Microsoft.Compute/virtualMachines -ResourceName MyUbuntuVM -Action deallocate
-
-### The following command removes the Virtual Machine
-Remove-AzureRmResource -ResourceName MyUbuntuVM -ResourceType Microsoft.Compute/virtualMachines -ResourceGroupName $resourceGroupName
-
-### Look at the resources that still exists
-Find-AzureRmResource -ResourceGroupName $resourceGroupName | Select-Object Name,ResourceType,Location
-
-### Remove the resource group and its resources
-Remove-AzureRmResourceGroup -Name $resourceGroupName
diff --git a/demos/Azure/Compute-Linux.json b/demos/Azure/Compute-Linux.json
deleted file mode 100644
index a0e9e27b85e..00000000000
--- a/demos/Azure/Compute-Linux.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "adminUsername": {
-      "type": "string",
-      "metadata": {
-        "description": "User name for the Virtual Machine."
-      }
-    },
-    "adminPassword": {
-      "type": "securestring",
-      "metadata": {
-        "description": "Password for the Virtual Machine."
-      }
-    },
-    "dnsLabelPrefix": {
-      "type": "string",
-      "metadata": {
-        "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
-      }
-    },
-    "ubuntuOSVersion": {
-      "type": "string",
-      "defaultValue": "14.04.2-LTS",
-      "allowedValues": [
-        "12.04.5-LTS",
-        "14.04.2-LTS",
-        "15.10",
-        "16.04.0-LTS"
-      ],
-      "metadata": {
-        "description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version. Allowed values: 12.04.5-LTS, 14.04.2-LTS, 15.10, 16.04.0-LTS."
-      }
-    }
-  },
-  "variables": {
-    "storageAccountName": "[concat(uniquestring(resourceGroup().id), 'salinuxvm')]",
-    "dataDisk1VhdName": "datadisk1",
-    "imagePublisher": "Canonical",
-    "imageOffer": "UbuntuServer",
-    "OSDiskName": "osdiskforlinuxsimple",
-    "nicName": "myVMNic",
-    "addressPrefix": "10.0.0.0/16",
-    "subnetName": "Subnet",
-    "subnetPrefix": "10.0.0.0/24",
-    "storageAccountType": "Standard_LRS",
-    "publicIPAddressName": "myPublicIP",
-    "publicIPAddressType": "Dynamic",
-    "vmStorageAccountContainerName": "vhds",
-    "vmName": "MyUbuntuVM",
-    "vmSize": "Standard_D1",
-    "virtualNetworkName": "MyVNET",
-    "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
-    "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
-    "apiVersion": "2015-06-15"
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Storage/storageAccounts",
-      "name": "[variables('storageAccountName')]",
-      "apiVersion": "2016-01-01",
-      "location": "[resourceGroup().location]",
-      "sku": {
-        "name": "[variables('storageAccountType')]"
-      },
-      "kind": "Storage",
-      "properties": {}
-    },
-    {
-      "apiVersion": "[variables('apiVersion')]",
-      "type": "Microsoft.Network/publicIPAddresses",
-      "name": "[variables('publicIPAddressName')]",
-      "location": "[resourceGroup().location]",
-      "properties": {
-        "publicIPAllocationMethod": "[variables('publicIPAddressType')]",
-        "dnsSettings": {
-          "domainNameLabel": "[parameters('dnsLabelPrefix')]"
-        }
-      }
-    },
-    {
-      "apiVersion": "[variables('apiVersion')]",
-      "type": "Microsoft.Network/virtualNetworks",
-      "name": "[variables('virtualNetworkName')]",
-      "location": "[resourceGroup().location]",
-      "properties": {
-        "addressSpace": {
-          "addressPrefixes": [
-            "[variables('addressPrefix')]"
-          ]
-        },
-        "subnets": [
-          {
-            "name": "[variables('subnetName')]",
-            "properties": {
-              "addressPrefix": "[variables('subnetPrefix')]"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "apiVersion": "[variables('apiVersion')]",
-      "type": "Microsoft.Network/networkInterfaces",
-      "name": "[variables('nicName')]",
-      "location": "[resourceGroup().location]",
-      "dependsOn": [
-        "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]",
-        "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
-      ],
-      "properties": {
-        "ipConfigurations": [
-          {
-            "name": "ipconfig1",
-            "properties": {
-              "privateIPAllocationMethod": "Dynamic",
-              "publicIPAddress": {
-                "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]"
-              },
-              "subnet": {
-                "id": "[variables('subnetRef')]"
-              }
-            }
-          }
-        ]
-      }
-    },
-    {
-      "apiVersion": "[variables('apiVersion')]",
-      "type": "Microsoft.Compute/virtualMachines",
-      "name": "[variables('vmName')]",
-      "location": "[resourceGroup().location]",
-      "dependsOn": [
-        "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
-        "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
-      ],
-      "properties": {
-        "hardwareProfile": {
-          "vmSize": "[variables('vmSize')]"
-        },
-        "osProfile": {
-          "computerName": "[variables('vmName')]",
-          "adminUsername": "[parameters('adminUsername')]",
-          "adminPassword": "[parameters('adminPassword')]"
-        },
-        "storageProfile": {
-          "imageReference": {
-            "publisher": "[variables('imagePublisher')]",
-            "offer": "[variables('imageOffer')]",
-            "sku": "[parameters('ubuntuOSVersion')]",
-            "version": "latest"
-          },
-          "osDisk": {
-            "name": "osdisk",
-            "vhd": {
-              "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), variables('apiVersion')).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
-            },
-            "caching": "ReadWrite",
-            "createOption": "FromImage"
-          },
-          "dataDisks": [
-            {
-              "name": "datadisk1",
-              "diskSizeGB": "100",
-              "lun": 0,
-              "vhd": {
-                "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), variables('apiVersion')).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/',variables('dataDisk1VhdName'),'.vhd')]"
-              },
-              "createOption": "Empty"
-            }
-          ]
-        },
-        "networkProfile": {
-          "networkInterfaces": [
-            {
-              "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]"
-            }
-          ]
-        },
-        "diagnosticsProfile": {
-          "bootDiagnostics": {
-            "enabled": "true",
-            "storageUri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), variables('apiVersion')).primaryEndpoints.blob)]"
-          }
-        }
-      }
-    }
-  ],
-  "outputs": {
-    "hostname": {
-      "type": "string",
-      "value": "[concat(parameters('dnsLabelPrefix'), '.', resourceGroup().location, '.cloudapp.azure.com')]"
-    },
-    "sshCommand": {
-      "type": "string",
-      "value": "[concat('ssh ', parameters('adminUsername'), '@', parameters('dnsLabelPrefix'), '.', resourceGroup().location, '.cloudapp.azure.com')]"
-    }
-  }
-}
diff --git a/demos/Azure/README.md b/demos/Azure/README.md
deleted file mode 100644
index d2c8155f6f4..00000000000
--- a/demos/Azure/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Demo: Managing Azure using PowerShell
-
-This demo (Azure-Demo.ps1) shows management of Azure Compute resource using Azure Resource Management (ARM) cmdlets.
-
-## Prerequisites ##
-- Install the latest PowerShell Core.
-- Install AzureRM.NetCore.Preview, AzureRM.Profile.NetCore.Preview and AzureRM.Resources.NetCore.Preview modules to a local directory.
-   - The instructions for downloading these modules are in Azure-Demo.ps1 file.
-   - You have to use the command "Install-Package -Name AzureRM.NetCore.Preview -Source https://www.powershellgallery.com/api/v2 -ProviderName NuGet -ExcludeVersion -Destination <Local Directory>"
-
-  
diff --git a/demos/DSC/dsc-demo.ps1 b/demos/DSC/dsc-demo.ps1
deleted file mode 100644
index 3abd642a3b4..00000000000
--- a/demos/DSC/dsc-demo.ps1
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-#Get Distro type and set distro-specific variables
-$OSname = Get-Content "/etc/os-release" |Select-String -Pattern "^Name="
-$OSName = $OSName.tostring().split("=")[1].Replace('"','')
-if ($OSName -like "Ubuntu*"){
-    $distro = "Ubuntu"
-    $ApachePackages = @("apache2","php5","libapache2-mod-php5")
-    $ServiceName = "apache2"
-    $VHostDir = "/etc/apache2/sites-enabled"
-    $PackageManager = "apt"
-}elseif (($OSName -like "CentOS*") -or ($OSName -like "Red Hat*") -or ($OSname -like "Oracle*")){
-    $distro = "Fedora"
-    $ApachePackages = @("httpd","mod_ssl","php","php-mysql")
-    $ServiceName = "httpd"
-    $VHostDir = "/etc/httpd/conf.d"
-    $PackageManager = "yum"
-}else{
-    Write-Error "Unknown Linux operating system. Cannot continue."
-}
-
-#Get Service Controller
-if ((Test-Path "/bin/systemctl") -or (Test-Path "/usr/bin/systemctl")){
-    $ServiceCtl = "SystemD"
-}else{
-    $ServiceCtl = "init"
-}
-
-#Get FQDN
-$hostname = & hostname --fqdn
-
-Write-Host -ForegroundColor Blue "Compile a DSC MOF for the Apache Server configuration"
-Configuration ApacheServer{
-    Node localhost{
-
-        ForEach ($Package in $ApachePackages){
-            nxPackage $Package{
-                Ensure = "Present"
-                Name = $Package
-                PackageManager = $PackageManager
-            }
-        }
-
-        nxFile vHostDirectory{
-            DestinationPath = $VhostDir
-            Type = "Directory"
-            Ensure = "Present"
-            Owner = "root"
-            Mode = "744"
-        }
-
-        #Ensure default content does not exist
-        nxFile DefVHost{
-            DestinationPath = "${VhostDir}/000-default.conf"
-            Ensure = "Absent"
-        }
-
-        nxFile Welcome.conf{
-            DestinationPath = "${VhostDir}/welcome.conf"
-            Ensure = "Absent"
-        }
-
-        nxFile UserDir.conf{
-            DestinationPath = "${VhostDir}/userdir.conf"
-            Ensure = "Absent"
-        }
-
-        #Ensure website is defined
-        nxFile DefaultSiteDir{
-            DestinationPath = "/var/www/html/defaultsite"
-            Type = "Directory"
-            Owner = "root"
-            Mode = "744"
-            Ensure = "Present"
-        }
-
-        nxFile DefaultSite.conf{
-            Destinationpath = "${VhostDir}/defaultsite.conf"
-            Owner = "root"
-            Mode = "744"
-            Ensure = "Present"
-            Contents = @"
-<VirtualHost *:80>
-DocumentRoot /var/www/html/defaultsite
-ServerName $hostname
-</VirtualHost>
-
-"@
-            DependsOn = "[nxFile]DefaultSiteDir"
-        }
-
-        nxFile TestPhp{
-            DestinationPath = "/var/www/html/defaultsite/test.php"
-            Ensure = "Present"
-            Owner = "root"
-            Mode = "744"
-            Contents = @'
-<?php phpinfo(); ?>
-
-'@
-        }
-
-        #Configure Apache Service
-        nxService ApacheService{
-            Name = "$ServiceName"
-            Enabled = $true
-            State = "running"
-            Controller = $ServiceCtl
-            DependsOn = "[nxFile]DefaultSite.conf"
-        }
-
-    }
-}
-
-ApacheServer -OutputPath "/tmp"
-
-Pause
-Write-Host -ForegroundColor Blue "Apply the configuration locally"
-& sudo /opt/microsoft/dsc/Scripts/StartDscConfiguration.py -configurationmof /tmp/localhost.mof | Out-Host
-
-Pause
-Write-Host -ForegroundColor Blue "Get the current configuration"
-& sudo /opt/microsoft/dsc/Scripts/GetDscConfiguration.py | Out-Host
diff --git a/demos/DSC/readme.md b/demos/DSC/readme.md
deleted file mode 100644
index 3a13cc6f2fe..00000000000
--- a/demos/DSC/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# DSC MOF Compilation Demo
-
-[PowerShell Desired State Configuration](https://learn.microsoft.com/powershell/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,
-such as the service controller and repo manager tools, for use in the configuration.
-
-## Prerequisites
-
-- PowerShell >= 6.0.0-alpha.8 [https://github.com/PowerShell/PowerShell/releases](https://github.com/PowerShell/PowerShell/releases)
-- OMI: >= 1.1.0  [https://www.github.com/microsoft/omi/releases](https://www.github.com/microsoft/omi/releases)
-- Desired State Configuration for Linux >= 1.1.1-278 [https://github.com/Microsoft/PowerShell-DSC-for-Linux/releases](https://github.com/Microsoft/PowerShell-DSC-for-Linux/releases)
-
-> Note: applying the DSC configuration requires privileges. The user must have sudo authorization capabilities. You will be prompted for a sudo password when running the demo.
diff --git a/demos/Docker-PowerShell/Docker-PowerShell.ps1 b/demos/Docker-PowerShell/Docker-PowerShell.ps1
deleted file mode 100644
index 18eb844fd32..00000000000
--- a/demos/Docker-PowerShell/Docker-PowerShell.ps1
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# This is a short example of the Docker-PowerShell module. The same cmdlets may be used to manage both local & remote machines, including both Windows & Linux hosts
-# The only difference between them is the example container image is pulled & run.
-
-# Import the Docker module
-#    It's available at https://github.com/Microsoft/Docker-PowerShell
-Import-Module Docker
-
-# Pull the 'hello-world' image from Docker Hub
-Pull-ContainerImage hello-world # Linux
-# Pull-ContainerImage patricklang/hello-world # Windows
-
-# Now run it
-Run-ContainerImage hello-world # Linux
-# Run-ContainerImage patricklang/hello-world # Windows
-
-# Make some room on the screen
-cls
-
-# List all containers that have exited
-Get-Container | Where-Object State -EQ "exited"
-
-# That found the right one, so go ahead and remove it
-Get-Container | Where-Object State -EQ "exited" | Remove-Container
-
-# Now remove the container image
-Remove-ContainerImage hello-world
-
-# And list the container images left on the container host
-Get-ContainerImage
diff --git a/demos/README.md b/demos/README.md
deleted file mode 100644
index 53882c047c6..00000000000
--- a/demos/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-This folder contains demos primarily targeted for Linux systems.
-Each demo showcases how to use PowerShell to be more productive by
-leveraging objects and how it can integrate with existing Linux 
-scripts and/or commands.
diff --git a/demos/SystemD/SystemD/SystemD.psm1 b/demos/SystemD/SystemD/SystemD.psm1
deleted file mode 100644
index d1bf0d8e890..00000000000
--- a/demos/SystemD/SystemD/SystemD.psm1
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-Function Get-SystemDJournal {
-    [CmdletBinding()]
-    param (
-        [Alias("args")][string]$journalctlParameters
-       )
-        $sudocmd = "sudo"
-        $cmd = "journalctl"
-        $Result = & $sudocmd $cmd $journalctlParameters -o json --no-pager
-        Try
-        {
-                  $JSONResult = $Result|ConvertFrom-Json
-                  $JSONResult
-        }
-        Catch
-        {
-                $Result
-        }
-}
diff --git a/demos/SystemD/journalctl-demo.ps1 b/demos/SystemD/journalctl-demo.ps1
deleted file mode 100644
index 2597bdc3b66..00000000000
--- a/demos/SystemD/journalctl-demo.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-Import-Module $PSScriptRoot/SystemD/SystemD.psm1
-
-#list recent journal events
-Write-Host -Foreground Blue "Get recent SystemD journal messages"
-Get-SystemDJournal -args "-xe" |Out-Host
-
-#Drill into SystemD unit messages
-Write-Host -Foreground Blue "Get recent SystemD journal messages for services and return Unit, Message"
-Get-SystemDJournal -args "-xe" | Where-Object {$_._SYSTEMD_UNIT -like "*.service"} | Format-Table _SYSTEMD_UNIT, MESSAGE | Select-Object -First 10 | Out-Host
diff --git a/demos/SystemD/readme.md b/demos/SystemD/readme.md
deleted file mode 100644
index 87580efbae3..00000000000
--- a/demos/SystemD/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## SystemD: journalctl demo
-
-This demo shows use of a PowerShell script module to wrap a native tool (journalctl) so that the output is structured for filtering and presentation control. `journalctl` is expressed as a cmdlet: Get-SystemDJournal, and the JSON output of journalctl is converted to a PowerShell object. 
-
-## Prerequisites ##
-- Requires a SystemD-based operating system (Red Hat or CentOS 7, Ubuntu 16.04)
-- Install PowerShell
-
-
-Note: Accessing the SystemD journal requires privileges. The user must have authorization to elevate with sudo. You will be prompted for a sudo password when running the demo.
\ No newline at end of file
diff --git a/demos/WindowsPowerShellModules/README.md b/demos/WindowsPowerShellModules/README.md
deleted file mode 100644
index 3cf63bd947e..00000000000
--- a/demos/WindowsPowerShellModules/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Using Windows PowerShell modules with PowerShell Core
-
-## Windows PowerShell vs PowerShell Core
-
-Existing Windows PowerShell users are familiar with the large number of modules available, however, they are not necessarily compatible with PowerShell Core.
-More information regarding compatibility is in a [blog post](https://devblogs.microsoft.com/powershell/powershell-6-0-roadmap-coreclr-backwards-compatibility-and-more/).
-
-Windows PowerShell 5.1 is based on .Net Framework 4.6.1, while PowerShell Core is based on .Net Core 2.x.
-Although both adhere to .Net Standard 2.0 and can be compatible, some modules may be using APIs or cmdlets not supported on CoreCLR or using APIs from Windows PowerShell that have been deprecated and removed from PowerShell Core (for example, PSSnapins).
-
-## Importing a Windows PowerShell module
-
-Since compatibility cannot be ensured, PowerShell Core, by default, does not look in the Windows PowerShell module path to find those modules.
-However, advanced users can explicitly enable PowerShell Core to include the Windows PowerShell module path and attempt to import those modules.
-
-First, install the [WindowsPSModulePath](https://www.powershellgallery.com/packages/WindowsPSModulePath) module from the PowerShellGallery:
-
-```powershell
-Install-Module WindowsPSModulePath -Scope CurrentUser
-```
-
-Then run `Add-WindowsPSModulePath` cmdlet to add the Windows PowerShell module path to your PowerShell Core module path:
-
-```powershell
-Add-WindowsPSModulePath
-```
-
-Note that this is only effective in the current PowerShell session.
-If you want to persist this, you can add `Add-WindowsPSModulePath` to your profile:
-
-```powershell
-"Add-WindowsPSModulePath" >> $profile
-```
-
-Once the module path has been updated, you can list available modules:
-
-```powershell
-Get-Module -ListAvailable
-```
-
-Note that PowerShell Core is not aware which Windows PowerShell modules will work and which will not so all are listed.
-We plan to improve this experience in the future.
-You can now import a Windows PowerShell module or just execute a known cmdlet and allow auto-module loading to take care of importing the module:
-
-```powershell
-Get-VM
-# this will automatically load the Hyper-V module
-```
-
-Most of the cmdlets based on CDXML will work just fine, as well as some C# based cmdlets that happen to be .NET Standard 2.0 compatible (for example, Hyper-V module) but the Active Directory module, for example, won't work.
-
-## How you can help
-
-Provide comments on Windows PowerShell modules that work or don't work in our [tracking issue](https://github.com/PowerShell/PowerShell/issues/4062).
diff --git a/demos/crontab/CronTab/CronTab.ps1xml b/demos/crontab/CronTab/CronTab.ps1xml
deleted file mode 100644
index 4246b1f62af..00000000000
--- a/demos/crontab/CronTab/CronTab.ps1xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<Configuration>
-  <ViewDefinitions>
-	<View>
-	<Name>Default</Name>
-	<ViewSelectedBy>
-		<TypeName>CronJob</TypeName>
-	</ViewSelectedBy>
-	<TableControl>
-		<TableHeaders>
-			<TableColumnHeader>
-				<Label>Minute</Label>
-				<Width>10</Width>
-				<Alignment>Left</Alignment>
-			</TableColumnHeader>
-			<TableColumnHeader>
-				<Label>Hour</Label>
-				<Width>10</Width>
-				<Alignment>Left</Alignment>
-			</TableColumnHeader>
-			<TableColumnHeader>
-				<Label>DayOfMonth</Label>
-				<Width>10</Width>
-				<Alignment>Left</Alignment>
-			</TableColumnHeader>
-			<TableColumnHeader>
-				<Label>Month</Label>
-				<Width>10</Width>
-				<Alignment>Left</Alignment>
-			</TableColumnHeader>
-			<TableColumnHeader>
-				<Label>DayOfWeek</Label>
-				<Width>10</Width>
-				<Alignment>Left</Alignment>
-			</TableColumnHeader>
-			<TableColumnHeader>
-				<Label>Command</Label>
-				<Alignment>Left</Alignment>
-			</TableColumnHeader>
-		</TableHeaders>
-		<TableRowEntries>
-		<TableRowEntry>
-			<TableColumnItems>
-			<TableColumnItem>
-			<PropertyName>Minute</PropertyName>
-			</TableColumnItem>
-			<TableColumnItem>
-				<PropertyName>Hour</PropertyName>
-			</TableColumnItem>
-			<TableColumnItem>
-				<PropertyName>DayOfMonth</PropertyName>
-			</TableColumnItem>
-			<TableColumnItem>
-				<PropertyName>Month</PropertyName>
-			</TableColumnItem>
-			<TableColumnItem>
-				<PropertyName>DayOfWeek</PropertyName>
-			</TableColumnItem>
-			<TableColumnItem>
-				<PropertyName>Command</PropertyName>
-			</TableColumnItem>
-			</TableColumnItems>
-		</TableRowEntry>
-		</TableRowEntries>
-	</TableControl>
-	</View>
-  </ViewDefinitions>
-</Configuration>
\ No newline at end of file
diff --git a/demos/crontab/CronTab/CronTab.psd1 b/demos/crontab/CronTab/CronTab.psd1
deleted file mode 100755
index aabc48e572e..00000000000
--- a/demos/crontab/CronTab/CronTab.psd1
+++ /dev/null
@@ -1,61 +0,0 @@
-@{
-
-# Script module or binary module file associated with this manifest.
-RootModule = 'CronTab.psm1'
-
-# Version number of this module.
-ModuleVersion = '0.1.0.0'
-
-# Supported PSEditions
-CompatiblePSEditions = @('Core')
-
-# ID used to uniquely identify this module
-GUID = '508bb97f-de2e-482e-aae2-01caec0be8c7'
-
-# Author of this module
-Author = 'PowerShell'
-
-# Company or vendor of this module
-CompanyName = 'Microsoft Corporation'
-
-# Copyright statement for this module
-Copyright = 'Copyright (c) Microsoft Corporation.'
-
-# Description of the functionality provided by this module
-Description = 'Sample module for managing CronTab'
-
-# Format files (.ps1xml) to be loaded when importing this module
-FormatsToProcess = 'CronTab.ps1xml'
-
-# Functions 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 functions to export.
-FunctionsToExport = 'New-CronJob','Remove-CronJob','Get-CronJob','Get-CronTabUser'
-
-# 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 = @()
-
-        # 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 = ''
-
-    } # End of PSData hashtable
-
-} # End of PrivateData hashtable
-
-# HelpInfo URI of this module
-# HelpInfoURI = ''
-
-}
-
diff --git a/demos/crontab/CronTab/CronTab.psm1 b/demos/crontab/CronTab/CronTab.psm1
deleted file mode 100644
index 4cb88e586b9..00000000000
--- a/demos/crontab/CronTab/CronTab.psm1
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-using namespace System.Collections.Generic
-using namespace System.Management.Automation
-
-$crontabcmd = "/usr/bin/crontab"
-
-class CronJob {
-    [string] $Minute
-    [string] $Hour
-    [string] $DayOfMonth
-    [string] $Month
-    [string] $DayOfWeek
-    [string] $Command
-
-    [string] ToString()
-    {
-        return "{0} {1} {2} {3} {4} {5}" -f
-            $this.Minute, $this.Hour, $this.DayOfMonth, $this.Month, $this.DayOfWeek, $this.Command
-    }
-}
-
-# Internal helper functions
-
-function Get-CronTab ([String] $user) {
-    $crontab = Invoke-CronTab -user $user -arguments "-l" -noThrow
-    if ($crontab -is [ErrorRecord]) {
-        if ($crontab.Exception.Message.StartsWith("no crontab for ")) {
-            $crontab = @()
-        }
-        else {
-            throw $crontab.Exception
-        }
-    }
-    [string[]] $crontab
-}
-
-function ConvertTo-CronJob ([String] $crontab) {
-    $split = $crontab -split " ", 6
-    $cronjob = [CronJob]@{
-        Minute = $split[0];
-        Hour = $split[1];
-        DayOfMonth= $split[2];
-        Month =$split[3];
-        DayOfWeek = $split[4];
-        Command = $split[5]
-    }
-    $cronjob
-}
-
-function Invoke-CronTab ([String] $user, [String[]] $arguments, [Switch] $noThrow) {
-    If ($user -ne [String]::Empty) {
-        $arguments = Write-Output "-u" $UserName $arguments
-    }
-
-    Write-Verbose "Running: $crontabcmd $arguments"
-    $output = & $crontabcmd @arguments 2>&1
-    if ($LASTEXITCODE -ne 0 -and -not $noThrow) {
-        $e = New-Object System.InvalidOperationException -ArgumentList $output.Exception.Message
-        throw $e
-    } else {
-        $output
-    }
-}
-
-function Import-CronTab ([String] $user, [String[]] $crontab) {
-    $temp = New-TemporaryFile
-    [String]::Join([Environment]::NewLine,$crontab) | Set-Content $temp.FullName
-    Invoke-CronTab -user $user $temp.FullName
-    Remove-Item $temp
-}
-
-# Public functions
-
-function Remove-CronJob {
-<#
-.SYNOPSIS
-  Removes the exactly matching cron job from the cron table
-
-.DESCRIPTION
-  Removes the exactly matching cron job from the cron table
-
-.EXAMPLE
-  Get-CronJob | Where-Object {%_.Command -like 'foo *'} | Remove-CronJob
-
-.RETURNVALUE
-  None
-
-.PARAMETER UserName
-  Optional parameter to specify a specific user's cron table
-
-.PARAMETER Job
-  Cron job object returned from Get-CronJob
-
-.PARAMETER Force
-  Don't prompt when removing the cron job
-#>
-    [CmdletBinding(SupportsShouldProcess=$true,ConfirmImpact="High")]
-    param (
-        [ArgumentCompleter( { $wordToComplete = $args[2]; Get-CronTabUser | Where-Object { $_ -like "$wordToComplete*" } | Sort-Object } )]
-        [Alias("u")]
-        [Parameter(Mandatory=$false)]
-        [String]
-        $UserName,
-
-        [Alias("j")]
-        [Parameter(Mandatory=$true,ValueFromPipeline=$true)]
-        [CronJob]
-        $Job,
-
-        [Switch]
-        $Force
-    )
-    process {
-
-        [string[]] $crontab = Get-CronTab -user $UserName
-        $newcrontab = [List[string]]::new()
-        $found = $false
-
-        $JobAsString = $Job.ToString()
-        foreach ($line in $crontab) {
-            if ($JobAsString -ceq $line) {
-                $found = $true
-            } else {
-                $newcrontab.Add($line)
-            }
-        }
-
-        if (-not $found) {
-            $e = New-Object System.Exception -ArgumentList "Job not found"
-            throw $e
-        }
-        if ($Force -or $PSCmdlet.ShouldProcess($Job.Command,"Remove")) {
-            Import-CronTab -user $UserName -crontab $newcrontab
-        }
-    }
-}
-
-function New-CronJob {
-<#
-.SYNOPSIS
-  Create a new cron job
-.DESCRIPTION
-  Create a new job in the cron table.  Date and time parameters can be specified
-  as ranges such as 10-30, as a list: 5,6,7, or combined 1-5,10-15.  An asterisk
-  means 'first through last' (the entire allowed range).  Step values can be used
-  with ranges or with an asterisk.  Every 2 hours can be specified as either
-  0-23/2 or */2.
-.EXAMPLE
-  New-CronJob -Minute 10-30 -Hour 10-20/2 -DayOfMonth */2 -Command "/bin/bash -c 'echo hello' > ~/hello"
-
-.RETURNVALUE
-  If successful, an object representing the cron job is returned
-
-.PARAMETER UserName
-  Optional parameter to specify a specific user's cron table
-
-.PARAMETER Minute
-  Valid values are 0 to 59.  If not specified, defaults to *.
-
-.PARAMETER Hour
-  Valid values are 0-23.  If not specified, defaults to *.
-
-.PARAMETER DayOfMonth
-  Valid values are 1-31.  If not specified, defaults to *.
-
-.PARAMETER Month
-  Valid values are 1-12.  If not specified, defaults to *.
-
-.PARAMETER DayOfWeek
-  Valid values are 0-7.  0 and 7 are both Sunday.  If not specified, defaults to *.
-
-.PARAMETER Command
-  Command to execute at the scheduled time and day.
-#>
-    [CmdletBinding()]
-    param (
-        [ArgumentCompleter( { $wordToComplete = $args[2]; Get-CronTabUser | Where-Object { $_ -like "$wordToComplete*" } | Sort-Object } )]
-        [Alias("u")]
-        [Parameter(Mandatory=$false)]
-        [String]
-        $UserName,
-
-        [Alias("mi")][Parameter(Position=1)][String[]] $Minute = "*",
-        [Alias("h")][Parameter(Position=2)][String[]] $Hour = "*",
-        [Alias("dm")][Parameter(Position=3)][String[]] $DayOfMonth = "*",
-        [Alias("mo")][Parameter(Position=4)][String[]] $Month = "*",
-        [Alias("dw")][Parameter(Position=5)][String[]] $DayOfWeek = "*",
-        [Alias("c")][Parameter(Mandatory=$true,Position=6)][String] $Command
-    )
-    process {
-        # TODO: validate parameters, note that different versions of crontab support different capabilities
-        $line = "{0} {1} {2} {3} {4} {5}" -f [String]::Join(",",$Minute), [String]::Join(",",$Hour),
-            [String]::Join(",",$DayOfMonth), [String]::Join(",",$Month), [String]::Join(",",$DayOfWeek), $Command
-        [string[]] $crontab = Get-CronTab -user $UserName
-        $crontab += $line
-        Import-CronTab -User $UserName -crontab $crontab
-        ConvertTo-CronJob -crontab $line
-    }
-}
-
-function Get-CronJob {
-<#
-.SYNOPSIS
-  Returns the current cron jobs from the cron table
-
-.DESCRIPTION
-  Returns the current cron jobs from the cron table
-
-.EXAMPLE
-  Get-CronJob -UserName Steve
-
-.RETURNVALUE
-  CronJob objects
-  
-.PARAMETER UserName
-  Optional parameter to specify a specific user's cron table
-#>
-    [CmdletBinding()]
-    [OutputType([CronJob])]
-    param (
-        [Alias("u")][Parameter(Mandatory=$false)][String] $UserName
-    )
-    process {
-        $crontab = Get-CronTab -user $UserName
-        ForEach ($line in $crontab) {
-            if ($line.Trim().Length -gt 0)
-            {
-                ConvertTo-CronJob -crontab $line
-            }
-        }
-    }
-}
-
-function Get-CronTabUser {
-<#
-.SYNOPSIS
-  Returns the users allowed to use crontab
-#>
-    [CmdletBinding()]
-    [OutputType([String])]
-    param()
-
-    $allow = '/etc/cron.allow'
-    if (Test-Path $allow)
-    {
-        Get-Content $allow
-    }
-    else
-    {
-        $users = Get-Content /etc/passwd | ForEach-Object { ($_ -split ':')[0] }
-        $deny = '/etc/cron.deny'
-        if (Test-Path $deny)
-        {
-            $denyUsers = Get-Content $deny
-            $users | Where-Object { $denyUsers -notcontains $_ }
-        }
-        else
-        {
-            $users
-        }
-    }
-}
diff --git a/demos/crontab/README.md b/demos/crontab/README.md
deleted file mode 100644
index bdfb16dbb06..00000000000
--- a/demos/crontab/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## CronTab demo
-
-This demo shows examining, creating, and removing cron jobs via crontab.
-
-Output of Get-CronJob is a strongly typed object with properties like DayOfWeek or Command.
-Remove-CronJob prompts before removing the job unless you specify -Force.
-
-Tab completion of -UserName is supported, e.g.
-
-Get-CronJob -u <TAB>
-
-NYI: no way to run crontab with sudo if necessary
-NYI: ignoring shell variables or comments
-NYI: New-CronJob -Description "..." (save in comments"
-NYI: @reboot,@daily,@hourly,etc
diff --git a/demos/crontab/crontab.ps1 b/demos/crontab/crontab.ps1
deleted file mode 100644
index 3d0ee0741ea..00000000000
--- a/demos/crontab/crontab.ps1
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-Import-Module $PSScriptRoot/CronTab/CronTab.psd1
-
-Write-Host -Foreground Yellow "Get the existing cron jobs"
-Get-CronJob | Out-Host
-
-Write-Host -Foreground Yellow "New cron job to clean out tmp every day at 1am"
-New-CronJob -Command 'rm -rf /tmp/*; #demo' -Hour 1 | Out-Host
-
-Write-Host -Foreground Yellow "Add some more jobs"
-New-CronJob -Command 'python -c ~/scripts/backup_users; #demo' -Hour 2 -DayOfWeek 1-5 | Out-Host
-New-CronJob -Command 'powershell -c "cd ~/src/PowerShell; ipmo ./build.psm1; Start-PSBuild"; #demo' -Hour 2 -DayOfWeek * | Out-Host
-
-Write-Host -Foreground Yellow "Show in bash that the new cron job exists"
-crontab -l
-
-Write-Host -Foreground Yellow "Get jobs that run every day"
-Get-CronJob | Where-Object { $_.DayOfWeek -eq '*' -or $_.DayOfWeek -eq '1-7' } | Out-Host
-
-Write-Host -Foreground Yellow "Remove one cron job, with prompting to confirm"
-Get-CronJob | Where-Object { $_.Command -match '^powershell.*' } | Remove-CronJob | Out-Host
-
-Write-Host -Foreground Yellow "And the other job remains"
-Get-CronJob | Out-Host
-
-Write-Host -Foreground Yellow "Remove remaining demo jobs without prompting"
-Get-CronJob | Where-Object { $_.Command -match '#demo'} | Remove-CronJob -Force
-
-Write-Host -Foreground Yellow "Show in bash that cron should be clean"
-crontab -l
diff --git a/demos/dsc.ps1 b/demos/dsc.ps1
deleted file mode 100644
index c59be643edc..00000000000
--- a/demos/dsc.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# DSC MOF Compilation
-# DSC Configuration() script that:
-# Defines base configuration users, groups, settings
-# Uses PS function to set package configuration (ensure=Present) for an array of packages
-# Probes for the existence of a package (Apache or MySQL) and conditionally configures the workload. I.e., if Apache is installed, configure Apache settings
-
-# Demo execution:
-# Show the .ps1
-# Run the .ps1 to generate a MOF
-# Apply the MOF locally with Start-DSCConfiguration
-# Show the newly configured state
diff --git a/demos/powershellget/PowerShellGet.ps1 b/demos/powershellget/PowerShellGet.ps1
deleted file mode 100644
index e93216851da..00000000000
--- a/demos/powershellget/PowerShellGet.ps1
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-#region find, install, update, uninstall the PowerShell scripts from an online repository.
-# Value: equivalent of pypi
-
-# List of PowerShellGet commands
-Get-Command -Module PowerShellGet
-
-# Discover PowerShell Scripts
-Find-Script
-Find-Script -Name Start-Demo
-
-# Save scripts to a specified location
-Save-Script Start-Demo -Repository PSGallery -Path /tmp
-Get-ChildItem -Path /tmp/Start-Demo.ps1
-
-# Install a script to the common scripts location
-Find-Script -Name Start-Demo -Repository PSGallery  | Install-Script
-Get-InstalledScript
-
-# Install another script to show the update functionality
-Install-Script Fabrikam-Script -RequiredVersion 1.0
-Get-InstalledScript
-Get-InstalledScript Fabrikam-Script | Format-List *
-
-# Update the installed scripts
-Update-Script -WhatIf
-Update-Script
-Get-InstalledScript
-
-# Uninstall a script file
-Uninstall-Script Fabrikam-Script -Verbose
-
-#endregion
-
-#region Using PowerShellGet find and install modules
-
-# Value: equivalent of pypi
-# Look for all the modules we'll be demoing today
-Find-Module -Tag 'PowerShellCore_Demo'
-
-# Save module to specified location
-Save-Module -Tag 'PowerShellCore_Demo' -Path /tmp
-
-# Pipe this to Install-Module to install them
-Find-Module -Tag 'PowerShellCore_Demo' | Install-Module -Verbose
-Get-InstalledModule
-
-# Update all installed modules
-Update-Module
-
-#endregion
-
-#region Using PowerShellGet with tags
-
-# Look for all the scripts we'll be demoing today
-Find-Script -Tag 'PowerShellCore_Demo'
-
-# Pipe this to Install-Script to install them
-Find-Script -Tag 'PowerShellCore_Demo' | Install-Script -Verbose
-Get-InstalledScript
-
-#endregion
-
-#region Working with PowerShellGet repositories
-
-# List available PS repositories
-Get-PSRepository
-
-# Register a new private feed
-Register-PSRepository -Name "myPrivateGallery" –SourceLocation "https://www.myget.org/F/powershellgetdemo/api/v2" -InstallationPolicy Trusted
-
-# Change the trust level for a repositories
-Set-PSRepository -Name "myPrivateGallery" -InstallationPolicy "Untrusted"
-
-# Remove a private feed
-Unregister-PSRepository -Name "myPrivateGallery"
-
-#endregion
diff --git a/demos/powershellget/README.md b/demos/powershellget/README.md
deleted file mode 100644
index f225610169b..00000000000
--- a/demos/powershellget/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## PowerShellGet demo
-
-PowerShellGet is a PowerShell module with the commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.
-
-This demo shows discovering, installing, updating, uninstalling the PowerShell scripts from an online repository.
diff --git a/demos/python/README.md b/demos/python/README.md
deleted file mode 100644
index d2d1486e2fe..00000000000
--- a/demos/python/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# PowerShell/Python Interoperation Demo
-
-The `demo_script.ps1` file in this directory walks through a
-demonstration of basic interoperation between PowerShell and Python
-including how to use JSON to exchange structured objects between
-Python and PowerShell.
-
-The other files in this directory are referenced by `demo_script.ps1`.
diff --git a/demos/python/class1.ps1 b/demos/python/class1.ps1
deleted file mode 100644
index b74c0c8d5d6..00000000000
--- a/demos/python/class1.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-#
-# Wrap Python script in such a way to make it easy to
-# consume from PowerShell
-#
-# The variable $PSScriptRoot points to the directory
-# from which the script was executed. This allows
-# picking up the Python script from the same directory
-#
-
-& $PSScriptRoot/class1.py | ConvertFrom-Json
-
diff --git a/demos/python/class1.py b/demos/python/class1.py
deleted file mode 100755
index ad923449455..00000000000
--- a/demos/python/class1.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/python3
-
-import json
-
-# Define a class with a method that returns JSON
-class returnsjson:
-    def __init__(self):
-        the_object = self
-    def method1(self):
-        return json.dumps(['foo',
-                            {
-                                'bar': ('baz', None, 1.0, 2),
-                                'buz': ('foo1', 'foo2', 'foo3')
-                            },
-                            'alpha',
-                            1,2,3])
-
-c = returnsjson()
-print(c.method1())
diff --git a/demos/python/demo_script.ps1 b/demos/python/demo_script.ps1
deleted file mode 100644
index af2067642a1..00000000000
--- a/demos/python/demo_script.ps1
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-#
-# Demo simple interoperation between PowerShell and Python
-
-# Basic execution of a Python script fragment
-python -c "print('Hi!')"
-
-# Capture output in a variable
-$data = python -c "print('Hi!')"
-
-# And show the data
-$data
-
-# Use in expressions
-5 + (python -c "print(2 + 3)") + 7
-
-# Create a Python script using a PowerShell here-string, no extension
-@"
-#!/usr/bin/python3
-print('Hi!')
-"@ | Out-File -Encoding ascii hi
-
-# Make it executable
-chmod +x hi
-
-# Run it - shows that PowerShell really is a shell
-./hi
-
-# A more complex script that outputs JSON
-cat class1.py
-
-# Run the script
-./class1.py
-
-# Capture the data as structured objects (arrays and hashtables)
-$data = ./class1.py | ConvertFrom-Json
-
-# look at the first element of the returned array
-$data[0]
-
-# Look at the second
-$data[1]
-
-# Get a specific element from the data
-$data[1].buz[1]
-
-# Finally wrap it all up so it looks like a simple PowerShell command
-cat class1.ps1
-
-# And run it, treating the output as structured data.
-(./class1)[1].buz[1]
-
-# Finally a PowerShell script with in-line Python
-cat inline_python.ps1
-
-# and run it
-./inline_python
-
-####################################
-# cleanup
-rm hi
diff --git a/demos/python/inline_python.ps1 b/demos/python/inline_python.ps1
deleted file mode 100644
index 71b65215f74..00000000000
--- a/demos/python/inline_python.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-#
-# An example showing inline Python code in a PowerShell script
-#
-
-"Hello from PowerShell!"
-
-# Inline Python code in a "here string" which allows for a multi-line script
-python3 -c @"
-print('    Hello from Python!')
-print('    Python and PowerShell get along great!')
-"@
-
-# Back to PowerShell...
-"Back to PowerShell."
-"Bye now!"
-
diff --git a/demos/rest/README.md b/demos/rest/README.md
deleted file mode 100644
index 03bb103889e..00000000000
--- a/demos/rest/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## REST demo
-
-This demo shows how to interact with the GitHub API using the Invoke-WebRequest cmdlet.
-
-rest.ps1:
-Invoke-WebRequest and ConvertFrom-Json cmdlets are used to get the issues of a repo.
-The issues are processed as objects to find the most commented on issues.
diff --git a/demos/rest/rest.ps1 b/demos/rest/rest.ps1
deleted file mode 100644
index f40b49b6538..00000000000
--- a/demos/rest/rest.ps1
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-#-----------------
-
-function Get-Issue
-{
-    param([string]$UserName,
-          [string]$Repo,
-          [ValidateRange(1,100)][int]$PerPage = 100)
-
-    $body = @{
-        per_page = $PerPage
-    }
-
-    $uri = "https://api.github.com/repos/$UserName/$Repo/issues"
-    while ($uri)
-    {
-        $response = Invoke-WebRequest -Uri $uri -Body $body
-        $response.Content | ConvertFrom-Json | Write-Output
-
-        $uri = $null
-        foreach ($link in $response.Headers.Link -split ',')
-        {
-            if ($link -match '\s*<(.*)>;\s+rel="next"')
-            {
-                $uri = $Matches[1]
-            }
-        }
-    }
-}
-
-$issues = Get-Issue -UserName lzybkr -Repo PSReadline
-
-$issues.Count
-
-$issues | Sort-Object -Descending comments | Select-Object -First 15 | ft number,comments,title
-
-foreach ($issue in $issues)
-{
-    if ($issue.labels.name -contains 'bug' -and $issue.labels.name -contains 'vi mode')
-    {
-        "{0} is a vi mode bug" -f $issue.url
-    }
-}
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 92ed78334f3..3263cf456c8 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -7,7 +7,7 @@
 - [PowerShell 101][11]
 - [PowerShell learning resources][10]
 
-## What are the best practices and style?
+## What are the best practices and styles?
 
 The [PoshCode][03] unofficial guide is our reference.
 
@@ -33,7 +33,7 @@ The [PoshCode][03] unofficial guide is our reference.
 
 Error handling in PowerShell is unique, as not all errors result in catchable exceptions by default.
 Setting `$ErrorActionPreference = 'Stop'` will likely do what you want; that is, cause
-non-terminating errors instead to terminate. Read the [GitHub issue][02] for more information.
+non-terminating errors instead of terminating. Read the [GitHub issue][02] for more information.
 
 ## Where do I get the PowerShell Core SDK package?
 
diff --git a/docs/building/linux.md b/docs/building/linux.md
index 87fce81843d..55d96e4c21a 100644
--- a/docs/building/linux.md
+++ b/docs/building/linux.md
@@ -5,14 +5,14 @@ We'll start by showing how to set up your environment from scratch.
 
 ## Environment
 
-These instructions are written assuming the Ubuntu 16.04 LTS, since that's the distro the team uses.
+These instructions are written assuming Ubuntu 24.04 LTS (the CI uses ubuntu-latest).
 The build module works on a best-effort basis for other distributions.
 
 ### Git Setup
 
 Using Git requires it to be set up correctly;
 refer to the [Working with the PowerShell Repository](../git/README.md),
-[README](../../README.md), and [Contributing Guidelines](../../.github/CONTRIBUTING.md).
+[Readme](../../README.md), and [Contributing Guidelines](../../.github/CONTRIBUTING.md).
 
 **This guide assumes that you have recursively cloned the PowerShell repository and `cd`ed into it.**
 
@@ -41,15 +41,13 @@ In PowerShell:
 
 ```powershell
 Import-Module ./build.psm1
-Start-PSBootstrap
+Start-PSBootstrap -Scenario Both
 ```
 
 The `Start-PSBootstrap` function does the following:
 
-- Adds the LLVM package feed
-- Installs our dependencies combined with the dependencies of the .NET CLI toolchain via `apt-get`
-- Uninstalls any prior versions of .NET CLI
-- Downloads and installs the .NET Core SDK 2.0.0 to `~/.dotnet`
+- Installs build dependencies and packaging tools via `apt-get` (or equivalent package manager)
+- Downloads and installs the .NET SDK (currently version 10.0.100-rc.1) to `~/.dotnet`
 
 If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your `PATH` environment variable.
 
@@ -63,13 +61,15 @@ If you have followed the toolchain setup section above, you should have PowerShe
 
 ```powershell
 Import-Module ./build.psm1
-Start-PSBuild
+Start-PSBuild -UseNuGetOrg
 ```
 
+> The PowerShell project by default references packages from the private Azure Artifacts feed, which requires authentication. The `-UseNuGetOrg` flag reconfigures the build to use the public NuGet.org feed instead.
+
 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/net6.0/linux-x64/publish/pwsh`.
+`./src/powershell-unix/bin/Debug/net11.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`.
+You can run our cross-platform Pester tests with `Start-PSPester -UseNuGetOrg`, and our xUnit tests with `Start-PSxUnit`.
diff --git a/docs/building/macos.md b/docs/building/macos.md
index 63f1b4c9f82..7fd767ffa1c 100644
--- a/docs/building/macos.md
+++ b/docs/building/macos.md
@@ -34,6 +34,8 @@ We cannot do this for you in the build module due to #[847][].
 
 ## Build using our module
 
-Start a PowerShell session by running `pwsh`, and then use `Start-PSBuild` from the module.
+Start a PowerShell session by running `pwsh`, and then use `Start-PSBuild -UseNuGetOrg` from the module.
 
 After building, PowerShell will be at `./src/powershell-unix/bin/Debug/net6.0/osx-x64/publish/pwsh`.
+
+> The PowerShell project by default references packages from the private Azure Artifacts feed, which requires authentication. The `-UseNuGetOrg` flag reconfigures the build to use the public NuGet.org feed instead.
diff --git a/docs/building/windows-core.md b/docs/building/windows-core.md
index af3ac86f1de..20774695fcd 100644
--- a/docs/building/windows-core.md
+++ b/docs/building/windows-core.md
@@ -10,8 +10,8 @@ R2, though they should work anywhere the dependencies work.
 
 ### Git Setup
 
-Using Git requires it to be setup correctly; refer to the
-[README](../../README.md) and
+Using Git requires it to be set up correctly; refer to the
+[Readme](../../README.md) and
 [Contributing Guidelines](../../.github/CONTRIBUTING.md).
 
 This guide assumes that you have recursively cloned the PowerShell repository and `cd`ed into it.
@@ -29,13 +29,13 @@ that you must have PowerShell Core 6 Beta.9 (or newer) installed to successfully
 
 ### .NET CLI
 
-We use the [.NET Command Line Interface][dotnet-cli] (`dotnet`) to build PowerShell.
+We use the [.NET command-line interface][dotnet-cli] (`dotnet`) to build PowerShell.
 The version we are currently using is mentioned in [`global.json`](../../global.json#L3) at the root of this repository.
 The `Start-PSBootstrap` function will automatically install it and add it to your path:
 
 ```powershell
 Import-Module ./build.psm1
-Start-PSBootstrap
+Start-PSBootstrap -Scenario Dotnet
 ```
 
 Or you can call `Install-Dotnet` directly:
@@ -54,11 +54,15 @@ If you have any problems installing `dotnet`, please see their [documentation][c
 
 We maintain a [PowerShell module](../../build.psm1) with the function `Start-PSBuild` to build PowerShell.
 
+We do not recommend using Visual Studio Dev Environment Terminal to build the source code.
+
 ```powershell
 Import-Module ./build.psm1
-Start-PSBuild
+Start-PSBuild -Clean -PSModuleRestore -UseNuGetOrg
 ```
 
+> The PowerShell project by default references packages from the private Azure Artifacts feed, which requires authentication. The `-UseNuGetOrg` flag reconfigures the build to use the public NuGet.org feed instead.
+
 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]`,
@@ -77,7 +81,7 @@ You can run our cross-platform Pester tests with `Start-PSPester`.
 
 ```powershell
 Import-Module ./build.psm1
-Start-PSPester
+Start-PSPester -UseNuGetOrg
 ```
 
 ## Building in Visual Studio
diff --git a/docs/cmdlet-example/visual-studio-simple-example.md b/docs/cmdlet-example/visual-studio-simple-example.md
index b4a20ba138c..37244f25705 100644
--- a/docs/cmdlet-example/visual-studio-simple-example.md
+++ b/docs/cmdlet-example/visual-studio-simple-example.md
@@ -131,5 +131,5 @@ It should find `PowerShellStandard.Library` package, select it and it will show
 ![StdImage61](./Images/Std61.png)
 On PowerShell Core on Linux:
 ![StdImage62](./Images/Std62.png)
-On Windows PowerShell on Windows (this requires [.NET Framework 4.7.1](https://github.com/Microsoft/dotnet-framework-early-access/blob/master/instructions.md)):
+On Windows PowerShell on Windows (this requires [.NET Framework 4.7.1](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net471)
 ![StdImage63](./Images/Std63.png)
diff --git a/docs/community/governance.md b/docs/community/governance.md
index 8cc989d2497..c401920bec7 100644
--- a/docs/community/governance.md
+++ b/docs/community/governance.md
@@ -6,7 +6,7 @@
   approving [RFCs][RFC-repo], and approving new maintainers/committee members
 * [**Repository maintainer**](#repository-maintainers): An individual responsible for merging pull requests (PRs) into `master` when all requirements are met (code review, tests, docs, and RFC approval as applicable).
   Repository Maintainers are the only people with write permissions for the `master` branch.
-* [**Working Groups (WGs)**](#working-groups-(wgs)) are collections of contributors responsible for
+* [**Working Groups (WGs)**](#working-groups) are collections of contributors responsible for
   providing expertise on a specific area of PowerShell in order to help establish consensus within
   the community and Committee.
 * **Corporation**: The Corporation owns the PowerShell repository and, under extreme circumstances,
@@ -58,15 +58,16 @@ If any Committee Members feels like this behavior is large enough to warrant an
 
 As a PowerShell Committee Member:
 
+1. **DO** enforce the [Code of Conduct][coc] by taking reports of abuse and violations to the committee for resolution
 1. **DO** reply to issues and pull requests with design opinions
   (this could include offering support for good work or exciting new features)
 1. **DO** encourage healthy discussion about the direction of PowerShell
 1. **DO** raise "red flags" on PRs that haven't followed the proper RFC process when applicable
 1. **DO** contribute to documentation and best practices
-1. **DO** maintain a presence in the PowerShell community outside of GitHub (Twitter, blogs, StackOverflow, Reddit, Hacker News, etc.)
+1. **DO** maintain a presence in the PowerShell community outside of GitHub (Twitter, blogs, Stack Overflow, Reddit, Hacker News, etc.)
 1. **DO** heavily incorporate community feedback into the weight of your decisions
 1. **DO** be polite and respectful to a wide variety of opinions and perspectives
-1. **DO** make sure contributors are following the [contributor guidelines](../../.github/CONTRIBUTING.md)
+1. **DO** make sure contributors are following the [contributing guidelines](../../.github/CONTRIBUTING.md)
 
 1. **DON'T** constantly raise "red flags" for unimportant or minor problems to the point that the progress of the project is being slowed
 1. **DON'T** offer up your opinions as the absolute opinion of the PowerShell Committee.
@@ -82,6 +83,19 @@ At any point in time, a Committee Member can nominate a strong community member
 Nominations should be submitted in the form of [RFCs][RFC-repo] detailing why that individual is qualified and how they will contribute.
 After the RFC has been discussed, a unanimous vote will be required for the new Committee Member to be confirmed.
 
+### PowerShell Committee Code of Conduct Enforcement
+
+As stated in the [contributing guidelines](../../.github/CONTRIBUTING.md#code-of-conduct-enforcement):
+
+Reports of abuse will be reviewed by the PowerShell Committee and if it has been determined that violations of the
+[Code of Conduct][coc] has occurred, then a temporary ban may be imposed.
+The duration of the temporary ban will depend on the impact and/or severity of the infraction.
+This can vary from 1 day, a few days, a week, and up to 30 days.
+Repeat offenses may result in a permanent ban from the PowerShell org.
+
+Microsoft employees on the PowerShell committee should review the available support at
+[aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support).
+
 ## Repository Maintainers
 
 Repository Maintainers are trusted stewards of the PowerShell community/repository responsible for maintaining consistency and quality of PowerShell code.
@@ -89,7 +103,7 @@ One of their primary responsibilities is merging pull requests after all require
 
 For more information on Repository Maintainers--their responsibilities, who they are, and how one becomes a Maintainer--see the [README for Repository Maintainers][maintainers].
 
-## Working Groups (WGs)
+## Working Groups
 
 [Working Groups (WGs)][wg] are collections of contributors with knowledge of specific components or
 technologies in the PowerShell domain.
@@ -143,6 +157,7 @@ See our [Pull Request Process][pull-request-process]
 [pester]: ../testing-guidelines/WritingPesterTests.md
 [breaking-changes]: ../dev-process/breaking-change-contract.md
 [issue-process]: ../maintainers/issue-management.md
+[coc]: ../../CODE_OF_CONDUCT.md
 [pull-request-process]: ../../.github/CONTRIBUTING.md#lifecycle-of-a-pull-request
 [docs-contributing]: https://github.com/PowerShell/PowerShell-Docs/blob/staging/CONTRIBUTING.md
 [maintainers]: ../maintainers/README.md
diff --git a/docs/community/working-group-definitions.md b/docs/community/working-group-definitions.md
index 1b03901d460..277fc37f789 100644
--- a/docs/community/working-group-definitions.md
+++ b/docs/community/working-group-definitions.md
@@ -30,7 +30,7 @@ The PowerShell developer experience includes the **development of modules** (in
 as well as the experience of **hosting PowerShell and its APIs** in other applications and language runtimes.
 Special consideration should be given to topics like **backwards compatibility** with Windows PowerShell
 (e.g. with **PowerShell Standard**) and **integration with related developer tools**
-(e.g. .NET CLI or the PowerShell extension for VS Code).
+(e.g. .NET CLI or the PowerShell extension for Visual Studio Code).
 
 ### Members
 
@@ -38,6 +38,7 @@ Special consideration should be given to topics like **backwards compatibility**
 * @adityapatwardhan (SDK)
 * @michaeltlombardi
 * @SeeminglyScience
+* @bergmeister
 
 ## Engine
 
@@ -49,8 +50,8 @@ This includes (but is not limited to):
 * The language parser
 * The command and parameter binders
 * The module and provider systems
-    * `*-Item` cmdlets
-    * Providers
+  * `*-Item` cmdlets
+  * Providers
 * Performance
 * Componentization
 * AssemblyLoadContext
@@ -61,13 +62,14 @@ However, it's expected that many issues will require input from both WGs.
 
 ### Members
 
-* @BrucePay
 * @daxian-dbw
 * @JamesWTruher
 * @rkeithhill
 * @vexx32
 * @SeeminglyScience
 * @IISResetMe
+* @powercode
+* @kilasuit
 
 ## Interactive UX
 
@@ -91,6 +93,8 @@ These topics include (but are not limited to):
 * @SeeminglyScience
 * @sdwheeler
 * @kilasuit
+* @FriedrichWeinmann
+* @StevenBucher98
 
 ## Language
 
@@ -104,7 +108,6 @@ particularly given the long-lasting effects of language decisions.
 
 * @JamesWTruher
 * @daxian-dbw
-* @BrucePay
 * @SeeminglyScience
 
 ## Remoting
@@ -118,14 +121,13 @@ Given the commonality of serialization boundaries, the Remoting WG should also f
 ### Members
 
 * @anmenaga
-* @PaulHigin
 * @TravisEz13
 
 ## Cmdlets and Modules
 
 The Cmdlet WG should focus on core/inbox modules whose source code lives within the
 `PowerShell/PowerShell` repository,
-including the proposal of new cmdlets and parameters, improvements and bug fixes to existing
+including the proposal of new cmdlets and parameters, improvements and bugfixes to existing
 cmdlets/parameters, and breaking changes.
 
 However, some modules that ship as part of the PowerShell package are managed in other source repositories.
@@ -147,6 +149,8 @@ These modules include:
 * @SteveL-MSFT
 * @jdhitsolutions
 * @TobiasPSP
+* @doctordns
+* @kilasuit
 
 ## Security
 
@@ -156,7 +160,9 @@ in order to provide their expertise, concerns, and guidance.
 ### Members
 
 * @TravisEz13
-* @PaulHigin
+* @SydneySmithReal
+* @anamnavi
+* @SteveL-MSFT
 
 ## Explicitly not Working Groups
 
@@ -170,12 +176,12 @@ This bucket is also not oriented a customer-facing deliverable and is already so
 so we don't need to address it as part of the WGs.
 
 * Build
-    * `build.psm1`
-    * `install-powershell.ps1`
-    * Build infrastructure and automation
+  * `build.psm1`
+  * `install-powershell.ps1`
+  * Build infrastructure and automation
 * Packaging
-    * Scripts
-    * Infrastructure
+  * Scripts
+  * Infrastructure
 
 ### Quality
 
@@ -184,10 +190,10 @@ Similar to the topic of building PowerShell, quality
 should be managed by the PowerShell Maintainers.
 
 * Test code
-    * Pester unit tests
-    * xUnit unit tests
+  * Pester unit tests
+  * xUnit unit tests
 * Test infrastructure
-    * Nightlies
-    * CI
+  * Nightlies
+  * CI
 * Code coverage
 * Pester
diff --git a/docs/git/README.md b/docs/git/README.md
index 817e4930f6c..46b5eee4c62 100644
--- a/docs/git/README.md
+++ b/docs/git/README.md
@@ -13,9 +13,9 @@ git clone https://github.com/PowerShell/PowerShell.git --branch=master
 * Checkout a new local branch from `master` for every change you want to make (bugfix, feature).
 * Use lowercase-with-dashes for naming.
 * Follow [Linus' recommendations][Linus] about history.
-    - "People can (and probably should) rebase their _private_ trees (their own work). That's a _cleanup_. But never other peoples code. That's a 'destroy history'...
-    You must never EVER destroy other peoples history. You must not rebase commits other people did.
-    Basically, if it doesn't have your sign-off on it, it's off limits: you can't rebase it, because it's not yours."
+  * "People can (and probably should) rebase their _private_ trees (their own work). That's a _cleanup_. But never other peoples code. That's a 'destroy history'...
+  You must never EVER destroy other peoples history. You must not rebase commits other people did.
+  Basically, if it doesn't have your sign-off on it, it's off limits: you can't rebase it, because it's not yours."
 
 ### Understand branches
 
@@ -23,12 +23,12 @@ git clone https://github.com/PowerShell/PowerShell.git --branch=master
   It could be unstable.
 * Send your pull requests to **master**.
 
-### Sync your local repo
+### Sync your local repository
 
 Use **git rebase** instead of **git merge** and **git pull**, when you're updating your feature-branch.
 
 ```sh
-# fetch updates all remote branch references in the repo
+# fetch updates all remote branch references in the repository
 # --all : tells it to do it for all remotes (handy, when you use your fork)
 # -p : tells it to remove obsolete remote branch references (when they are removed from remote)
 git fetch --all -p
@@ -42,11 +42,9 @@ git rebase origin/master
 Covering all possible git scenarios is behind the scope of the current document.
 Git has excellent documentation and lots of materials available online.
 
-We are leaving few links here:
+We are leaving a few links here:
 
-[Git pretty flowchart](http://justinhileman.info/article/git-pretty/): what to do, when your local repo became a mess.
-
-[Linus]:https://wincent.com/wiki/git_rebase%3A_you're_doing_it_wrong
+[Linus]:https://web.archive.org/web/20230522041845/https://wincent.com/wiki/git_rebase%3A_you're_doing_it_wrong
 
 ## Tags
 
@@ -57,12 +55,12 @@ you will find it via **tags**.
 * Find the tag that corresponds to the release.
 * Use `git checkout <tag-name>` to get this version.
 
-**Note:** [checking out a tag][tag] will move the repo to a [DETACHED HEAD][HEAD] state.
+**Note:** [checking out a tag][tag] will move the repository to a [DETACHED HEAD][HEAD] state.
 
 [tag]:https://git-scm.com/book/en/v2/Git-Basics-Tagging#Checking-out-Tags
 [HEAD]:https://www.git-tower.com/learn/git/faq/detached-head-when-checkout-commit
 
-If you want to make changes, based on tag's version (i.e. a hotfix), 
+If you want to make changes, based on tag's version (i.e. a hotfix),
 checkout a new branch from this DETACHED HEAD state.
 
 ```sh
diff --git a/docs/host-powershell/sample/NuGet.config b/docs/host-powershell/sample/NuGet.config.md
similarity index 70%
rename from docs/host-powershell/sample/NuGet.config
rename to docs/host-powershell/sample/NuGet.config.md
index b3ce3cb82a5..bf2b4c3f688 100644
--- a/docs/host-powershell/sample/NuGet.config
+++ b/docs/host-powershell/sample/NuGet.config.md
@@ -1,3 +1,8 @@
+# Nuget.config creation
+
+Create a filed called `nuget.config` at this location with this content:
+
+```xml
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
@@ -8,3 +13,4 @@
     <clear />
   </disabledPackageSources>
 </configuration>
+```
diff --git a/docs/maintainers/README.md b/docs/maintainers/README.md
index e592661cf8f..ebba4b02258 100644
--- a/docs/maintainers/README.md
+++ b/docs/maintainers/README.md
@@ -15,7 +15,6 @@ They have [write access](https://docs.github.com/en/free-pro-team@latest/github/
 - [Repository Maintainer Responsibilities](#repository-maintainer-responsibilities)
 - [Issue Management Process](#issue-management-process)
 - [Pull Request Workflow](#pull-request-workflow)
-    - [Abandoned Pull Requests](#abandoned-pull-requests)
 - [Becoming a Repository Maintainer](#becoming-a-repository-maintainer)
 
 ## Current Repository Maintainers
@@ -33,7 +32,7 @@ They have [write access](https://docs.github.com/en/free-pro-team@latest/github/
 
 <!-- please keep in alphabetical order -->
 
-- Andy Schwartzmeyer ([andschwa](https://github.com/andschwa))
+- Andy Jordan ([andyleejordan](https://github.com/andyleejordan))
 - Jason Shirk ([lzybkr](https://github.com/lzybkr))
 - Mike Richmond ([mirichmo](https://github.com/mirichmo))
 - Sergei Vorobev ([vors](https://github.com/vors))
@@ -44,6 +43,7 @@ Repository Maintainers enable rapid contributions while maintaining a high level
 
 If you are a Repository Maintainer, you:
 
+1. **MUST** abide by the [Code of Conduct](../../CODE_OF_CONDUCT.md) and report suspected violations to the [PowerShell Committee][ps-committee]
 1. **MUST** ensure that each contributor has signed a valid Microsoft Contributor License Agreement (CLA)
 1. **MUST** verify compliance with any third party code license terms (e.g., requiring attribution, etc.) if the contribution contains third party code.
 1. **MUST** make sure that [any change requiring approval from the PowerShell Committee](../community/governance.md#changes-that-require-an-rfc) has gone through the proper [RFC][RFC-repo] or approval process
@@ -96,10 +96,11 @@ At any point in time, the existing Repository Maintainers can unanimously nomina
 Nominations are brought to the PowerShell Committee to understand the reasons and justification.
 A simple majority of the PowerShell Committee is required to veto the nomination.
 When a nominee has been approved, a PR will be submitted by a current Maintainer to update this document to add the nominee's name to
-the [Current Repository Maintainers](#Current-Repository-Maintainers) with justification as the description of the PR to serve as the public announcement.
+the [Current Repository Maintainers](#current-repository-maintainers) with justification as the description of the PR to serve as the public announcement.
 
 [RFC-repo]: https://github.com/PowerShell/PowerShell-RFC
 [ci-system]: ../testing-guidelines/testing-guidelines.md#ci-system
 [issue-management]: issue-management.md
 [CONTRIBUTING]: ../../.github/CONTRIBUTING.md
 [best-practice]: best-practice.md
+[ps-committee]: ../community/governance.md#powershell-committee
diff --git a/docs/maintainers/releasing.md b/docs/maintainers/releasing.md
index a44ae5ee604..ccb4e5529d7 100644
--- a/docs/maintainers/releasing.md
+++ b/docs/maintainers/releasing.md
@@ -21,20 +21,15 @@ This is to help track the release preparation work.
    - Sign the MSI packages and DEB/RPM packages.
    - Install and verify the packages.
 1. Update documentation, scripts and Dockerfiles
-   - Summarize the change log for the release. It should be reviewed by PM(s) to make it more user-friendly.
-   - Update [CHANGELOG.md](../../CHANGELOG.md) with the finalized change log draft.
+   - Summarize the changelog for the release. It should be reviewed by PM(s) to make it more user-friendly.
+   - Update [CHANGELOG.md](../../CHANGELOG.md) with the finalized changelog draft.
    - Update other documents and scripts to use the new package names and links.
 1. Verify the release Dockerfiles.
 1. [Create NuGet packages](#nuget-packages) and publish them to [powershell-core feed][ps-core-feed].
 1. [Create the release tag](#release-tag) and push the tag to `PowerShell/PowerShell` repository.
-1. Create the draft and publish the release in Github.
+1. Create the draft and publish the release in GitHub.
 1. Merge the `release-<Release Tag>` branch to `master` in `powershell/powershell` and delete the `release-<Release Tag>` branch.
 1. Publish Linux packages to Microsoft YUM/APT repositories.
-1. Trigger the release docker builds for Linux and Windows container images.
-   - Linux: push a branch named `docker` to `powershell/powershell` repository to trigger the build at [powershell docker hub](https://hub.docker.com/r/microsoft/powershell/builds/).
-     Delete the `docker` branch once the builds succeed.
-   - Windows: queue a new build in `PowerShell Windows Docker Build` on VSTS.
-1. Verify the generated docker container images.
 1. [Update the homebrew formula](#homebrew) for the macOS package.
    This task usually will be taken care of by the community,
    so we can wait for one day or two and see if the homebrew formula has already been updated,
@@ -62,26 +57,29 @@ It **requires** that PowerShell Core has been built via `Start-PSBuild` from the
 
 #### Windows
 
-The `Start-PSPackage` function delegates to `New-MSIPackage` which creates a Windows Installer Package of PowerShell.
+`Start-PSPackage` supports creating ZIP and MSIX packages for Windows.
+When called without `-Type` on Windows, it defaults to creating both ZIP and MSIX packages.
 The packages *must* be published in release mode,
 so make sure `-Configuration Release` is specified when running `Start-PSBuild`.
 
-It uses the Windows Installer XML Toolset (WiX) to generate a MSI package,
-which copies the output of the published PowerShell files to a version-specific folder in Program Files,
-and installs a shortcut in the Start Menu.
-It can be uninstalled through `Programs and Features`.
-
 Note that PowerShell is always self-contained, thus using it does not require installing it.
-The output of `Start-PSBuild` includes a `powershell.exe` executable which can simply be launched.
+The output of `Start-PSBuild` includes a `pwsh.exe` executable which can simply be launched.
 
 #### Linux / macOS
 
 The `Start-PSPackage` function delegates to `New-UnixPackage`.
-It relies on the [Effing Package Management][fpm] project,
-which makes building packages for any (non-Windows) platform a breeze.
-Similarly, the PowerShell man-page is generated from the Markdown-like file
+
+For **Linux** (Debian-based distributions), it relies on the [Effing Package Management][fpm] project,
+which makes building packages a breeze.
+
+For **macOS**, it uses native packaging tools (`pkgbuild` and `productbuild`) from Xcode Command Line Tools,
+eliminating the need for Ruby or fpm.
+
+For **Linux** (Red Hat-based distributions), it uses `rpmbuild` directly.
+
+The PowerShell man-page is generated from the Markdown-like file
 [`assets/pwsh.1.ronn`][man] using [Ronn][].
-The function `Start-PSBootstrap -Package` will install both these tools.
+The function `Start-PSBootstrap -Package` will install these tools.
 
 To modify any property of the packages, edit the `New-UnixPackage` function.
 Please also refer to the function for details on the package properties
@@ -104,7 +102,7 @@ this package will contain actual PowerShell bits
 (i.e. it is not a meta-package).
 These bits are installed to `/opt/microsoft/powershell/6.0.0-alpha.8/`,
 where the version will change with each update
-(and is the pre-release version).
+(and is the prerelease version).
 On macOS, the prefix is `/usr/local`,
 instead of `/opt/microsoft` because it is derived from BSD.
 
@@ -136,7 +134,7 @@ Without `-Name` specified, the primary `powershell`
 package will instead be created.
 
 [fpm]: https://github.com/jordansissel/fpm
-[man]: ../../assets/pwsh.1.ronn
+[man]: ../../assets/manpage/pwsh.1.ronn
 [ronn]: https://github.com/rtomayko/ronn
 
 ### Build and Packaging Examples
@@ -167,13 +165,13 @@ Start-PSBuild -Clean -CrossGen -PSModuleRestore -Runtime win7-x64 -Configuration
 ```powershell
 # Create packages for v6.0.0-beta.1 release targeting Windows universal package.
 # 'win7-x64' / 'win7-x86' should be used for -WindowsRuntime.
-Start-PSPackage -Type msi -ReleaseTag v6.0.0-beta.1 -WindowsRuntime 'win7-x64'
 Start-PSPackage -Type zip -ReleaseTag v6.0.0-beta.1 -WindowsRuntime 'win7-x64'
+Start-PSPackage -Type msix -ReleaseTag v6.0.0-beta.1 -WindowsRuntime 'win7-x64'
 ```
 
 ## NuGet Packages
 
-The NuGet packages for hosting PowerShell for Windows and non-Windows are being built in our release build pipeline.
+The NuGet packages for hosting PowerShell for Windows and non-Windows are being built-in our release build pipeline.
 The assemblies from the individual Windows and Linux builds are consumed and packed into NuGet packages.
 These are then released to [powershell-core feed][ps-core-feed].
 
@@ -190,7 +188,7 @@ we create an [annotated tag][tag] that names the release.
 An annotated tag has a message (like a commit),
 and is *not* the same as a lightweight tag.
 Create one with `git tag -a v6.0.0-alpha.7 -m <message-here>`,
-and use the release change logs as the message.
+and use the release changelogs as the message.
 Our convention is to prepend the `v` to the semantic version.
 The summary (first line) of the annotated tag message should be the full release title,
 e.g. 'v6.0.0-alpha.7 release of PowerShellCore'.
diff --git a/dsc/pwsh.profile.dsc.resource.json b/dsc/pwsh.profile.dsc.resource.json
new file mode 100644
index 00000000000..aa5f5c29eee
--- /dev/null
+++ b/dsc/pwsh.profile.dsc.resource.json
@@ -0,0 +1,126 @@
+{
+    "$schema": "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json",
+    "description": "Manage PowerShell profiles.",
+    "tags": [
+        "Linux",
+        "Windows",
+        "macOS",
+        "PowerShell"
+    ],
+    "type": "Microsoft.PowerShell/Profile",
+    "version": "0.1.0",
+    "get": {
+        "executable": "pwsh",
+        "args": [
+            "-NoLogo",
+            "-NonInteractive",
+            "-NoProfile",
+            "-ExecutionPolicy",
+            "Bypass",
+            "-File",
+            "./pwsh.profile.resource.ps1",
+            "-operation",
+             "get"
+        ],
+        "input": "stdin"
+    },
+    "set": {
+        "executable": "pwsh",
+        "args": [
+            "-NoLogo",
+            "-NonInteractive",
+            "-NoProfile",
+            "-ExecutionPolicy",
+            "Bypass",
+            "-File",
+            "./pwsh.profile.resource.ps1",
+            "-operation",
+            "set"
+        ],
+        "input": "stdin"
+    },
+    "export": {
+        "executable": "pwsh",
+        "args": [
+            "-NoLogo",
+            "-NonInteractive",
+            "-NoProfile",
+            "-ExecutionPolicy",
+            "Bypass",
+            "-File",
+            "./pwsh.profile.resource.ps1",
+            "-operation",
+            "export"
+        ],
+        "input": "stdin"
+    },
+    "exitCodes": {
+        "0": "Success",
+        "1": "Error",
+        "2": "Input not supported for export operation"
+    },
+    "schema": {
+        "embedded": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "title": "Profile",
+            "description": "Manage PowerShell profiles.",
+            "type": "object",
+            "unevaluatedProperties": false,
+            "required": [
+                "profileType"
+            ],
+            "properties": {
+                "profileType": {
+                    "type": "string",
+                    "title": "Profile Type",
+                    "description": "Defines which profile to manage. Valid values are: 'AllUsersCurrentHost', 'AllUsersAllHosts', 'CurrentUserAllHosts', and 'CurrentUserCurrentHost'.",
+                    "enum": [
+                        "AllUsersCurrentHost",
+                        "AllUsersAllHosts",
+                        "CurrentUserAllHosts",
+                        "CurrentUserCurrentHost"
+                    ]
+                },
+                "profilePath": {
+                    "title": "Profile Path",
+                    "description": "The full path to the profile file.",
+                    "type": "string",
+                    "readOnly": true
+                },
+                "content": {
+                    "title": "Content",
+                    "description": "Defines the content of the profile. If you don't specify this property, the resource doesn't manage the file contents. If you specify this property as an empty string, the resource removes all content from the file. If you specify this property as a non-empty string, the resource sets the file contents to the specified string. The resources retains newlines from this property without any modification.",
+                    "type": [ "string", "null" ]
+                },
+                "_exist": {
+                    "$ref": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/v3/resource/properties/exist.json"
+                },
+                "_name": {
+                    "$ref": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/v3/resource/properties/name.json"
+                }
+            },
+            "$defs": {
+                "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/v3/resource/properties/exist.json": {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/v3/resource/properties/exist.json",
+                    "title": "Instance should exist",
+                    "description": "Indicates whether the DSC resource instance should exist.",
+                    "type": "boolean",
+                    "default": true,
+                    "enum": [
+                        false,
+                        true
+                    ]
+                },
+                "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/v3/resource/properties/name.json": {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/v3/resource/properties/name.json",
+                    "title": "Exported instance name",
+                    "description": "Returns a generated name for the resource instance from an export operation.",
+                    "readOnly": true,
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
diff --git a/dsc/pwsh.profile.resource.ps1 b/dsc/pwsh.profile.resource.ps1
new file mode 100644
index 00000000000..ad9cfa4a63a
--- /dev/null
+++ b/dsc/pwsh.profile.resource.ps1
@@ -0,0 +1,179 @@
+## Copyright (c) Microsoft Corporation. All rights reserved.
+## Licensed under the MIT License.
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateSet('get', 'set', 'export')]
+    [string]$Operation,
+    [Parameter(ValueFromPipeline)]
+    [string[]]$UserInput
+)
+
+Begin {
+    enum ProfileType {
+        AllUsersCurrentHost
+        AllUsersAllHosts
+        CurrentUserAllHosts
+        CurrentUserCurrentHost
+    }
+
+    function New-PwshResource {
+        param(
+            [Parameter(Mandatory = $true)]
+            [ProfileType] $ProfileType,
+
+            [Parameter(ParameterSetName = 'WithContent')]
+            [string] $Content,
+
+            [Parameter(ParameterSetName = 'WithContent')]
+            [bool] $Exist
+        )
+
+        # Create the PSCustomObject with properties
+        $resource = [PSCustomObject]@{
+            profileType = $ProfileType
+            content     = $null
+            profilePath = GetProfilePath -profileType $ProfileType
+            _exist      = $false
+        }
+
+        # Add ToJson method
+        $resource | Add-Member -MemberType ScriptMethod -Name 'ToJson' -Value {
+            return ([ordered] @{
+                    profileType = $this.profileType
+                    content     = $this.content
+                    profilePath = $this.profilePath
+                    _exist      = $this._exist
+                }) | ConvertTo-Json -Compress -EnumsAsStrings
+        }
+
+        # Constructor logic - if Content and Exist parameters are provided (WithContent parameter set)
+        if ($PSCmdlet.ParameterSetName -eq 'WithContent') {
+            $resource.content = $Content
+            $resource._exist = $Exist
+        } else {
+            # Default constructor logic - read from file system
+            $fileExists = Test-Path $resource.profilePath
+            if ($fileExists) {
+                $resource.content = Get-Content -Path $resource.profilePath
+            } else {
+                $resource.content = $null
+            }
+            $resource._exist = $fileExists
+        }
+
+        return $resource
+    }
+
+    function GetProfilePath {
+        param (
+            [ProfileType] $profileType
+        )
+
+        $path = switch ($profileType) {
+            'AllUsersCurrentHost' { $PROFILE.AllUsersCurrentHost }
+            'AllUsersAllHosts' { $PROFILE.AllUsersAllHosts }
+            'CurrentUserAllHosts' { $PROFILE.CurrentUserAllHosts }
+            'CurrentUserCurrentHost' { $PROFILE.CurrentUserCurrentHost }
+        }
+
+        return $path
+    }
+
+    function ExportOperation {
+        $allUserCurrentHost = New-PwshResource -ProfileType 'AllUsersCurrentHost'
+        $allUsersAllHost = New-PwshResource -ProfileType 'AllUsersAllHosts'
+        $currentUserAllHost = New-PwshResource -ProfileType 'CurrentUserAllHosts'
+        $currentUserCurrentHost = New-PwshResource -ProfileType 'CurrentUserCurrentHost'
+
+        # Cannot use the ToJson() method here as we are adding a note property
+        $allUserCurrentHost | Add-Member -NotePropertyName '_name' -NotePropertyValue 'AllUsersCurrentHost' -PassThru | ConvertTo-Json -Compress -EnumsAsStrings
+        $allUsersAllHost | Add-Member -NotePropertyName '_name' -NotePropertyValue 'AllUsersAllHosts' -PassThru | ConvertTo-Json -Compress -EnumsAsStrings
+        $currentUserAllHost | Add-Member -NotePropertyName '_name' -NotePropertyValue 'CurrentUserAllHosts' -PassThru | ConvertTo-Json -Compress -EnumsAsStrings
+        $currentUserCurrentHost | Add-Member -NotePropertyName '_name' -NotePropertyValue 'CurrentUserCurrentHost' -PassThru | ConvertTo-Json -Compress -EnumsAsStrings
+    }
+
+    function GetOperation {
+        param (
+            [Parameter(Mandatory = $true)]
+            $InputResource,
+            [Parameter()]
+            [switch] $AsJson
+        )
+
+        $profilePath = GetProfilePath -profileType $InputResource.profileType.ToString()
+
+        $actualState = New-PwshResource -ProfileType $InputResource.profileType
+
+        $actualState.profilePath = $profilePath
+
+        $exists = Test-Path $profilePath
+
+        if ($InputResource._exist -and $exists) {
+            $content = Get-Content -Path $profilePath
+            $actualState.Content = $content
+        } elseif ($InputResource._exist -and -not $exists) {
+            $actualState.Content = $null
+            $actualState._exist = $false
+        } elseif (-not $InputResource._exist -and $exists) {
+            $actualState.Content = Get-Content -Path $profilePath
+            $actualState._exist = $true
+        } else {
+            $actualState.Content = $null
+            $actualState._exist = $false
+        }
+
+        if ($AsJson) {
+            return $actualState.ToJson()
+        } else {
+            return $actualState
+        }
+    }
+
+    function SetOperation {
+        param (
+            $InputResource
+        )
+
+        $actualState = GetOperation -InputResource $InputResource
+
+        if ($InputResource._exist) {
+            if (-not $actualState._exist) {
+                $null = New-Item -Path $actualState.profilePath -ItemType File -Force
+            }
+
+            if ($null -ne $InputResource.content) {
+                Set-Content -Path $actualState.profilePath -Value $InputResource.content
+            }
+        } elseif ($actualState._exist) {
+            Remove-Item -Path $actualState.profilePath -Force
+        }
+    }
+}
+End {
+    $inputJson = $input | ConvertFrom-Json
+
+    if ($inputJson) {
+        $InputResource = New-PwshResource -ProfileType $inputJson.profileType -Content $inputJson.content -Exist $inputJson._exist
+    }
+
+    switch ($Operation) {
+        'get' {
+            GetOperation -InputResource $InputResource -AsJson
+        }
+        'set' {
+            SetOperation -InputResource $InputResource
+        }
+        'export' {
+            if ($inputJson) {
+                Write-Error "Input not supported for export operation"
+                exit 2
+            }
+
+            ExportOperation
+        }
+    }
+
+    exit 0
+}
diff --git a/es-metadata.yml b/es-metadata.yml
new file mode 100644
index 00000000000..24da115c114
--- /dev/null
+++ b/es-metadata.yml
@@ -0,0 +1,12 @@
+schemaVersion: 1.0.0
+providers:
+- provider: InventoryAsCode
+  version: 1.0.0
+  metadata:
+    isProduction: true
+    accountableOwners:
+      service: cef1de07-99d6-45df-b907-77d0066032ec
+    routing:
+      defaultAreaPath:
+        org: msazure
+        path: One\MGMT\Compute\Powershell\Powershell\Powershell Core\pwsh
diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index 5adfecd7075..31f7b965a5b 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -1,8 +1,9 @@
 [
-  "PSCommandNotFoundSuggestion",
-  "PSCommandWithArgs",
   "PSFeedbackProvider",
   "PSLoadAssemblyFromNativeCode",
-  "PSModuleAutoLoadSkipOfflineFiles",
+  "PSNativeWindowsTildeExpansion",
+  "PSProfileDSCResource",
+  "PSSerializeJSONLongEnumAsNumber",
+  "PSRedirectToVariable",
   "PSSubsystemPluginModel"
 ]
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index 5adfecd7075..31f7b965a5b 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -1,8 +1,9 @@
 [
-  "PSCommandNotFoundSuggestion",
-  "PSCommandWithArgs",
   "PSFeedbackProvider",
   "PSLoadAssemblyFromNativeCode",
-  "PSModuleAutoLoadSkipOfflineFiles",
+  "PSNativeWindowsTildeExpansion",
+  "PSProfileDSCResource",
+  "PSSerializeJSONLongEnumAsNumber",
+  "PSRedirectToVariable",
   "PSSubsystemPluginModel"
 ]
diff --git a/global.json b/global.json
index 3ecc5db745d..d31f5220d83 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.2.23502.2"
+    "version": "11.0.100-preview.3.26207.106"
   }
 }
diff --git a/nuget.config b/nuget.config
index 5137d0c33d6..388a65572dd 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,8 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v2" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj b/src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj
new file mode 100644
index 00000000000..8449c58ebb0
--- /dev/null
+++ b/src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net11.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PackAsTool>true</PackAsTool>
+    <PackAsToolShimRuntimeIdentifiers>win-x64</PackAsToolShimRuntimeIdentifiers>
+    <ToolCommandName>pwsh</ToolCommandName>
+    <Version>$(PackageVersion)</Version>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>../../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\powershell\Program.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+    <Content Include="..\..\Modules\Windows\**\*;..\..\Modules\Shared\**\*">
+      <Link>Modules\%(RecursiveDir)\%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <None Include="Powershell_64.png" Pack="true" PackagePath="" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.PowerShell.SDK\Microsoft.PowerShell.SDK.csproj" />
+    <ProjectReference Include="..\..\Microsoft.PowerShell.Commands.Diagnostics\Microsoft.PowerShell.Commands.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\Microsoft.Management.Infrastructure.CimCmdlets\Microsoft.Management.Infrastructure.CimCmdlets.csproj" />
+    <ProjectReference Include="..\..\Microsoft.WSMan.Management\Microsoft.WSMan.Management.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/GlobalTools/PowerShell.Windows.x64/Powershell_64.png b/src/GlobalTools/PowerShell.Windows.x64/Powershell_64.png
new file mode 100644
index 00000000000..2a656ffc3c8
Binary files /dev/null and b/src/GlobalTools/PowerShell.Windows.x64/Powershell_64.png differ
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
index 023bf652b1d..e794fd929d1 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
@@ -381,7 +381,7 @@ protected object GetReferenceOrReferenceArrayObject(object value, ref CimType re
             if (value is PSReference cimReference)
             {
                 object baseObject = GetBaseObject(cimReference.Value);
-                if (!(baseObject is CimInstance cimInstance))
+                if (baseObject is not CimInstance cimInstance)
                 {
                     return null;
                 }
@@ -403,7 +403,7 @@ protected object GetReferenceOrReferenceArrayObject(object value, ref CimType re
                 CimInstance[] cimInstanceArray = new CimInstance[cimReferenceArray.Length];
                 for (int i = 0; i < cimReferenceArray.Length; i++)
                 {
-                    if (!(cimReferenceArray[i] is PSReference tempCimReference))
+                    if (cimReferenceArray[i] is not PSReference tempCimReference)
                     {
                         return null;
                     }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs
index eb69ba67392..899e67495cc 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs
@@ -239,7 +239,7 @@ private void NewSubscriptionResultHandler(object src, CimSubscriptionEventArgs a
         /// If set EnableRaisingEvents to false, which will be ignored
         /// </para>
         /// </summary>
-        [BrowsableAttribute(false)]
+        [Browsable(false)]
         public bool EnableRaisingEvents
         {
             get
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs
index f31e7035202..b8ebc9adaef 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs
@@ -535,9 +535,8 @@ internal IEnumerable<PSObject> QuerySession(
             {
                 if (this.curCimSessionsById.ContainsKey(id))
                 {
-                    if (!sessionIds.Contains(id))
+                    if (sessionIds.Add(id))
                     {
-                        sessionIds.Add(id);
                         sessions.Add(this.curCimSessionsById[id].GetPSObject());
                     }
                 }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
index 630bb34dfb1..5cdc168ae24 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
@@ -2041,7 +2041,7 @@ protected override bool PreNewActionEvent(CmdletActionEventArgs args)
             }
 
             CimWriteResultObject writeResultObject = args.Action as CimWriteResultObject;
-            if (!(writeResultObject.Result is CimClass cimClass))
+            if (writeResultObject.Result is not CimClass cimClass)
             {
                 return true;
             }
@@ -2200,7 +2200,7 @@ protected override bool PreNewActionEvent(CmdletActionEventArgs args)
             }
 
             CimWriteResultObject writeResultObject = args.Action as CimWriteResultObject;
-            if (!(writeResultObject.Result is CimInstance cimInstance))
+            if (writeResultObject.Result is not CimInstance cimInstance)
             {
                 return true;
             }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/ComparableValueFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/ComparableValueFilterRule.cs
index e7ef648e3fe..8362a035156 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/ComparableValueFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/ComparableValueFilterRule.cs
@@ -13,9 +13,25 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public abstract class ComparableValueFilterRule<T> : FilterRule where T : IComparable
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ComparableValueFilterRule{T}"/> class.
+        /// </summary>
+        protected ComparableValueFilterRule()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ComparableValueFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        protected ComparableValueFilterRule(ComparableValueFilterRule<T> source)
+            : base(source)
+        {
+            this.DefaultNullValueEvaluation = source.DefaultNullValueEvaluation;
+        }
+
         #region Properties
 
         /// <summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/DoesNotEqualFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/DoesNotEqualFilterRule.cs
index ae209d0e60f..c5d4f36fe55 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/DoesNotEqualFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/DoesNotEqualFilterRule.cs
@@ -13,11 +13,10 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class DoesNotEqualFilterRule<T> : EqualsFilterRule<T> where T : IComparable
     {
         /// <summary>
-        /// Initializes a new instance of the DoesNotEqualFilterRule class.
+        /// Initializes a new instance of the <see cref="DoesNotEqualFilterRule{T}"/> class.
         /// </summary>
         public DoesNotEqualFilterRule()
         {
@@ -25,6 +24,15 @@ public DoesNotEqualFilterRule()
             this.DefaultNullValueEvaluation = true;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DoesNotEqualFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public DoesNotEqualFilterRule(DoesNotEqualFilterRule<T> source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if item is not equal to Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/EqualsFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/EqualsFilterRule.cs
index 7bafd53e411..34a1ecb722d 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/EqualsFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/EqualsFilterRule.cs
@@ -14,17 +14,25 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class EqualsFilterRule<T> : SingleValueComparableValueFilterRule<T> where T : IComparable
     {
         /// <summary>
-        /// Initializes a new instance of the EqualsFilterRule class.
+        /// Initializes a new instance of the <see cref="EqualsFilterRule{T}"/> class.
         /// </summary>
         public EqualsFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_Equals;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EqualsFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public EqualsFilterRule(EqualsFilterRule<T> source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if item is equal to Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRule.cs
index e7717c9a7b8..f18c89addf9 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRule.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Management.UI.Internal
 {
@@ -10,8 +9,7 @@ namespace Microsoft.Management.UI.Internal
     /// The base class for all filtering rules.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
-    public abstract class FilterRule : IEvaluate
+    public abstract class FilterRule : IEvaluate, IDeepCloneable
     {
         /// <summary>
         /// Gets a value indicating whether the FilterRule can be
@@ -35,12 +33,28 @@ public string DisplayName
         }
 
         /// <summary>
-        /// Initializes a new instance of the FilterRule class.
+        /// Initializes a new instance of the <see cref="FilterRule"/> class.
         /// </summary>
         protected FilterRule()
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        protected FilterRule(FilterRule source)
+        {
+            ArgumentNullException.ThrowIfNull(source);
+            this.DisplayName = source.DisplayName;
+        }
+
+        /// <inheritdoc cref="IDeepCloneable.DeepClone()" />
+        public object DeepClone()
+        {
+            return Activator.CreateInstance(this.GetType(), new object[] { this });
+        }
+
         /// <summary>
         /// Gets a value indicating whether the supplied item meets the
         /// criteria specified by this rule.
@@ -54,7 +68,6 @@ protected FilterRule()
         /// <summary>
         /// Occurs when the values of this rule changes.
         /// </summary>
-        [field: NonSerialized]
         public event EventHandler EvaluationResultInvalidated;
 
         /// <summary>
@@ -62,14 +75,12 @@ protected FilterRule()
         /// </summary>
         protected void NotifyEvaluationResultInvalidated()
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             var eh = this.EvaluationResultInvalidated;
 
             if (eh != null)
             {
                 eh(this, new EventArgs());
             }
-            #pragma warning restore IDE1005
         }
 
         #endregion
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRuleExtensions.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRuleExtensions.cs
index bc8e0b02ca6..4a3f8dc2975 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRuleExtensions.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRuleExtensions.cs
@@ -2,10 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
 
 namespace Microsoft.Management.UI.Internal
 {
@@ -28,29 +24,7 @@ public static class FilterRuleExtensions
         public static FilterRule DeepCopy(this FilterRule rule)
         {
             ArgumentNullException.ThrowIfNull(rule);
-
-#pragma warning disable SYSLIB0050
-            Debug.Assert(rule.GetType().IsSerializable, "rule is serializable");
-#pragma warning disable SYSLIB0011
-            BinaryFormatter formatter = new BinaryFormatter(null, new StreamingContext(StreamingContextStates.Clone));
-#pragma warning restore SYSLIB0011
-            MemoryStream ms = new MemoryStream();
-
-            FilterRule copy = null;
-            try
-            {
-                formatter.Serialize(ms, rule);
-
-                ms.Position = 0;
-                copy = (FilterRule)formatter.Deserialize(ms);
-#pragma warning restore SYSLIB0050
-            }
-            finally
-            {
-                ms.Close();
-            }
-
-            return copy;
+            return (FilterRule)rule.DeepClone();
         }
     }
 }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsBetweenFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsBetweenFilterRule.cs
index cbe4a875dd0..f51093510ec 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsBetweenFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsBetweenFilterRule.cs
@@ -16,7 +16,6 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class IsBetweenFilterRule<T> : ComparableValueFilterRule<T> where T : IComparable
     {
         #region Properties
@@ -56,7 +55,7 @@ public ValidatingValue<T> EndValue
         #region Ctor
 
         /// <summary>
-        /// Initializes a new instance of the IsBetweenFilterRule class.
+        /// Initializes a new instance of the <see cref="IsBetweenFilterRule{T}"/> class.
         /// </summary>
         public IsBetweenFilterRule()
         {
@@ -69,6 +68,20 @@ public IsBetweenFilterRule()
             this.EndValue.PropertyChanged += this.Value_PropertyChanged;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsBetweenFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public IsBetweenFilterRule(IsBetweenFilterRule<T> source)
+            : base(source)
+        {
+            this.StartValue = (ValidatingValue<T>)source.StartValue.DeepClone();
+            this.StartValue.PropertyChanged += this.Value_PropertyChanged;
+
+            this.EndValue = (ValidatingValue<T>)source.EndValue.DeepClone();
+            this.EndValue.PropertyChanged += this.Value_PropertyChanged;
+        }
+
         #endregion Ctor
 
         #region Public Methods
@@ -108,13 +121,6 @@ private void Value_PropertyChanged(object sender, PropertyChangedEventArgs e)
             }
         }
 
-        [OnDeserialized]
-        private void Initialize(StreamingContext context)
-        {
-            this.StartValue.PropertyChanged += this.Value_PropertyChanged;
-            this.EndValue.PropertyChanged += this.Value_PropertyChanged;
-        }
-
         #endregion Value Change Handlers
     }
 }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsEmptyFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsEmptyFilterRule.cs
index 5ad2ae1247e..71bb7e23e7c 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsEmptyFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsEmptyFilterRule.cs
@@ -10,17 +10,25 @@ namespace Microsoft.Management.UI.Internal
     /// is empty or not.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class IsEmptyFilterRule : FilterRule
     {
         /// <summary>
-        /// Initializes a new instance of the IsEmptyFilterRule class.
+        /// Initializes a new instance of the <see cref="IsEmptyFilterRule"/> class.
         /// </summary>
         public IsEmptyFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_IsEmpty;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsEmptyFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public IsEmptyFilterRule(IsEmptyFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Gets a values indicating whether the supplied item is empty.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsGreaterThanFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsGreaterThanFilterRule.cs
index d098d2a9383..6c7d16f312a 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsGreaterThanFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsGreaterThanFilterRule.cs
@@ -14,17 +14,25 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class IsGreaterThanFilterRule<T> : SingleValueComparableValueFilterRule<T> where T : IComparable
     {
         /// <summary>
-        /// Initializes a new instance of the IsGreaterThanFilterRule class.
+        /// Initializes a new instance of the <see cref="IsGreaterThanFilterRule{T}"/> class.
         /// </summary>
         public IsGreaterThanFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_GreaterThanOrEqual;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsGreaterThanFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public IsGreaterThanFilterRule(IsGreaterThanFilterRule<T> source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if item is greater than Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsLessThanFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsLessThanFilterRule.cs
index 8539d6edf0e..e1dc3268cc5 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsLessThanFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsLessThanFilterRule.cs
@@ -14,17 +14,25 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class IsLessThanFilterRule<T> : SingleValueComparableValueFilterRule<T> where T : IComparable
     {
         /// <summary>
-        /// Initializes a new instance of the IsLessThanFilterRule class.
+        /// Initializes a new instance of the <see cref="IsLessThanFilterRule{T}"/> class.
         /// </summary>
         public IsLessThanFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_LessThanOrEqual;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsLessThanFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public IsLessThanFilterRule(IsLessThanFilterRule<T> source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if item is less than Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyFilterRule.cs
index 68e501d1f68..711caee9874 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyFilterRule.cs
@@ -10,17 +10,25 @@ namespace Microsoft.Management.UI.Internal
     /// is empty or not.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class IsNotEmptyFilterRule : IsEmptyFilterRule
     {
         /// <summary>
-        /// Initializes a new instance of the IsNotEmptyFilterRule class.
+        /// Initializes a new instance of the <see cref="IsNotEmptyFilterRule"/> class.
         /// </summary>
         public IsNotEmptyFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_IsNotEmpty;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotEmptyFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public IsNotEmptyFilterRule(IsNotEmptyFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Gets a values indicating whether the supplied item is not empty.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyValidationRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyValidationRule.cs
index 31722bfe1f7..cb6eacaaff3 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyValidationRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/IsNotEmptyValidationRule.cs
@@ -9,7 +9,6 @@ namespace Microsoft.Management.UI.Internal
     /// The IsNotEmptyValidationRule checks a value to see if a value is not empty.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class IsNotEmptyValidationRule : DataErrorInfoValidationRule
     {
         #region Properties
@@ -51,6 +50,14 @@ public override DataErrorInfoValidationResult Validate(object value, System.Glob
             }
         }
 
+        /// <inheritdoc cref="IDeepCloneable.DeepClone()" />
+        public override object DeepClone()
+        {
+            // Instance is stateless.
+            // return this;
+            return new IsNotEmptyValidationRule();
+        }
+
         #endregion Public Methods
 
         internal static bool IsStringNotEmpty(string value)
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertiesTextContainsFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertiesTextContainsFilterRule.cs
index 2a1cc576b39..8c32530be8c 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertiesTextContainsFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertiesTextContainsFilterRule.cs
@@ -12,7 +12,6 @@ namespace Microsoft.Management.UI.Internal
     /// Represents a filter rule that searches for text within properties on an object.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class PropertiesTextContainsFilterRule : TextFilterRule
     {
         private static readonly string TextContainsCharactersRegexPattern = "{0}";
@@ -29,6 +28,17 @@ public PropertiesTextContainsFilterRule()
             this.EvaluationResultInvalidated += this.PropertiesTextContainsFilterRule_EvaluationResultInvalidated;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the  <see cref="PropertiesTextContainsFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public PropertiesTextContainsFilterRule(PropertiesTextContainsFilterRule source)
+            : base(source)
+        {
+            this.PropertyNames = new List<string>(source.PropertyNames);
+            this.EvaluationResultInvalidated += this.PropertiesTextContainsFilterRule_EvaluationResultInvalidated;
+        }
+
         /// <summary>
         /// Gets a collection of the names of properties to search in.
         /// </summary>
@@ -120,11 +130,5 @@ private void PropertiesTextContainsFilterRule_EvaluationResultInvalidated(object
         {
             this.OnEvaluationResultInvalidated();
         }
-
-        [OnDeserialized]
-        private void Initialize(StreamingContext context)
-        {
-            this.EvaluationResultInvalidated += this.PropertiesTextContainsFilterRule_EvaluationResultInvalidated;
-        }
     }
 }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertyValueSelectorFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertyValueSelectorFilterRule.cs
index 158ab4e0229..09c732970b0 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertyValueSelectorFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertyValueSelectorFilterRule.cs
@@ -16,7 +16,6 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class PropertyValueSelectorFilterRule<T> : SelectorFilterRule where T : IComparable
     {
         #region Properties
@@ -82,6 +81,17 @@ public PropertyValueSelectorFilterRule(string propertyName, string propertyDispl
             this.AvailableRules.DisplayNameConverter = new FilterRuleToDisplayNameConverter();
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PropertyValueSelectorFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public PropertyValueSelectorFilterRule(PropertyValueSelectorFilterRule<T> source)
+            : base(source)
+        {
+            this.PropertyName = source.PropertyName;
+            this.AvailableRules.DisplayNameConverter = new FilterRuleToDisplayNameConverter();
+        }
+
         #endregion Ctor
 
         #region Public Methods
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SelectorFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SelectorFilterRule.cs
index da4a62b6f66..d1627ee2281 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SelectorFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SelectorFilterRule.cs
@@ -10,7 +10,6 @@ namespace Microsoft.Management.UI.Internal
     /// The SelectorFilterRule represents a rule composed of other rules.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class SelectorFilterRule : FilterRule
     {
         #region Properties
@@ -40,7 +39,7 @@ public ValidatingSelectorValue<FilterRule> AvailableRules
         #region Ctor
 
         /// <summary>
-        /// Creates a new SelectorFilterRule instance.
+        /// Initializes a new instance of the <see cref="SelectorFilterRule"/> class.
         /// </summary>
         public SelectorFilterRule()
         {
@@ -48,6 +47,18 @@ public SelectorFilterRule()
             this.AvailableRules.SelectedValueChanged += this.AvailableRules_SelectedValueChanged;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SelectorFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public SelectorFilterRule(SelectorFilterRule source)
+            : base(source)
+        {
+            this.AvailableRules = (ValidatingSelectorValue<FilterRule>)source.AvailableRules.DeepClone();
+            this.AvailableRules.SelectedValueChanged += this.AvailableRules_SelectedValueChanged;
+            this.AvailableRules.SelectedValue.EvaluationResultInvalidated += this.SelectedValue_EvaluationResultInvalidated;
+        }
+
         #endregion Ctor
 
         #region Public Methods
@@ -86,8 +97,8 @@ protected void OnSelectedValueChanged(FilterRule oldValue, FilterRule newValue)
             FilterRuleCustomizationFactory.FactoryInstance.TransferValues(oldValue, newValue);
             FilterRuleCustomizationFactory.FactoryInstance.ClearValues(oldValue);
 
-            newValue.EvaluationResultInvalidated += this.SelectedValue_EvaluationResultInvalidated;
             oldValue.EvaluationResultInvalidated -= this.SelectedValue_EvaluationResultInvalidated;
+            newValue.EvaluationResultInvalidated += this.SelectedValue_EvaluationResultInvalidated;
 
             this.NotifyEvaluationResultInvalidated();
         }
@@ -101,13 +112,6 @@ private void SelectedValue_EvaluationResultInvalidated(object sender, EventArgs
 
         #region Private Methods
 
-        [OnDeserialized]
-        private void Initialize(StreamingContext context)
-        {
-            this.AvailableRules.SelectedValueChanged += this.AvailableRules_SelectedValueChanged;
-            this.AvailableRules.SelectedValue.EvaluationResultInvalidated += this.SelectedValue_EvaluationResultInvalidated;
-        }
-
         private void AvailableRules_SelectedValueChanged(object sender, PropertyChangedEventArgs<FilterRule> e)
         {
             this.OnSelectedValueChanged(e.OldValue, e.NewValue);
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SingleValueComparableValueFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SingleValueComparableValueFilterRule.cs
index 9486a126820..b26531943fc 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SingleValueComparableValueFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/SingleValueComparableValueFilterRule.cs
@@ -13,7 +13,6 @@ namespace Microsoft.Management.UI.Internal
     /// </summary>
     /// <typeparam name="T">The generic parameter.</typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public abstract class SingleValueComparableValueFilterRule<T> : ComparableValueFilterRule<T> where T : IComparable
     {
         #region Properties
@@ -44,7 +43,7 @@ public override bool IsValid
         #region Ctor
 
         /// <summary>
-        /// Initializes a new instance of the SingleValueComparableValueFilterRule class.
+        /// Initializes a new instance of the <see cref="SingleValueComparableValueFilterRule{T}"/> class.
         /// </summary>
         protected SingleValueComparableValueFilterRule()
         {
@@ -52,6 +51,17 @@ protected SingleValueComparableValueFilterRule()
             this.Value.PropertyChanged += this.Value_PropertyChanged;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SingleValueComparableValueFilterRule{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        protected SingleValueComparableValueFilterRule(SingleValueComparableValueFilterRule<T> source)
+            : base(source)
+        {
+            this.Value = (ValidatingValue<T>)source.Value.DeepClone();
+            this.Value.PropertyChanged += this.Value_PropertyChanged;
+        }
+
         #endregion Ctor
 
         private void Value_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -61,11 +71,5 @@ private void Value_PropertyChanged(object sender, PropertyChangedEventArgs e)
                 this.NotifyEvaluationResultInvalidated();
             }
         }
-
-        [OnDeserialized]
-        private void Initialize(StreamingContext context)
-        {
-            this.Value.PropertyChanged += this.Value_PropertyChanged;
-        }
     }
 }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextContainsFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextContainsFilterRule.cs
index fe581ca2031..beb4a29d23f 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextContainsFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextContainsFilterRule.cs
@@ -11,20 +11,28 @@ namespace Microsoft.Management.UI.Internal
     /// check if it is contains the rule's value within it.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class TextContainsFilterRule : TextFilterRule
     {
         private static readonly string TextContainsCharactersRegexPattern = "{0}";
         private static readonly string TextContainsWordsRegexPattern = WordBoundaryRegexPattern + TextContainsCharactersRegexPattern + WordBoundaryRegexPattern;
 
         /// <summary>
-        /// Initializes a new instance of the TextContainsFilterRule class.
+        /// Initializes a new instance of the <see cref="TextContainsFilterRule"/> class.
         /// </summary>
         public TextContainsFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_Contains;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextContainsFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public TextContainsFilterRule(TextContainsFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if Value is contained within data.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotContainFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotContainFilterRule.cs
index 29bec9b4bbf..2cdbf1efcef 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotContainFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotContainFilterRule.cs
@@ -10,11 +10,10 @@ namespace Microsoft.Management.UI.Internal
     /// check if it is does not contain the rule's value within it.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class TextDoesNotContainFilterRule : TextContainsFilterRule
     {
         /// <summary>
-        /// Initializes a new instance of the TextDoesNotContainFilterRule class.
+        /// Initializes a new instance of the <see cref="TextDoesNotContainFilterRule"/> class.
         /// </summary>
         public TextDoesNotContainFilterRule()
         {
@@ -22,6 +21,15 @@ public TextDoesNotContainFilterRule()
             this.DefaultNullValueEvaluation = true;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextDoesNotContainFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public TextDoesNotContainFilterRule(TextDoesNotContainFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if Value is not contained within data.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotEqualFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotEqualFilterRule.cs
index 4e72fe16e67..e74b371a7a6 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotEqualFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextDoesNotEqualFilterRule.cs
@@ -10,11 +10,10 @@ namespace Microsoft.Management.UI.Internal
     /// check if it is not equal to the rule's value.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class TextDoesNotEqualFilterRule : TextEqualsFilterRule
     {
         /// <summary>
-        /// Initializes a new instance of the TextDoesNotEqualFilterRule class.
+        /// Initializes a new instance of the <see cref="TextDoesNotEqualFilterRule"/> class.
         /// </summary>
         public TextDoesNotEqualFilterRule()
         {
@@ -22,6 +21,15 @@ public TextDoesNotEqualFilterRule()
             this.DefaultNullValueEvaluation = true;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextDoesNotEqualFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public TextDoesNotEqualFilterRule(TextDoesNotEqualFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if data is not equal to Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEndsWithFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEndsWithFilterRule.cs
index baca67801bf..d7f7e05c4b8 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEndsWithFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEndsWithFilterRule.cs
@@ -11,20 +11,28 @@ namespace Microsoft.Management.UI.Internal
     /// check if it ends with the rule's value.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class TextEndsWithFilterRule : TextFilterRule
     {
         private static readonly string TextEndsWithCharactersRegexPattern = "{0}$";
         private static readonly string TextEndsWithWordsRegexPattern = WordBoundaryRegexPattern + TextEndsWithCharactersRegexPattern;
 
         /// <summary>
-        /// Initializes a new instance of the TextEndsWithFilterRule class.
+        /// Initializes a new instance of the <see cref="TextEndsWithFilterRule"/> class.
         /// </summary>
         public TextEndsWithFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_TextEndsWith;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextEndsWithFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public TextEndsWithFilterRule(TextEndsWithFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if data ends with Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEqualsFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEqualsFilterRule.cs
index e49dd9b4a0d..a357575c6ab 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEqualsFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextEqualsFilterRule.cs
@@ -11,19 +11,27 @@ namespace Microsoft.Management.UI.Internal
     /// check if it is equal to the rule's value.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class TextEqualsFilterRule : TextFilterRule
     {
         private static readonly string TextEqualsCharactersRegexPattern = "^{0}$";
 
         /// <summary>
-        /// Initializes a new instance of the TextEqualsFilterRule class.
+        /// Initializes a new instance of the <see cref="TextEqualsFilterRule"/> class.
         /// </summary>
         public TextEqualsFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_Equals;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextEqualsFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public TextEqualsFilterRule(TextEqualsFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if data is equal to Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextFilterRule.cs
index 0dc75cf24e4..eacbcb8d256 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextFilterRule.cs
@@ -14,7 +14,6 @@ namespace Microsoft.Management.UI.Internal
     /// evaluating string operations.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public abstract class TextFilterRule : SingleValueComparableValueFilterRule<string>
     {
         /// <summary>
@@ -62,7 +61,7 @@ public bool CultureInvariant
         }
 
         /// <summary>
-        /// Initializes a new instance of the TextFilterRule class.
+        /// Initializes a new instance of the <see cref="TextFilterRule"/> class.
         /// </summary>
         protected TextFilterRule()
         {
@@ -70,6 +69,17 @@ protected TextFilterRule()
             this.CultureInvariant = false;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the  <see cref="TextFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        protected TextFilterRule(TextFilterRule source)
+            : base(source)
+        {
+            this.IgnoreCase = source.IgnoreCase;
+            this.CultureInvariant = source.CultureInvariant;
+        }
+
         /// <summary>
         /// Gets the current value and determines whether it should be evaluated as an exact match.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextStartsWithFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextStartsWithFilterRule.cs
index e97deb0fd46..98eac2b9a41 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextStartsWithFilterRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/TextStartsWithFilterRule.cs
@@ -11,20 +11,28 @@ namespace Microsoft.Management.UI.Internal
     /// check if it starts with the rule's value.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class TextStartsWithFilterRule : TextFilterRule
     {
         private static readonly string TextStartsWithCharactersRegexPattern = "^{0}";
         private static readonly string TextStartsWithWordsRegexPattern = TextStartsWithCharactersRegexPattern + WordBoundaryRegexPattern;
 
         /// <summary>
-        /// Initializes a new instance of the TextStartsWithFilterRule class.
+        /// Initializes a new instance of the <see cref="TextStartsWithFilterRule"/> class.
         /// </summary>
         public TextStartsWithFilterRule()
         {
             this.DisplayName = UICultureResources.FilterRule_TextStartsWith;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextStartsWithFilterRule"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public TextStartsWithFilterRule(TextStartsWithFilterRule source)
+            : base(source)
+        {
+        }
+
         /// <summary>
         /// Determines if data starts with Value.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/IDeepCloneable.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/IDeepCloneable.cs
new file mode 100644
index 00000000000..841a2424b51
--- /dev/null
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/IDeepCloneable.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace Microsoft.Management.UI.Internal
+{
+    /// <summary>
+    /// Defines a generalized method for creating a deep copy of an instance.
+    /// </summary>
+    internal interface IDeepCloneable
+    {
+        /// <summary>
+        /// Creates a deep copy of the current instance.
+        /// </summary>
+        /// <returns>A new object that is a deep copy of the current instance.</returns>
+        object DeepClone();
+    }
+}
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingSelectorValue.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingSelectorValue.cs
index f8583e98bc8..0fed0c42e65 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingSelectorValue.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingSelectorValue.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Windows.Data;
 
@@ -17,9 +16,39 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class ValidatingSelectorValue<T> : ValidatingValueBase
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatingSelectorValue{T}"/> class.
+        /// </summary>
+        public ValidatingSelectorValue()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatingSelectorValue{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public ValidatingSelectorValue(ValidatingSelectorValue<T> source)
+            : base(source)
+        {
+            availableValues.EnsureCapacity(source.availableValues.Count);
+            if (typeof(IDeepCloneable).IsAssignableFrom(typeof(T)))
+            {
+                foreach (var value in source.availableValues)
+                {
+                    availableValues.Add((T)((IDeepCloneable)value).DeepClone());
+                }
+            }
+            else
+            {
+                availableValues.AddRange(source.availableValues);
+            }
+
+            selectedIndex = source.selectedIndex;
+            displayNameConverter = source.displayNameConverter;
+        }
+
         #region Properties
 
         #region Consts
@@ -144,13 +173,18 @@ public IValueConverter DisplayNameConverter
         /// <summary>
         /// Notifies listeners that the selected value has changed.
         /// </summary>
-        [field: NonSerialized]
         public event EventHandler<PropertyChangedEventArgs<T>> SelectedValueChanged;
 
         #endregion Events
 
         #region Public Methods
 
+        /// <inheritdoc cref="IDeepCloneable.DeepClone()" />
+        public override object DeepClone()
+        {
+            return new ValidatingSelectorValue<T>(this);
+        }
+
         #region Validate
 
         /// <summary>
@@ -210,14 +244,12 @@ protected override DataErrorInfoValidationResult Validate(string columnName)
         /// </param>
         protected void NotifySelectedValueChanged(T oldValue, T newValue)
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             EventHandler<PropertyChangedEventArgs<T>> eh = this.SelectedValueChanged;
 
             if (eh != null)
             {
                 eh(this, new PropertyChangedEventArgs<T>(oldValue, newValue));
             }
-            #pragma warning restore IDE1005
         }
 
         #endregion NotifySelectedValueChanged
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValue.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValue.cs
index fe21d2fee37..437cb3be50e 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValue.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValue.cs
@@ -15,9 +15,25 @@ namespace Microsoft.Management.UI.Internal
     /// The generic parameter.
     /// </typeparam>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class ValidatingValue<T> : ValidatingValueBase
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatingValue{T}"/> class.
+        /// </summary>
+        public ValidatingValue()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatingValue{T}"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        public ValidatingValue(ValidatingValue<T> source)
+            : base(source)
+        {
+            value = source.Value is IDeepCloneable deepClone ? deepClone.DeepClone() : source.Value;
+        }
+
         #region Properties
 
         #region Value
@@ -50,6 +66,12 @@ public object Value
 
         #region Public Methods
 
+        /// <inheritdoc cref="IDeepCloneable.DeepClone()" />
+        public override object DeepClone()
+        {
+            return new ValidatingValue<T>(this);
+        }
+
         /// <summary>
         /// Gets the raw value cast/transformed into
         /// type T.
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValueBase.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValueBase.cs
index be7584f0ffb..a4ffb1af77c 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValueBase.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidatingValueBase.cs
@@ -6,7 +6,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
 namespace Microsoft.Management.UI.Internal
@@ -16,9 +15,29 @@ namespace Microsoft.Management.UI.Internal
     /// classes to support validation via the IDataErrorInfo interface.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
-    public abstract class ValidatingValueBase : IDataErrorInfo, INotifyPropertyChanged
+    public abstract class ValidatingValueBase : IDataErrorInfo, INotifyPropertyChanged, IDeepCloneable
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatingValueBase"/> class.
+        /// </summary>
+        protected ValidatingValueBase()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the  <see cref="ValidatingValueBase"/> class.
+        /// </summary>
+        /// <param name="source">The source to initialize from.</param>
+        protected ValidatingValueBase(ValidatingValueBase source)
+        {
+            ArgumentNullException.ThrowIfNull(source);
+            validationRules.EnsureCapacity(source.validationRules.Count);
+            foreach (var rule in source.validationRules)
+            {
+                validationRules.Add((DataErrorInfoValidationRule)rule.DeepClone());
+            }
+        }
+
         #region Properties
 
         #region ValidationRules
@@ -27,7 +46,6 @@ public abstract class ValidatingValueBase : IDataErrorInfo, INotifyPropertyChang
         private ReadOnlyCollection<DataErrorInfoValidationRule> readonlyValidationRules;
         private bool isValidationRulesCollectionDirty = true;
 
-        [field: NonSerialized]
         private DataErrorInfoValidationResult cachedValidationResult;
 
         /// <summary>
@@ -121,7 +139,6 @@ public string Error
         /// <remarks>
         /// The listeners attached to this event are not serialized.
         /// </remarks>
-        [field: NonSerialized]
         public event PropertyChangedEventHandler PropertyChanged;
 
         #endregion PropertyChanged
@@ -130,6 +147,9 @@ public string Error
 
         #region Public Methods
 
+        /// <inheritdoc cref="IDeepCloneable.DeepClone()" />
+        public abstract object DeepClone();
+
         #region AddValidationRule
 
         /// <summary>
@@ -252,14 +272,12 @@ protected void InvalidateValidationResult()
         /// </param>
         protected void NotifyPropertyChanged(string propertyName)
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             PropertyChangedEventHandler eh = this.PropertyChanged;
 
             if (eh != null)
             {
                 eh(this, new PropertyChangedEventArgs(propertyName));
             }
-            #pragma warning restore IDE1005
         }
 
         #endregion NotifyPropertyChanged
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidationRules/DataErrorInfoValidationRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidationRules/DataErrorInfoValidationRule.cs
index 652592aec04..a92916c0717 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidationRules/DataErrorInfoValidationRule.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/ValidationRules/DataErrorInfoValidationRule.cs
@@ -9,8 +9,7 @@ namespace Microsoft.Management.UI.Internal
     /// Provides a way to create a custom rule in order to check the validity of user input.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
-    public abstract class DataErrorInfoValidationRule
+    public abstract class DataErrorInfoValidationRule : IDeepCloneable
     {
         /// <summary>
         /// When overridden in a derived class, performs validation checks on a value.
@@ -25,5 +24,8 @@ public abstract class DataErrorInfoValidationRule
         /// A DataErrorInfoValidationResult object.
         /// </returns>
         public abstract DataErrorInfoValidationResult Validate(object value, System.Globalization.CultureInfo cultureInfo);
+
+        /// <inheritdoc cref="IDeepCloneable.DeepClone()" />
+        public abstract object DeepClone();
     }
 }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/AddFilterRulePickerItem.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/AddFilterRulePickerItem.cs
index 962d4a9665a..24c6eec1889 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/AddFilterRulePickerItem.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/AddFilterRulePickerItem.cs
@@ -70,14 +70,12 @@ public AddFilterRulePickerItem(FilterRulePanelItem filterRule)
         /// </param>
         protected void NotifyPropertyChanged(string propertyName)
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             PropertyChangedEventHandler eh = this.PropertyChanged;
 
             if (eh != null)
             {
                 eh(this, new PropertyChangedEventArgs(propertyName));
             }
-            #pragma warning restore IDE1005
         }
 
         #endregion NotifyPropertyChanged
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanel.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanel.cs
index 3e577d3cb9f..c3bb4042d53 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanel.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanel.cs
@@ -204,13 +204,11 @@ public void ClearContentTemplates()
         /// </summary>
         protected virtual void NotifyFilterExpressionChanged()
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             EventHandler eh = this.FilterExpressionChanged;
             if (eh != null)
             {
                 eh(this, new EventArgs());
             }
-            #pragma warning restore IDE1005
         }
 
         private void Controller_FilterExpressionChanged(object sender, EventArgs e)
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelController.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelController.cs
index 6d3b18da484..68c22de5af9 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelController.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelController.cs
@@ -260,13 +260,11 @@ private void UpdateFilterRulePanelItemTypes()
         /// </summary>
         protected virtual void NotifyFilterExpressionChanged()
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             EventHandler eh = this.FilterExpressionChanged;
             if (eh != null)
             {
                 eh(this, new EventArgs());
             }
-            #pragma warning restore IDE1005
         }
 
         #endregion Notify Filter Expression Changed
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelItem.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelItem.cs
index 60ad54e6613..ee6b124562c 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelItem.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanelItem.cs
@@ -100,15 +100,11 @@ protected void NotifyPropertyChanged(string propertyName)
         {
             Debug.Assert(!string.IsNullOrEmpty(propertyName), "not null");
 
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
-
             PropertyChangedEventHandler eh = this.PropertyChanged;
             if (eh != null)
             {
                 eh(this, new PropertyChangedEventArgs(propertyName));
             }
-
-            #pragma warning restore IDE1005s
         }
 
         #endregion Public Methods
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleToDisplayNameConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleToDisplayNameConverter.cs
index aaca30ff321..972c19080e0 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleToDisplayNameConverter.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleToDisplayNameConverter.cs
@@ -12,7 +12,6 @@ namespace Microsoft.Management.UI.Internal
     /// a FilterRule value to its DisplayName.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class FilterRuleToDisplayNameConverter : IValueConverter
     {
         /// <summary>
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/InputFieldBackgroundTextConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/InputFieldBackgroundTextConverter.cs
index 28adfa82c86..1295b933d5b 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/InputFieldBackgroundTextConverter.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/InputFieldBackgroundTextConverter.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Management.UI.Internal
 {
     /// <summary>
-    /// The InputFieldBackgroundTextConverter is responsible for determing the
+    /// The InputFieldBackgroundTextConverter is responsible for determining the
     /// correct background text to display for a particular type of data.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/SearchBox.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/SearchBox.cs
index ac9b5267f31..b3345a10cf2 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/SearchBox.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/SearchBox.cs
@@ -60,13 +60,11 @@ public bool HasFilterExpression
         /// </summary>
         protected virtual void NotifyFilterExpressionChanged()
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             EventHandler eh = this.FilterExpressionChanged;
             if (eh != null)
             {
                 eh(this, new EventArgs());
             }
-            #pragma warning restore IDE1005s
         }
 
         #endregion
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml.cs b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml.cs
index 8a919959968..05151330ea2 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml.cs
@@ -60,7 +60,7 @@ internal ColumnPicker(
             : this()
         {
             ArgumentNullException.ThrowIfNull(columns);
-            
+
             ArgumentNullException.ThrowIfNull(availableColumns);
 
             // Add visible columns to Selected list, preserving order
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ManagementListStateDescriptor.cs b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ManagementListStateDescriptor.cs
index 45db449d705..bbfd3d8603c 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ManagementListStateDescriptor.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ManagementListStateDescriptor.cs
@@ -16,7 +16,6 @@ namespace Microsoft.Management.UI.Internal
     /// Allows the state of the ManagementList to be saved and restored.
     /// </summary>
     [SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes")]
-    [Serializable]
     public class ManagementListStateDescriptor : StateDescriptor<ManagementList>
     {
         #region Fields
@@ -136,7 +135,7 @@ private static bool VerifyColumnsSavable(ManagementList subject, RetryActionCall
         /// </summary>
         /// <param name="subject">Target ManagementList.</param>
         /// <param name="callback">RetryActionAfterLoaded callback method.</param>
-        /// <returns>True iff columns restorable.</returns>
+        /// <returns>True if-and-only-if columns are restorable.</returns>
         /// <exception cref="InvalidOperationException">
         /// ManagementList.AutoGenerateColumns not supported.
         /// </exception>
diff --git a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
index 7a1b3a817f2..acc4eae2c61 100644
--- a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
+++ b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
@@ -5,10 +5,11 @@
     <NoWarn>$(NoWarn);CS1570</NoWarn>
     <RootNamespace>Microsoft.Management.UI.Internal</RootNamespace>
     <AssemblyName>Microsoft.PowerShell.GraphicalHost</AssemblyName>
-    <UseWPF>True</UseWPF>
+    <RunAnalyzers>false</RunAnalyzers>
     <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
     <TargetPlatformVersion>8.0</TargetPlatformVersion>
-    <RunAnalyzers>false</RunAnalyzers>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>True</UseWPF>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml.cs b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml.cs
index 440eb329f39..4bdaa32fd9f 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml.cs
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml.cs
@@ -47,8 +47,8 @@ public Window Owner
         /// it will select the item under it, but if you keep the mouse button down and move the mouse
         /// (if the list supported drag and drop, the mouse action would be the same as dragging) it
         /// will select other list items.
-        /// If the first selection change causes  details for the item to be displayed and resizes the list
-        /// the selection can skip to another list item it happend to be over as the list got resized.
+        /// If the first selection change causes details for the item to be displayed and resizes the list,
+        /// the selection can skip to another list item that happens to be over as the list got resized.
         /// In summary, resizing the list on selection can cause a selection bug. If the user selects an
         /// item in the end of the list the next item downwards can be selected.
         /// The WPF drag-and-select feature is not a standard win32 list behavior, and we can do without it
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/CommandViewModel.cs b/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/CommandViewModel.cs
index 425accfaea9..cfa2798963c 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/CommandViewModel.cs
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/CommandViewModel.cs
@@ -550,8 +550,6 @@ internal static CommandViewModel GetCommandViewModel(ModuleViewModel module, Sho
             return returnValue;
         }
 
-        #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
-
         /// <summary>
         /// Called to trigger the event fired when help is needed for the command.
         /// </summary>
@@ -627,8 +625,6 @@ private void OnNotifyPropertyChanged(string propertyName)
             }
         }
 
-        #pragma warning restore IDE1005
-
         /// <summary>
         /// Called when the PropertyChanged event is triggered on the SelectedParameterSet.
         /// </summary>
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterSetViewModel.cs b/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterSetViewModel.cs
index 89428ecf58d..b4f42dd78a2 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterSetViewModel.cs
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterSetViewModel.cs
@@ -363,13 +363,11 @@ private void EvaluateAllMandatoryParametersHaveValues()
         /// <param name="propertyName">The changed property.</param>
         private void OnNotifyPropertyChanged(string propertyName)
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             PropertyChangedEventHandler handler = this.PropertyChanged;
             if (handler != null)
             {
                 handler(this, new PropertyChangedEventArgs(propertyName));
             }
-            #pragma warning restore IDE1005
         }
 
         /// <summary>
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterViewModel.cs b/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterViewModel.cs
index fd5b14fff12..93227df87a1 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterViewModel.cs
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/ViewModel/ParameterViewModel.cs
@@ -262,13 +262,11 @@ internal static string EvaluateTooltip(string typeName, int position, bool manda
         /// <param name="propertyName">The changed property.</param>
         private void OnNotifyPropertyChanged(string propertyName)
         {
-            #pragma warning disable IDE1005 // IDE1005: Delegate invocation can be simplified.
             PropertyChangedEventHandler handler = this.PropertyChanged;
             if (handler != null)
             {
                 handler(this, new PropertyChangedEventArgs(propertyName));
             }
-            #pragma warning restore IDE1005
         }
     }
 }
diff --git a/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs b/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs
index 32c68e961c6..10690b65dc7 100644
--- a/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs
+++ b/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs
@@ -679,7 +679,8 @@ internal static string SingleQuote(string str)
         /// <returns>The host window, if it is present or null if it is not.</returns>
         internal static Window GetHostWindow(PSCmdlet cmdlet)
         {
-            PSPropertyInfo windowProperty = cmdlet.Host.PrivateData.Properties["Window"];
+            // The value of 'PrivateData' property may be null for the default host or a custom host.
+            PSPropertyInfo windowProperty = cmdlet.Host.PrivateData?.Properties["Window"];
             if (windowProperty == null)
             {
                 return null;
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/CounterFileInfo.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/CounterFileInfo.cs
index cbebb9b4557..2b11b6d3b03 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/CounterFileInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/CounterFileInfo.cs
@@ -54,4 +54,3 @@ public UInt32 SampleCount
         private UInt32 _sampleCount = 0;
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
index 3aec30c9e4c..c7a07bab6ec 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
@@ -225,10 +225,6 @@ public sealed class GetWinEventCommand : PSCmdlet
                 ValueFromPipelineByPropertyName = false,
                 ParameterSetName = "XmlQuerySet",
                 HelpMessageBaseName = "GetEventResources")]
-        [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes",
-                            Scope = "member",
-                            Target = "Microsoft.PowerShell.Commands.GetEvent.FilterXml",
-                            Justification = "An XmlDocument is required here because that is the type Powershell supports")]
         public XmlDocument FilterXml { get; set; }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs
index ed4cdb51ff9..729334d0605 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs
@@ -679,4 +679,3 @@ private void WriteSampleSetObject(PerformanceCounterSampleSet set, bool firstSet
         }
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
index 1e7f70bc8f8..9552f72c83a 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
-    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="11.0.0-preview.3.26207.106" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
index b0b102870c4..cdddba939f3 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
@@ -323,7 +323,7 @@ protected override void EndProcessing()
         }
     }
 
-    internal class EventWriteException : Exception
+    internal sealed class EventWriteException : Exception
     {
         internal EventWriteException(string msg, Exception innerException)
             : base(msg, innerException)
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
index b761aa6e30b..6f5d8f6e5ec 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
@@ -190,7 +190,7 @@ internal struct CounterHandleNInstance
         public string InstanceName;
     }
 
-    internal class PdhHelper : IDisposable
+    internal sealed class PdhHelper : IDisposable
     {
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         private struct PDH_COUNTER_PATH_ELEMENTS
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 0d6c585478d..8ce2a97d67b 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="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="11.0.0-preview.3.26207.106" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs
index 675c6c71404..935cc960c6c 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs
@@ -49,7 +49,7 @@ public CimJobException(string message, Exception inner) : base(message, inner)
         /// </summary>
         /// <param name="info">The <see cref="SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
         /// <param name="context">The <see cref="StreamingContext"/> that contains contextual information about the source or destination.</param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected CimJobException(
             SerializationInfo info,
             StreamingContext context)
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CreateInstanceJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CreateInstanceJob.cs
index d8a1bdd44ea..eb594dd4eea 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CreateInstanceJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CreateInstanceJob.cs
@@ -12,7 +12,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// Job wrapping invocation of a CreateInstance intrinsic CIM method.
     /// </summary>
-    internal class CreateInstanceJob : PropertySettingJob<CimInstance>
+    internal sealed class CreateInstanceJob : PropertySettingJob<CimInstance>
     {
         private CimInstance _resultFromCreateInstance;
         private CimInstance _resultFromGetInstance;
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/DeleteInstanceJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/DeleteInstanceJob.cs
index 327fb83affa..0432c6c9a8f 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/DeleteInstanceJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/DeleteInstanceJob.cs
@@ -12,7 +12,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// Job wrapping invocation of a DeleteInstance intrinsic CIM method.
     /// </summary>
-    internal class DeleteInstanceJob : MethodInvocationJobBase<object>
+    internal sealed class DeleteInstanceJob : MethodInvocationJobBase<object>
     {
         private readonly CimInstance _objectToDelete;
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/EnumerateAssociatedInstancesJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/EnumerateAssociatedInstancesJob.cs
index bd024b7d76a..569740d0d1b 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/EnumerateAssociatedInstancesJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/EnumerateAssociatedInstancesJob.cs
@@ -14,7 +14,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// Job that handles executing a WQL (in the future CQL?) query on a remote CIM server.
     /// </summary>
-    internal class EnumerateAssociatedInstancesJob : QueryJobBase
+    internal sealed class EnumerateAssociatedInstancesJob : QueryJobBase
     {
         private readonly CimInstance _associatedObject;
         private readonly string _associationName;
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/InstanceMethodInvocationJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/InstanceMethodInvocationJob.cs
index cd1eb78d81c..06a45933522 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/InstanceMethodInvocationJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/InstanceMethodInvocationJob.cs
@@ -13,7 +13,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// Job wrapping invocation of an extrinsic CIM method.
     /// </summary>
-    internal class InstanceMethodInvocationJob : ExtrinsicMethodInvocationJob
+    internal sealed class InstanceMethodInvocationJob : ExtrinsicMethodInvocationJob
     {
         private readonly CimInstance _targetInstance;
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ModifyInstanceJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ModifyInstanceJob.cs
index f0d07fc201d..869002a55f4 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ModifyInstanceJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ModifyInstanceJob.cs
@@ -13,7 +13,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// Job wrapping invocation of a ModifyInstance intrinsic CIM method.
     /// </summary>
-    internal class ModifyInstanceJob : PropertySettingJob<CimInstance>
+    internal sealed class ModifyInstanceJob : PropertySettingJob<CimInstance>
     {
         private CimInstance _resultFromModifyInstance;
         private bool _resultFromModifyInstanceHasBeenPassedThru;
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/QueryJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/QueryJob.cs
index 7c7a82ee9ca..7bd2bd17531 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/QueryJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/QueryJob.cs
@@ -14,7 +14,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// Job that handles executing a WQL (in the future CQL?) query on a remote CIM server.
     /// </summary>
-    internal class QueryInstancesJob : QueryJobBase
+    internal sealed class QueryInstancesJob : QueryJobBase
     {
         private readonly string _wqlQuery;
         private readonly bool _useEnumerateInstances;
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/StaticMethodInvocationJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/StaticMethodInvocationJob.cs
index 5a25206fe94..3bc376ab3d5 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/StaticMethodInvocationJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/StaticMethodInvocationJob.cs
@@ -11,7 +11,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// Job wrapping invocation of a static CIM method.
     /// </summary>
-    internal class StaticMethodInvocationJob : ExtrinsicMethodInvocationJob
+    internal sealed class StaticMethodInvocationJob : ExtrinsicMethodInvocationJob
     {
         internal StaticMethodInvocationJob(CimJobContext jobContext, MethodInvocationInfo methodInvocationInfo)
                 : base(jobContext, false /* passThru */, jobContext.CmdletizationClassName, methodInvocationInfo)
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 d787389e9f0..6bd2bee7fee 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
@@ -84,7 +84,7 @@ private enum WsManErrorCode : uint
 
         private static bool IsWsManQuotaReached(Exception exception)
         {
-            if (!(exception is CimException cimException))
+            if (exception is not CimException cimException)
             {
                 return false;
             }
@@ -1002,7 +1002,7 @@ private CimResponseType PromptUserCallback(string message, CimPromptType promptT
         internal static bool IsShowComputerNameMarkerPresent(CimInstance cimInstance)
         {
             PSObject pso = PSObject.AsPSObject(cimInstance);
-            if (!(pso.InstanceMembers[RemotingConstants.ShowComputerNameNoteProperty] is PSPropertyInfo psShowComputerNameProperty))
+            if (pso.InstanceMembers[RemotingConstants.ShowComputerNameNoteProperty] is not PSPropertyInfo psShowComputerNameProperty)
             {
                 return false;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletDefinitionContext.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletDefinitionContext.cs
index c334ff29601..8a4e4272561 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletDefinitionContext.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletDefinitionContext.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.PowerShell.Cmdletization.Cim
 {
-    internal class CimCmdletDefinitionContext
+    internal sealed class CimCmdletDefinitionContext
     {
         internal CimCmdletDefinitionContext(
             string cmdletizationClassName,
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs
index c876184c141..3bee74526fc 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.PowerShell.Cmdletization.Cim
 {
-    internal class CimCmdletInvocationContext
+    internal sealed class CimCmdletInvocationContext
     {
         internal CimCmdletInvocationContext(
             CimCmdletDefinitionContext cmdletDefinitionContext,
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
index 5522049a48f..da075286c34 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
@@ -24,7 +24,7 @@
 
 namespace Microsoft.PowerShell.Cim
 {
-    internal class CimSensitiveValueConverter : IDisposable
+    internal sealed class CimSensitiveValueConverter : IDisposable
     {
         private sealed class SensitiveString : IDisposable
         {
@@ -425,7 +425,9 @@ internal static object ConvertFromCimToDotNet(object cimObject, Type expectedDot
                 var cimIntrinsicValue = (byte[])LanguagePrimitives.ConvertTo(cimObject, typeof(byte[]), CultureInfo.InvariantCulture);
                 return exceptionSafeReturn(delegate
                                                {
+                                                   #pragma warning disable SYSLIB0057
                                                    return new X509Certificate2(cimIntrinsicValue);
+                                                   #pragma warning restore SYSLIB0057
                                                });
             }
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimJobContext.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimJobContext.cs
index 5f01d472554..27d48ccab9a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimJobContext.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimJobContext.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.PowerShell.Cmdletization.Cim
 {
-    internal class CimJobContext
+    internal sealed class CimJobContext
     {
         internal CimJobContext(
             CimCmdletInvocationContext cmdletInvocationContext,
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs
index a065f79204f..f08c2ab3c11 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs
@@ -18,7 +18,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// <summary>
     /// CimQuery supports building of queries against CIM object model.
     /// </summary>
-    internal class CimQuery : QueryBuilder, ISessionBoundQueryBuilder<CimSession>
+    internal sealed class CimQuery : QueryBuilder, ISessionBoundQueryBuilder<CimSession>
     {
         private readonly StringBuilder _wqlCondition;
 
@@ -315,7 +315,7 @@ public override void FilterByAssociatedInstance(object associatedInstance, strin
         public override void AddQueryOption(string optionName, object optionValue)
         {
             ArgumentException.ThrowIfNullOrEmpty(optionName);
-            ArgumentNullException.ThrowIfNull(optionValue); 
+            ArgumentNullException.ThrowIfNull(optionValue);
 
             this.queryOptions[optionName] = optionValue;
         }
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 c812778456a..472046b192f 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
@@ -168,7 +168,7 @@ private CimJobContext CreateJobContext(CimSession session, object targetObject)
         /// <returns><see cref="System.Management.Automation.Job"/> object that performs a query against the wrapped object model.</returns>
         internal override StartableJob CreateQueryJob(CimSession session, QueryBuilder baseQuery)
         {
-            if (!(baseQuery is CimQuery query))
+            if (baseQuery is not CimQuery query)
             {
                 throw new ArgumentNullException(nameof(baseQuery));
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs
index e8e4d46e075..c1a8552db8c 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs
@@ -20,9 +20,9 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// 1) filtering that cannot be translated into a server-side query (i.e. when CimQuery.WildcardToWqlLikeOperand reports that it cannot translate into WQL)
     /// 2) detecting if all expected results have been received and giving friendly user errors otherwise (i.e. could not find process with name='foo';  details in Windows 8 Bugs: #60926)
     /// </summary>
-    internal class ClientSideQuery : QueryBuilder
+    internal sealed class ClientSideQuery : QueryBuilder
     {
-        internal class NotFoundError
+        internal sealed class NotFoundError
         {
             public NotFoundError()
             {
@@ -530,7 +530,7 @@ private static bool WildcardEqual(string propertyName, object actualPropertyValu
             }
         }
 
-        internal class PropertyValueExcludeFilter : PropertyValueRegularFilter
+        internal sealed class PropertyValueExcludeFilter : PropertyValueRegularFilter
         {
             public PropertyValueExcludeFilter(string propertyName, object expectedPropertyValue, bool wildcardsEnabled, BehaviorOnNoMatch behaviorOnNoMatch)
                 : base(propertyName, expectedPropertyValue, wildcardsEnabled, behaviorOnNoMatch)
@@ -548,7 +548,7 @@ protected override bool IsMatchingValue(object actualPropertyValue)
             }
         }
 
-        internal class PropertyValueMinFilter : PropertyValueFilter
+        internal sealed class PropertyValueMinFilter : PropertyValueFilter
         {
             public PropertyValueMinFilter(string propertyName, object expectedPropertyValue, BehaviorOnNoMatch behaviorOnNoMatch)
                 : base(propertyName, expectedPropertyValue, behaviorOnNoMatch)
@@ -569,7 +569,7 @@ private static bool ActualValueGreaterThanOrEqualToExpectedValue(string property
             {
                 try
                 {
-                    if (!(expectedPropertyValue is IComparable expectedComparable))
+                    if (expectedPropertyValue is not IComparable expectedComparable)
                     {
                         return false;
                     }
@@ -583,7 +583,7 @@ private static bool ActualValueGreaterThanOrEqualToExpectedValue(string property
             }
         }
 
-        internal class PropertyValueMaxFilter : PropertyValueFilter
+        internal sealed class PropertyValueMaxFilter : PropertyValueFilter
         {
             public PropertyValueMaxFilter(string propertyName, object expectedPropertyValue, BehaviorOnNoMatch behaviorOnNoMatch)
                 : base(propertyName, expectedPropertyValue, behaviorOnNoMatch)
@@ -604,7 +604,7 @@ private static bool ActualValueLessThanOrEqualToExpectedValue(string propertyNam
             {
                 try
                 {
-                    if (!(actualPropertyValue is IComparable actualComparable))
+                    if (actualPropertyValue is not IComparable actualComparable)
                     {
                         return false;
                     }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs
index 035d5b17bbe..688b6362e16 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs
@@ -132,7 +132,7 @@ internal static string WqlQueryAll(string from)
         internal static T[] GetAll<T>(CimSession session, string nameSpace, string wmiClassName) where T : class, new()
         {
             ArgumentException.ThrowIfNullOrEmpty(wmiClassName);
-            
+
             var rv = new List<T>();
 
             try
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/CombinePathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/CombinePathCommand.cs
index bdeef0dd7a0..79b1c862bfd 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/CombinePathCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/CombinePathCommand.cs
@@ -32,7 +32,8 @@ public class JoinPathCommand : CoreCommandWithCredentialsBase
         [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true)]
         [AllowNull]
         [AllowEmptyString]
-        public string ChildPath { get; set; }
+        [AllowEmptyCollection]
+        public string[] ChildPath { get; set; }
 
         /// <summary>
         /// Gets or sets additional childPaths to the command.
@@ -50,6 +51,21 @@ public class JoinPathCommand : CoreCommandWithCredentialsBase
         [Parameter]
         public SwitchParameter Resolve { get; set; }
 
+        /// <summary>
+        /// Gets or sets the extension to use for the resulting path.
+        /// If not specified, the original extension (if any) is preserved.
+        /// <para>
+        /// Behavior:
+        /// - If the path has an existing extension, it will be replaced with the specified extension.
+        /// - If the path does not have an extension, the specified extension will be added.
+        /// - If an empty string is provided, any existing extension will be removed.
+        /// - A leading dot in the extension is optional; if omitted, one will be added automatically.
+        /// </para>
+        /// </summary>
+        [Parameter(ValueFromPipelineByPropertyName = true)]
+        [ValidateNotNull]
+        public string Extension { get; set; }
+
         #endregion Parameters
 
         #region Command code
@@ -64,7 +80,15 @@ protected override void ProcessRecord()
                 Path != null,
                 "Since Path is a mandatory parameter, paths should never be null");
 
-            string combinedChildPath = ChildPath;
+            string combinedChildPath = string.Empty;
+
+            if (this.ChildPath != null)
+            {
+                foreach (string childPath in this.ChildPath)
+                {
+                    combinedChildPath = SessionState.Path.Combine(combinedChildPath, childPath, CmdletProviderContext);
+                }
+            }
 
             // join the ChildPath elements
             if (AdditionalChildPath != null)
@@ -119,6 +143,12 @@ protected override void ProcessRecord()
                     continue;
                 }
 
+                // If Extension parameter is present it is not null due to [ValidateNotNull].
+                if (Extension is not null)
+                {
+                    joinedPath = System.IO.Path.ChangeExtension(joinedPath, Extension.Length == 0 ? null : Extension);
+                }
+
                 if (Resolve)
                 {
                     // Resolve the paths. The default API (GetResolvedPSPathFromPSPath)
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/CommitTransactionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/CommitTransactionCommand.cs
index 6f93119c999..94e923bfa6e 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/CommitTransactionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/CommitTransactionCommand.cs
@@ -28,4 +28,3 @@ protected override void EndProcessing()
         }
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index 2203c920c1e..ea8c111531c 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -24,10 +24,6 @@
 using Microsoft.Win32;
 using Dbg = System.Management.Automation;
 
-// FxCop suppressions for resource strings:
-[module: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", Scope = "resource", Target = "ComputerResources.resources", MessageId = "unjoined")]
-[module: SuppressMessage("Microsoft.Naming", "CA1701:ResourceStringCompoundWordsShouldBeCasedCorrectly", Scope = "resource", Target = "ComputerResources.resources", MessageId = "UpTime")]
-
 namespace Microsoft.PowerShell.Commands
 {
     #region Restart-Computer
@@ -2023,54 +2019,24 @@ internal static void WriteNonTerminatingError(int errorcode, PSCmdlet cmdlet, st
         /// <returns></returns>
         internal static bool IsComputerNameValid(string computerName)
         {
-            bool allDigits = true;
+            bool hasAsciiLetterOrHyphen = false;
 
             if (computerName.Length >= 64)
                 return false;
 
             foreach (char t in computerName)
             {
-                if (t >= 'A' && t <= 'Z' ||
-                    t >= 'a' && t <= 'z')
+                if (char.IsAsciiLetter(t) || t is '-')
                 {
-                    allDigits = false;
-                    continue;
-                }
-                else if (t >= '0' && t <= '9')
-                {
-                    continue;
+                    hasAsciiLetterOrHyphen = true;
                 }
-                else if (t == '-')
-                {
-                    allDigits = false;
-                    continue;
-                }
-                else
+                else if (!char.IsAsciiDigit(t))
                 {
                     return false;
                 }
             }
 
-            return !allDigits;
-        }
-
-        /// <summary>
-        /// System Restore APIs are not supported on the ARM platform. Skip the system restore operation is necessary.
-        /// </summary>
-        /// <param name="cmdlet"></param>
-        /// <returns></returns>
-        internal static bool SkipSystemRestoreOperationForARMPlatform(PSCmdlet cmdlet)
-        {
-            bool retValue = false;
-            if (PsUtils.IsRunningOnProcessorArchitectureARM())
-            {
-                var ex = new InvalidOperationException(ComputerResources.SystemRestoreNotSupported);
-                var er = new ErrorRecord(ex, "SystemRestoreNotSupported", ErrorCategory.InvalidOperation, null);
-                cmdlet.WriteError(er);
-                retValue = true;
-            }
-
-            return retValue;
+            return hasAsciiLetterOrHyphen;
         }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
index eb286f7c190..22092116330 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
@@ -158,7 +158,7 @@ protected override void StopProcessing()
         /// <summary>
         /// Run shutdown command.
         /// </summary>
-        protected void RunShutdown(String args)
+        protected void RunShutdown(string args)
         {
             if (shutdownPath is null)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
index 87c7731ed70..e7b3ada4ebb 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
@@ -244,7 +244,7 @@ internal void WriteContentObject(object content, long readCount, PathInfo pathIn
         /// as they get written to the pipeline. An instance of this cache class is
         /// only valid for a single path.
         /// </summary>
-        internal class ContentPathsCache
+        internal sealed class ContentPathsCache
         {
             /// <summary>
             /// Constructs a content cache item.
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ControlPanelItemCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ControlPanelItemCommand.cs
index fffb36d2979..3734eb82b0c 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ControlPanelItemCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ControlPanelItemCommand.cs
@@ -300,7 +300,7 @@ internal void GetCategoryMap()
             foreach (ShellFolderItem category in catItems)
             {
                 string path = category.Path;
-                string catNum = path.Substring(path.LastIndexOf("\\", StringComparison.OrdinalIgnoreCase) + 1);
+                string catNum = path.Substring(path.LastIndexOf('\\') + 1);
 
                 CategoryMap.Add(catNum, category.Name);
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ConvertPathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ConvertPathCommand.cs
index c32d0f2aa67..33796b23378 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ConvertPathCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ConvertPathCommand.cs
@@ -55,6 +55,16 @@ public string[] LiteralPath
             }
         }
 
+        /// <summary>
+        /// Gets or sets the force property.
+        /// </summary>
+        [Parameter]
+        public override SwitchParameter Force
+        {
+            get => base.Force;
+            set => base.Force = value;
+        }
+
         #endregion Parameters
 
         #region parameter data
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs
index 3731687599c..c667116fdd0 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs
@@ -555,7 +555,7 @@ private bool FiltersMatch(EventLogEntry entry)
                     }
                 }
 
-                if (!usernamematch) 
+                if (!usernamematch)
                 {
                     return usernamematch;
                 }
@@ -595,7 +595,7 @@ private bool FiltersMatch(EventLogEntry entry)
                     }
                 }
 
-                if (!datematch) 
+                if (!datematch)
                 {
                     return datematch;
                 }
@@ -1465,4 +1465,3 @@ protected override void BeginProcessing()
 
     #endregion RemoveEventLogCommand
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs
index dd878bd72ce..a2b7f03ce70 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs
@@ -2,8 +2,10 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Management.Automation;
+using System.Management.Automation.Language;
 using Microsoft.PowerShell.Commands.Internal;
 
 namespace Microsoft.PowerShell.Commands
@@ -34,6 +36,13 @@ public SwitchParameter Raw
             }
         }
 
+        /// <summary>
+        /// Gets or sets the delimiters to use when splitting the clipboard content.
+        /// </summary>
+        [Parameter]
+        [ArgumentCompleter(typeof(DelimiterCompleter))]
+        public string[] Delimiter { get; set; } = [Environment.NewLine];
+
         private bool _raw;
 
         /// <summary>
@@ -68,11 +77,40 @@ private List<string> GetClipboardContentAsText()
             }
             else
             {
-                string[] splitSymbol = { Environment.NewLine };
-                result.AddRange(textContent.Split(splitSymbol, StringSplitOptions.None));
+                result.AddRange(textContent.Split(Delimiter, StringSplitOptions.None));
             }
 
             return result;
         }
     }
+
+    /// <summary>
+    /// Provides argument completion for the Delimiter parameter.
+    /// </summary>
+    public sealed class DelimiterCompleter : IArgumentCompleter
+    {
+        /// <summary>
+        /// Provides argument completion for the Delimiter parameter.
+        /// </summary>
+        /// <param name="commandName">The name of the command that is being completed.</param>
+        /// <param name="parameterName">The name of the parameter that is being completed.</param>
+        /// <param name="wordToComplete">The input text to filter the results by.</param>
+        /// <param name="commandAst">The ast of the command that triggered the completion.</param>
+        /// <param name="fakeBoundParameters">The parameters bound to the command.</param>
+        /// <returns>Completion results.</returns>
+        public IEnumerable<CompletionResult> CompleteArgument(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
+        {
+            wordToComplete ??= string.Empty;
+            var pattern = new WildcardPattern(wordToComplete + '*', WildcardOptions.IgnoreCase);
+            if (pattern.IsMatch("CRLF") || pattern.IsMatch("Windows"))
+            {
+                yield return new CompletionResult("\"`r`n\"", "CRLF", CompletionResultType.ParameterValue, "Windows (CRLF)");
+            }
+
+            if (pattern.IsMatch("LF") || pattern.IsMatch("Unix") || pattern.IsMatch("Linux"))
+            {
+                yield return new CompletionResult("\"`n\"", "LF", CompletionResultType.ParameterValue, "UNIX (LF)");
+            }
+        }
+    }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
index 3de7c723745..87f96c436ea 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -1335,7 +1335,7 @@ protected static string GetLanguageName(uint? lcid)
 
 #pragma warning disable 649 // fields and properties in these class are assigned dynamically
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiBaseBoard
+    internal sealed class WmiBaseBoard
     {
         public string Caption;
         public string[] ConfigOptions;
@@ -1368,7 +1368,7 @@ internal class WmiBaseBoard
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiBios : WmiClassBase
+    internal sealed class WmiBios : WmiClassBase
     {
         public ushort[] BiosCharacteristics;
         public string[] BIOSVersion;
@@ -1403,7 +1403,7 @@ internal class WmiBios : WmiClassBase
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiComputerSystem
+    internal sealed class WmiComputerSystem
     {
         public ushort? AdminPasswordStatus;
         public bool? AutomaticManagedPagefile;
@@ -1486,7 +1486,7 @@ public PowerManagementCapabilities[] GetPowerManagementCapabilities()
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiDeviceGuard
+    internal sealed class WmiDeviceGuard
     {
         public uint[] AvailableSecurityProperties;
         public uint? CodeIntegrityPolicyEnforcementStatus;
@@ -1561,7 +1561,7 @@ public DeviceGuard AsOutputType
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiKeyboard
+    internal sealed class WmiKeyboard
     {
         public ushort? Availability;
         public string Caption;
@@ -1588,14 +1588,14 @@ internal class WmiKeyboard
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WMiLogicalMemory
+    internal sealed class WMiLogicalMemory
     {
         // TODO: fill this in!!!
         public uint? TotalPhysicalMemory;
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiMsftNetAdapter
+    internal sealed class WmiMsftNetAdapter
     {
         public string Caption;
         public string Description;
@@ -1683,7 +1683,7 @@ internal class WmiMsftNetAdapter
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiNetworkAdapter
+    internal sealed class WmiNetworkAdapter
     {
         public string AdapterType;
         public ushort? AdapterTypeID;
@@ -1727,7 +1727,7 @@ internal class WmiNetworkAdapter
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiNetworkAdapterConfiguration
+    internal sealed class WmiNetworkAdapterConfiguration
     {
         public bool? ArpAlwaysSourceRoute;
         public bool? ArpUseEtherSNAP;
@@ -1793,7 +1793,7 @@ internal class WmiNetworkAdapterConfiguration
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiOperatingSystem : WmiClassBase
+    internal sealed class WmiOperatingSystem : WmiClassBase
     {
         #region Fields
         public string BootDevice;
@@ -1900,7 +1900,7 @@ private static OSProductSuite[] MakeProductSuites(uint? suiteMask)
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiPageFileUsage
+    internal sealed class WmiPageFileUsage
     {
         public uint? AllocatedBaseSize;
         public string Caption;
@@ -1914,7 +1914,7 @@ internal class WmiPageFileUsage
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
-    internal class WmiProcessor
+    internal sealed class WmiProcessor
     {
         public ushort? AddressWidth;
         public ushort? Architecture;
@@ -1977,7 +1977,7 @@ internal class WmiProcessor
     #endregion Intermediate WMI classes
 
     #region Other Intermediate classes
-    internal class RegWinNtCurrentVersion
+    internal sealed class RegWinNtCurrentVersion
     {
         public string BuildLabEx;
         public string CurrentVersion;
@@ -3685,7 +3685,7 @@ public enum DeviceGuardHardwareSecure
         /// Secure Memory Overwrite.
         /// </summary>
         SecureMemoryOverwrite = 4,
-        
+
         /// <summary>
         /// UEFI Code Readonly.
         /// </summary>
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
index 4e83eda905f..a9d8772a5fc 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
@@ -87,7 +87,7 @@ protected override void ProcessRecord()
                 return;
             }
 
-            if (TotalCount == 0 || Tail == 0)
+            if (TotalCount == 0)
             {
                 // Don't read anything
                 return;
@@ -118,7 +118,7 @@ protected override void ProcessRecord()
                     // as reading forwards. So we read forwards in this case.
                     // If Tail is positive, we seek the right position. Or, if the seek failed
                     // because of an unsupported encoding, we scan forward to get the tail content.
-                    if (Tail > 0)
+                    if (Tail >= 0)
                     {
                         bool seekSuccess = false;
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetTransactionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetTransactionCommand.cs
index 484ddb96680..6b6551619f1 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetTransactionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetTransactionCommand.cs
@@ -23,4 +23,3 @@ protected override void EndProcessing()
         }
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetWMIObjectCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetWMIObjectCommand.cs
index 85d8c4feb3f..27f812c7a80 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetWMIObjectCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetWMIObjectCommand.cs
@@ -438,4 +438,3 @@ private string GetClassNameFromQuery(string query)
         #endregion Command code
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
index 1aa94509469..d0f15346396 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
@@ -206,26 +206,11 @@ private bool FilterMatch(ManagementObject obj)
         #region "IDisposable Members"
 
         /// <summary>
-        /// Dispose Method.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
         {
-            this.Dispose(true);
-            // Use SuppressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Dispose Method.
-        /// </summary>
-        /// <param name="disposing"></param>
-        public void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _searchProcess?.Dispose();
-            }
+            _searchProcess?.Dispose();
         }
 
         #endregion "IDisposable Members"
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/JobProcessCollection.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/JobProcessCollection.cs
new file mode 100644
index 00000000000..78560543939
--- /dev/null
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/JobProcessCollection.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+#if !UNIX
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using Microsoft.Win32.SafeHandles;
+
+namespace Microsoft.PowerShell.Commands;
+
+/// <summary>
+/// JobProcessCollection is a helper class used by Start-Process -Wait cmdlet to monitor the
+/// child processes created by the main process hosted by the Start-process cmdlet.
+/// </summary>
+internal sealed class JobProcessCollection : IDisposable
+{
+    /// <summary>
+    /// Stores the initialisation state of the job and completion port.
+    /// </summary>
+    private bool? _initStatus;
+
+    /// <summary>
+    /// JobObjectHandle is a reference to the job object used to track
+    /// the child processes created by the main process hosted by the Start-Process cmdlet.
+    /// </summary>
+    private Interop.Windows.SafeJobHandle? _jobObject;
+
+    /// <summary>
+    /// The completion port handle that is used to monitor job events.
+    /// </summary>
+    private Interop.Windows.SafeIoCompletionPort? _completionPort;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JobProcessCollection"/> class.
+    /// </summary>
+    public JobProcessCollection()
+    { }
+
+    /// <summary>
+    /// Initializes the job and IO completion port and adds the process to the
+    /// job object.
+    /// </summary>
+    /// <param name="process">The process to add to the job.</param>
+    /// <returns>Whether the job creation and assignment worked or not.</returns>
+    public bool AssignProcessToJobObject(SafeProcessHandle process)
+        => InitializeJob() && Interop.Windows.AssignProcessToJobObject(_jobObject, process);
+
+    /// <summary>
+    /// Blocks the current thread until all processes in the job have exited.
+    /// </summary>
+    /// <param name="cancellationToken">A token to cancel the operation.</param>
+    public void WaitForExit(CancellationToken cancellationToken)
+    {
+        if (_completionPort is null)
+        {
+            return;
+        }
+
+        using var cancellationRegistration = cancellationToken.Register(() =>
+        {
+            Interop.Windows.PostQueuedCompletionStatus(
+                _completionPort,
+                Interop.Windows.JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO);
+        });
+
+        int completionCode = 0;
+        do
+        {
+            Interop.Windows.GetQueuedCompletionStatus(
+                _completionPort,
+                Interop.Windows.INFINITE,
+                out completionCode);
+        }
+        while (completionCode != Interop.Windows.JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO);
+        cancellationToken.ThrowIfCancellationRequested();
+    }
+
+    [MemberNotNullWhen(true, [nameof(_jobObject), nameof(_completionPort)])]
+    private bool InitializeJob()
+    {
+        if (_initStatus.HasValue)
+        {
+            return _initStatus.Value;
+        }
+
+        if (_jobObject is null)
+        {
+            _jobObject = Interop.Windows.CreateJobObject();
+            if (_jobObject.IsInvalid)
+            {
+                _initStatus = false;
+                _jobObject.Dispose();
+                _jobObject = null;
+                return false;
+            }
+        }
+
+        if (_completionPort is null)
+        {
+            _completionPort = Interop.Windows.CreateIoCompletionPort();
+            if (_completionPort.IsInvalid)
+            {
+                _initStatus = false;
+                _completionPort.Dispose();
+                _completionPort = null;
+                return false;
+            }
+        }
+
+        _initStatus = Interop.Windows.SetInformationJobObject(
+            _jobObject,
+            _completionPort);
+
+        return _initStatus.Value;
+    }
+
+    public void Dispose()
+    {
+        _jobObject?.Dispose();
+        _completionPort?.Dispose();
+    }
+}
+#endif
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
index 8bc149c2cf1..6ab8f1d652d 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
@@ -25,7 +25,7 @@ public abstract class CoreCommandBase : PSCmdlet, IDynamicParameters
         /// An instance of the PSTraceSource class used for trace output
         /// using "NavigationCommands" as the category.
         /// </summary>
-        [Dbg.TraceSourceAttribute("NavigationCommands", "The namespace navigation tracer")]
+        [Dbg.TraceSource("NavigationCommands", "The namespace navigation tracer")]
         internal static readonly Dbg.PSTraceSource tracer = Dbg.PSTraceSource.GetTracer("NavigationCommands", "The namespace navigation tracer");
 
         #endregion Tracer
@@ -1129,6 +1129,7 @@ public string Description
         /// Gets or sets the scope identifier for the drive being created.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
 #if !UNIX
@@ -1533,6 +1534,7 @@ public string[] PSProvider
         /// global scope until a drive of the given name is found to remove.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         /// <summary>
@@ -1701,6 +1703,7 @@ public string[] LiteralName
         /// Gets or sets the scope parameter to the command.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         /// <summary>
@@ -2715,7 +2718,7 @@ protected override void ProcessRecord()
                     {
                         // Get the localized prompt string
 
-                        string prompt = StringUtil.Format(NavigationResources.RemoveItemWithChildren, resolvedPath.Path);
+                        string prompt = StringUtil.Format(NavigationResources.RemoveItemWithChildren, providerPath);
 
                         // Confirm the user wants to remove all children and the item even if
                         // they did not specify -recurse
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/NewPropertyCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/NewPropertyCommand.cs
index b2b9e6c1a85..fb134ce7a11 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/NewPropertyCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/NewPropertyCommand.cs
@@ -1,7 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Management.Automation;
+using System.Management.Automation.Language;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -63,6 +67,9 @@ public string[] LiteralPath
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
         [Alias("Type")]
+#if !UNIX
+        [ArgumentCompleter(typeof(PropertyTypeArgumentCompleter))]
+#endif
         public string PropertyType { get; set; }
 
         /// <summary>
@@ -175,4 +182,114 @@ protected override void ProcessRecord()
         #endregion Command code
 
     }
+
+#if !UNIX
+    /// <summary>
+    /// Provides argument completion for PropertyType parameter.
+    /// </summary>
+    public class PropertyTypeArgumentCompleter : IArgumentCompleter
+    {
+        private static readonly CompletionHelpers.CompletionDisplayInfoMapper RegistryPropertyTypeDisplayInfoMapper = registryPropertyType => registryPropertyType switch
+        {
+            "String" => (
+                ToolTip: TabCompletionStrings.RegistryStringToolTip,
+                ListItemText: "String"),
+            "ExpandString" => (
+                ToolTip: TabCompletionStrings.RegistryExpandStringToolTip,
+                ListItemText: "ExpandString"),
+            "Binary" => (
+                ToolTip: TabCompletionStrings.RegistryBinaryToolTip,
+                ListItemText: "Binary"),
+            "DWord" => (
+                ToolTip: TabCompletionStrings.RegistryDWordToolTip,
+                ListItemText: "DWord"),
+            "MultiString" => (
+                ToolTip: TabCompletionStrings.RegistryMultiStringToolTip,
+                ListItemText: "MultiString"),
+            "QWord" => (
+                ToolTip: TabCompletionStrings.RegistryQWordToolTip,
+                ListItemText: "QWord"),
+            _ => (
+                ToolTip: TabCompletionStrings.RegistryUnknownToolTip,
+                ListItemText: "Unknown"),
+        };
+
+        private static readonly IReadOnlyList<string> s_RegistryPropertyTypes = new List<string>(capacity: 7)
+        {
+            "String",
+            "ExpandString",
+            "Binary",
+            "DWord",
+            "MultiString",
+            "QWord",
+            "Unknown"
+        };
+
+        /// <summary>
+        /// Returns completion results for PropertyType parameter.
+        /// </summary>
+        /// <param name="commandName">The command name.</param>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="commandAst">The command AST.</param>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>List of Completion Results.</returns>
+        public IEnumerable<CompletionResult> CompleteArgument(
+            string commandName,
+            string parameterName,
+            string wordToComplete,
+            CommandAst commandAst,
+            IDictionary fakeBoundParameters)
+                => IsRegistryProvider(fakeBoundParameters)
+                    ? CompletionHelpers.GetMatchingResults(
+                        wordToComplete,
+                        possibleCompletionValues: s_RegistryPropertyTypes,
+                        displayInfoMapper: RegistryPropertyTypeDisplayInfoMapper,
+                        resultType: CompletionResultType.ParameterValue)
+                    : [];
+
+        /// <summary>
+        /// Checks if parameter paths are from Registry provider.
+        /// </summary>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>Boolean indicating if paths are from Registry Provider.</returns>
+        private static bool IsRegistryProvider(IDictionary fakeBoundParameters)
+        {
+            Collection<PathInfo> paths;
+
+            if (fakeBoundParameters.Contains("Path"))
+            {
+                paths = ResolvePath(fakeBoundParameters["Path"], isLiteralPath: false);
+            }
+            else if (fakeBoundParameters.Contains("LiteralPath"))
+            {
+                paths = ResolvePath(fakeBoundParameters["LiteralPath"], isLiteralPath: true);
+            }
+            else
+            {
+                paths = ResolvePath(@".\", isLiteralPath: false);
+            }
+
+            return paths.Count > 0 && paths[0].Provider.NameEquals("Registry");
+        }
+
+        /// <summary>
+        /// Resolve path or literal path using Resolve-Path.
+        /// </summary>
+        /// <param name="path">The path to resolve.</param>
+        /// <param name="isLiteralPath">Specifies if path is literal path.</param>
+        /// <returns>Collection of Pathinfo objects.</returns>
+        private static Collection<PathInfo> ResolvePath(object path, bool isLiteralPath)
+        {
+            using var ps = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);
+
+            ps.AddCommand("Microsoft.PowerShell.Management\\Resolve-Path");
+            ps.AddParameter(isLiteralPath ? "LiteralPath" : "Path", path);
+
+            Collection<PathInfo> output = ps.Invoke<PathInfo>();
+
+            return output;
+        }
+    }
+#endif
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs
index b6609f8b692..ca616301ebb 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs
@@ -289,137 +289,125 @@ protected override void ProcessRecord()
             {
                 string result = null;
 
-                switch (ParameterSetName)
+                // Check switch parameters in order of specificity
+                if (IsAbsolute)
                 {
-                    case isAbsoluteSet:
-                        string ignored;
-                        bool isPathAbsolute =
-                            SessionState.Path.IsPSAbsolute(pathsToParse[index], out ignored);
+                    string ignored;
+                    bool isPathAbsolute =
+                        SessionState.Path.IsPSAbsolute(pathsToParse[index], out ignored);
 
-                        WriteObject(isPathAbsolute);
-                        continue;
+                    WriteObject(isPathAbsolute);
+                    continue;
+                }
+                else if (Qualifier)
+                {
+                    int separatorIndex = pathsToParse[index].IndexOf(':');
 
-                    case qualifierSet:
-                        int separatorIndex = pathsToParse[index].IndexOf(':');
+                    if (separatorIndex < 0)
+                    {
+                        FormatException e =
+                            new(
+                                StringUtil.Format(NavigationResources.ParsePathFormatError, pathsToParse[index]));
+                        WriteError(
+                            new ErrorRecord(
+                                e,
+                                "ParsePathFormatError", // RENAME
+                                ErrorCategory.InvalidArgument,
+                                pathsToParse[index]));
+                        continue;
+                    }
+                    else
+                    {
+                        // Check to see if it is provider or drive qualified
 
-                        if (separatorIndex < 0)
-                        {
-                            FormatException e =
-                                new(
-                                    StringUtil.Format(NavigationResources.ParsePathFormatError, pathsToParse[index]));
-                            WriteError(
-                                new ErrorRecord(
-                                    e,
-                                    "ParsePathFormatError", // RENAME
-                                    ErrorCategory.InvalidArgument,
-                                    pathsToParse[index]));
-                            continue;
-                        }
-                        else
+                        if (SessionState.Path.IsProviderQualified(pathsToParse[index]))
                         {
-                            // Check to see if it is provider or drive qualified
-
-                            if (SessionState.Path.IsProviderQualified(pathsToParse[index]))
-                            {
-                                // The plus 2 is for the length of the provider separator
-                                // which is "::"
-
-                                result =
-                                    pathsToParse[index].Substring(
-                                        0,
-                                        separatorIndex + 2);
-                            }
-                            else
-                            {
-                                result =
-                                    pathsToParse[index].Substring(
-                                        0,
-                                        separatorIndex + 1);
-                            }
-                        }
+                            // The plus 2 is for the length of the provider separator
+                            // which is "::"
 
-                        break;
-
-                    case parentSet:
-                    case literalPathSet:
-                        try
-                        {
                             result =
-                                SessionState.Path.ParseParent(
-                                    pathsToParse[index],
-                                    string.Empty,
-                                    CmdletProviderContext,
-                                    true);
+                                pathsToParse[index].Substring(
+                                    0,
+                                    separatorIndex + 2);
                         }
-                        catch (PSNotSupportedException)
-                        {
-                            // Since getting the parent path is not supported,
-                            // the provider must be a container, item, or drive
-                            // provider.  Since the paths for these types of
-                            // providers can't be split, asking for the parent
-                            // is asking for an empty string.
-                            result = string.Empty;
-                        }
-
-                        break;
-
-                    case leafSet:
-                    case leafBaseSet:
-                    case extensionSet:
-                        try
+                        else
                         {
-                            // default handles leafSet
                             result =
-                                SessionState.Path.ParseChildName(
-                                    pathsToParse[index],
-                                    CmdletProviderContext,
-                                    true);
-                            if (LeafBase)
-                            {
-                                result = System.IO.Path.GetFileNameWithoutExtension(result);
-                            }
-                            else if (Extension)
-                            {
-                                result = System.IO.Path.GetExtension(result);
-                            }
+                                pathsToParse[index].Substring(
+                                    0,
+                                    separatorIndex + 1);
                         }
-                        catch (PSNotSupportedException)
+                    }
+                }
+                else if (Leaf || LeafBase || Extension)
+                {
+                    try
+                    {
+                        result =
+                            SessionState.Path.ParseChildName(
+                                pathsToParse[index],
+                                CmdletProviderContext,
+                                true);
+                        if (LeafBase)
                         {
-                            // Since getting the leaf part of a path is not supported,
-                            // the provider must be a container, item, or drive
-                            // provider.  Since the paths for these types of
-                            // providers can't be split, asking for the leaf
-                            // is asking for the specified path back.
-                            result = pathsToParse[index];
+                            result = System.IO.Path.GetFileNameWithoutExtension(result);
                         }
-                        catch (DriveNotFoundException driveNotFound)
+                        else if (Extension)
                         {
-                            WriteError(
-                                new ErrorRecord(
-                                    driveNotFound.ErrorRecord,
-                                    driveNotFound));
-                            continue;
-                        }
-                        catch (ProviderNotFoundException providerNotFound)
-                        {
-                            WriteError(
-                                new ErrorRecord(
-                                    providerNotFound.ErrorRecord,
-                                    providerNotFound));
-                            continue;
+                            result = System.IO.Path.GetExtension(result);
                         }
-
-                        break;
-
-                    case noQualifierSet:
-                        result = RemoveQualifier(pathsToParse[index]);
-                        break;
-
-                    default:
-                        Dbg.Diagnostics.Assert(
-                            false,
-                            "Only a known parameter set should be called");
-                        break;
+                    }
+                    catch (PSNotSupportedException)
+                    {
+                        // Since getting the leaf part of a path is not supported,
+                        // the provider must be a container, item, or drive
+                        // provider.  Since the paths for these types of
+                        // providers can't be split, asking for the leaf
+                        // is asking for the specified path back.
+                        result = pathsToParse[index];
+                    }
+                    catch (DriveNotFoundException driveNotFound)
+                    {
+                        WriteError(
+                            new ErrorRecord(
+                                driveNotFound.ErrorRecord,
+                                driveNotFound));
+                        continue;
+                    }
+                    catch (ProviderNotFoundException providerNotFound)
+                    {
+                        WriteError(
+                            new ErrorRecord(
+                                providerNotFound.ErrorRecord,
+                                providerNotFound));
+                        continue;
+                    }
+                }
+                else if (NoQualifier)
+                {
+                    result = RemoveQualifier(pathsToParse[index]);
+                }
+                else
+                {
+                    // None of the switch parameters are true: default to -Parent behavior
+                    try
+                    {
+                        result =
+                            SessionState.Path.ParseParent(
+                                pathsToParse[index],
+                                string.Empty,
+                                CmdletProviderContext,
+                                true);
+                    }
+                    catch (PSNotSupportedException)
+                    {
+                        // Since getting the parent path is not supported,
+                        // the provider must be a container, item, or drive
+                        // provider.  Since the paths for these types of
+                        // providers can't be split, asking for the parent
+                        // is asking for an empty string.
+                        result = string.Empty;
+                    }
                 }
 
                 if (result != null)
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
index c5df76c0445..91efda12263 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel; // Win32Exception
 using System.Diagnostics; // Process class
@@ -11,10 +12,10 @@
 using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
+using System.Management.Automation.Language;
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
-using System.Security;
 using System.Security.Principal;
 using System.Text;
 using System.Threading;
@@ -542,20 +543,6 @@ public override Process[] InputObject
 
         #region Overrides
 
-        /// <summary>
-        /// Check the elevation mode if IncludeUserName is specified.
-        /// </summary>
-        protected override void BeginProcessing()
-        {
-            // The parameter 'IncludeUserName' requires administrator privilege
-            if (IncludeUserName.IsPresent && !Utils.IsAdministrator())
-            {
-                var ex = new InvalidOperationException(ProcessResources.IncludeUserNameRequiresElevation);
-                var er = new ErrorRecord(ex, "IncludeUserNameRequiresElevation", ErrorCategory.InvalidOperation, null);
-                ThrowTerminatingError(er);
-            }
-        }
-
         /// <summary>
         /// Write the process objects.
         /// </summary>
@@ -683,7 +670,7 @@ protected override void ProcessRecord()
                 }
                 else
                 {
-                    WriteObject(IncludeUserName.IsPresent ? AddUserNameToProcess(process) : (object)process);
+                    WriteObject(IncludeUserName.IsPresent ? AddUserNameToProcess(process) : process);
                 }
             }
         }
@@ -763,28 +750,17 @@ private static string RetrieveProcessUserName(Process process)
                 }
 
                 var tokenUser = Marshal.PtrToStructure<Win32Native.TOKEN_USER>(tokenUserInfo);
-
-                // Max username is defined as UNLEN = 256 in lmcons.h
-                // Max domainname is defined as DNLEN = CNLEN = 15 in lmcons.h
-                // The buffer length must be +1, last position is for a null string terminator.
-                int userNameLength = 257;
-                int domainNameLength = 16;
-                Span<char> userNameStr = stackalloc char[userNameLength];
-                Span<char> domainNameStr = stackalloc char[domainNameLength];
-                Win32Native.SID_NAME_USE accountType;
-
-                // userNameLength and domainNameLength will be set to actual lengths.
-                if (!Win32Native.LookupAccountSid(null, tokenUser.User.Sid, userNameStr, ref userNameLength, domainNameStr, ref domainNameLength, out accountType))
-                {
-                    return null;
-                }
-
-                userName = string.Concat(domainNameStr.Slice(0, domainNameLength), "\\", userNameStr.Slice(0, userNameLength));
+                SecurityIdentifier sid = new SecurityIdentifier(tokenUser.User.Sid);
+                userName = sid.Translate(typeof(System.Security.Principal.NTAccount)).Value;
             }
             catch (NotSupportedException)
             {
                 // The Process not started yet, or it's a process from a remote machine.
             }
+            catch (IdentityNotMappedException)
+            {
+                // SID cannot be mapped to a user
+            }
             catch (InvalidOperationException)
             {
                 // The Process has exited, Process.Handle will raise this exception.
@@ -896,7 +872,7 @@ public int Timeout
                 _timeOutSpecified = true;
             }
         }
-        
+
         /// <summary>
         /// Gets or sets a value indicating whether to return after any one process exits.
         /// </summary>
@@ -1045,7 +1021,7 @@ protected override void EndProcessing()
                     }
                 }
             }
-            
+
             if (PassThru)
             {
                 WriteObject(_processList, enumerateCollection: true);
@@ -1627,7 +1603,7 @@ private static string MapReturnCodeToErrorMessage(int returnCode)
     [OutputType(typeof(Process))]
     public sealed class StartProcessCommand : PSCmdlet, IDisposable
     {
-        private ManualResetEvent _waithandle = null;
+        private readonly CancellationTokenSource _cancellationTokenSource = new();
         private bool _isDefaultSetParameterSpecified = false;
 
         #region Parameters
@@ -1700,7 +1676,7 @@ public SwitchParameter LoadUserProfile
         private SwitchParameter _loaduserprofile = SwitchParameter.Present;
 
         /// <summary>
-        /// Starts process in a new window.
+        /// Starts process in the current console window.
         /// </summary>
         [Parameter(ParameterSetName = "Default")]
         [Alias("nnw")]
@@ -1800,6 +1776,7 @@ public string RedirectStandardOutput
         /// </remarks>
         [Parameter(ParameterSetName = "UseShellExecute")]
         [ValidateNotNullOrEmpty]
+        [ArgumentCompleter(typeof(VerbArgumentCompleter))]
         public string Verb { get; set; }
 
         /// <summary>
@@ -1926,6 +1903,7 @@ protected override void BeginProcessing()
             }
             catch (CommandNotFoundException)
             {
+                // codeql[cs/microsoft/command-line-injection-shell-execution] - This is expected Poweshell behavior where user inputted paths are supported for the context of this method. The user assumes trust for the file path they are specifying and the process is on the user's system except for remoting in which case restricted remoting security guidelines should be used.
                 startInfo.FileName = FilePath;
 #if UNIX
                 // Arguments are passed incorrectly to the executable used for ShellExecute and not to filename https://github.com/dotnet/corefx/issues/30718
@@ -1987,7 +1965,9 @@ protected override void BeginProcessing()
 
                 startInfo.WindowStyle = _windowstyle;
 
-                if (_nonewwindow)
+                // When starting a process as another user, the 'CreateNoWindow' property value is ignored and a new window is created.
+                // See details at https://learn.microsoft.com/dotnet/api/system.diagnostics.processstartinfo.createnowindow?view=net-9.0#remarks
+                if (_nonewwindow && _credential is null)
                 {
                     startInfo.CreateNoWindow = _nonewwindow;
                 }
@@ -2084,7 +2064,7 @@ protected override void BeginProcessing()
             Process process = null;
 
 #if !UNIX
-            ProcessCollection jobObject = null;
+            using JobProcessCollection jobObject = new();
             bool? jobAssigned = null;
 #endif
             if (startInfo.UseShellExecute)
@@ -2122,10 +2102,30 @@ protected override void BeginProcessing()
                 // https://github.com/PowerShell/PowerShell/issues/17033
                 if (Wait)
                 {
-                    jobObject = new();
                     jobAssigned = jobObject.AssignProcessToJobObject(processInfo.Process);
                 }
 
+                // Since the process wasn't spawned by .NET, we need to trigger .NET to get a lock on the handle of the process.
+                // Otherwise, accessing properties like `ExitCode` will throw the following exception:
+                //   "Process was not started by this object, so requested information cannot be determined."
+                // Fetching the process handle will trigger the `Process` object to update its internal state by calling `SetProcessHandle`,
+                // the result is discarded as it's not used later in this code.
+                try
+                {
+                    _ = process.Handle;
+                }
+                catch (Win32Exception e)
+                {
+                    // If the caller was not an admin and the process was started with another user's credentials .NET
+                    // won't be able to retrieve the process handle. As this is not a critical failure we treat this as
+                    // a warning.
+                    if (PassThru)
+                    {
+                        string msg = StringUtil.Format(ProcessResources.FailedToCreateProcessObject, e.Message);
+                        WriteDebug(msg);
+                    }
+                }
+
                 // Resume the process now that is has been set up.
                 processInfo.Resume();
 #endif
@@ -2152,23 +2152,20 @@ protected override void BeginProcessing()
                     if (!process.HasExited)
                     {
 #if UNIX
-                        process.WaitForExit();
+                        process.WaitForExitAsync(_cancellationTokenSource.Token).GetAwaiter().GetResult();
 #else
-                        _waithandle = new ManualResetEvent(false);
-
-                        // Create and start the job object. This may have
-                        // already been done in StartWithCreateProcess.
-                        jobObject ??= new();
+                        // Add the process to the job, this may have already
+                        // been done in StartWithCreateProcess.
                         if (jobAssigned == true || (jobAssigned is null && jobObject.AssignProcessToJobObject(process.SafeHandle)))
                         {
                             // Wait for the job object to finish
-                            jobObject.WaitOne(_waithandle);
+                            jobObject.WaitForExit(_cancellationTokenSource.Token);
                         }
                         else
                         {
                             // WinBlue: 27537 Start-Process -Wait doesn't work in a remote session on Windows 7 or lower.
                             // A Remote session is in it's own job and nested job support was only added in Windows 8/Server 2012.
-                            process.WaitForExit();
+                            process.WaitForExitAsync(_cancellationTokenSource.Token).GetAwaiter().GetResult();
                         }
 #endif
                     }
@@ -2184,28 +2181,21 @@ protected override void BeginProcessing()
         /// <summary>
         /// Implements ^c, after creating a process.
         /// </summary>
-        protected override void StopProcessing() => _waithandle?.Set();
+        protected override void StopProcessing() => _cancellationTokenSource.Cancel();
 
         #endregion
 
         #region IDisposable Overrides
 
         /// <summary>
-        /// Dispose WaitHandle used to honor -Wait parameter.
+        /// Release all resources.
         /// </summary>
+        /// <remarks>
+        /// Dispose WaitHandle used to honor -Wait parameter.
+        /// </remarks>
         public void Dispose()
         {
-            Dispose(true);
-            System.GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool isDisposing)
-        {
-            if (_waithandle != null)
-            {
-                _waithandle.Dispose();
-                _waithandle = null;
-            }
+            _cancellationTokenSource.Dispose();
         }
 
         #endregion
@@ -2414,6 +2404,19 @@ private static byte[] ConvertEnvVarsToByteArray(StringDictionary sd)
 
         private void SetStartupInfo(ProcessStartInfo startinfo, ref ProcessNativeMethods.STARTUPINFO lpStartupInfo, ref int creationFlags)
         {
+            // If we are starting a process using the current console window, we need to set its standard handles
+            // explicitly when they are not redirected because otherwise they won't be set and the new process will
+            // fail with the "invalid handle" error.
+            //
+            // However, if we are starting a process with a new console window, we should not explicitly set those
+            // standard handles when they are not redirected, but instead let Windows figure out the default to use
+            // when creating the process. Otherwise, the standard input handles of the current window and the new
+            // window will get weirdly tied together and cause problems.
+            bool hasRedirection = startinfo.CreateNoWindow
+                || _redirectstandardinput is not null
+                || _redirectstandardoutput is not null
+                || _redirectstandarderror is not null;
+
             // RedirectionStandardInput
             if (_redirectstandardinput != null)
             {
@@ -2421,9 +2424,11 @@ private void SetStartupInfo(ProcessStartInfo startinfo, ref ProcessNativeMethods
                 _redirectstandardinput = ResolveFilePath(_redirectstandardinput);
                 lpStartupInfo.hStdInput = GetSafeFileHandleForRedirection(_redirectstandardinput, FileMode.Open);
             }
-            else
+            else if (startinfo.CreateNoWindow)
             {
-                lpStartupInfo.hStdInput = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-10), false);
+                lpStartupInfo.hStdInput = new SafeFileHandle(
+                    ProcessNativeMethods.GetStdHandle(-10),
+                    ownsHandle: false);
             }
 
             // RedirectionStandardOutput
@@ -2433,9 +2438,11 @@ private void SetStartupInfo(ProcessStartInfo startinfo, ref ProcessNativeMethods
                 _redirectstandardoutput = ResolveFilePath(_redirectstandardoutput);
                 lpStartupInfo.hStdOutput = GetSafeFileHandleForRedirection(_redirectstandardoutput, FileMode.Create);
             }
-            else
+            else if (startinfo.CreateNoWindow)
             {
-                lpStartupInfo.hStdOutput = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-11), false);
+                lpStartupInfo.hStdOutput = new SafeFileHandle(
+                    ProcessNativeMethods.GetStdHandle(-11),
+                    ownsHandle: false);
             }
 
             // RedirectionStandardError
@@ -2445,13 +2452,18 @@ private void SetStartupInfo(ProcessStartInfo startinfo, ref ProcessNativeMethods
                 _redirectstandarderror = ResolveFilePath(_redirectstandarderror);
                 lpStartupInfo.hStdError = GetSafeFileHandleForRedirection(_redirectstandarderror, FileMode.Create);
             }
-            else
+            else if (startinfo.CreateNoWindow)
             {
-                lpStartupInfo.hStdError = new SafeFileHandle(ProcessNativeMethods.GetStdHandle(-12), false);
+                lpStartupInfo.hStdError = new SafeFileHandle(
+                    ProcessNativeMethods.GetStdHandle(-12),
+                    ownsHandle: false);
             }
 
-            // STARTF_USESTDHANDLES
-            lpStartupInfo.dwFlags = 0x100;
+            if (hasRedirection)
+            {
+                // Set STARTF_USESTDHANDLES only if there is redirection.
+                lpStartupInfo.dwFlags = 0x100;
+            }
 
             if (startinfo.CreateNoWindow)
             {
@@ -2654,82 +2666,80 @@ private Process StartWithShellExecute(ProcessStartInfo startInfo)
         #endregion
     }
 
-#if !UNIX
     /// <summary>
-    /// ProcessCollection is a helper class used by Start-Process -Wait cmdlet to monitor the
-    /// child processes created by the main process hosted by the Start-process cmdlet.
+    /// Provides argument completion for Verb parameter.
     /// </summary>
-    internal class ProcessCollection
+    public class VerbArgumentCompleter : IArgumentCompleter
     {
         /// <summary>
-        /// JobObjectHandle is a reference to the job object used to track
-        /// the child processes created by the main process hosted by the Start-Process cmdlet.
-        /// </summary>
-        private readonly Microsoft.PowerShell.Commands.SafeJobHandle _jobObjectHandle;
-
-        /// <summary>
-        /// ProcessCollection constructor.
+        /// Returns completion results for verb parameter.
         /// </summary>
-        internal ProcessCollection()
+        /// <param name="commandName">The command name.</param>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="commandAst">The command AST.</param>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>List of Completion Results.</returns>
+        public IEnumerable<CompletionResult> CompleteArgument(
+            string commandName,
+            string parameterName,
+            string wordToComplete,
+            CommandAst commandAst,
+            IDictionary fakeBoundParameters)
         {
-            IntPtr jobObjectHandleIntPtr = NativeMethods.CreateJobObject(IntPtr.Zero, null);
-            _jobObjectHandle = new SafeJobHandle(jobObjectHandleIntPtr);
-        }
+            // -Verb is not supported on non-Windows platforms as well as Windows headless SKUs
+            if (!Platform.IsWindowsDesktop)
+            {
+                return Array.Empty<CompletionResult>();
+            }
 
-        /// <summary>
-        /// Start API assigns the process to the JobObject and starts monitoring
-        /// the child processes hosted by the process created by Start-Process cmdlet.
-        /// </summary>
-        internal bool AssignProcessToJobObject(SafeProcessHandle process)
-        {
-            // Add the process to the job object
-            bool result = Interop.Windows.AssignProcessToJobObject(
-                _jobObjectHandle.DangerousGetHandle(),
-                process.DangerousGetHandle());
-            return result;
-        }
+            // Completion: Start-Process -FilePath <path> -Verb <wordToComplete>
+            if (commandName.Equals("Start-Process", StringComparison.OrdinalIgnoreCase)
+                && fakeBoundParameters.Contains("FilePath"))
+            {
+                string filePath = fakeBoundParameters["FilePath"].ToString();
 
-        /// <summary>
-        /// Checks to see if the JobObject is empty (has no assigned processes).
-        /// If job is empty the auto reset event supplied as input would be set.
-        /// </summary>
-        internal void CheckJobStatus(object stateInfo)
-        {
-            ManualResetEvent emptyJobAutoEvent = (ManualResetEvent)stateInfo;
-            int dwSize = 0;
-            const int JOB_OBJECT_BASIC_PROCESS_ID_LIST = 3;
-            JOBOBJECT_BASIC_PROCESS_ID_LIST JobList = new();
+                // Complete file verbs if extension exists
+                if (Path.HasExtension(filePath))
+                {
+                    return CompleteFileVerbs(wordToComplete, filePath);
+                }
 
-            dwSize = Marshal.SizeOf(JobList);
-            if (NativeMethods.QueryInformationJobObject(_jobObjectHandle,
-                JOB_OBJECT_BASIC_PROCESS_ID_LIST,
-                ref JobList, dwSize, IntPtr.Zero))
-            {
-                if (JobList.NumberOfAssignedProcess == 0)
+                // Otherwise check if command is an Application to resolve executable full path with extension
+                // e.g if powershell was given, resolve to powershell.exe to get verbs
+                using var ps = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);
+
+                var commandInfo = new CmdletInfo("Get-Command", typeof(GetCommandCommand));
+
+                ps.AddCommand(commandInfo);
+                ps.AddParameter("Name", filePath);
+                ps.AddParameter("CommandType", CommandTypes.Application);
+
+                Collection<CommandInfo> commands = ps.Invoke<CommandInfo>();
+
+                // Start-Process & Get-Command select first found application based on PATHEXT environment variable
+                if (commands.Count >= 1)
                 {
-                    emptyJobAutoEvent.Set();
+                    return CompleteFileVerbs(wordToComplete, filePath: commands[0].Source);
                 }
             }
+
+            return Array.Empty<CompletionResult>();
         }
 
         /// <summary>
-        /// WaitOne blocks the current thread until the current instance receives a signal, using
-        /// a System.TimeSpan to measure the time interval and specifying whether to
-        /// exit the synchronization domain before the wait.
+        /// Completes file verbs.
         /// </summary>
-        /// <param name="waitHandleToUse">
-        /// WaitHandle to use for waiting on the job object.
-        /// </param>
-        internal void WaitOne(ManualResetEvent waitHandleToUse)
-        {
-            TimerCallback jobObjectStatusCb = this.CheckJobStatus;
-            using (Timer stateTimer = new(jobObjectStatusCb, waitHandleToUse, 0, 1000))
-            {
-                waitHandleToUse.WaitOne();
-            }
-        }
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="filePath">The file path to get verbs.</param>
+        /// <returns>List of file verbs to complete.</returns>
+        private static IEnumerable<CompletionResult> CompleteFileVerbs(string wordToComplete, string filePath)
+            => CompletionHelpers.GetMatchingResults(
+                wordToComplete,
+                possibleCompletionValues: new ProcessStartInfo(filePath).Verbs);
     }
 
+#if !UNIX
     /// <summary>
     /// ProcessInformation is a helper class that wraps the native PROCESS_INFORMATION structure
     /// returned by CreateProcess or CreateProcessWithLogon. It ensures the process and thread
@@ -2768,34 +2778,6 @@ public void Dispose()
         ~ProcessInformation() => Dispose();
     }
 
-    /// <summary>
-    /// JOBOBJECT_BASIC_PROCESS_ID_LIST Contains the process identifier list for a job object.
-    /// If the job is nested, the process identifier list consists of all
-    /// processes associated with the job and its child jobs.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct JOBOBJECT_BASIC_PROCESS_ID_LIST
-    {
-        /// <summary>
-        /// The number of process identifiers to be stored in ProcessIdList.
-        /// </summary>
-        public uint NumberOfAssignedProcess;
-
-        /// <summary>
-        /// The number of process identifiers returned in the ProcessIdList buffer.
-        /// If this number is less than NumberOfAssignedProcesses, increase
-        /// the size of the buffer to accommodate the complete list.
-        /// </summary>
-        public uint NumberOfProcessIdsInList;
-
-        /// <summary>
-        /// A variable-length array of process identifiers returned by this call.
-        /// Array elements 0 through NumberOfProcessIdsInList minus 1
-        /// contain valid process identifiers.
-        /// </summary>
-        public IntPtr ProcessIdList;
-    }
-
     internal static class ProcessNativeMethods
     {
         [DllImport(PinvokeDllNames.GetStdHandleDllName, SetLastError = true)]
@@ -2856,7 +2838,7 @@ internal struct PROCESS_INFORMATION
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        internal class SECURITY_ATTRIBUTES
+        internal sealed class SECURITY_ATTRIBUTES
         {
             public int nLength;
             public SafeLocalMemHandle lpSecurityDescriptor;
@@ -2894,7 +2876,7 @@ protected override bool ReleaseHandle()
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        internal class STARTUPINFO
+        internal sealed class STARTUPINFO
         {
             public int cb;
             public IntPtr lpReserved;
@@ -2957,21 +2939,6 @@ public void Dispose()
             }
         }
     }
-
-    [SuppressUnmanagedCodeSecurity]
-    internal sealed class SafeJobHandle : SafeHandleZeroOrMinusOneIsInvalid
-    {
-        internal SafeJobHandle(IntPtr jobHandle)
-            : base(true)
-        {
-            base.SetHandle(jobHandle);
-        }
-
-        protected override bool ReleaseHandle()
-        {
-            return Interop.Windows.CloseHandle(base.handle);
-        }
-    }
 #endif
     #endregion
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
index b624c6e08cf..d0f5fecf495 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
@@ -81,7 +81,7 @@ public SwitchParameter Relative
         /// </summary>
         [Parameter]
         public string RelativeBasePath
-        { 
+        {
             get
             {
                 return _relativeBasePath;
@@ -93,6 +93,16 @@ public string RelativeBasePath
             }
         }
 
+        /// <summary>
+        /// Gets or sets the force property.
+        /// </summary>
+        [Parameter]
+        public override SwitchParameter Force
+        {
+            get => base.Force;
+            set => base.Force = value;
+        }
+
         #endregion Parameters
 
         #region parameter data
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/RollbackTransactionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/RollbackTransactionCommand.cs
index 297dd5269a9..3d6fc27cc3c 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/RollbackTransactionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/RollbackTransactionCommand.cs
@@ -28,4 +28,3 @@ protected override void EndProcessing()
         }
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
index ec6e8062dd0..a00f9583d6a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
@@ -610,146 +610,197 @@ public string[] Name
         /// </summary>
         protected override void ProcessRecord()
         {
-            foreach (ServiceController service in MatchingServices())
+            nint scManagerHandle = nint.Zero;
+            if (!DependentServices && !RequiredServices)
             {
-                if (!DependentServices.IsPresent && !RequiredServices.IsPresent)
-                {
-                    WriteObject(AddProperties(service));
+                // As Get-Service only works on local services we get this once
+                // to retrieve extra properties added by PowerShell.
+                scManagerHandle = NativeMethods.OpenSCManagerW(
+                    lpMachineName: null,
+                    lpDatabaseName: null,
+                    dwDesiredAccess: NativeMethods.SC_MANAGER_CONNECT);
+                if (scManagerHandle == nint.Zero)
+                {
+                    Win32Exception exception = new();
+                    string message = StringUtil.Format(ServiceResources.FailToOpenServiceControlManager, exception.Message);
+                    ServiceCommandException serviceException = new ServiceCommandException(message, exception);
+                    ErrorRecord err = new ErrorRecord(
+                        serviceException,
+                        "FailToOpenServiceControlManager",
+                        ErrorCategory.PermissionDenied,
+                        null);
+                    ThrowTerminatingError(err);
                 }
-                else
+            }
+
+            try
+            {
+                foreach (ServiceController service in MatchingServices())
                 {
-                    if (DependentServices.IsPresent)
+                    if (!DependentServices.IsPresent && !RequiredServices.IsPresent)
                     {
-                        foreach (ServiceController dependantserv in service.DependentServices)
+                        WriteObject(AddProperties(scManagerHandle, service));
+                    }
+                    else
+                    {
+                        if (DependentServices.IsPresent)
                         {
-                            WriteObject(dependantserv);
+                            foreach (ServiceController dependantserv in service.DependentServices)
+                            {
+                                WriteObject(dependantserv);
+                            }
                         }
-                    }
 
-                    if (RequiredServices.IsPresent)
-                    {
-                        foreach (ServiceController servicedependedon in service.ServicesDependedOn)
+                        if (RequiredServices.IsPresent)
                         {
-                            WriteObject(servicedependedon);
+                            foreach (ServiceController servicedependedon in service.ServicesDependedOn)
+                            {
+                                WriteObject(servicedependedon);
+                            }
                         }
                     }
                 }
             }
+            finally
+            {
+                if (scManagerHandle != nint.Zero)
+                {
+                    bool succeeded = NativeMethods.CloseServiceHandle(scManagerHandle);
+                    Diagnostics.Assert(succeeded, "SCManager handle close failed");
+                }
+            }
         }
 
         #endregion Overrides
 
+#nullable enable
+
+        /// <summary>
+        /// Writes a verbose message when a service property query fails.
+        /// </summary>
+        /// <param name="serviceName">Name of the service.</param>
+        /// <param name="propertyName">Name of the property that failed to be queried.</param>
+        private void WriteServicePropertyError(string serviceName, string propertyName)
+        {
+            Win32Exception e = new(Marshal.GetLastWin32Error());
+            WriteVerbose(
+                StringUtil.Format(
+                    ServiceResources.CouldNotGetServiceProperty,
+                    serviceName,
+                    propertyName,
+                    e.Message));
+        }
+
         /// <summary>
         /// Adds UserName, Description, BinaryPathName, DelayedAutoStart and StartupType to a ServiceController object.
         /// </summary>
+        /// <param name="scManagerHandle">Handle to the local SCManager instance.</param>
         /// <param name="service"></param>
         /// <returns>ServiceController as PSObject with UserName, Description and StartupType added.</returns>
-        private PSObject AddProperties(ServiceController service)
+        private PSObject AddProperties(nint scManagerHandle, ServiceController service)
         {
-            NakedWin32Handle hScManager = IntPtr.Zero;
-            NakedWin32Handle hService = IntPtr.Zero;
-            int lastError = 0;
-            PSObject serviceAsPSObj = PSObject.AsPSObject(service);
+            NakedWin32Handle hService = nint.Zero;
+
+            // As these are optional values, a failure due to permissions or
+            // other problem is ignored and the properties are set to null.
+            bool? isDelayedAutoStart = null;
+            string? binPath = null;
+            string? description = null;
+            string? startName = null;
+            ServiceStartupType startupType = ServiceStartupType.InvalidValue;
             try
             {
-                hScManager = NativeMethods.OpenSCManagerW(
-                    lpMachineName: service.MachineName,
-                    lpDatabaseName: null,
-                    dwDesiredAccess: NativeMethods.SC_MANAGER_CONNECT
-                );
-                if (hScManager == IntPtr.Zero)
-                {
-                    lastError = Marshal.GetLastWin32Error();
-                    Win32Exception exception = new(lastError);
-                    WriteNonTerminatingError(
-                        service,
-                        exception,
-                        "FailToOpenServiceControlManager",
-                        ServiceResources.FailToOpenServiceControlManager,
-                        ErrorCategory.PermissionDenied);
-                }
-
+                // We don't use service.ServiceHandle as that requests
+                // SERVICE_ALL_ACCESS when we only need SERVICE_QUERY_CONFIG.
                 hService = NativeMethods.OpenServiceW(
-                    hScManager,
+                    scManagerHandle,
                     service.ServiceName,
                     NativeMethods.SERVICE_QUERY_CONFIG
                 );
-                if (hService == IntPtr.Zero)
+                if (hService != nint.Zero)
                 {
-                    lastError = Marshal.GetLastWin32Error();
-                    Win32Exception exception = new(lastError);
-                    WriteNonTerminatingError(
-                        service,
-                        exception,
-                        "CouldNotGetServiceInfo",
-                        ServiceResources.CouldNotGetServiceInfo,
-                        ErrorCategory.PermissionDenied);
-                }
-
-                NativeMethods.SERVICE_DESCRIPTIONW description = new();
-                bool querySuccessful = NativeMethods.QueryServiceConfig2<NativeMethods.SERVICE_DESCRIPTIONW>(hService, NativeMethods.SERVICE_CONFIG_DESCRIPTION, out description);
-
-                NativeMethods.SERVICE_DELAYED_AUTO_START_INFO autostartInfo = new();
-                querySuccessful = querySuccessful && NativeMethods.QueryServiceConfig2<NativeMethods.SERVICE_DELAYED_AUTO_START_INFO>(hService, NativeMethods.SERVICE_CONFIG_DELAYED_AUTO_START_INFO, out autostartInfo);
+                    if (NativeMethods.QueryServiceConfig2(
+                        hService,
+                        NativeMethods.SERVICE_CONFIG_DESCRIPTION,
+                        out NativeMethods.SERVICE_DESCRIPTIONW descriptionInfo))
+                    {
+                        description = descriptionInfo.lpDescription;
+                    }
+                    else
+                    {
+                        WriteServicePropertyError(service.ServiceName, nameof(NativeMethods.SERVICE_DESCRIPTIONW));
+                    }
 
-                NativeMethods.QUERY_SERVICE_CONFIG serviceInfo = new();
-                querySuccessful = querySuccessful && NativeMethods.QueryServiceConfig(hService, out serviceInfo);
+                    if (NativeMethods.QueryServiceConfig2(
+                        hService,
+                        NativeMethods.SERVICE_CONFIG_DELAYED_AUTO_START_INFO,
+                        out NativeMethods.SERVICE_DELAYED_AUTO_START_INFO autostartInfo))
+                    {
+                        isDelayedAutoStart = autostartInfo.fDelayedAutostart;
+                    }
+                    else
+                    {
+                        WriteServicePropertyError(service.ServiceName, nameof(NativeMethods.SERVICE_DELAYED_AUTO_START_INFO));
+                    }
 
-                if (!querySuccessful)
+                    if (NativeMethods.QueryServiceConfig(
+                        hService,
+                        out NativeMethods.QUERY_SERVICE_CONFIG serviceInfo))
+                    {
+                        binPath = serviceInfo.lpBinaryPathName;
+                        startName = serviceInfo.lpServiceStartName;
+                        if (isDelayedAutoStart.HasValue)
+                        {
+                            startupType = NativeMethods.GetServiceStartupType(
+                                (ServiceStartMode)serviceInfo.dwStartType,
+                                isDelayedAutoStart.Value);
+                        }
+                    }
+                    else
+                    {
+                        WriteServicePropertyError(service.ServiceName, nameof(NativeMethods.QUERY_SERVICE_CONFIG));
+                    }
+                }
+                else
                 {
-                    WriteNonTerminatingError(
-                        service: service,
-                        innerException: null,
-                        errorId: "CouldNotGetServiceInfo",
-                        errorMessage: ServiceResources.CouldNotGetServiceInfo,
-                        category: ErrorCategory.PermissionDenied
-                        );
+                    // handle when OpenServiceW itself fails:
+                    WriteServicePropertyError(service.ServiceName, nameof(NativeMethods.SERVICE_QUERY_CONFIG));
                 }
-
-                PSProperty noteProperty = new("UserName", serviceInfo.lpServiceStartName);
-                serviceAsPSObj.Properties.Add(noteProperty, true);
-                serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#UserName");
-
-                noteProperty = new PSProperty("Description", description.lpDescription);
-                serviceAsPSObj.Properties.Add(noteProperty, true);
-                serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#Description");
-
-                noteProperty = new PSProperty("DelayedAutoStart", autostartInfo.fDelayedAutostart);
-                serviceAsPSObj.Properties.Add(noteProperty, true);
-                serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#DelayedAutoStart");
-
-                noteProperty = new PSProperty("BinaryPathName", serviceInfo.lpBinaryPathName);
-                serviceAsPSObj.Properties.Add(noteProperty, true);
-                serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#BinaryPathName");
-
-                noteProperty = new PSProperty("StartupType", NativeMethods.GetServiceStartupType(service.StartType, autostartInfo.fDelayedAutostart));
-                serviceAsPSObj.Properties.Add(noteProperty, true);
-                serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#StartupType");
             }
             finally
             {
                 if (hService != IntPtr.Zero)
                 {
                     bool succeeded = NativeMethods.CloseServiceHandle(hService);
-                    if (!succeeded)
-                    {
-                        Diagnostics.Assert(lastError != 0, "ErrorCode not success");
-                    }
-                }
-
-                if (hScManager != IntPtr.Zero)
-                {
-                    bool succeeded = NativeMethods.CloseServiceHandle(hScManager);
-                    if (!succeeded)
-                    {
-                        Diagnostics.Assert(lastError != 0, "ErrorCode not success");
-                    }
+                    Diagnostics.Assert(succeeded, "Failed to close service handle");
                 }
             }
 
+            PSObject serviceAsPSObj = PSObject.AsPSObject(service);
+            PSNoteProperty noteProperty = new("UserName", startName);
+            serviceAsPSObj.Properties.Add(noteProperty, true);
+            serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#UserName");
+
+            noteProperty = new PSNoteProperty("Description", description);
+            serviceAsPSObj.Properties.Add(noteProperty, true);
+            serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#Description");
+
+            noteProperty = new PSNoteProperty("DelayedAutoStart", isDelayedAutoStart);
+            serviceAsPSObj.Properties.Add(noteProperty, true);
+            serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#DelayedAutoStart");
+
+            noteProperty = new PSNoteProperty("BinaryPathName", binPath);
+            serviceAsPSObj.Properties.Add(noteProperty, true);
+            serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#BinaryPathName");
+
+            noteProperty = new PSNoteProperty("StartupType", startupType);
+            serviceAsPSObj.Properties.Add(noteProperty, true);
+            serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#StartupType");
+
             return serviceAsPSObj;
         }
     }
+#nullable disable
     #endregion GetServiceCommand
 
     #region ServiceOperationBaseCommand
@@ -888,7 +939,7 @@ internal bool DoWaitForStatus(
         /// This will start the service.
         /// </summary>
         /// <param name="serviceController">Service to start.</param>
-        /// <returns>True iff the service was started.</returns>
+        /// <returns>True if-and-only-if the service was started.</returns>
         internal bool DoStartService(ServiceController serviceController)
         {
             Exception exception = null;
@@ -944,7 +995,7 @@ internal bool DoStartService(ServiceController serviceController)
         /// <param name="serviceController">Service to stop.</param>
         /// <param name="force">Stop dependent services.</param>
         /// <param name="waitForServiceToStop"></param>
-        /// <returns>True iff the service was stopped.</returns>
+        /// <returns>True if-and-only-if the service was stopped.</returns>
         internal List<ServiceController> DoStopService(ServiceController serviceController, bool force, bool waitForServiceToStop)
         {
             // Ignore ServiceController.CanStop.  CanStop will be set false
@@ -1094,7 +1145,7 @@ internal void RemoveNotStoppedServices(List<ServiceController> services)
         /// This will pause the service.
         /// </summary>
         /// <param name="serviceController">Service to pause.</param>
-        /// <returns>True iff the service was paused.</returns>
+        /// <returns>True if-and-only-if the service was paused.</returns>
         internal bool DoPauseService(ServiceController serviceController)
         {
             Exception exception = null;
@@ -1174,7 +1225,7 @@ internal bool DoPauseService(ServiceController serviceController)
         /// This will resume the service.
         /// </summary>
         /// <param name="serviceController">Service to resume.</param>
-        /// <returns>True iff the service was resumed.</returns>
+        /// <returns>True if-and-only-if the service was resumed.</returns>
         internal bool DoResumeService(ServiceController serviceController)
         {
             Exception exception = null;
@@ -2737,53 +2788,6 @@ bool SetServiceObjectSecurity(
             byte[] lpSecurityDescriptor
             );
 
-        /// <summary>
-        /// CreateJobObject API creates or opens a job object.
-        /// </summary>
-        /// <param name="lpJobAttributes">
-        /// A pointer to a SECURITY_ATTRIBUTES structure that specifies the security descriptor for the
-        /// job object and determines whether child processes can inherit the returned handle.
-        /// If lpJobAttributes is NULL, the job object gets a default security descriptor
-        /// and the handle cannot be inherited.
-        /// </param>
-        /// <param name="lpName">
-        /// The name of the job.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is a handle to the job object.
-        /// If the object existed before the function call, the function
-        /// returns a handle to the existing job object.
-        /// </returns>
-        [DllImport("Kernel32.dll", CharSet = CharSet.Unicode)]
-        internal static extern IntPtr CreateJobObject(IntPtr lpJobAttributes, string lpName);
-
-        /// <summary>
-        /// Retrieves job state information from the job object.
-        /// </summary>
-        /// <param name="hJob">
-        /// A handle to the job whose information is being queried.
-        /// </param>
-        /// <param name="JobObjectInfoClass">
-        /// The information class for the limits to be queried.
-        /// </param>
-        /// <param name="lpJobObjectInfo">
-        /// The limit or job state information.
-        /// </param>
-        /// <param name="cbJobObjectLength">
-        /// The count of the job information being queried, in bytes.
-        /// </param>
-        /// <param name="lpReturnLength">
-        /// A pointer to a variable that receives the length of
-        /// data written to the structure pointed to by the lpJobObjectInfo parameter.
-        /// </param>
-        /// <returns>If the function succeeds, the return value is nonzero.
-        /// If the function fails, the return value is zero.
-        /// </returns>
-        [DllImport("Kernel32.dll", EntryPoint = "QueryInformationJobObject", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern bool QueryInformationJobObject(SafeHandle hJob, int JobObjectInfoClass,
-                                    ref JOBOBJECT_BASIC_PROCESS_ID_LIST lpJobObjectInfo,
-                                    int cbJobObjectLength, IntPtr lpReturnLength);
-
         internal static bool QueryServiceConfig(NakedWin32Handle hService, out NativeMethods.QUERY_SERVICE_CONFIG configStructure)
         {
             IntPtr lpBuffer = IntPtr.Zero;
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/StartTransactionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/StartTransactionCommand.cs
index 6c178626d96..58dcfbd1daa 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/StartTransactionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/StartTransactionCommand.cs
@@ -107,4 +107,3 @@ protected override void EndProcessing()
         }
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
index 1370a56ea96..2a4a453f8f7 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
@@ -242,14 +242,13 @@ public class TestConnectionCommand : PSCmdlet, IDisposable
         /// </summary>
         protected override void BeginProcessing()
         {
-            switch (ParameterSetName)
+            if (Repeat)
             {
-                case RepeatPingParameterSet:
-                    Count = int.MaxValue;
-                    break;
-                case TcpPortParameterSet:
-                    SetCountForTcpTest();
-                    break;
+                Count = int.MaxValue;
+            }
+            else if (ParameterSetName == TcpPortParameterSet)
+            {
+                SetCountForTcpTest();
             }
         }
 
@@ -265,21 +264,22 @@ protected override void ProcessRecord()
 
             foreach (var targetName in TargetName)
             {
-                switch (ParameterSetName)
+                if (MtuSize)
+                {
+                    ProcessMTUSize(targetName);
+                }
+                else if (Traceroute)
+                {
+                    ProcessTraceroute(targetName);
+                }
+                else if (ParameterSetName == TcpPortParameterSet)
                 {
-                    case DefaultPingParameterSet:
-                    case RepeatPingParameterSet:
-                        ProcessPing(targetName);
-                        break;
-                    case MtuSizeDetectParameterSet:
-                        ProcessMTUSize(targetName);
-                        break;
-                    case TraceRouteParameterSet:
-                        ProcessTraceroute(targetName);
-                        break;
-                    case TcpPortParameterSet:
-                        ProcessConnectionByTCPPort(targetName);
-                        break;
+                    ProcessConnectionByTCPPort(targetName);
+                }
+                else
+                {
+                    // None of the switch parameters are true: handle default ping or -Repeat
+                    ProcessPing(targetName);
                 }
             }
         }
@@ -298,7 +298,7 @@ protected override void StopProcessing()
 
         private void SetCountForTcpTest()
         {
-            if (Repeat.IsPresent)
+            if (Repeat)
             {
                 Count = int.MaxValue;
             }
@@ -565,6 +565,8 @@ private void ProcessMTUSize(string targetNameOrAddress)
             int LowMTUSize = targetAddress.AddressFamily == AddressFamily.InterNetworkV6 ? 1280 : 68;
             int timeout = TimeoutSeconds * 1000;
 
+            PingReply? timeoutReply = null;
+
             try
             {
                 PingOptions pingOptions = new(MaxHops, true);
@@ -585,6 +587,7 @@ private void ProcessMTUSize(string targetNameOrAddress)
                     if (reply.Status == IPStatus.PacketTooBig || reply.Status == IPStatus.TimedOut)
                     {
                         HighMTUSize = CurrentMTUSize;
+                        timeoutReply = reply;
                         retry = 1;
                     }
                     else if (reply.Status == IPStatus.Success)
@@ -643,13 +646,32 @@ private void ProcessMTUSize(string targetNameOrAddress)
             }
             else
             {
-                ArgumentNullException.ThrowIfNull(replyResult);
+                if (replyResult is null)
+                {
+                    if (timeoutReply is not null)
+                    {
+                        Exception timeoutException = new TimeoutException(targetAddress.ToString());
+                        ErrorRecord errorRecord = new(
+                            timeoutException,
+                            TestConnectionExceptionId,
+                            ErrorCategory.ResourceUnavailable,
+                            timeoutReply);
+                        WriteError(errorRecord);
+                    }
+                    else
+                    {
+                        ArgumentNullException.ThrowIfNull(replyResult);
+                    }
+                }
+                else
+                {
+                    WriteObject(new PingMtuStatus(
+                        Source,
+                        resolvedTargetName,
+                        replyResult,
+                        CurrentMTUSize));
+                }
 
-                WriteObject(new PingMtuStatus(
-                    Source,
-                    resolvedTargetName,
-                    replyResult,
-                    CurrentMTUSize));
             }
         }
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/TestPathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/TestPathCommand.cs
index 04e6f36a8c3..50765c0e0ae 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/TestPathCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/TestPathCommand.cs
@@ -136,7 +136,7 @@ internal override object GetDynamicParameters(CmdletProviderContext context)
         {
             object result = null;
 
-            if (this.PathType == TestPathType.Any && !IsValid)
+            if (!IsValid)
             {
                 if (Path != null && Path.Length > 0 && Path[0] != null)
                 {
@@ -200,7 +200,7 @@ protected override void ProcessRecord()
                     {
                         WriteObject(result);
                     }
-                    
+
                     continue;
                 }
 
@@ -212,19 +212,15 @@ protected override void ProcessRecord()
                     }
                     else
                     {
+                        result = InvokeProvider.Item.Exists(path, currentContext);
+
                         if (this.PathType == TestPathType.Container)
                         {
-                            result = InvokeProvider.Item.IsContainer(path, currentContext);
+                            result &= InvokeProvider.Item.IsContainer(path, currentContext);
                         }
                         else if (this.PathType == TestPathType.Leaf)
                         {
-                            result =
-                                InvokeProvider.Item.Exists(path, currentContext) &&
-                                !InvokeProvider.Item.IsContainer(path, currentContext);
-                        }
-                        else
-                        {
-                            result = InvokeProvider.Item.Exists(path, currentContext);
+                            result &= !InvokeProvider.Item.IsContainer(path, currentContext);
                         }
                     }
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
index 8fdb2c55acd..22a50e41176 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
@@ -54,7 +54,7 @@ protected override void ProcessRecord()
             // make sure we've got the latest time zone settings
             TimeZoneInfo.ClearCachedData();
 
-            if (this.ParameterSetName.Equals("ListAvailable", StringComparison.OrdinalIgnoreCase))
+            if (ListAvailable)
             {
                 // output the list of all available time zones
                 WriteObject(TimeZoneInfo.GetSystemTimeZones(), true);
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/UseTransactionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/UseTransactionCommand.cs
index 056cf60265b..67d3acee44a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/UseTransactionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/UseTransactionCommand.cs
@@ -91,4 +91,3 @@ protected override void EndProcessing()
         }
     }
 }
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/WebServiceProxy.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/WebServiceProxy.cs
index 3fc313fe222..3f91d597e57 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/WebServiceProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/WebServiceProxy.cs
@@ -475,7 +475,7 @@ private object InstantiateWebServiceProxy(Assembly assembly)
                     break;
                 }
 
-                if (proxyType != null) 
+                if (proxyType != null)
                 {
                     break;
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/resources/ProcessResources.resx b/src/Microsoft.PowerShell.Commands.Management/resources/ProcessResources.resx
index 65513e55f5f..b4c1ddbccf8 100644
--- a/src/Microsoft.PowerShell.Commands.Management/resources/ProcessResources.resx
+++ b/src/Microsoft.PowerShell.Commands.Management/resources/ProcessResources.resx
@@ -189,6 +189,9 @@
   <data name="CannotStarttheProcess" xml:space="preserve">
     <value>This command cannot be run completely because the system cannot find all the information required.</value>
   </data>
+  <data name="FailedToCreateProcessObject" xml:space="preserve">
+    <value>Failed to retrieve the new process handle: "{0}". The Process object outputted may have some properties and methods that do not work properly.</value>
+  </data>
   <data name="InvalidUserError" xml:space="preserve">
     <value>This command cannot be run due to error 1783. The possible cause of this error can be using of a non-existing user "{0}". Please give a valid user and run your command again.</value>
   </data>
@@ -204,9 +207,6 @@
   <data name="ContradictParametersSpecified" xml:space="preserve">
     <value>Parameters "{0}" and "{1}" cannot be specified at the same time.</value>
   </data>
-  <data name="IncludeUserNameRequiresElevation" xml:space="preserve">
-    <value>The 'IncludeUserName' parameter requires elevated user rights. Try running the command again in a session that has been opened with elevated user rights (that is, Run as Administrator).</value>
-  </data>
   <data name="CouldNotDebugProcess" xml:space="preserve">
     <value>Cannot debug process "{0} ({1})" because of the following error: {2}</value>
   </data>
diff --git a/src/Microsoft.PowerShell.Commands.Management/resources/ServiceResources.resx b/src/Microsoft.PowerShell.Commands.Management/resources/ServiceResources.resx
index 3792ce8db99..c19f753529f 100644
--- a/src/Microsoft.PowerShell.Commands.Management/resources/ServiceResources.resx
+++ b/src/Microsoft.PowerShell.Commands.Management/resources/ServiceResources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    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
+    
+    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>
@@ -26,36 +26,36 @@
         <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
+                
+    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
+    
+    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
+    
+    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
+    
+    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
+    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
+    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
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -159,9 +159,6 @@
   <data name="CouldNotSetService" xml:space="preserve">
     <value>Service '{1} ({0})' cannot be configured due to the following error: {2}</value>
   </data>
-  <data name="CouldNotGetServiceInfo" xml:space="preserve">
-    <value>Service '{1} ({0})' cannot be queried due to the following error: {2}</value>
-  </data>
   <data name="CouldNotSetServiceDescription" xml:space="preserve">
     <value>Service '{1} ({0})' description cannot be configured due to the following error: {2}</value>
   </data>
@@ -211,9 +208,12 @@
     <value>Service '{1} ({0})' resume failed.</value>
   </data>
   <data name="FailToOpenServiceControlManager" xml:space="preserve">
-    <value>Failed to configure the service '{1} ({0})' due to the following error: {2}. Run PowerShell as admin and run your command again.</value>
+    <value>Failed to open SCManager due to the following error: {0}. Run PowerShell as admin and run your command again.</value>
   </data>
   <data name="UnsupportedStartupType" xml:space="preserve">
     <value>The startup type '{0}' is not supported by {1}.</value>
   </data>
+  <data name="CouldNotGetServiceProperty" xml:space="preserve">
+    <value>Could not retrieve property '{1}' for service '{0}': {2}</value>
+  </data>
 </root>
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 a23b657f61e..cc98893c5b6 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="Markdig.Signed" Version="0.33.0" />
+    <PackageReference Include="Markdig.Signed" Version="1.1.2" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
   </ItemGroup>
 
@@ -32,10 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-2.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.0-rc.2.23479.14" />
-    <PackageReference Include="JsonSchema.Net" Version="5.2.6" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
+    <PackageReference Include="System.Drawing.Common" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="JsonSchema.Net" Version="7.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
index 604e54345d4..4c7601e883f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
@@ -147,8 +147,8 @@ public SwitchParameter PassThru
         /// The name of the new NoteProperty member.
         /// </summary>
         [Parameter(Mandatory = true, Position = 0, ParameterSetName = NotePropertySingleMemberSet)]
-        [ValidateNotePropertyNameAttribute]
-        [NotePropertyTransformationAttribute]
+        [ValidateNotePropertyName]
+        [NotePropertyTransformation]
         [ValidateNotNullOrEmpty]
         public string NotePropertyName
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index 81ca82cb3c3..7dc0a9c3556 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -684,6 +684,7 @@ private void LoadAssemblies(IEnumerable<string> assemblies)
             {
                 // CoreCLR doesn't allow re-load TPA assemblies with different API (i.e. we load them by name and now want to load by path).
                 // LoadAssemblyHelper helps us avoid re-loading them, if they already loaded.
+                // codeql[cs/dll-injection-remote] - This is expected PowerShell behavior and integral to the purpose of the class. It allows users to load any C# dependencies they need for their PowerShell application and add other types they require.
                 Assembly assembly = LoadAssemblyHelper(assemblyName) ?? Assembly.LoadFrom(ResolveAssemblyName(assemblyName, false));
 
                 if (PassThru)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
index f4cddb37bec..48bda12cd8a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
@@ -81,9 +81,8 @@ private static List<string> GetApplicableAccessRights(int accessMask, AccessRigh
                 foreach (string memberName in Enum.GetNames(accessRightType))
                 {
                     int memberValue = (int)Enum.Parse(accessRightType, memberName);
-                    if (!foundAccessRightValues.Contains(memberValue))
+                    if (foundAccessRightValues.Add(memberValue))
                     {
-                        foundAccessRightValues.Add(memberValue);
                         if ((accessMask & memberValue) == memberValue)
                         {
                             foundAccessRightNames.Add(memberName);
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 2c530a8ab93..41dd159a3ba 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
@@ -321,7 +321,7 @@ internal static class ConvertHTMLParameterDefinitionKeys
         /// <summary>
         /// This allows for @{e='foo';label='bar';alignment='center';width='20'}.
         /// </summary>
-        internal class ConvertHTMLExpressionParameterDefinition : CommandParameterDefinition
+        internal sealed class ConvertHTMLExpressionParameterDefinition : CommandParameterDefinition
         {
             protected override void SetEntries()
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
index 9590cd7c771..d0b9f91e7f7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
@@ -8,7 +8,7 @@ namespace Microsoft.PowerShell.Commands
     /// <summary>
     /// This class is used to parse CSV text.
     /// </summary>
-    internal class CSVHelper
+    internal sealed class CSVHelper
     {
         internal CSVHelper(char delimiter)
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
index d45c4d70cd8..cb455417531 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
@@ -45,17 +45,19 @@ public abstract class BaseCsvWritingCommand : PSCmdlet
         public abstract PSObject InputObject { get; set; }
 
         /// <summary>
-        /// IncludeTypeInformation : The #TYPE line should be generated. Default is false. Cannot specify with NoTypeInformation.
+        /// IncludeTypeInformation : The #TYPE line should be generated. Default is false.
         /// </summary>
         [Parameter]
         [Alias("ITI")]
         public SwitchParameter IncludeTypeInformation { get; set; }
 
         /// <summary>
-        /// NoTypeInformation : The #TYPE line should not be generated. Default is true. Cannot specify with IncludeTypeInformation.
+        /// Gets or sets a value indicating whether to suppress the #TYPE line.
+        /// This parameter is obsolete and has no effect. It is retained for backward compatibility only.
         /// </summary>
         [Parameter(DontShow = true)]
         [Alias("NTI")]
+        [Obsolete("This parameter is obsolete and has no effect. The default behavior is to not include type information. Use -IncludeTypeInformation to include type information.")]
         public SwitchParameter NoTypeInformation { get; set; } = true;
 
         /// <summary>
@@ -120,18 +122,6 @@ protected override void BeginProcessing()
                 this.ThrowTerminatingError(errorRecord);
             }
 
-            if (this.MyInvocation.BoundParameters.ContainsKey(nameof(IncludeTypeInformation)) && this.MyInvocation.BoundParameters.ContainsKey(nameof(NoTypeInformation)))
-            {
-                InvalidOperationException exception = new(CsvCommandStrings.CannotSpecifyIncludeTypeInformationAndNoTypeInformation);
-                ErrorRecord errorRecord = new(exception, "CannotSpecifyIncludeTypeInformationAndNoTypeInformation", ErrorCategory.InvalidData, null);
-                this.ThrowTerminatingError(errorRecord);
-            }
-
-            if (this.MyInvocation.BoundParameters.ContainsKey(nameof(IncludeTypeInformation)))
-            {
-                NoTypeInformation = !IncludeTypeInformation;
-            }
-
             Delimiter = ImportExportCSVHelper.SetDelimiter(this, ParameterSetName, Delimiter, UseCulture);
         }
     }
@@ -218,8 +208,8 @@ public string LiteralPath
         /// Gets or sets encoding optional flag.
         /// </summary>
         [Parameter]
-        [ArgumentToEncodingTransformationAttribute]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
@@ -270,6 +260,14 @@ protected override void BeginProcessing()
                 this.ThrowTerminatingError(errorRecord);
             }
 
+            // Validate that Append and NoHeader are not specified together.
+            if (Append && NoHeader)
+            {
+                InvalidOperationException exception = new(CsvCommandStrings.CannotSpecifyAppendAndNoHeader);
+                ErrorRecord errorRecord = new(exception, "CannotSpecifyBothAppendAndNoHeader", ErrorCategory.InvalidData, null);
+                this.ThrowTerminatingError(errorRecord);
+            }
+
             _shouldProcess = ShouldProcess(Path);
             if (!_shouldProcess)
             {
@@ -309,7 +307,7 @@ protected override void ProcessRecord()
                 // write headers (row1: typename + row2: column names)
                 if (!_isActuallyAppending && !NoHeader.IsPresent)
                 {
-                    if (NoTypeInformation == false)
+                    if (IncludeTypeInformation)
                     {
                         WriteCsvLine(ExportCsvHelper.GetTypeString(InputObject));
                     }
@@ -602,8 +600,8 @@ public string[] LiteralPath
         /// Gets or sets encoding optional flag.
         /// </summary>
         [Parameter]
-        [ArgumentToEncodingTransformationAttribute]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
@@ -734,7 +732,7 @@ protected override void ProcessRecord()
 
                 if (!NoHeader.IsPresent)
                 {
-                    if (NoTypeInformation == false)
+                    if (IncludeTypeInformation)
                     {
                         WriteCsvLine(ExportCsvHelper.GetTypeString(InputObject));
                     }
@@ -885,7 +883,7 @@ protected override void ProcessRecord()
     /// <summary>
     /// Helper class for Export-Csv and ConvertTo-Csv.
     /// </summary>
-    internal class ExportCsvHelper : IDisposable
+    internal sealed class ExportCsvHelper : IDisposable
     {
         private readonly char _delimiter;
         private readonly BaseCsvWritingCommand.QuoteKind _quoteKind;
@@ -959,7 +957,7 @@ internal static IList<string> BuildPropertyNames(PSObject source, IList<string>
         /// <returns>Converted string.</returns>
         internal string ConvertPropertyNamesCSV(IList<string> propertyNames)
         {
-            ArgumentNullException.ThrowIfNull(propertyNames); 
+            ArgumentNullException.ThrowIfNull(propertyNames);
 
             _outputString.Clear();
             bool first = true;
@@ -994,7 +992,7 @@ internal string ConvertPropertyNamesCSV(IList<string> propertyNames)
                             AppendStringWithEscapeAlways(_outputString, propertyName);
                             break;
                         case BaseCsvWritingCommand.QuoteKind.AsNeeded:
-                            
+
                             if (propertyName.AsSpan().IndexOfAny(_delimiter, '\n', '"') != -1)
                             {
                                 AppendStringWithEscapeAlways(_outputString, propertyName);
@@ -1023,7 +1021,7 @@ internal string ConvertPropertyNamesCSV(IList<string> propertyNames)
         /// <returns></returns>
         internal string ConvertPSObjectToCSV(PSObject mshObject, IList<string> propertyNames)
         {
-            ArgumentNullException.ThrowIfNull(propertyNames); 
+            ArgumentNullException.ThrowIfNull(propertyNames);
 
             _outputString.Clear();
             bool first = true;
@@ -1044,7 +1042,7 @@ internal string ConvertPSObjectToCSV(PSObject mshObject, IList<string> propertyN
                 {
                     if (dictionary.Contains(propertyName))
                     {
-                        value = dictionary[propertyName].ToString();
+                        value = dictionary[propertyName]?.ToString();
                     }
                     else if (mshObject.Properties[propertyName] is PSPropertyInfo property)
                     {
@@ -1109,7 +1107,7 @@ internal string ConvertPSObjectToCSV(PSObject mshObject, IList<string> propertyN
         /// <returns>ToString() value.</returns>
         internal static string GetToStringValueForProperty(PSPropertyInfo property)
         {
-            ArgumentNullException.ThrowIfNull(property); 
+            ArgumentNullException.ThrowIfNull(property);
 
             string value = null;
             try
@@ -1224,7 +1222,7 @@ public void Dispose()
     /// <summary>
     /// Helper class to import single CSV file.
     /// </summary>
-    internal class ImportCsvHelper
+    internal sealed class ImportCsvHelper
     {
         #region constructor
 
@@ -1271,7 +1269,7 @@ internal class ImportCsvHelper
 
         internal ImportCsvHelper(PSCmdlet cmdlet, char delimiter, IList<string> header, string typeName, StreamReader streamReader)
         {
-            ArgumentNullException.ThrowIfNull(cmdlet); 
+            ArgumentNullException.ThrowIfNull(cmdlet);
             ArgumentNullException.ThrowIfNull(streamReader);
 
             _cmdlet = cmdlet;
@@ -1419,11 +1417,7 @@ private static void ValidatePropertyNames(IList<string> names)
                     {
                         if (!string.IsNullOrEmpty(currentHeader))
                         {
-                            if (!headers.Contains(currentHeader))
-                            {
-                                headers.Add(currentHeader);
-                            }
-                            else
+                            if (!headers.Add(currentHeader))
                             {
                                 // throw a terminating error as there are duplicate headers in the input.
                                 string memberAlreadyPresentMsg =
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
index da4e4a1262a..6d224d29007 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
@@ -14,7 +14,7 @@ namespace System.Management.Automation
     /// <summary>
     /// This class provides functionality for serializing a PSObject.
     /// </summary>
-    internal class CustomSerialization
+    internal sealed class CustomSerialization
     {
         #region constructor
         /// <summary>
@@ -179,8 +179,7 @@ internal void Stop()
     /// <summary>
     /// This internal helper class provides methods for serializing mshObject.
     /// </summary>
-    internal class
-    CustomInternalSerializer
+    internal sealed class CustomInternalSerializer
     {
         #region constructor
 
@@ -705,7 +704,7 @@ private void WriteMemberInfoCollection(
                     continue;
                 }
 
-                if (!(info is PSPropertyInfo property))
+                if (info is not PSPropertyInfo property)
                 {
                     continue;
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
index f5d84dfd195..756afff13de 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
@@ -265,6 +265,15 @@ private void WaitAndReceiveRunspaceOutput()
                 // Set up host script debugger to debug the runspace.
                 _debugger.DebugRunspace(_runspace, breakAll: BreakAll);
 
+                _runspace.IsRemoteDebuggerAttached = true;
+                _runspace.Events?.GenerateEvent(
+                    PSEngineEvent.OnDebugAttach,
+                    sender: null,
+                    args: Array.Empty<object>(),
+                    extraData: null,
+                    processInCurrentThread: true,
+                    waitForCompletionInCurrentThread: false);
+
                 while (_debugging)
                 {
                     // Wait for running script.
@@ -307,6 +316,7 @@ private void WaitAndReceiveRunspaceOutput()
             {
                 _runspace.AvailabilityChanged -= HandleRunspaceAvailabilityChanged;
                 _debugger.NestedDebuggingCancelledEvent -= HandleDebuggerNestedDebuggingCancelledEvent;
+                _runspace.IsRemoteDebuggerAttached = false;
                 _debugger.StopDebugRunspace(_runspace);
                 _newRunningScriptEvent.Dispose();
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
index 33deb01eb2c..d6f2c661ad0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
@@ -184,6 +184,7 @@ public SwitchParameter NoClobber
         /// which scope the aliases are retrieved from.
         /// </summary>
         [Parameter]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         #endregion Parameters
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs
index a42462737ea..65efee78a28 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs
@@ -48,7 +48,7 @@ internal Type GetValueType(PSObject liveObject, out object columnValue)
         /// <returns>The source string limited in the number of lines.</returns>
         internal static object LimitString(object src)
         {
-            if (!(src is string srcString))
+            if (src is not string srcString)
             {
                 return src;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
index e905f5d64b6..4d0c8af875c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    internal class ExpressionColumnInfo : ColumnInfo
+    internal sealed class ExpressionColumnInfo : ColumnInfo
     {
         private readonly PSPropertyExpression _expression;
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
index d811ce32303..4f4e84a1569 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    internal class HeaderInfo
+    internal sealed class HeaderInfo
     {
         private readonly List<ColumnInfo> _columns = new();
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs
index 974188c2f74..4ec5e2240fa 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    internal class OriginalColumnInfo : ColumnInfo
+    internal sealed class OriginalColumnInfo : ColumnInfo
     {
         private readonly string _liveObjectPropertyName;
         private readonly OutGridViewCommand _parentCmdlet;
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 43e24e8b5b6..574ca39426d 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
@@ -323,7 +323,7 @@ internal static GridHeader ConstructGridHeader(PSObject input, OutGridViewComman
             internal abstract void ProcessInputObject(PSObject input);
         }
 
-        internal class ScalarTypeHeader : GridHeader
+        internal sealed class ScalarTypeHeader : GridHeader
         {
             private readonly Type _originalScalarType;
 
@@ -349,7 +349,7 @@ internal override void ProcessInputObject(PSObject input)
             }
         }
 
-        internal class NonscalarTypeHeader : GridHeader
+        internal sealed class NonscalarTypeHeader : GridHeader
         {
             private readonly AppliesTo _appliesTo = null;
 
@@ -453,7 +453,7 @@ internal override void ProcessInputObject(PSObject input)
             }
         }
 
-        internal class HeteroTypeHeader : GridHeader
+        internal sealed class HeteroTypeHeader : GridHeader
         {
             internal HeteroTypeHeader(OutGridViewCommand parentCmd, PSObject input) : base(parentCmd)
             {
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 b406c2bc78c..ef9b0528c75 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
@@ -13,7 +13,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    internal class OutWindowProxy : IDisposable
+    internal sealed class OutWindowProxy : IDisposable
     {
         private const string OutGridViewWindowClassName = "Microsoft.Management.UI.Internal.OutGridViewWindow";
         private const string OriginalTypePropertyName = "OriginalType";
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs
index 77f80c269a3..38cc9668856 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    internal class ScalarTypeColumnInfo : ColumnInfo
+    internal sealed class ScalarTypeColumnInfo : ColumnInfo
     {
         private readonly Type _type;
 
@@ -29,7 +29,7 @@ internal override object GetValue(PSObject liveObject)
         }
     }
 
-    internal class TypeNameColumnInfo : ColumnInfo
+    internal sealed class TypeNameColumnInfo : ColumnInfo
     {
         internal TypeNameColumnInfo(string staleObjectPropertyName, string displayName)
             : base(staleObjectPropertyName, displayName)
@@ -43,7 +43,7 @@ internal override object GetValue(PSObject liveObject)
         }
     }
 
-    internal class ToStringColumnInfo : ColumnInfo
+    internal sealed class ToStringColumnInfo : ColumnInfo
     {
         private readonly OutGridViewCommand _parentCmdlet;
 
@@ -60,7 +60,7 @@ internal override object GetValue(PSObject liveObject)
         }
     }
 
-    internal class IndexColumnInfo : ColumnInfo
+    internal sealed class IndexColumnInfo : ColumnInfo
     {
         private int _index = 0;
 
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 9213484d332..e152bb7c973 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
@@ -12,7 +12,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    internal class TableView
+    internal sealed class TableView
     {
         private PSPropertyExpressionFactory _expressionFactory;
         private TypeInfoDataBase _typeInfoDatabase;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs
index 2ba36f5faf2..16d4325f68a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Management.Automation;
 using System.Management.Automation.Remoting;
 using System.Management.Automation.Runspaces;
@@ -129,6 +130,7 @@ protected override void ProcessRecord()
 
             foreach (ViewDefinition definition in viewdefinitions)
             {
+                this.WriteVerbose(string.Format(CultureInfo.CurrentCulture, GetFormatDataStrings.ProcessViewDefinition, definition.name));
                 if (definition.isHelpFormatter)
                     continue;
 
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 2f2536d361a..7e9dab8a203 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
@@ -68,8 +68,8 @@ public sealed class FormatHex : PSCmdlet
         /// Gets or sets the type of character encoding for InputObject.
         /// </summary>
         [Parameter(ParameterSetName = "ByInputObject")]
-        [ArgumentToEncodingTransformationAttribute]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs
index cd965431c36..693a799c809 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs
@@ -32,6 +32,7 @@ public FormatCustomCommand()
         /// will be determined using property sets, etc.
         /// </summary>
         [Parameter(Position = 0)]
+        [ValidateNotNullOrEmpty]
         public object[] Property
         {
             get { return _props; }
@@ -41,10 +42,16 @@ public object[] Property
 
         private object[] _props;
 
+        /// <summary>
+        /// Gets or sets the properties to exclude from formatting.
+        /// </summary>
+        [Parameter]
+        public string[] ExcludeProperty { get; set; }
+
         /// <summary>
         /// </summary>
         /// <value></value>
-        [ValidateRangeAttribute(1, int.MaxValue)]
+        [ValidateRange(1, int.MaxValue)]
         [Parameter]
         public int Depth
         {
@@ -61,6 +68,18 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
         {
             FormattingCommandLineParameters parameters = new();
 
+            // Check View conflicts first (before any auto-expansion)
+            if (!string.IsNullOrEmpty(this.View))
+            {
+                // View cannot be used with Property or ExcludeProperty
+                if ((_props is not null && _props.Length != 0) || (ExcludeProperty is not null && ExcludeProperty.Length != 0))
+                {
+                    ReportCannotSpecifyViewAndProperty();
+                }
+
+                parameters.viewName = this.View;
+            }
+
             if (_props != null)
             {
                 ParameterProcessor processor = new(new FormatObjectParameterDefinition());
@@ -68,15 +87,17 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
                 parameters.mshParameterList = processor.ProcessParameters(_props, invocationContext);
             }
 
-            if (!string.IsNullOrEmpty(this.View))
+            if (ExcludeProperty is not null)
             {
-                // we have a view command line switch
-                if (parameters.mshParameterList.Count != 0)
+                parameters.excludePropertyFilter = new PSPropertyExpressionFilter(ExcludeProperty);
+
+                // ExcludeProperty implies -Property * for better UX
+                if (_props is null || _props.Length == 0)
                 {
-                    ReportCannotSpecifyViewAndProperty();
+                    ParameterProcessor processor = new(new FormatObjectParameterDefinition());
+                    TerminatingErrorContext invocationContext = new(this);
+                    parameters.mshParameterList = processor.ProcessParameters(new object[] { "*" }, invocationContext);
                 }
-
-                parameters.viewName = this.View;
             }
 
             parameters.groupByParameter = this.ProcessGroupByParameter();
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 ba7cff6a08e..c6aef5c20be 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
@@ -42,9 +42,14 @@ public object Property
         private object _prop;
 
         /// <summary>
-        /// Optional, non positional parameter.
+        /// Gets or sets the properties to exclude from formatting.
+        /// </summary>
+        [Parameter]
+        public string[] ExcludeProperty { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to autosize the output.
         /// </summary>
-        /// <value></value>
         [Parameter]
         public SwitchParameter AutoSize
         {
@@ -59,7 +64,7 @@ public SwitchParameter AutoSize
         /// </summary>
         /// <value></value>
         [Parameter]
-        [ValidateRangeAttribute(1, int.MaxValue)]
+        [ValidateRange(1, int.MaxValue)]
         public int Column
         {
             get => _column.GetValueOrDefault(-1);
@@ -74,6 +79,18 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
         {
             FormattingCommandLineParameters parameters = new();
 
+            // Check View conflicts first (before any auto-expansion)
+            if (!string.IsNullOrEmpty(this.View))
+            {
+                // View cannot be used with Property or ExcludeProperty
+                if (_prop is not null || (ExcludeProperty is not null && ExcludeProperty.Length != 0))
+                {
+                    ReportCannotSpecifyViewAndProperty();
+                }
+
+                parameters.viewName = this.View;
+            }
+
             if (_prop != null)
             {
                 ParameterProcessor processor = new(new FormatWideParameterDefinition());
@@ -81,15 +98,17 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
                 parameters.mshParameterList = processor.ProcessParameters(new object[] { _prop }, invocationContext);
             }
 
-            if (!string.IsNullOrEmpty(this.View))
+            if (ExcludeProperty is not null)
             {
-                // we have a view command line switch
-                if (parameters.mshParameterList.Count != 0)
+                parameters.excludePropertyFilter = new PSPropertyExpressionFilter(ExcludeProperty);
+
+                // ExcludeProperty implies -Property * for better UX
+                if (_prop is null)
                 {
-                    ReportCannotSpecifyViewAndProperty();
+                    ParameterProcessor processor = new(new FormatWideParameterDefinition());
+                    TerminatingErrorContext invocationContext = new(this);
+                    parameters.mshParameterList = processor.ProcessParameters(new object[] { "*" }, invocationContext);
                 }
-
-                parameters.viewName = this.View;
             }
 
             // we cannot specify -column and -autosize, they are mutually exclusive
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
index 751b5ab0d99..e585fc1ce08 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
@@ -74,8 +74,8 @@ public string LiteralPath
         /// Encoding optional flag.
         /// </summary>
         [Parameter(Position = 1)]
-        [ArgumentToEncodingTransformationAttribute]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
@@ -136,7 +136,7 @@ public SwitchParameter NoClobber
         /// <summary>
         /// Optional, number of columns to use when writing to device.
         /// </summary>
-        [ValidateRangeAttribute(2, int.MaxValue)]
+        [ValidateRange(2, int.MaxValue)]
         [Parameter]
         public int Width
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs
index 512bf1048e0..0f485bec06a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs
@@ -34,7 +34,7 @@ public SwitchParameter Stream
         /// <summary>
         /// Optional, number of columns to use when writing to device.
         /// </summary>
-        [ValidateRangeAttribute(2, int.MaxValue)]
+        [ValidateRange(2, int.MaxValue)]
         [Parameter]
         public int Width
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs
index 85bb8fa53b7..c675a0f6dc1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs
@@ -115,7 +115,7 @@ protected override void ProcessRecord()
                     Command,
                     (Breakpoint breakpoint, string command) =>
                     {
-                        if (!(breakpoint is CommandBreakpoint commandBreakpoint))
+                        if (breakpoint is not CommandBreakpoint commandBreakpoint)
                         {
                             return false;
                         }
@@ -130,7 +130,7 @@ protected override void ProcessRecord()
                     Variable,
                     (Breakpoint breakpoint, string variable) =>
                     {
-                        if (!(breakpoint is VariableBreakpoint variableBreakpoint))
+                        if (breakpoint is not VariableBreakpoint variableBreakpoint)
                         {
                             return false;
                         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
index bf4c8a39db4..7b93b555c5c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
@@ -51,6 +51,7 @@ public string[] Exclude
         /// which scope the aliases are retrieved from.
         /// </summary>
         [Parameter]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
index 62a2d276ebf..6717cc7196b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
@@ -78,7 +78,7 @@ public long UnixTimeSeconds
         /// Allows the user to override the year.
         /// </summary>
         [Parameter]
-        [ValidateRangeAttribute(1, 9999)]
+        [ValidateRange(1, 9999)]
         public int Year
         {
             get
@@ -100,7 +100,7 @@ public int Year
         /// Allows the user to override the month.
         /// </summary>
         [Parameter]
-        [ValidateRangeAttribute(1, 12)]
+        [ValidateRange(1, 12)]
         public int Month
         {
             get
@@ -122,7 +122,7 @@ public int Month
         /// Allows the user to override the day.
         /// </summary>
         [Parameter]
-        [ValidateRangeAttribute(1, 31)]
+        [ValidateRange(1, 31)]
         public int Day
         {
             get
@@ -144,7 +144,7 @@ public int Day
         /// Allows the user to override the hour.
         /// </summary>
         [Parameter]
-        [ValidateRangeAttribute(0, 23)]
+        [ValidateRange(0, 23)]
         public int Hour
         {
             get
@@ -166,7 +166,7 @@ public int Hour
         /// Allows the user to override the minute.
         /// </summary>
         [Parameter]
-        [ValidateRangeAttribute(0, 59)]
+        [ValidateRange(0, 59)]
         public int Minute
         {
             get
@@ -188,7 +188,7 @@ public int Minute
         /// Allows the user to override the second.
         /// </summary>
         [Parameter]
-        [ValidateRangeAttribute(0, 59)]
+        [ValidateRange(0, 59)]
         public int Second
         {
             get
@@ -210,7 +210,7 @@ public int Second
         /// Allows the user to override the millisecond.
         /// </summary>
         [Parameter]
-        [ValidateRangeAttribute(0, 999)]
+        [ValidateRange(0, 999)]
         public int Millisecond
         {
             get
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommandBase.cs
index 7d6e4e71e67..8e50b1cf5a9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommandBase.cs
@@ -488,7 +488,7 @@ protected override void ProcessRecord()
         {
             if (EffectiveParameterSet == MyParameterSet.RandomListItem)
             {
-                if (ParameterSetName == ShuffleParameterSet)
+                if (Shuffle)
                 {
                     // this allows for $null to be in an array passed to InputObject
                     foreach (object item in InputObject ?? _nullInArray)
@@ -561,7 +561,7 @@ protected override void EndProcessing()
     /// methods using the NextBytes() primitive based on the CLR implementation:
     ///     https://referencesource.microsoft.com/#mscorlib/system/random.cs.
     /// </summary>
-    internal class PolymorphicRandomNumberGenerator
+    internal sealed class PolymorphicRandomNumberGenerator
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PolymorphicRandomNumberGenerator"/> class.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
index e8dcfbe254a..c21165301e2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
@@ -36,16 +36,15 @@ protected override void ProcessRecord()
             {
                 TimeSpan uptime = TimeSpan.FromSeconds(Stopwatch.GetTimestamp() / Stopwatch.Frequency);
 
-                switch (ParameterSetName)
+                if (Since)
                 {
-                    case TimespanParameterSet:
-                        // return TimeSpan of time since the system started up
-                        WriteObject(uptime);
-                        break;
-                    case SinceParameterSet:
-                        // return Datetime when the system started up
-                        WriteObject(DateTime.Now.Subtract(uptime));
-                        break;
+                    // Output the time of the last system boot.
+                    WriteObject(DateTime.Now.Subtract(uptime));
+                }
+                else
+                {
+                    // Output the time elapsed since the last system boot.
+                    WriteObject(uptime);
                 }
             }
             else
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
index 1ec93b0f1d7..61a0fe1a390 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
-using System.Collections.ObjectModel;
 using System.Management.Automation;
-using System.Reflection;
+using static System.Management.Automation.Verbs;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -19,6 +17,7 @@ public class GetVerbCommand : Cmdlet
         /// Optional Verb filter.
         /// </summary>
         [Parameter(ValueFromPipeline = true, ValueFromPipelineByPropertyName = true, Position = 0)]
+        [ArgumentCompleter(typeof(VerbArgumentCompleter))]
         public string[] Verb
         {
             get; set;
@@ -39,45 +38,9 @@ public string[] Group
         /// </summary>
         protected override void ProcessRecord()
         {
-            Type[] verbTypes = new Type[] { typeof(VerbsCommon), typeof(VerbsCommunications), typeof(VerbsData),
-                typeof(VerbsDiagnostic), typeof(VerbsLifecycle), typeof(VerbsOther), typeof(VerbsSecurity) };
-
-            Collection<WildcardPattern> matchingVerbs = SessionStateUtilities.CreateWildcardsFromStrings(
-                            this.Verb,
-                            WildcardOptions.IgnoreCase
-                        );
-
-            foreach (Type type in verbTypes)
+            foreach (VerbInfo verb in FilterByVerbsAndGroups(Verb, Group))
             {
-                string groupName = type.Name.Substring(5);
-                if (this.Group != null)
-                {
-                    if (!SessionStateUtilities.CollectionContainsValue(this.Group, groupName, StringComparer.OrdinalIgnoreCase))
-                    {
-                        continue;
-                    }
-                }
-
-                foreach (FieldInfo field in type.GetFields())
-                {
-                    if (field.IsLiteral)
-                    {
-                        if (this.Verb != null)
-                        {
-                            if (!SessionStateUtilities.MatchesAnyWildcardPattern(field.Name, matchingVerbs, false))
-                            {
-                                continue;
-                            }
-                        }
-
-                        VerbInfo verb = new();
-                        verb.Verb = field.Name;
-                        verb.AliasPrefix = VerbAliasPrefixes.GetVerbAliasPrefix(field.Name);
-                        verb.Group = groupName;
-                        verb.Description = VerbDescriptions.GetVerbDescription(field.Name);
-                        WriteObject(verb);
-                    }
-                }
+                WriteObject(verb);
             }
         }
     }
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 0f0a9951967..1f527258939 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
@@ -153,7 +153,7 @@ private static string BuildName(List<ObjectCommandPropertyValue> propValues)
 
                         foreach (object item in propertyValueItems)
                         {
-                            sb.AppendFormat(CultureInfo.CurrentCulture, $"{item}, ");
+                            sb.Append(CultureInfo.CurrentCulture, $"{item}, ");
                         }
 
                         sb = sb.Length > length ? sb.Remove(sb.Length - 2, 2) : sb;
@@ -161,7 +161,7 @@ private static string BuildName(List<ObjectCommandPropertyValue> propValues)
                     }
                     else
                     {
-                        sb.AppendFormat(CultureInfo.CurrentCulture, $"{propValuePropertyValue}, ");
+                        sb.Append(CultureInfo.CurrentCulture, $"{propValuePropertyValue}, ");
                     }
                 }
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
index 3b7db715953..d01d144caca 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -73,8 +73,8 @@ public SwitchParameter Force
         /// Encoding optional flag.
         /// </summary>
         [Parameter]
-        [ArgumentToEncodingTransformationAttribute]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
@@ -1705,7 +1705,7 @@ private void HandleHostCallReceived(object sender, RemoteDataEventArgs<RemoteHos
         internal List<CommandMetadata> GetRemoteCommandMetadata(out Dictionary<string, string> alias2resolvedCommandName)
         {
             bool isReleaseCandidateBackcompatibilityMode =
-                this.Session.Runspace.GetRemoteProtocolVersion() == RemotingConstants.ProtocolVersionWin7RC;
+                this.Session.Runspace.GetRemoteProtocolVersion() == RemotingConstants.ProtocolVersion_2_0;
 
             alias2resolvedCommandName = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             if ((this.CommandName == null) || (this.CommandName.Length == 0) ||
@@ -1916,7 +1916,7 @@ internal List<string> GenerateProxyModule(
         #endregion
     }
 
-    internal class ImplicitRemotingCodeGenerator
+    internal sealed class ImplicitRemotingCodeGenerator
     {
         internal static readonly Version VersionOfScriptWriter = new(1, 0);
 
@@ -2620,7 +2620,7 @@ private string GenerateConnectionStringForNewRunspace()
 
         private string GenerateAllowRedirectionParameter()
         {
-            if (!(_remoteRunspaceInfo.Runspace.ConnectionInfo is WSManConnectionInfo wsmanConnectionInfo))
+            if (_remoteRunspaceInfo.Runspace.ConnectionInfo is not WSManConnectionInfo wsmanConnectionInfo)
             {
                 return string.Empty;
             }
@@ -2646,7 +2646,7 @@ private string GenerateAuthenticationMechanismParameter()
                 return string.Empty;
             }
 
-            if (!(_remoteRunspaceInfo.Runspace.ConnectionInfo is WSManConnectionInfo wsmanConnectionInfo))
+            if (_remoteRunspaceInfo.Runspace.ConnectionInfo is not WSManConnectionInfo wsmanConnectionInfo)
             {
                 return string.Empty;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
index d69226babb1..c4e423ffd1d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
@@ -157,7 +158,7 @@ protected override void ProcessRecord()
                     ThrowTerminatingError(
                         new ErrorRecord(nse, "CannotDefineSupportedCommand", ErrorCategory.PermissionDenied, null));
                 }
-                
+
                 SystemPolicy.LogWDACAuditMessage(
                     context: Context,
                     title: ImportLocalizedDataStrings.WDACLogTitle,
@@ -290,7 +291,7 @@ private string GetFilePath()
 
             fileName = Path.GetFileNameWithoutExtension(fileName);
 
-            CultureInfo culture = null;
+            CultureInfo culture;
             if (_uiculture == null)
             {
                 culture = CultureInfo.CurrentUICulture;
@@ -307,19 +308,33 @@ private string GetFilePath()
                 }
             }
 
-            CultureInfo currentCulture = culture;
+            List<CultureInfo> cultureList = new List<CultureInfo> { culture };
+            if (_uiculture == null && culture.Name != "en-US")
+            {
+                // .NET 4.8 presents en-US as a parent of any current culture when accessed via the CurrentUICulture
+                // property.
+                //
+                // This feature is not present when GetCultureInfo is called, therefore this fallback change only
+                // applies when the UICulture parameter is not supplied.
+                cultureList.Add(CultureInfo.GetCultureInfo("en-US"));
+            }
+
             string filePath;
             string fullFileName = fileName + ".psd1";
-            while (currentCulture != null && !string.IsNullOrEmpty(currentCulture.Name))
+            foreach (CultureInfo cultureToTest in cultureList)
             {
-                filePath = Path.Combine(dir, currentCulture.Name, fullFileName);
-
-                if (File.Exists(filePath))
+                CultureInfo currentCulture = cultureToTest;
+                while (currentCulture != null && !string.IsNullOrEmpty(currentCulture.Name))
                 {
-                    return filePath;
-                }
+                    filePath = Path.Combine(dir, currentCulture.Name, fullFileName);
 
-                currentCulture = currentCulture.Parent;
+                    if (File.Exists(filePath))
+                    {
+                        return filePath;
+                    }
+
+                    currentCulture = currentCulture.Parent;
+                }
             }
 
             filePath = Path.Combine(dir, fullFileName);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
index 9a647d4c72b..657d00b4fc5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
@@ -55,6 +55,7 @@ public string LiteralPath
         /// </summary>
         [Parameter]
         [ValidateNotNullOrEmpty]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs
index 0aebabe94c7..80a04b07f17 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs
@@ -41,7 +41,7 @@ public sealed class JoinStringCommand : PSCmdlet
         /// Gets or sets the delimiter to join the output with.
         /// </summary>
         [Parameter(Position = 1)]
-        [ArgumentCompleter(typeof(JoinItemCompleter))]
+        [ArgumentCompleter(typeof(SeparatorArgumentCompleter))]
         [AllowEmptyString]
         public string Separator
         {
@@ -79,7 +79,7 @@ public string Separator
         /// Gets or sets a format string that is applied to each input object.
         /// </summary>
         [Parameter(ParameterSetName = "Format")]
-        [ArgumentCompleter(typeof(JoinItemCompleter))]
+        [ArgumentCompleter(typeof(FormatStringArgumentCompleter))]
         public string FormatString { get; set; }
 
         /// <summary>
@@ -160,79 +160,115 @@ protected override void EndProcessing()
         }
     }
 
-    [SuppressMessage(
-        "Microsoft.Performance",
-        "CA1812:AvoidUninstantiatedInternalClasses",
-        Justification = "Class is instantiated through late-bound reflection")]
-    internal class JoinItemCompleter : IArgumentCompleter
+    /// <summary>
+    /// Provides completion for the Separator parameter of the Join-String cmdlet.
+    /// </summary>
+    public sealed class SeparatorArgumentCompleter : IArgumentCompleter
     {
+        private const string NewLineText =
+#if UNIX
+        "`n";
+#else
+        "`r`n";
+#endif
+
+        private static readonly CompletionHelpers.CompletionDisplayInfoMapper SeparatorDisplayInfoMapper = separator => separator switch
+        {
+            "," => (
+                ToolTip: TabCompletionStrings.SeparatorCommaToolTip,
+                ListItemText: "Comma"),
+            ", " => (
+                ToolTip: TabCompletionStrings.SeparatorCommaSpaceToolTip,
+                ListItemText: "Comma-Space"),
+            ";" => (
+                ToolTip: TabCompletionStrings.SeparatorSemiColonToolTip,
+                ListItemText: "Semi-Colon"),
+            "; " => (
+                ToolTip: TabCompletionStrings.SeparatorSemiColonSpaceToolTip,
+                ListItemText: "Semi-Colon-Space"),
+            "-" => (
+                ToolTip: TabCompletionStrings.SeparatorDashToolTip,
+                ListItemText: "Dash"),
+            " " => (
+                ToolTip: TabCompletionStrings.SeparatorSpaceToolTip,
+                ListItemText: "Space"),
+            NewLineText => (
+                ToolTip: StringUtil.Format(TabCompletionStrings.SeparatorNewlineToolTip, NewLineText),
+                ListItemText: "Newline"),
+            _ => (
+                ToolTip: separator,
+                ListItemText: separator),
+        };
+
+        private static readonly IReadOnlyList<string> s_separatorValues = new List<string>(capacity: 7)
+        {
+            ",",
+            ", ",
+            ";",
+            "; ",
+            NewLineText,
+            "-",
+            " ",
+        };
+
+        /// <summary>
+        /// Returns completion results for Separator parameter.
+        /// </summary>
+        /// <param name="commandName">The command name.</param>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="commandAst">The command AST.</param>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>List of Completion Results.</returns>
         public IEnumerable<CompletionResult> CompleteArgument(
             string commandName,
             string parameterName,
             string wordToComplete,
             CommandAst commandAst,
             IDictionary fakeBoundParameters)
-        {
-            switch (parameterName)
-            {
-                case "Separator": return CompleteSeparator(wordToComplete);
-                case "FormatString": return CompleteFormatString(wordToComplete);
-            }
-
-            return null;
-        }
-
-        private static IEnumerable<CompletionResult> CompleteFormatString(string wordToComplete)
-        {
-            var res = new List<CompletionResult>();
-            void AddMatching(string completionText)
-            {
-                if (completionText.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase))
-                {
-                    res.Add(new CompletionResult(completionText));
-                }
-            }
-
-            AddMatching("'[{0}]'");
-            AddMatching("'{0:N2}'");
-            AddMatching("\"`r`n    `${0}\"");
-            AddMatching("\"`r`n    [string] `${0}\"");
-
-            return res;
-        }
-
-        private IEnumerable<CompletionResult> CompleteSeparator(string wordToComplete)
-        {
-            var res = new List<CompletionResult>(10);
-
-            void AddMatching(string completionText, string listText, string toolTip)
-            {
-                if (completionText.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase))
-                {
-                    res.Add(new CompletionResult(completionText, listText, CompletionResultType.ParameterValue, toolTip));
-                }
-            }
-
-            AddMatching("', '", "Comma-Space", "', ' - Comma-Space");
-            AddMatching("';'", "Semi-Colon", "';'  - Semi-Colon ");
-            AddMatching("'; '", "Semi-Colon-Space", "'; ' - Semi-Colon-Space");
-            AddMatching($"\"{NewLineText}\"", "Newline", $"{NewLineText} - Newline");
-            AddMatching("','", "Comma", "','  - Comma");
-            AddMatching("'-'", "Dash", "'-'  - Dash");
-            AddMatching("' '", "Space", "' '  - Space");
-            return res;
-        }
+                => CompletionHelpers.GetMatchingResults(
+                    wordToComplete,
+                    possibleCompletionValues: s_separatorValues,
+                    displayInfoMapper: SeparatorDisplayInfoMapper,
+                    resultType: CompletionResultType.ParameterValue);
+    }
 
-        public string NewLineText
+    /// <summary>
+    /// Provides completion for the FormatString parameter of the Join-String cmdlet.
+    /// </summary>
+    public sealed class FormatStringArgumentCompleter : IArgumentCompleter
+    {
+        private static readonly IReadOnlyList<string> s_formatStringValues = new List<string>(capacity: 4)
         {
-            get
-            {
+            "[{0}]",
+            "{0:N2}",
 #if UNIX
-                return "`n";
+            "`n    `${0}",
+            "`n    [string] `${0}",
 #else
-                return "`r`n";
+            "`r`n    `${0}",
+            "`r`n    [string] `${0}",
 #endif
-            }
-        }
+        };
+
+        /// <summary>
+        /// Returns completion results for FormatString parameter.
+        /// </summary>
+        /// <param name="commandName">The command name.</param>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="commandAst">The command AST.</param>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>List of Completion Results.</returns>
+        public IEnumerable<CompletionResult> CompleteArgument(
+            string commandName,
+            string parameterName,
+            string wordToComplete,
+            CommandAst commandAst,
+            IDictionary fakeBoundParameters)
+                => CompletionHelpers.GetMatchingResults(
+                    wordToComplete,
+                    possibleCompletionValues: s_formatStringValues,
+                    matchStrategy: CompletionHelpers.WildcardPatternEscapeMatch);
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/JsonSchemaReferenceResolutionException.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/JsonSchemaReferenceResolutionException.cs
index ba664ccef1b..7c2a7ac65f4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/JsonSchemaReferenceResolutionException.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/JsonSchemaReferenceResolutionException.cs
@@ -11,7 +11,7 @@ namespace Microsoft.PowerShell.Commands;
 /// Thrown during evaluation of <see cref="TestJsonCommand"/> when an attempt
 /// to resolve a <code>$ref</code> or <code>$dynamicRef</code> fails.
 /// </summary>
-internal class JsonSchemaReferenceResolutionException : Exception
+internal sealed class JsonSchemaReferenceResolutionException : Exception
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="JsonSchemaReferenceResolutionException"/> class.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
index b93280f6191..262fd44b30f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
@@ -80,7 +80,7 @@ public class MatchInfo
         /// Gets or sets the number of the matching line.
         /// </summary>
         /// <value>The number of the matching line.</value>
-        public int LineNumber { get; set; }
+        public ulong LineNumber { get; set; }
 
         /// <summary>
         /// Gets or sets the text of the matching line.
@@ -277,7 +277,7 @@ private string ToString(string directory, string line)
             // Otherwise, render the full context.
             List<string> lines = new(Context.DisplayPreContext.Length + Context.DisplayPostContext.Length + 1);
 
-            int displayLineNumber = this.LineNumber - Context.DisplayPreContext.Length;
+            ulong displayLineNumber = this.LineNumber - (ulong)Context.DisplayPreContext.Length;
             foreach (string contextLine in Context.DisplayPreContext)
             {
                 lines.Add(FormatLine(contextLine, displayLineNumber++, displayPath, ContextPrefix));
@@ -356,7 +356,7 @@ private string EmphasizeLine()
         /// <param name="displayPath">The file path, formatted for display.</param>
         /// <param name="prefix">The match prefix.</param>
         /// <returns>The formatted line as a string.</returns>
-        private string FormatLine(string lineStr, int displayLineNumber, string displayPath, string prefix)
+        private string FormatLine(string lineStr, ulong displayLineNumber, string displayPath, string prefix)
         {
             return _pathSet
                        ? StringUtil.Format(MatchFormat, prefix, displayPath, displayLineNumber, lineStr)
@@ -1336,8 +1336,8 @@ public string[] Exclude
         /// Gets or sets the text encoding to process each file as.
         /// </summary>
         [Parameter]
-        [ArgumentToEncodingTransformationAttribute]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
@@ -1417,7 +1417,7 @@ private IContextTracker GetContextTracker() => (Raw || (_preContext == 0 && _pos
         /// </summary>
         private bool _doneProcessing;
 
-        private int _inputRecordNumber;
+        private ulong _inputRecordNumber;
 
         /// <summary>
         /// Read command line parameters.
@@ -1595,7 +1595,7 @@ private bool ProcessFile(string filename)
                     using (StreamReader sr = new(fs, Encoding))
                     {
                         string line;
-                        int lineNo = 0;
+                        ulong lineNo = 0;
 
                         // Read and display lines from the file until the end of
                         // the file is reached.
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 cf483b16a93..1e741758270 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
@@ -824,7 +824,7 @@ protected override void EndProcessing()
                         string errorId = (IsMeasuringGeneric) ? "GenericMeasurePropertyNotFound" : "TextMeasurePropertyNotFound";
                         WritePropertyNotFoundError(propertyName, errorId);
                     }
-                    
+
                     continue;
                 }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs
index f2c31faf400..0ea312f2963 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs
@@ -196,12 +196,12 @@ protected override void BeginProcessing()
                             {
                                 ThrowTerminatingError(
                                     new ErrorRecord(
-                                        new PSNotSupportedException(NewObjectStrings.CannotCreateTypeConstrainedLanguage), 
+                                        new PSNotSupportedException(NewObjectStrings.CannotCreateTypeConstrainedLanguage),
                                         "CannotCreateTypeConstrainedLanguage",
                                         ErrorCategory.PermissionDenied,
                                         targetObject: null));
                             }
-                            
+
                             SystemPolicy.LogWDACAuditMessage(
                                 context: Context,
                                 title: NewObjectStrings.TypeWDACLogTitle,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewGuidCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewGuidCommand.cs
index 3aa070bcd62..0e466f86d3f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewGuidCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewGuidCommand.cs
@@ -45,11 +45,11 @@ protected override void ProcessRecord()
                 {
                     ErrorRecord error = new(ex, "StringNotRecognizedAsGuid", ErrorCategory.InvalidArgument, null);
                     WriteError(error);
-                }  
+                }
             }
             else
             {
-                guid = ParameterSetName is "Empty" ? Guid.Empty : Guid.NewGuid();
+                guid = Empty.ToBool() ? Guid.Empty : Guid.NewGuid();
             }
 
             WriteObject(guid);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
index bb71dfdbe1c..13b0234a02b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.PowerShell.Commands
     /// isExistingProperty is needed to distinguish whether a property exists and its value is null or
     /// the property does not exist at all.
     /// </summary>
-    internal class ObjectCommandPropertyValue
+    internal sealed class ObjectCommandPropertyValue
     {
         private ObjectCommandPropertyValue() { }
 
@@ -77,7 +77,7 @@ internal CultureInfo Culture
         /// <returns>True if both the objects are same or else returns false.</returns>
         public override bool Equals(object inputObject)
         {
-            if (!(inputObject is ObjectCommandPropertyValue objectCommandPropertyValueObject))
+            if (inputObject is not ObjectCommandPropertyValue objectCommandPropertyValueObject)
             {
                 return false;
             }
@@ -136,7 +136,7 @@ public override int GetHashCode()
     /// <summary>
     /// ObjectCommandComparer class.
     /// </summary>
-    internal class ObjectCommandComparer : IComparer
+    internal sealed class ObjectCommandComparer : IComparer
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectCommandComparer"/> class.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
index 519b472620b..596bbcaafc6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
@@ -24,7 +24,7 @@ internal static class SortObjectParameterDefinitionKeys
 
     /// <summary>
     /// </summary>
-    internal class SortObjectExpressionParameterDefinition : CommandParameterDefinition
+    internal sealed class SortObjectExpressionParameterDefinition : CommandParameterDefinition
     {
         protected override void SetEntries()
         {
@@ -36,7 +36,7 @@ protected override void SetEntries()
 
     /// <summary>
     /// </summary>
-    internal class GroupObjectExpressionParameterDefinition : CommandParameterDefinition
+    internal sealed class GroupObjectExpressionParameterDefinition : CommandParameterDefinition
     {
         protected override void SetEntries()
         {
@@ -358,7 +358,7 @@ internal static string[] GetDefaultKeyPropertySet(PSObject mshObj)
                 return null;
             }
 
-            if (!(standardNames.Members["DefaultKeyPropertySet"] is PSPropertySet defaultKeys))
+            if (standardNames.Members["DefaultKeyPropertySet"] is not PSPropertySet defaultKeys)
             {
                 return null;
             }
@@ -630,7 +630,7 @@ internal sealed class OrderByPropertyEntry
         internal bool comparable = false;
     }
 
-    internal class OrderByPropertyComparer : IComparer<OrderByPropertyEntry>
+    internal sealed class OrderByPropertyComparer : IComparer<OrderByPropertyEntry>
     {
         internal OrderByPropertyComparer(bool[] ascending, CultureInfo cultureInfo, bool caseSensitive)
         {
@@ -699,7 +699,7 @@ internal static OrderByPropertyComparer CreateComparer(List<OrderByPropertyEntry
         private readonly ObjectCommandComparer[] _propertyComparers = null;
     }
 
-    internal class IndexedOrderByPropertyComparer : IComparer<OrderByPropertyEntry>
+    internal sealed class IndexedOrderByPropertyComparer : IComparer<OrderByPropertyEntry>
     {
         internal IndexedOrderByPropertyComparer(OrderByPropertyComparer orderByPropertyComparer)
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs
index cd0c4fce327..15c48efd847 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs
@@ -25,6 +25,7 @@ public class RemoveAliasCommand : PSCmdlet
         /// The scope parameter for the command determines which scope the alias is removed from.
         /// </summary>
         [Parameter]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs
index cf39a20a068..e0b0bff07c5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs
@@ -12,48 +12,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    /// <summary>
-    /// Helper class to do wildcard matching on PSPropertyExpressions.
-    /// </summary>
-    internal sealed class PSPropertyExpressionFilter
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PSPropertyExpressionFilter"/> class
-        /// with the specified array of patterns.
-        /// </summary>
-        /// <param name="wildcardPatternsStrings">Array of pattern strings to use.</param>
-        internal PSPropertyExpressionFilter(string[] wildcardPatternsStrings)
-        {
-            ArgumentNullException.ThrowIfNull(wildcardPatternsStrings);
-
-            _wildcardPatterns = new WildcardPattern[wildcardPatternsStrings.Length];
-            for (int k = 0; k < wildcardPatternsStrings.Length; k++)
-            {
-                _wildcardPatterns[k] = WildcardPattern.Get(wildcardPatternsStrings[k], WildcardOptions.IgnoreCase);
-            }
-        }
-
-        /// <summary>
-        /// Try to match the expression against the array of wildcard patterns.
-        /// The first match shortcircuits the search.
-        /// </summary>
-        /// <param name="expression">PSPropertyExpression to test against.</param>
-        /// <returns>True if there is a match, else false.</returns>
-        internal bool IsMatch(PSPropertyExpression expression)
-        {
-            for (int k = 0; k < _wildcardPatterns.Length; k++)
-            {
-                if (_wildcardPatterns[k].IsMatch(expression.ToString()))
-                    return true;
-            }
-
-            return false;
-        }
-
-        private readonly WildcardPattern[] _wildcardPatterns;
-    }
-
-    internal class SelectObjectExpressionParameterDefinition : CommandParameterDefinition
+    internal sealed class SelectObjectExpressionParameterDefinition : CommandParameterDefinition
     {
         protected override void SetEntries()
         {
@@ -179,7 +138,7 @@ public int First
         /// </summary>
         /// <value></value>
         [Parameter(ParameterSetName = "IndexParameter")]
-        [ValidateRangeAttribute(0, int.MaxValue)]
+        [ValidateRange(0, int.MaxValue)]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public int[] Index
         {
@@ -202,7 +161,7 @@ public int[] Index
         /// </summary>
         /// <value></value>
         [Parameter(ParameterSetName = "SkipIndexParameter")]
-        [ValidateRangeAttribute(0, int.MaxValue)]
+        [ValidateRange(0, int.MaxValue)]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public int[] SkipIndex
         {
@@ -866,7 +825,7 @@ protected override void EndProcessing()
     [SuppressMessage("Microsoft.Usage", "CA2237:MarkISerializableTypesWithSerializable", Justification = "This exception is internal and never thrown by any public API")]
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors", Justification = "This exception is internal and never thrown by any public API")]
     [SuppressMessage("Microsoft.Design", "CA1064:ExceptionsShouldBePublic", Justification = "This exception is internal and never thrown by any public API")]
-    internal class SelectObjectException : SystemException
+    internal sealed class SelectObjectException : SystemException
     {
         internal ErrorRecord ErrorRecord { get; }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
index 64ee818a6bd..2598d953496 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
@@ -61,8 +61,8 @@ public sealed class SendMailMessage : PSCmdlet
         [Parameter(ValueFromPipelineByPropertyName = true)]
         [Alias("BE")]
         [ValidateNotNullOrEmpty]
-        [ArgumentEncodingCompletionsAttribute]
-        [ArgumentToEncodingTransformationAttribute]
+        [ArgumentEncodingCompletions]
+        [ArgumentToEncodingTransformation]
         public Encoding Encoding
         {
             get
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs
index a8a9c8f194d..ab8909bb590 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs
@@ -16,7 +16,7 @@ namespace Microsoft.PowerShell.Commands
     /// Help show-command create WPF object and invoke WPF windows with the
     /// Microsoft.PowerShell.Commands.ShowCommandInternal.ShowCommandHelperhelp type defined in Microsoft.PowerShell.GraphicalHost.dll.
     /// </summary>
-    internal class ShowCommandProxy
+    internal sealed class ShowCommandProxy
     {
         private const string ShowCommandHelperName = "Microsoft.PowerShell.Commands.ShowCommandInternal.ShowCommandHelper";
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
index 36849814375..839a0b7c051 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
@@ -44,14 +44,14 @@ public void Dispose()
         /// </summary>
         [Parameter(Position = 0, Mandatory = true, ParameterSetName = "Seconds", ValueFromPipeline = true,
                    ValueFromPipelineByPropertyName = true)]
-        [ValidateRangeAttribute(0.0, (double)(int.MaxValue / 1000))]
+        [ValidateRange(0.0, (double)(int.MaxValue / 1000))]
         public double Seconds { get; set; }
 
         /// <summary>
         /// Allows sleep time to be specified in milliseconds.
         /// </summary>
         [Parameter(Mandatory = true, ParameterSetName = "Milliseconds", ValueFromPipelineByPropertyName = true)]
-        [ValidateRangeAttribute(0, int.MaxValue)]
+        [ValidateRange(0, int.MaxValue)]
         [Alias("ms")]
         public int Milliseconds { get; set; }
 
@@ -110,7 +110,7 @@ protected override void ProcessRecord()
                 case "Milliseconds":
                     sleepTime = Milliseconds;
                     break;
-                
+
                 case "FromTimeSpan":
                     if (Duration.TotalMilliseconds > int.MaxValue)
                     {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs
index d8b3261c118..4a0f4831299 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs
@@ -78,8 +78,8 @@ public SwitchParameter Append
         /// </summary>
         [Parameter(ParameterSetName = "File")]
         [Parameter(ParameterSetName = "LiteralFile")]
-        [ArgumentToEncodingTransformationAttribute]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding { get; set; } = Encoding.Default;
 
@@ -140,12 +140,15 @@ protected override void EndProcessing()
             _commandWrapper.ShutDown();
         }
 
-        private void Dispose(bool isDisposing)
+        /// <summary>
+        /// Release all resources.
+        /// </summary>
+        public void Dispose()
         {
             if (!_alreadyDisposed)
             {
                 _alreadyDisposed = true;
-                if (isDisposing && _commandWrapper != null)
+                if (_commandWrapper != null)
                 {
                     _commandWrapper.Dispose();
                     _commandWrapper = null;
@@ -153,15 +156,6 @@ private void Dispose(bool isDisposing)
             }
         }
 
-        /// <summary>
-        /// Dispose method in IDisposable.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
         #region private
         private CommandWrapper _commandWrapper;
         private bool _alreadyDisposed;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
index 9df1a005514..909cbff3c8f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Management.Automation;
 using System.Net.Http;
 using System.Security;
@@ -34,6 +35,13 @@ public class TestJsonCommand : PSCmdlet
 
         #endregion
 
+        #region Json Document Option Constants
+
+        private const string IgnoreCommentsOption = "IgnoreComments";
+        private const string AllowTrailingCommasOption = "AllowTrailingCommas";
+
+        #endregion
+
         #region Parameters
 
         /// <summary>
@@ -97,12 +105,21 @@ public string LiteralPath
         [ValidateNotNullOrEmpty]
         public string SchemaFile { get; set; }
 
+        /// <summary>
+        /// Gets or sets JSON document options.
+        /// </summary>
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        [ValidateSet(IgnoreCommentsOption, AllowTrailingCommasOption)]
+        public string[] Options { get; set; } = Array.Empty<string>();
+
         #endregion
 
         #region Private Members
 
         private bool _isLiteralPath = false;
         private JsonSchema _jschema;
+        private JsonDocumentOptions _documentOptions;
 
         #endregion
 
@@ -200,6 +217,14 @@ e is SecurityException
                 Exception exception = new(TestJsonCmdletStrings.InvalidJsonSchema, e);
                 ThrowTerminatingError(new ErrorRecord(exception, "InvalidJsonSchema", ErrorCategory.InvalidData, resolvedpath));
             }
+
+            _documentOptions = new JsonDocumentOptions
+            {
+                CommentHandling = Options.Contains(IgnoreCommentsOption, StringComparer.OrdinalIgnoreCase)
+                    ? JsonCommentHandling.Skip
+                    : JsonCommentHandling.Disallow,
+                AllowTrailingCommas = Options.Contains(AllowTrailingCommasOption, StringComparer.OrdinalIgnoreCase)
+            };
         }
 
         /// <summary>
@@ -235,23 +260,15 @@ protected override void ProcessRecord()
             try
             {
 
-                var parsedJson = JsonNode.Parse(jsonToParse);
+                var parsedJson = JsonNode.Parse(jsonToParse, nodeOptions: null, _documentOptions);
 
                 if (_jschema != null)
                 {
-                    EvaluationResults evaluationResults = _jschema.Evaluate(parsedJson, new EvaluationOptions { OutputFormat = OutputFormat.List });
+                    EvaluationResults evaluationResults = _jschema.Evaluate(parsedJson, new EvaluationOptions { OutputFormat = OutputFormat.Hierarchical });
                     result = evaluationResults.IsValid;
                     if (!result)
                     {
-                        HandleValidationErrors(evaluationResults);
-
-                        if (evaluationResults.HasDetails)
-                        {
-                            foreach (var nestedResult in evaluationResults.Details)
-                            {
-                                HandleValidationErrors(nestedResult);
-                            }
-                        }
+                        ReportValidationErrors(evaluationResults);
                     }
                 }
             }
@@ -273,6 +290,33 @@ protected override void ProcessRecord()
             WriteObject(result);
         }
 
+        /// <summary>
+        /// Recursively reports validation errors from hierarchical evaluation results.
+        /// Skips nodes (and their children) where IsValid is true to avoid false positives
+        /// from constructs like OneOf or AnyOf.
+        /// </summary>
+        /// <param name="evaluationResult">The evaluation result to process.</param>
+        private void ReportValidationErrors(EvaluationResults evaluationResult)
+        {
+            // Skip this node and all children if validation passed
+            if (evaluationResult.IsValid)
+            {
+                return;
+            }
+
+            // Report errors at this level
+            HandleValidationErrors(evaluationResult);
+
+            // Recursively process child results
+            if (evaluationResult.HasDetails)
+            {
+                foreach (var nestedResult in evaluationResult.Details)
+                {
+                    ReportValidationErrors(nestedResult);
+                }
+            }
+        }
+
         private void HandleValidationErrors(EvaluationResults evaluationResult)
         {
             if (!evaluationResult.HasErrors)
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 d181112ec82..b73d8570040 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
@@ -260,7 +260,7 @@ public string[] PropertySerializationSet
         /// The type name we want to update on.
         /// </summary>
         [Parameter(Mandatory = true, ValueFromPipeline = true, ParameterSetName = DynamicTypeSet)]
-        [ArgumentToTypeNameTransformationAttribute]
+        [ArgumentToTypeNameTransformation]
         [ValidateNotNullOrEmpty]
         public string TypeName
         {
@@ -792,9 +792,8 @@ private void ProcessTypeFiles()
 
                     if (ShouldProcess(formattedTarget, action))
                     {
-                        if (!fullFileNameHash.Contains(resolvedPath))
+                        if (fullFileNameHash.Add(resolvedPath))
                         {
-                            fullFileNameHash.Add(resolvedPath);
                             newTypes.Add(new SessionStateTypeEntry(prependPathTotal[i]));
                         }
                     }
@@ -806,9 +805,8 @@ private void ProcessTypeFiles()
                     if (entry.FileName != null)
                     {
                         string resolvedPath = ModuleCmdletBase.ResolveRootedFilePath(entry.FileName, Context) ?? entry.FileName;
-                        if (!fullFileNameHash.Contains(resolvedPath))
+                        if (fullFileNameHash.Add(resolvedPath))
                         {
-                            fullFileNameHash.Add(resolvedPath);
                             newTypes.Add(entry);
                         }
                     }
@@ -825,9 +823,8 @@ private void ProcessTypeFiles()
 
                     if (ShouldProcess(formattedTarget, action))
                     {
-                        if (!fullFileNameHash.Contains(resolvedPath))
+                        if (fullFileNameHash.Add(resolvedPath))
                         {
-                            fullFileNameHash.Add(resolvedPath);
                             newTypes.Add(new SessionStateTypeEntry(appendPathTotalItem));
                         }
                     }
@@ -971,9 +968,8 @@ protected override void ProcessRecord()
 
                     if (ShouldProcess(formattedTarget, action))
                     {
-                        if (!fullFileNameHash.Contains(appendPathTotalItem))
+                        if (fullFileNameHash.Add(appendPathTotalItem))
                         {
-                            fullFileNameHash.Add(appendPathTotalItem);
                             newFormats.Add(new SessionStateFormatEntry(appendPathTotalItem));
                         }
                     }
@@ -1055,7 +1051,7 @@ public class RemoveTypeDataCommand : PSCmdlet
         /// The target type to remove.
         /// </summary>
         [Parameter(Mandatory = true, Position = 0, ValueFromPipeline = true, ValueFromPipelineByPropertyName = true, ParameterSetName = RemoveTypeSet)]
-        [ArgumentToTypeNameTransformationAttribute]
+        [ArgumentToTypeNameTransformation]
         [ValidateNotNullOrEmpty]
         public string TypeName
         {
@@ -1339,7 +1335,6 @@ protected override void ProcessRecord()
             ValidateTypeName();
 
             Dictionary<string, TypeData> alltypes = Context.TypeTable.GetAllTypeData();
-            Collection<TypeData> typedefs = new();
 
             foreach (string type in alltypes.Keys)
             {
@@ -1347,17 +1342,11 @@ protected override void ProcessRecord()
                 {
                     if (pattern.IsMatch(type))
                     {
-                        typedefs.Add(alltypes[type]);
+                        WriteObject(alltypes[type]);
                         break;
                     }
                 }
             }
-
-            // write out all the available type definitions
-            foreach (TypeData typedef in typedefs)
-            {
-                WriteObject(typedef);
-            }
         }
     }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
index 6df552ab8e8..a41b284f568 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
@@ -22,6 +22,7 @@ public abstract class VariableCommandBase : PSCmdlet
         /// </summary>
         [Parameter]
         [ValidateNotNullOrEmpty]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         #endregion parameters
@@ -692,6 +693,12 @@ public SwitchParameter PassThru
 
         private bool _passThru;
 
+        /// <summary>
+        /// Gets whether we will append to the variable if it exists.
+        /// </summary>
+        [Parameter]
+        public SwitchParameter Append { get; set; }
+
         private bool _nameIsFormalParameter;
         private bool _valueIsFormalParameter;
         #endregion parameters
@@ -710,6 +717,33 @@ protected override void BeginProcessing()
             {
                 _valueIsFormalParameter = true;
             }
+
+            if (Append)
+            {
+                // create the list here and add to it if it has a value
+                // but if they have more than one name, produce an error
+                if (Name.Length != 1)
+                {
+                    ErrorRecord appendVariableError = new ErrorRecord(new InvalidOperationException(), "SetVariableAppend", ErrorCategory.InvalidOperation, Name);
+                    appendVariableError.ErrorDetails = new ErrorDetails("SetVariableAppend");
+                    appendVariableError.ErrorDetails.RecommendedAction = VariableCommandStrings.UseSingleVariable;
+                    ThrowTerminatingError(appendVariableError);
+                }
+
+                _valueList = new List<object>();
+                var currentValue = Context.SessionState.PSVariable.Get(Name[0]);
+                if (currentValue is not null)
+                {
+                    if (currentValue.Value is IList<object> ilist)
+                    {
+                        _valueList.AddRange(ilist);
+                    }
+                    else
+                    {
+                        _valueList.Add(currentValue.Value);
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -725,6 +759,16 @@ protected override void ProcessRecord()
         {
             if (_nameIsFormalParameter && _valueIsFormalParameter)
             {
+                if (Append)
+                {
+                    if (Value != AutomationNull.Value)
+                    {
+                        _valueList ??= new List<object>();
+
+                        _valueList.Add(Value);
+                    }
+                }
+
                 return;
             }
 
@@ -755,7 +799,14 @@ protected override void EndProcessing()
             {
                 if (_valueIsFormalParameter)
                 {
-                    SetVariable(Name, Value);
+                    if (Append)
+                    {
+                        SetVariable(Name, _valueList);
+                    }
+                    else
+                    {
+                        SetVariable(Name, Value);
+                    }
                 }
                 else
                 {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs
index a8ca247671c..3c4336f07d0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs
@@ -42,7 +42,7 @@ public string SourceIdentifier
         /// </summary>
         [Parameter]
         [Alias("TimeoutSec")]
-        [ValidateRangeAttribute(-1, int.MaxValue)]
+        [ValidateRange(-1, int.MaxValue)]
         public int Timeout
         {
             get
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 9bd76f99413..ea650e80e67 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
@@ -81,9 +81,9 @@ public WebCmdletElementCollection InputFields
                 {
                     List<PSObject> parsedFields = new();
                     MatchCollection fieldMatch = HtmlParser.InputFieldRegex.Matches(Content);
-                    foreach (Match field in fieldMatch)
+                    foreach (Match match in fieldMatch)
                     {
-                        parsedFields.Add(CreateHtmlObject(field.Value, "INPUT"));
+                        parsedFields.Add(CreateHtmlObject(match.Value, "INPUT"));
                     }
 
                     _inputFields = new WebCmdletElementCollection(parsedFields);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
index bb31366f794..9eca5ce187a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
@@ -9,7 +9,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
-
+using Humanizer;
 using Microsoft.Win32;
 
 namespace Microsoft.PowerShell.Commands
@@ -21,8 +21,15 @@ internal static class ContentHelper
         // ContentType may not exist in response header.  Return null if not.
         internal static string? GetContentType(HttpResponseMessage response) => response.Content.Headers.ContentType?.MediaType;
 
+        internal static string? GetContentType(HttpRequestMessage request) => request.Content?.Headers.ContentType?.MediaType;
+
         internal static Encoding GetDefaultEncoding() => Encoding.UTF8;
 
+        internal static string GetFriendlyContentLength(long? length) =>
+            length.HasValue
+            ? $"{length.Value.Bytes().Humanize()} ({length.Value:#,0} bytes)"
+            : "unknown size";
+
         internal static StringBuilder GetRawContentHeader(HttpResponseMessage response)
         {
             StringBuilder raw = new();
@@ -133,10 +140,13 @@ internal static bool IsXml([NotNullWhen(true)] string? contentType)
                        || contentType.Equals("application/xml-external-parsed-entity", StringComparison.OrdinalIgnoreCase)
                        || contentType.Equals("application/xml-dtd", StringComparison.OrdinalIgnoreCase)
                        || contentType.EndsWith("+xml", StringComparison.OrdinalIgnoreCase);
-            
+
             return isXml;
         }
 
+        internal static bool IsTextBasedContentType([NotNullWhen(true)] string? contentType)
+            => IsText(contentType) || IsJson(contentType) || IsXml(contentType);
+
         #endregion Internal Methods
     }
 }
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
index 05eb8ed96b6..903ff4d8f80 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/HttpVersionCompletionsAttribute.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/HttpVersionCompletionsAttribute.cs
@@ -46,6 +46,6 @@ static HttpVersionCompletionsAttribute()
         /// <inheritdoc/>
         public HttpVersionCompletionsAttribute() : base(AllowedVersions)
         {
-        } 
+        }
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
index ca78ff370b2..22ffaef288c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
@@ -81,11 +81,11 @@ internal override void ProcessResponse(HttpResponseMessage response)
             ArgumentNullException.ThrowIfNull(_cancelToken);
 
             TimeSpan perReadTimeout = ConvertTimeoutSecondsToTimeSpan(OperationTimeoutSeconds);
-            Stream baseResponseStream = StreamHelper.GetResponseStream(response, _cancelToken.Token);
+            Stream responseStream = StreamHelper.GetResponseStream(response, _cancelToken.Token);
 
             if (ShouldWriteToPipeline)
             {
-                using BufferingStreamReader responseStream = new(baseResponseStream, perReadTimeout, _cancelToken.Token);
+                responseStream = new BufferingStreamReader(responseStream, perReadTimeout, _cancelToken.Token);
 
                 // First see if it is an RSS / ATOM feed, in which case we can
                 // stream it - unless the user has overridden it with a return type of "XML"
@@ -99,18 +99,22 @@ internal override void ProcessResponse(HttpResponseMessage response)
                     string? characterSet = WebResponseHelper.GetCharacterSet(response);
                     string str = StreamHelper.DecodeStream(responseStream, characterSet, out Encoding encoding, perReadTimeout, _cancelToken.Token);
 
-                    string encodingVerboseName;
+                    string friendlyName = "unknown";
+                    string encodingWebName = "unknown";
+                    string encodingPage = encoding.CodePage == -1 ? "unknown" : encoding.CodePage.ToString();
                     try
                     {
-                        encodingVerboseName = encoding.HeaderName;
+                        // NOTE: These are getter methods that may possibly throw a NotSupportedException exception,
+                        // hence the try/catch
+                        encodingWebName = encoding.WebName;
+                        friendlyName = encoding.EncodingName;
                     }
                     catch
                     {
-                        encodingVerboseName = string.Empty;
                     }
 
-                    // NOTE: Tests use this verbose output to verify the encoding.
-                    WriteVerbose(string.Create(System.Globalization.CultureInfo.InvariantCulture, $"Content encoding: {encodingVerboseName}"));
+                    // NOTE: Tests use this debug output to verify the encoding.
+                    WriteDebug($"WebResponse content encoding: {encodingWebName} ({friendlyName}) CodePage: {encodingPage}");
 
                     // Determine the response type
                     RestReturnType returnType = CheckReturnType(response);
@@ -137,14 +141,17 @@ internal override void ProcessResponse(HttpResponseMessage response)
 
                     WriteObject(obj);
                 }
+
+                responseStream.Position = 0;
             }
-            else if (ShouldSaveToOutFile)
+
+            if (ShouldSaveToOutFile)
             {
                 string outFilePath = WebResponseHelper.GetOutFilePath(response, _qualifiedOutFile);
 
-                WriteVerbose(string.Create(System.Globalization.CultureInfo.InvariantCulture, $"File Name: {Path.GetFileName(_qualifiedOutFile)}"));
+                WriteVerbose($"File Name: {Path.GetFileName(outFilePath)}");
 
-                StreamHelper.SaveStreamToFile(baseResponseStream, outFilePath, this, response.Content.Headers.ContentLength.GetValueOrDefault(), perReadTimeout, _cancelToken.Token);
+                StreamHelper.SaveStreamToFile(responseStream, outFilePath, this, response.Content.Headers.ContentLength.GetValueOrDefault(), perReadTimeout, _cancelToken.Token);
             }
 
             if (!string.IsNullOrEmpty(StatusCodeVariable))
@@ -347,7 +354,7 @@ public enum RestReturnType
             Xml,
         }
 
-        internal class BufferingStreamReader : Stream
+        internal sealed class BufferingStreamReader : Stream
         {
             internal BufferingStreamReader(Stream baseStream, TimeSpan perReadTimeout, CancellationToken cancellationToken)
             {
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 95b25e4e4d5..f1a455974b9 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
@@ -93,6 +93,11 @@ public abstract class WebRequestPSCmdlet : PSCmdlet, IDisposable
     {
         #region Fields
 
+        /// <summary>
+        /// Used to prefix the headers in debug and verbose messaging.
+        /// </summary>
+        internal const string DebugHeaderPrefix = "--- ";
+
         /// <summary>
         /// Cancellation token source.
         /// </summary>
@@ -567,29 +572,10 @@ protected override void ProcessRecord()
                         FillRequestStream(request);
                         try
                         {
-                            long requestContentLength = request.Content is null ? 0 : request.Content.Headers.ContentLength.Value;
-
-                            string reqVerboseMsg = string.Format(
-                                CultureInfo.CurrentCulture,
-                                WebCmdletStrings.WebMethodInvocationVerboseMsg,
-                                request.Version,
-                                request.Method,
-                                requestContentLength);
-
-                            WriteVerbose(reqVerboseMsg);
-
                             _maximumRedirection = WebSession.MaximumRedirection;
 
                             using HttpResponseMessage response = GetResponse(client, request, handleRedirect);
 
-                            string contentType = ContentHelper.GetContentType(response);
-                            long? contentLength = response.Content.Headers.ContentLength;
-                            string respVerboseMsg = contentLength is null
-                                ? string.Format(CultureInfo.CurrentCulture, WebCmdletStrings.WebResponseNoSizeVerboseMsg, response.Version, contentType)
-                                : string.Format(CultureInfo.CurrentCulture, WebCmdletStrings.WebResponseVerboseMsg, response.Version, contentLength, contentType);
-
-                            WriteVerbose(respVerboseMsg);
-
                             bool _isSuccess = response.IsSuccessStatusCode;
 
                             // Check if the Resume range was not satisfiable because the file already completed downloading.
@@ -638,6 +624,9 @@ protected override void ProcessRecord()
                                 string detailMsg = string.Empty;
                                 try
                                 {
+                                    string contentType = ContentHelper.GetContentType(response);
+                                    long? contentLength = response.Content.Headers.ContentLength;
+
                                     // We can't use ReadAsStringAsync because it doesn't have per read timeouts
                                     TimeSpan perReadTimeout = ConvertTimeoutSecondsToTimeSpan(OperationTimeoutSeconds);
                                     string characterSet = WebResponseHelper.GetCharacterSet(response);
@@ -1172,7 +1161,7 @@ internal virtual void FillRequestStream(HttpRequestMessage request)
             {
                 WebSession.ContentHeaders[HttpKnownHeaderNames.ContentType] = ContentType;
             }
-            else if (request.Method == HttpMethod.Post || request.Method == HttpMethod.Put)
+            else if (request.Method == HttpMethod.Post)
             {
                 // Win8:545310 Invoke-WebRequest does not properly set MIME type for POST
                 WebSession.ContentHeaders.TryGetValue(HttpKnownHeaderNames.ContentType, out string contentType);
@@ -1296,7 +1285,28 @@ internal virtual HttpResponseMessage GetResponse(HttpClient client, HttpRequestM
                 _cancelToken = new CancellationTokenSource();
                 try
                 {
+                    if (IsWriteVerboseEnabled())
+                    {
+                        WriteWebRequestVerboseInfo(currentRequest);
+                    }
+
+                    if (IsWriteDebugEnabled())
+                    {
+                        WriteWebRequestDebugInfo(currentRequest);
+                    }
+
+                    // codeql[cs/ssrf] - This is expected Poweshell behavior where user inputted Uri is supported for the context of this method. The user assumes trust for the Uri and invocation is done on the user's machine, not a web application. If there is concern for remoting, they should use restricted remoting.
                     response = client.SendAsync(currentRequest, HttpCompletionOption.ResponseHeadersRead, _cancelToken.Token).GetAwaiter().GetResult();
+
+                    if (IsWriteVerboseEnabled())
+                    {
+                        WriteWebResponseVerboseInfo(response);
+                    }
+
+                    if (IsWriteDebugEnabled())
+                    {
+                        WriteWebResponseDebugInfo(response);
+                    }
                 }
                 catch (TaskCanceledException ex)
                 {
@@ -1361,17 +1371,6 @@ internal virtual HttpResponseMessage GetResponse(HttpClient client, HttpRequestM
                     {
                         FillRequestStream(requestWithoutRange);
 
-                        long requestContentLength = requestWithoutRange.Content is null ? 0 : requestWithoutRange.Content.Headers.ContentLength.Value;
-
-                        string reqVerboseMsg = string.Format(
-                            CultureInfo.CurrentCulture,
-                            WebCmdletStrings.WebMethodInvocationVerboseMsg,
-                            requestWithoutRange.Version,
-                            requestWithoutRange.Method,
-                            requestContentLength);
-
-                        WriteVerbose(reqVerboseMsg);
-
                         response.Dispose();
                         response = GetResponse(client, requestWithoutRange, handleRedirect);
                     }
@@ -1431,13 +1430,206 @@ internal virtual void UpdateSession(HttpResponseMessage response)
         {
             ArgumentNullException.ThrowIfNull(response);
         }
-
         #endregion Virtual Methods
 
         #region Helper Methods
-
+#nullable enable
         internal static TimeSpan ConvertTimeoutSecondsToTimeSpan(int timeout) => timeout > 0 ? TimeSpan.FromSeconds(timeout) : Timeout.InfiniteTimeSpan;
 
+        private void WriteWebRequestVerboseInfo(HttpRequestMessage request)
+        {
+            try
+            {
+                // Typical Basic Example: 'WebRequest: v1.1 POST https://httpstat.us/200 with query length 6'
+                StringBuilder verboseBuilder = new(128);
+
+                // "Redact" the query string from verbose output, the details will be visible in Debug output
+                string uriWithoutQuery = request.RequestUri?.GetLeftPart(UriPartial.Path) ?? string.Empty;
+                verboseBuilder.Append($"WebRequest: v{request.Version} {request.Method} {uriWithoutQuery}");
+                if (request.RequestUri?.Query is not null && request.RequestUri.Query.Length > 1)
+                {
+                    verboseBuilder.Append($" with query length {request.RequestUri.Query.Length - 1}");
+                }
+
+                string? requestContentType = ContentHelper.GetContentType(request);
+                if (requestContentType is not null)
+                {
+                    verboseBuilder.Append($" with {requestContentType} payload");
+                }
+
+                long? requestContentLength = request.Content?.Headers?.ContentLength;
+                if (requestContentLength is not null)
+                {
+                    verboseBuilder.Append($" with body size {ContentHelper.GetFriendlyContentLength(requestContentLength)}");
+                }
+                if (OutFile is not null)
+                {
+                    verboseBuilder.Append($" output to {QualifyFilePath(OutFile)}");
+                }
+
+                WriteVerbose(verboseBuilder.ToString().Trim());
+            }
+            catch (Exception ex)
+            {
+                // Just in case there are any edge cases we missed, we don't break workflows with an exception
+                WriteVerbose($"Failed to Write WebRequest Verbose Info: {ex} {ex.StackTrace}");
+            }
+        }
+
+        private void WriteWebRequestDebugInfo(HttpRequestMessage request)
+        {
+            try
+            {
+                // Typical basic example:
+                // WebRequest Detail
+                // ---QUERY
+                // test = 5
+                // --- HEADERS
+                // User - Agent: Mozilla / 5.0, (Linux;Ubuntu 24.04.2 LTS;en - US), PowerShell / 7.6.0
+                StringBuilder debugBuilder = new("WebRequest Detail" + Environment.NewLine, 512);
+
+                if (!string.IsNullOrEmpty(request.RequestUri?.Query))
+                {
+                    debugBuilder.Append(DebugHeaderPrefix).AppendLine("QUERY");
+                    string[] queryParams = request.RequestUri.Query.TrimStart('?').Split('&');
+                    debugBuilder
+                        .AppendJoin(Environment.NewLine, queryParams)
+                        .AppendLine()
+                        .AppendLine();
+                }
+
+                debugBuilder.Append(DebugHeaderPrefix).AppendLine("HEADERS");
+
+                foreach (var headerSet in new HttpHeaders?[] { request.Headers, request.Content?.Headers })
+                {
+                    if (headerSet is null)
+                    {
+                        continue;
+                    }
+
+                    debugBuilder.AppendLine(headerSet.ToString());
+                }
+
+                if (request.Content is not null)
+                {
+                    debugBuilder
+                    .Append(DebugHeaderPrefix).AppendLine("BODY")
+                    .AppendLine(request.Content switch
+                    {
+                        StringContent stringContent => stringContent
+                            .ReadAsStringAsync(_cancelToken.Token)
+                            .GetAwaiter().GetResult(),
+                        MultipartFormDataContent multipartContent => "=> Multipart Form Content"
+                            + Environment.NewLine
+                            + multipartContent.ReadAsStringAsync(_cancelToken.Token)
+                            .GetAwaiter().GetResult(),
+                        ByteArrayContent byteContent => InFile is not null
+                            ? "[Binary content: "
+                                + ContentHelper.GetFriendlyContentLength(byteContent.Headers.ContentLength)
+                                + "]"
+                            : byteContent.ReadAsStringAsync(_cancelToken.Token).GetAwaiter().GetResult(),
+                        StreamContent streamContent =>
+                            "[Stream content: " + ContentHelper.GetFriendlyContentLength(streamContent.Headers.ContentLength) + "]",
+                        _ => "[Unknown content type]",
+                    })
+                    .AppendLine();
+                }
+
+                WriteDebug(debugBuilder.ToString().Trim());
+            }
+            catch (Exception ex)
+            {
+                // Just in case there are any edge cases we missed, we don't break workflows with an exception
+                WriteVerbose($"Failed to Write WebRequest Debug Info: {ex} {ex.StackTrace}");
+            }
+        }
+
+        private void WriteWebResponseVerboseInfo(HttpResponseMessage response)
+        {
+            try
+            {
+                // Typical basic example: WebResponse: 200 OK with text/plain payload body size 6 B (6 bytes)
+                StringBuilder verboseBuilder = new(128);
+                verboseBuilder.Append($"WebResponse: {(int)response.StatusCode} {response.ReasonPhrase ?? response.StatusCode.ToString()}");
+
+                string? responseContentType = ContentHelper.GetContentType(response);
+                if (responseContentType is not null)
+                {
+                    verboseBuilder.Append($" with {responseContentType} payload");
+                }
+
+                long? responseContentLength = response.Content?.Headers?.ContentLength;
+                if (responseContentLength is not null)
+                {
+                    verboseBuilder.Append($" with body size {ContentHelper.GetFriendlyContentLength(responseContentLength)}");
+                }
+
+                WriteVerbose(verboseBuilder.ToString().Trim());
+            }
+            catch (Exception ex)
+            {
+                // Just in case there are any edge cases we missed, we don't break workflows with an exception
+                WriteVerbose($"Failed to Write WebResponse Verbose Info: {ex} {ex.StackTrace}");
+            }
+        }
+
+        private void WriteWebResponseDebugInfo(HttpResponseMessage response)
+        {
+            try
+            {
+                // Typical basic example
+                // WebResponse Detail
+                // --- HEADERS
+                // Date: Fri, 09 May 2025 18:06:44 GMT
+                // Server: Kestrel
+                // Set-Cookie: ARRAffinity=ee0b467f95b53d8dcfe48aeeb4173f93cf819be6e4721f434341647f4695039d;Path=/;HttpOnly;Secure;Domain=httpstat.us, ARRAffinitySameSite=ee0b467f95b53d8dcfe48aeeb4173f93cf819be6e4721f434341647f4695039d;Path=/;HttpOnly;SameSite=None;Secure;Domain=httpstat.us
+                // Strict-Transport-Security: max-age=2592000
+                // Request-Context: appId=cid-v1:3548b0f5-7f75-492f-82bb-b6eb0e864e53
+                // Content-Length: 6
+                // Content-Type: text/plain
+                // --- BODY
+                // 200 OK
+                StringBuilder debugBuilder = new("WebResponse Detail" + Environment.NewLine, 512);
+
+                debugBuilder.Append(DebugHeaderPrefix).AppendLine("HEADERS");
+
+                foreach (var headerSet in new HttpHeaders?[] { response.Headers, response.Content?.Headers })
+                {
+                    if (headerSet is null)
+                    {
+                        continue;
+                    }
+
+                    debugBuilder.AppendLine(headerSet.ToString());
+                }
+
+                if (response.Content is not null)
+                {
+                    debugBuilder.Append(DebugHeaderPrefix).AppendLine("BODY");
+
+                    if (ContentHelper.IsTextBasedContentType(ContentHelper.GetContentType(response)))
+                    {
+                        debugBuilder.AppendLine(
+                            response.Content.ReadAsStringAsync(_cancelToken.Token)
+                            .GetAwaiter().GetResult());
+                    }
+                    else
+                    {
+                        string friendlyContentLength = ContentHelper.GetFriendlyContentLength(
+                            response.Content?.Headers?.ContentLength);
+                        debugBuilder.AppendLine($"[Binary content: {friendlyContentLength}]");
+                    }
+                }
+
+                WriteDebug(debugBuilder.ToString().Trim());
+            }
+            catch (Exception ex)
+            {
+                // Just in case there are any edge cases we missed, we don't break workflows with an exception
+                WriteVerbose($"Failed to Write WebResponse Debug Info: {ex} {ex.StackTrace}");
+            }
+        }
+
         private Uri PrepareUri(Uri uri)
         {
             uri = CheckProtocol(uri);
@@ -1472,6 +1664,7 @@ private static Uri CheckProtocol(Uri uri)
 
             return uri.IsAbsoluteUri ? uri : new Uri("http://" + uri.OriginalString);
         }
+#nullable restore
 
         private string QualifyFilePath(string path) => PathUtils.ResolveFilePath(filePath: path, command: this, isLiteralPath: true);
 
@@ -1575,9 +1768,8 @@ internal void SetRequestContent(HttpRequestMessage request, string content)
             ArgumentNullException.ThrowIfNull(content);
 
             Encoding encoding = null;
-            string contentType = WebSession.ContentHeaders[HttpKnownHeaderNames.ContentType];
 
-            if (contentType is not null)
+            if (WebSession.ContentHeaders.TryGetValue(HttpKnownHeaderNames.ContentType, out string contentType) && contentType is not null)
             {
                 // If Content-Type contains the encoding format (as CharSet), use this encoding format
                 // to encode the Body of the WebRequest sent to the server. Default Encoding format
@@ -1772,6 +1964,7 @@ private static StringContent GetMultipartStringContent(object fieldName, object
             ContentDispositionHeaderValue contentDisposition = new("form-data");
             contentDisposition.Name = LanguagePrimitives.ConvertTo<string>(fieldName);
 
+            // codeql[cs/information-exposure-through-exception] - PowerShell is an on-premise product, meaning local users would already have access to the binaries and stack traces. Therefore, the information would not be exposed in the same way it would be for an ASP .NET service.
             StringContent result = new(LanguagePrimitives.ConvertTo<string>(fieldValue));
             result.Headers.ContentDisposition = contentDisposition;
 
@@ -1802,7 +1995,7 @@ private static StreamContent GetMultipartStreamContent(object fieldName, Stream
         /// <param name="file">The file to use for the <see cref="StreamContent"/></param>
         private static StreamContent GetMultipartFileContent(object fieldName, FileInfo file)
         {
-            StreamContent result = GetMultipartStreamContent(fieldName: fieldName, stream: new FileStream(file.FullName, FileMode.Open));
+            StreamContent result = GetMultipartStreamContent(fieldName: fieldName, stream: new FileStream(file.FullName, FileMode.Open, FileAccess.Read, FileShare.Read));
 
             result.Headers.ContentDisposition.FileName = file.Name;
             result.Headers.ContentDisposition.FileNameStar = file.Name;
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 81bd4f13c62..ace84f480f9 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
@@ -70,6 +70,11 @@ public class WebResponseObject
         /// </summary>
         public string StatusDescription => WebResponseHelper.GetStatusDescription(BaseResponse);
 
+        /// <summary>
+        /// Gets or sets the output file path.
+        /// </summary>
+        public string? OutFile { get; internal set; }
+
         #endregion Properties
 
         #region Protected Fields
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 66313f832d3..82e1277e00c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
@@ -49,6 +49,12 @@ public class ConvertFromJsonCommand : Cmdlet
         [Parameter]
         public SwitchParameter NoEnumerate { get; set; }
 
+        /// <summary>
+        /// Gets or sets the switch to control how DateTime values are to be parsed as a dotnet object.
+        /// </summary>
+        [Parameter]
+        public JsonDateKind DateKind { get; set; } = JsonDateKind.Default;
+
         #endregion parameters
 
         #region overrides
@@ -113,7 +119,7 @@ protected override void EndProcessing()
         private bool ConvertFromJsonHelper(string input)
         {
             ErrorRecord error = null;
-            object result = JsonObject.ConvertFromJson(input, AsHashtable.IsPresent, Depth, out error);
+            object result = JsonObject.ConvertFromJson(input, AsHashtable.IsPresent, Depth, DateKind, out error);
 
             if (error != null)
             {
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 eb8c3e3cc08..173d999b06d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
@@ -98,7 +98,7 @@ protected virtual void Dispose(bool disposing)
                 _cancellationSource.Dispose();
             }
         }
-        
+
         private readonly List<object> _inputObjects = new();
 
         /// <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 026bbe866e5..0bcafcf2964 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
@@ -38,6 +38,8 @@ internal override void ProcessResponse(HttpResponseMessage response)
             ArgumentNullException.ThrowIfNull(response);
             TimeSpan perReadTimeout = ConvertTimeoutSecondsToTimeSpan(OperationTimeoutSeconds);
             Stream responseStream = StreamHelper.GetResponseStream(response, _cancelToken.Token);
+            string outFilePath = WebResponseHelper.GetOutFilePath(response, _qualifiedOutFile);
+
             if (ShouldWriteToPipeline)
             {
                 // Creating a MemoryStream wrapper to response stream here to support IsStopping.
@@ -50,6 +52,7 @@ internal override void ProcessResponse(HttpResponseMessage response)
                     _cancelToken.Token);
                 WebResponseObject ro = WebResponseHelper.IsText(response) ? new BasicHtmlWebResponseObject(response, responseStream, perReadTimeout, _cancelToken.Token) : new WebResponseObject(response, responseStream, perReadTimeout, _cancelToken.Token);
                 ro.RelationLink = _relationLink;
+                ro.OutFile = outFilePath;
                 WriteObject(ro);
 
                 // Use the rawcontent stream from WebResponseObject for further
@@ -61,11 +64,11 @@ internal override void ProcessResponse(HttpResponseMessage response)
 
             if (ShouldSaveToOutFile)
             {
-                string outFilePath = WebResponseHelper.GetOutFilePath(response, _qualifiedOutFile);
-
-                WriteVerbose(string.Create(System.Globalization.CultureInfo.InvariantCulture, $"File Name: {Path.GetFileName(_qualifiedOutFile)}"));
+                WriteVerbose($"File Name: {Path.GetFileName(outFilePath)}");
 
-                StreamHelper.SaveStreamToFile(responseStream, outFilePath, this, response.Content.Headers.ContentLength.GetValueOrDefault(), perReadTimeout, _cancelToken.Token);
+                // ContentLength is always the partial length, while ContentRange is the full length
+                // Without Request.Range set, ContentRange is null and partial length (ContentLength) equals to full length
+                StreamHelper.SaveStreamToFile(responseStream, outFilePath, this, response.Content.Headers.ContentRange?.Length.GetValueOrDefault() ?? response.Content.Headers.ContentLength.GetValueOrDefault(), perReadTimeout, _cancelToken.Token);
             }
         }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebProxy.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebProxy.cs
index 6e9f6bdf98e..c8fed859771 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebProxy.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-    internal class WebProxy : IWebProxy, IEquatable<WebProxy>
+    internal sealed class WebProxy : IWebProxy, IEquatable<WebProxy>
     {
         private ICredentials? _credentials;
         private readonly Uri _proxyAddress;
@@ -31,7 +31,7 @@ public bool Equals(WebProxy? other)
                 return false;
             }
 
-            // _proxyAddress cannot be null as it is set in the constructor            
+            // _proxyAddress cannot be null as it is set in the constructor
             return other._credentials == _credentials
                 && _proxyAddress.Equals(other._proxyAddress)
                 && BypassProxyOnLocal == other.BypassProxyOnLocal;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs
index 6e24629548b..377a7e56265 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs
@@ -37,12 +37,12 @@ internal static Dictionary<string, IEnumerable<string>> GetHeadersDictionary(Htt
             return headers;
         }
 
-        internal static string GetOutFilePath(HttpResponseMessage response, string _qualifiedOutFile)
+        internal static string GetOutFilePath(HttpResponseMessage response, string qualifiedOutFile)
         {
             // Get file name from last segment of Uri
             string? lastUriSegment = System.Net.WebUtility.UrlDecode(response.RequestMessage?.RequestUri?.Segments[^1]);
 
-            return Directory.Exists(_qualifiedOutFile) ? Path.Join(_qualifiedOutFile, lastUriSegment) : _qualifiedOutFile;
+            return Directory.Exists(qualifiedOutFile) ? Path.Join(qualifiedOutFile, lastUriSegment) : qualifiedOutFile;
         }
 
         internal static string GetProtocol(HttpResponseMessage response) => string.Create(CultureInfo.InvariantCulture, $"HTTP/{response.Version}");
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonDateKind.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonDateKind.cs
new file mode 100644
index 00000000000..2fed27128a6
--- /dev/null
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonDateKind.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+namespace Microsoft.PowerShell.Commands
+{
+    /// <summary>
+    /// Enums for ConvertFrom-Json -DateKind parameter.
+    /// </summary>
+    public enum JsonDateKind
+    {
+        /// <summary>
+        /// DateTime values are returned as a DateTime with the Kind representing the time zone in the raw string.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// DateTime values are returned as the Local kind representation of the value.
+        /// </summary>
+        Local,
+
+        /// <summary>
+        /// DateTime values are returned as the UTC kind representation of the value.
+        /// </summary>
+        Utc,
+
+        /// <summary>
+        /// DateTime values are returned as a DateTimeOffset value preserving the timezone information.
+        /// </summary>
+        Offset,
+
+        /// <summary>
+        /// DateTime values are returned as raw strings.
+        /// </summary>
+        String,
+    }
+}
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 f08c3a64aec..6506f2bd2ce 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
@@ -8,8 +8,8 @@
 using System.Globalization;
 using System.Management.Automation;
 using System.Management.Automation.Language;
+using System.Numerics;
 using System.Reflection;
-using System.Text.RegularExpressions;
 using System.Threading;
 
 using Newtonsoft.Json;
@@ -151,9 +151,58 @@ public static object ConvertFromJson(string input, bool returnHashtable, out Err
         /// if the <paramref name="returnHashtable"/> parameter is true.</returns>
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Preferring Json over JSON")]
         public static object ConvertFromJson(string input, bool returnHashtable, int? maxDepth, out ErrorRecord error)
+            => ConvertFromJson(input, returnHashtable, maxDepth, jsonDateKind: JsonDateKind.Default, out error);
+
+        /// <summary>
+        /// Convert a JSON string back to an object of type <see cref="System.Management.Automation.PSObject"/> or
+        /// <see cref="System.Collections.Hashtable"/> depending on parameter <paramref name="returnHashtable"/>.
+        /// </summary>
+        /// <param name="input">The JSON text to convert.</param>
+        /// <param name="returnHashtable">True if the result should be returned as a <see cref="System.Collections.Hashtable"/>
+        /// instead of a <see cref="System.Management.Automation.PSObject"/>.</param>
+        /// <param name="maxDepth">The max depth allowed when deserializing the json input. Set to null for no maximum.</param>
+        /// <param name="jsonDateKind">Controls how DateTime values are to be converted.</param>
+        /// <param name="error">An error record if the conversion failed.</param>
+        /// <returns>A <see cref="System.Management.Automation.PSObject"/> or a <see cref="System.Collections.Hashtable"/>
+        /// if the <paramref name="returnHashtable"/> parameter is true.</returns>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Preferring Json over JSON")]
+        internal static object ConvertFromJson(string input, bool returnHashtable, int? maxDepth, JsonDateKind jsonDateKind, out ErrorRecord error)
         {
             ArgumentNullException.ThrowIfNull(input);
 
+            DateParseHandling dateParseHandling;
+            DateTimeZoneHandling dateTimeZoneHandling;
+            switch (jsonDateKind)
+            {
+                case JsonDateKind.Default:
+                    dateParseHandling = DateParseHandling.DateTime;
+                    dateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
+                    break;
+
+                case JsonDateKind.Local:
+                    dateParseHandling = DateParseHandling.DateTime;
+                    dateTimeZoneHandling = DateTimeZoneHandling.Local;
+                    break;
+
+                case JsonDateKind.Utc:
+                    dateParseHandling = DateParseHandling.DateTime;
+                    dateTimeZoneHandling = DateTimeZoneHandling.Utc;
+                    break;
+
+                case JsonDateKind.Offset:
+                    dateParseHandling = DateParseHandling.DateTimeOffset;
+                    dateTimeZoneHandling = DateTimeZoneHandling.Unspecified;
+                    break;
+
+                case JsonDateKind.String:
+                    dateParseHandling = DateParseHandling.None;
+                    dateTimeZoneHandling = DateTimeZoneHandling.Unspecified;
+                    break;
+
+                default:
+                    throw new ArgumentException($"Unknown JsonDateKind value requested '{jsonDateKind}'");
+            }
+
             error = null;
             try
             {
@@ -161,6 +210,9 @@ public static object ConvertFromJson(string input, bool returnHashtable, int? ma
                     input,
                     new JsonSerializerSettings
                     {
+                        DateParseHandling = dateParseHandling,
+                        DateTimeZoneHandling = dateTimeZoneHandling,
+
                         // This TypeNameHandling setting is required to be secure.
                         TypeNameHandling = TypeNameHandling.None,
                         MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
@@ -236,11 +288,11 @@ private static PSObject PopulateFromJDictionary(JObject entries, DuplicateMember
                     return null;
                 }
 
-                // Array
                 switch (entry.Value)
                 {
                     case JArray list:
                         {
+                            // Array
                             var listResult = PopulateFromJArray(list, out error);
                             if (error != null)
                             {
@@ -280,45 +332,44 @@ private static ICollection<object> PopulateFromJArray(JArray list, out ErrorReco
         {
             error = null;
             var result = new object[list.Count];
+            var i = 0;
 
-            for (var index = 0; index < list.Count; index++)
+            foreach (var element in list)
             {
-                var element = list[index];
                 switch (element)
                 {
                     case JArray subList:
+                        // Array
+                        result[i++] = PopulateFromJArray(subList, out error);
+                        if (error != null)
                         {
-                            // Array
-                            var listResult = PopulateFromJArray(subList, out error);
-                            if (error != null)
-                            {
-                                return null;
-                            }
-
-                            result[index] = listResult;
-                            break;
+                            return null;
                         }
+
+                        break;
+
                     case JObject dic:
+                        // Dictionary
+                        result[i++] = PopulateFromJDictionary(dic, new DuplicateMemberHashSet(dic.Count), out error);
+                        if (error != null)
                         {
-                            // Dictionary
-                            var dicResult = PopulateFromJDictionary(dic, new DuplicateMemberHashSet(dic.Count), out error);
-                            if (error != null)
-                            {
-                                return null;
-                            }
-
-                            result[index] = dicResult;
-                            break;
+                            return null;
                         }
+
+                        break;
+
                     case JValue value:
+                        if (value.Type != JTokenType.Comment)
                         {
-                            result[index] = value.Value;
-                            break;
+                            result[i++] = value.Value;
                         }
+
+                        break;
                 }
             }
 
-            return result;
+            // In the common case of not having any comments, return the original array, otherwise create a sliced copy.
+            return i == list.Count ? result : result[..i];
         }
 
         // This function is a clone of PopulateFromDictionary using JObject as an input.
@@ -383,46 +434,44 @@ private static ICollection<object> PopulateHashTableFromJArray(JArray list, out
         {
             error = null;
             var result = new object[list.Count];
+            var i = 0;
 
-            for (var index = 0; index < list.Count; index++)
+            foreach (var element in list)
             {
-                var element = list[index];
-
                 switch (element)
                 {
-                    case JArray array:
+                    case JArray subList:
+                        // Array
+                        result[i++] = PopulateHashTableFromJArray(subList, out error);
+                        if (error != null)
                         {
-                            // Array
-                            var listResult = PopulateHashTableFromJArray(array, out error);
-                            if (error != null)
-                            {
-                                return null;
-                            }
-
-                            result[index] = listResult;
-                            break;
+                            return null;
                         }
+
+                        break;
+
                     case JObject dic:
+                        // Dictionary
+                        result[i++] = PopulateHashTableFromJDictionary(dic, out error);
+                        if (error != null)
                         {
-                            // Dictionary
-                            var dicResult = PopulateHashTableFromJDictionary(dic, out error);
-                            if (error != null)
-                            {
-                                return null;
-                            }
-
-                            result[index] = dicResult;
-                            break;
+                            return null;
                         }
+
+                        break;
+
                     case JValue value:
+                        if (value.Type != JTokenType.Comment)
                         {
-                            result[index] = value.Value;
-                            break;
+                            result[i++] = value.Value;
                         }
+
+                        break;
                 }
             }
 
-            return result;
+            // In the common case of not having any comments, return the original array, otherwise create a sliced copy.
+            return i == list.Count ? result : result[..i];
         }
 
         #endregion ConvertFromJson
@@ -511,7 +560,8 @@ private static object ProcessValue(object obj, int currentDepth, in ConvertToJso
                     || obj is Uri
                     || obj is double
                     || obj is float
-                    || obj is decimal)
+                    || obj is decimal
+                    || obj is BigInteger)
             {
                 rv = obj;
             }
@@ -523,7 +573,7 @@ private static object ProcessValue(object obj, int currentDepth, in ConvertToJso
             {
                 Type t = obj.GetType();
 
-                if (t.IsPrimitive)
+                if (t.IsPrimitive || (t.IsEnum && ExperimentalFeature.IsEnabled(ExperimentalFeature.PSSerializeJSONLongEnumAsNumber)))
                 {
                     rv = obj;
                 }
@@ -612,7 +662,7 @@ private static object ProcessValue(object obj, int currentDepth, in ConvertToJso
         /// </returns>
         private static object AddPsProperties(object psObj, object obj, int depth, bool isPurePSObj, bool isCustomObj, in ConvertToJsonContext context)
         {
-            if (!(psObj is PSObject pso))
+            if (psObj is not PSObject pso)
             {
                 return obj;
             }
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 52ff515b0b2..d24961834b6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
@@ -22,7 +22,7 @@ namespace Microsoft.PowerShell.Commands
     /// this class as a wrapper to MemoryStream to lazily initialize. Otherwise, the
     /// content will unnecessarily be read even if there are no consumers for it.
     /// </summary>
-    internal class WebResponseContentMemoryStream : MemoryStream
+    internal sealed class WebResponseContentMemoryStream : MemoryStream
     {
         #region Data
 
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 6c42ae3a4f8..efee6f3240e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
@@ -183,7 +183,7 @@ internal void AddCertificate(X509Certificate certificate)
         /// <returns>The HttpClient cached in the WebSession, based on all current settings.</returns>
         internal HttpClient GetHttpClient(bool suppressHttpClientRedirects, out bool clientWasReset)
         {
-            // Do not auto redirect if the the caller does not want it, or maximum redirections is 0
+            // Do not auto redirect if the caller does not want it, or maximum redirections is 0
             SetStructVar(ref _allowAutoRedirect, !(suppressHttpClientRedirects || MaximumRedirection == 0));
 
             clientWasReset = _disposedClient;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
index 82c9c9f6557..31670935fcf 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
@@ -61,6 +61,7 @@ public SwitchParameter PassThru
         /// The scope parameter for the command determines which scope the alias is set in.
         /// </summary>
         [Parameter]
+        [ArgumentCompleter(typeof(ScopeArgumentCompleter))]
         public string Scope { get; set; }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
index b9c4e2d454a..48d84636ce2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
@@ -4,6 +4,7 @@
 using System.Collections;
 using System.Management.Automation;
 using System.Text;
+using System.Xml;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -59,6 +60,10 @@ private string ProcessObject(object o)
                         return s;
                     }
                 }
+                else if (o is XmlNode xmlNode)
+                {
+                    return xmlNode.Name;
+                }
                 else if (o is IEnumerable enumerable)
                 {
                     // unroll enumerables, including arrays.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
index 5b0af6473f4..cc3b1f2b251 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
@@ -111,8 +111,8 @@ public SwitchParameter NoClobber
         /// Encoding optional flag.
         /// </summary>
         [Parameter]
-        [ArgumentToEncodingTransformationAttribute()]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
@@ -331,13 +331,12 @@ public string[] LiteralPath
         private bool _disposed = false;
 
         /// <summary>
-        /// Public dispose method.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
         {
             if (!_disposed)
             {
-                GC.SuppressFinalize(this);
                 if (_helper != null)
                 {
                     _helper.Dispose();
@@ -632,10 +631,90 @@ private void CleanUp()
         #endregion IDisposable Members
     }
 
+    /// <summary>
+    /// Implements ConvertTo-CliXml command.
+    /// </summary>
+    [Cmdlet(VerbsData.ConvertTo, "CliXml", HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2280866")]
+    [OutputType(typeof(string))]
+    public sealed class ConvertToClixmlCommand : PSCmdlet
+    {
+        #region Parameters
+
+        /// <summary>
+        /// Gets or sets input objects to be converted to CliXml object.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true)]
+        public PSObject InputObject { get; set; }
+
+        /// <summary>
+        /// Gets or sets depth of serialization.
+        /// </summary>
+        [Parameter]
+        [ValidateRange(1, int.MaxValue)]
+        public int Depth { get; set; } = 2;
+
+        #endregion Parameters
+
+        #region Private Members
+
+        private readonly List<object> _inputObjectBuffer = new();
+
+        #endregion Private Members
+
+        #region Overrides
+
+        /// <summary>
+        /// Process record.
+        /// </summary>
+        protected override void ProcessRecord()
+        {
+            _inputObjectBuffer.Add(InputObject);
+        }
+
+        /// <summary>
+        /// End Processing.
+        /// </summary>
+        protected override void EndProcessing()
+        {
+            WriteObject(PSSerializer.Serialize(_inputObjectBuffer, Depth, enumerate: true));
+        }
+
+        #endregion Overrides
+    }
+
+    /// <summary>
+    /// Implements ConvertFrom-CliXml command.
+    /// </summary>
+    [Cmdlet(VerbsData.ConvertFrom, "CliXml", HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2280770")]
+    public sealed class ConvertFromClixmlCommand : PSCmdlet
+    {
+        #region Parameters
+
+        /// <summary>
+        /// Gets or sets input object which is written in CliXml format.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true)]
+        public string InputObject { get; set; }
+
+        #endregion Parameters
+
+        #region Overrides
+
+        /// <summary>
+        /// Process record.
+        /// </summary>
+        protected override void ProcessRecord()
+        {
+            WriteObject(PSSerializer.Deserialize(InputObject));
+        }
+
+        #endregion Overrides
+    }
+
     /// <summary>
     /// Helper class to import single XML file.
     /// </summary>
-    internal class ImportXmlHelper : IDisposable
+    internal sealed class ImportXmlHelper : IDisposable
     {
         #region constructor
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
index 357e0222b6d..b7e4ed279aa 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
@@ -17,7 +17,7 @@ namespace Microsoft.PowerShell.Commands
     /// This trace listener cannot be specified in the app.config file.
     /// It must be added through the add-tracelistener cmdlet.
     /// </remarks>
-    internal class PSHostTraceListener
+    internal sealed class PSHostTraceListener
         : System.Diagnostics.TraceListener
     {
         #region TraceListener constructors and disposer
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 91cb0d46abc..1eadd4934b3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
@@ -323,14 +323,14 @@ public void Dispose()
     /// cmdlet.  It gets attached to the sub-pipelines success or error pipeline and redirects
     /// all objects written to these pipelines to trace-command pipeline.
     /// </summary>
-    internal class TracePipelineWriter : PipelineWriter
+    internal sealed class TracePipelineWriter : PipelineWriter
     {
         internal TracePipelineWriter(
             TraceListenerCommandBase cmdlet,
             bool writeError,
             Collection<PSTraceSource> matchingSources)
         {
-            ArgumentNullException.ThrowIfNull(cmdlet); 
+            ArgumentNullException.ThrowIfNull(cmdlet);
             ArgumentNullException.ThrowIfNull(matchingSources);
 
             _cmdlet = cmdlet;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/CsvCommandStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/CsvCommandStrings.resx
index 0eff0d6f84f..dde1be6ab49 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/CsvCommandStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/CsvCommandStrings.resx
@@ -130,9 +130,6 @@
   <data name="CannotSpecifyQuoteFieldsAndUseQuotes" xml:space="preserve">
     <value>You must specify either the -UseQuotes or -QuoteFields parameters, but not both.</value>
   </data>
-  <data name="CannotSpecifyIncludeTypeInformationAndNoTypeInformation" xml:space="preserve">
-    <value>You must specify either the -IncludeTypeInformation or -NoTypeInformation parameters, but not both.</value>
-  </data>
   <data name="CannotSpecifyPathAndLiteralPath" xml:space="preserve">
     <value>You must specify either the -Path or -LiteralPath parameters, but not both.</value>
   </data>
@@ -157,4 +154,7 @@
   <data name="EOFIsReached" xml:space="preserve">
     <value>EOF is reached.</value>
   </data>
+  <data name="CannotSpecifyAppendAndNoHeader" xml:space="preserve">
+    <value>You must specify either the -Append or -NoHeader parameters, but not both.</value>
+  </data>
 </root>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/GetFormatDataStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/GetFormatDataStrings.resx
new file mode 100644
index 00000000000..de231836cd5
--- /dev/null
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/GetFormatDataStrings.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="https://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="https://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="ProcessViewDefinition" xml:space="preserve">
+    <value>Processing view defintion '{0}'</value>
+  </data>
+</root>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/VariableCommandStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/VariableCommandStrings.resx
index be5d3bbe47d..d385adda038 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/VariableCommandStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/VariableCommandStrings.resx
@@ -123,6 +123,9 @@
   <data name="SetVariableTarget" xml:space="preserve">
     <value>Name: {0} Value: {1}</value>
   </data>
+  <data name="UseSingleVariable" xml:space="preserve">
+    <value>Use a single variable rather than a collection</value>
+  </data>
   <data name="NewVariableAction" xml:space="preserve">
     <value>New variable</value>
   </data>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
index 6e73043747e..cb080d37012 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
@@ -164,7 +164,7 @@
   </data>
   <data name="InsecureRedirection" xml:space="preserve">
     <value>Cannot follow an insecure redirection by default. Reissue the command specifying the -AllowInsecureRedirect switch. </value>
-  </data> 
+  </data>
   <data name="KeysWithDifferentCasingInJsonString" xml:space="preserve">
     <value>Cannot convert the JSON string because it contains keys with different casing. Please use the -AsHashTable switch instead. The key that was attempted to be added to the existing key '{0}' was '{1}'.</value>
   </data>
@@ -234,15 +234,9 @@
   <data name="FollowingRelLinkVerboseMsg" xml:space="preserve">
     <value>Following rel link {0}</value>
   </data>
-  <data name="WebMethodInvocationVerboseMsg" xml:space="preserve">
-    <value>Requested 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>
   </data>
-  <data name="WebResponseVerboseMsg" xml:space="preserve">
-    <value>Received HTTP/{0} {1}-byte response of content type {2}</value>
-  </data>
   <data name="WebResponseNoSizeVerboseMsg" xml:space="preserve">
     <value>Received HTTP/{0} response of content type {1} of unknown size</value>
   </data>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/HResult.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/HResult.cs
index e23f0810ea1..4789bcef06f 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/HResult.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/HResult.cs
@@ -4,18 +4,18 @@
 namespace Microsoft.PowerShell
 {
     /// <summary>
-    /// HRESULT Wrapper    
-    /// </summary>    
+    /// HRESULT Wrapper
+    /// </summary>
     internal enum HResult
     {
-        /// <summary>     
-        /// S_OK          
-        /// </summary>    
+        /// <summary>
+        /// S_OK
+        /// </summary>
         Ok = 0x0000,
 
         /// <summary>
         /// S_FALSE.
-        /// </summary>        
+        /// </summary>
         False = 0x0001,
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs
index 10db7912b4a..408c59c482a 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs
@@ -34,9 +34,7 @@ internal PropVariant(string value)
                 throw new ArgumentException("PropVariantNullString", nameof(value));
             }
 
-#pragma warning disable CS0618 // Type or member is obsolete (might get deprecated in future versions
             _valueType = (ushort)VarEnum.VT_LPWSTR;
-#pragma warning restore CS0618 // Type or member is obsolete (might get deprecated in future versions
             _ptr = Marshal.StringToCoTaskMemUni(value);
         }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs
index 90c6c811bb1..5606eabd567 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs
@@ -33,13 +33,12 @@ internal static void CreateRunAsAdministratorJumpList()
             {
                 try
                 {
-                    TaskbarJumpList.CreateElevatedEntry(ConsoleHostStrings.RunAsAdministrator);
+                    CreateElevatedEntry(ConsoleHostStrings.RunAsAdministrator);
                 }
-                catch (Exception exception)
+                catch (Exception)
                 {
                     // Due to COM threading complexity there might still be sporadic failures but they can be
                     // ignored as creating the JumpList is not critical and persists after its first creation.
-                    Debug.Fail($"Creating 'Run as Administrator' JumpList failed. {exception}");
                 }
             });
 
@@ -48,7 +47,7 @@ internal static void CreateRunAsAdministratorJumpList()
                 thread.SetApartmentState(ApartmentState.STA);
                 thread.Start();
             }
-            catch (System.Threading.ThreadStartException)
+            catch (ThreadStartException)
             {
                 // STA may not be supported on some platforms
             }
@@ -117,7 +116,6 @@ private static void CreateElevatedEntry(string title)
                     var CLSID_EnumerableObjectCollection = new Guid(@"2d3468c1-36a7-43b6-ac24-d3f02fd9607a");
                     const uint CLSCTX_INPROC_HANDLER = 2;
                     const uint CLSCTX_INPROC = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER;
-                    var ComSvrInterface_GUID = new Guid(@"555E2D2B-EE00-47AA-AB2B-39F953F6B339");
                     hResult = CoCreateInstance(ref CLSID_EnumerableObjectCollection, null, CLSCTX_INPROC, ref IID_IUnknown, out object instance);
                     if (hResult < 0)
                     {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
index 50d2bd77d0f..0fb85e740f4 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -196,6 +196,7 @@ internal static int MaxNameLength()
             "workingdirectory"
         };
 
+#pragma warning disable SA1025 // CodeMustNotContainMultipleWhitespaceInARow
         /// <summary>
         /// These represent the parameters that are used when starting pwsh.
         /// We can query in our telemetry to determine how pwsh was invoked.
@@ -203,35 +204,36 @@ internal static int MaxNameLength()
         [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
-            ConfigurationFile   = 0x04000000, // -ConfigurationFile
-            NoProfileLoadTime   = 0x08000000, // -NoProfileLoadTime
-            CommandWithArgs     = 0x10000000, // -CommandWithArgs | -cwa
+            Command             = 0x0000000000000001, // -Command | -c
+            ConfigurationName   = 0x0000000000000002, // -ConfigurationName | -config
+            CustomPipeName      = 0x0000000000000004, // -CustomPipeName
+            EncodedCommand      = 0x0000000000000008, // -EncodedCommand | -e | -ec
+            EncodedArgument     = 0x0000000000000010, // -EncodedArgument
+            ExecutionPolicy     = 0x0000000000000020, // -ExecutionPolicy | -ex | -ep
+            File                = 0x0000000000000040, // -File | -f
+            Help                = 0x0000000000000080, // -Help, -?, /?
+            InputFormat         = 0x0000000000000100, // -InputFormat | -inp | -if
+            Interactive         = 0x0000000000000200, // -Interactive | -i
+            Login               = 0x0000000000000400, // -Login | -l
+            MTA                 = 0x0000000000000800, // -MTA
+            NoExit              = 0x0000000000001000, // -NoExit | -noe
+            NoLogo              = 0x0000000000002000, // -NoLogo | -nol
+            NonInteractive      = 0x0000000000004000, // -NonInteractive | -noni
+            NoProfile           = 0x0000000000008000, // -NoProfile | -nop
+            OutputFormat        = 0x0000000000010000, // -OutputFormat | -o | -of
+            SettingsFile        = 0x0000000000020000, // -SettingsFile | -settings
+            SSHServerMode       = 0x0000000000040000, // -SSHServerMode | -sshs
+            SocketServerMode    = 0x0000000000080000, // -SocketServerMode | -sockets
+            ServerMode          = 0x0000000000100000, // -ServerMode | -server
+            NamedPipeServerMode = 0x0000000000200000, // -NamedPipeServerMode | -namedpipes
+            STA                 = 0x0000000000400000, // -STA
+            Version             = 0x0000000000800000, // -Version | -v
+            WindowStyle         = 0x0000000001000000, // -WindowStyle | -w
+            WorkingDirectory    = 0x0000000002000000, // -WorkingDirectory | -wd
+            ConfigurationFile   = 0x0000000004000000, // -ConfigurationFile
+            NoProfileLoadTime   = 0x0000000008000000, // -NoProfileLoadTime
+            CommandWithArgs     = 0x0000000010000000, // -CommandWithArgs | -cwa
+
             // Enum values for specified ExecutionPolicy
             EPUnrestricted      = 0x0000000100000000, // ExecutionPolicy unrestricted
             EPRemoteSigned      = 0x0000000200000000, // ExecutionPolicy remote signed
@@ -241,7 +243,11 @@ internal enum ParameterBitmap : long
             EPBypass            = 0x0000002000000000, // ExecutionPolicy bypass
             EPUndefined         = 0x0000004000000000, // ExecutionPolicy undefined
             EPIncorrect         = 0x0000008000000000, // ExecutionPolicy incorrect
+
+            // V2 Socket Server Mode
+            V2SocketServerMode  = 0x0000100000000000, // -V2SocketServerMode | -v2so
         }
+#pragma warning restore SA1025 // CodeMustNotContainMultipleWhitespaceInARow
 
         internal ParameterBitmap ParametersUsed = 0;
 
@@ -597,6 +603,33 @@ internal bool RemoveWorkingDirectoryTrailingCharacter
                 return _removeWorkingDirectoryTrailingCharacter;
             }
         }
+
+        internal DateTimeOffset? UTCTimestamp
+        {
+            get
+            {
+                AssertArgumentsParsed();
+                return _utcTimestamp;
+            }
+        }
+
+        internal string? Token
+        {
+            get
+            {
+                AssertArgumentsParsed();
+                return _token;
+            }
+        }
+
+        internal bool V2SocketServerMode
+        {
+            get
+            {
+                AssertArgumentsParsed();
+                return _v2SocketServerMode;
+            }
+        }
 #endif
 
         #endregion Internal properties
@@ -916,6 +949,14 @@ private void ParseHelper(string[] args)
                     _showBanner = false;
                     ParametersUsed |= ParameterBitmap.SocketServerMode;
                 }
+#if !UNIX
+                else if (MatchSwitch(switchKey, "v2socketservermode", "v2so"))
+                {
+                    _v2SocketServerMode = true;
+                    _showBanner = false;
+                    ParametersUsed |= ParameterBitmap.V2SocketServerMode;
+                }
+#endif
                 else if (MatchSwitch(switchKey, "servermode", "s"))
                 {
                     _serverMode = true;
@@ -1176,6 +1217,37 @@ private void ParseHelper(string[] args)
                 {
                     _removeWorkingDirectoryTrailingCharacter = true;
                 }
+                else if (MatchSwitch(switchKey, "token", "to"))
+                {
+                    ++i;
+                    if (i >= args.Length)
+                    {
+                        SetCommandLineError(
+                            string.Format(CultureInfo.CurrentCulture, CommandLineParameterParserStrings.MissingMandatoryArgument, "-Token"));
+                        break;
+                    }
+
+                    _token = args[i];
+
+                    // Not adding anything to ParametersUsed, because it is required with V2 socket server mode
+                    // So, we can assume it based on that bit
+                }
+                else if (MatchSwitch(switchKey, "utctimestamp", "utc"))
+                {
+                    ++i;
+                    if (i >= args.Length)
+                    {
+                        SetCommandLineError(
+                            string.Format(CultureInfo.CurrentCulture, CommandLineParameterParserStrings.MissingMandatoryArgument, "-UTCTimestamp"));
+                        break;
+                    }
+
+                    // Parse as iso8601UtcString
+                    _utcTimestamp = DateTimeOffset.ParseExact(args[i], "yyyy-MM-dd'T'HH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind);
+
+                    // Not adding anything to ParametersUsed, because it is required with V2 socket server mode
+                    // So, we can assume it based on that bit
+                }
 #endif
                 else
                 {
@@ -1530,6 +1602,9 @@ private bool CollectArgs(string[] args, ref int i)
         }
 
         private bool _socketServerMode;
+#if !UNIX
+        private bool _v2SocketServerMode;
+#endif
         private bool _serverMode;
         private bool _namedPipeServerMode;
         private bool _sshServerMode;
@@ -1562,6 +1637,10 @@ private bool CollectArgs(string[] args, ref int i)
         private string? _executionPolicy;
         private string? _settingsFile;
         private string? _workingDirectory;
+#if !UNIX
+        private string? _token;
+        private DateTimeOffset? _utcTimestamp;
+#endif
 
 #if !UNIX
         private ProcessWindowStyle? _windowStyle;
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
index 8857c64fa50..7bda4bc5688 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
@@ -211,41 +211,6 @@ internal struct FONTSIGNATURE
             internal DWORD fsCsb1;
         }
 
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct CHARSETINFO
-        {
-            // From public\sdk\inc\wingdi.h
-            internal uint ciCharset;   // Character set value.
-            internal uint ciACP;       // ANSI code-page identifier.
-            internal FONTSIGNATURE fs;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        internal struct TEXTMETRIC
-        {
-            // From public\sdk\inc\wingdi.h
-            public int tmHeight;
-            public int tmAscent;
-            public int tmDescent;
-            public int tmInternalLeading;
-            public int tmExternalLeading;
-            public int tmAveCharWidth;
-            public int tmMaxCharWidth;
-            public int tmWeight;
-            public int tmOverhang;
-            public int tmDigitizedAspectX;
-            public int tmDigitizedAspectY;
-            public char tmFirstChar;
-            public char tmLastChar;
-            public char tmDefaultChar;
-            public char tmBreakChar;
-            public byte tmItalic;
-            public byte tmUnderlined;
-            public byte tmStruckOut;
-            public byte tmPitchAndFamily;
-            public byte tmCharSet;
-        }
-
         #region SentInput Data Structures
 
         [StructLayout(LayoutKind.Sequential)]
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 3a9ab8e7f45..daf69d50251 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -54,16 +54,11 @@ internal sealed partial class ConsoleHost
         internal const int ExitCodeCtrlBreak = 128 + 21; // SIGBREAK
         internal const int ExitCodeInitFailure = 70; // Internal Software Error
         internal const int ExitCodeBadCommandLineParameter = 64; // Command Line Usage Error
-        private const uint SPI_GETSCREENREADER = 0x0046;
 #if UNIX
         internal const string DECCKM_ON = "\x1b[?1h";
         internal const string DECCKM_OFF = "\x1b[?1l";
 #endif
 
-        [DllImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool SystemParametersInfo(uint uiAction, uint uiParam, ref bool pvParam, uint fWinIni);
-
         /// <summary>
         /// Internal Entry point in msh console host implementation.
         /// </summary>
@@ -123,11 +118,23 @@ internal static int Start(
                 throw new ConsoleHostStartupException(ConsoleHostStrings.ShellCannotBeStartedWithConfigConflict);
             }
 
-            // put PSHOME in front of PATH so that calling `powershell` within `powershell` always starts the same running version
+            // Put PSHOME in front of PATH so that calling `pwsh` within `pwsh` always starts the same running version.
             string path = Environment.GetEnvironmentVariable("PATH");
-            string pshome = Utils.DefaultPowerShellAppBase + Path.PathSeparator;
+            string pshome = Utils.DefaultPowerShellAppBase;
+            string dotnetToolsPathSegment = $"{Path.DirectorySeparatorChar}.store{Path.DirectorySeparatorChar}powershell{Path.DirectorySeparatorChar}";
+
+            int index = pshome.IndexOf(dotnetToolsPathSegment, StringComparison.Ordinal);
+            if (index > 0)
+            {
+                // We're running PowerShell global tool. In this case the real entry executable should be the 'pwsh'
+                // or 'pwsh.exe' within the tool folder which should be the path right before the '\.store', not what
+                // PSHome is pointing to.
+                pshome = pshome[0..index];
+            }
 
-            // to not impact startup perf, we don't remove duplicates, but we avoid adding a duplicate to the front
+            pshome += Path.PathSeparator;
+
+            // To not impact startup perf, we don't remove duplicates, but we avoid adding a duplicate to the front
             // we also don't handle the edge case where PATH only contains $PSHOME
             if (string.IsNullOrEmpty(path))
             {
@@ -141,13 +148,16 @@ internal static int Start(
             try
             {
                 string profileDir = Platform.CacheDirectory;
-#if !UNIX
-                if (!Directory.Exists(profileDir))
+                if (!string.IsNullOrEmpty(profileDir))
                 {
-                    Directory.CreateDirectory(profileDir);
-                }
+#if !UNIX
+                    if (!Directory.Exists(profileDir))
+                    {
+                        Directory.CreateDirectory(profileDir);
+                    }
 #endif
-                ProfileOptimization.SetProfileRoot(profileDir);
+                    ProfileOptimization.SetProfileRoot(profileDir);
+                }
             }
             catch
             {
@@ -186,7 +196,26 @@ internal static int Start(
                 }
 
                 // Servermode parameter validation check.
-                if ((s_cpp.ServerMode && s_cpp.NamedPipeServerMode) || (s_cpp.ServerMode && s_cpp.SocketServerMode) || (s_cpp.NamedPipeServerMode && s_cpp.SocketServerMode))
+                int serverModeCount = 0;
+                if (s_cpp.ServerMode)
+                {
+                    serverModeCount++;
+                }
+                if (s_cpp.NamedPipeServerMode)
+                {
+                    serverModeCount++;
+                }
+                if (s_cpp.SocketServerMode)
+                {
+                    serverModeCount++;
+                }
+#if !UNIX
+                if (s_cpp.V2SocketServerMode)
+                {
+                    serverModeCount++;
+                }
+#endif
+                if (serverModeCount > 1)
                 {
                     s_tracer.TraceError("Conflicting server mode parameters, parameters must be used exclusively.");
                     s_theConsoleHost?.ui.WriteErrorLine(ConsoleHostStrings.ConflictingServerModeParameters);
@@ -230,6 +259,34 @@ internal static int Start(
                         configurationName: s_cpp.ConfigurationName);
                     exitCode = 0;
                 }
+#if !UNIX
+                else if (s_cpp.V2SocketServerMode)
+                {
+                    if (s_cpp.Token == null)
+                    {
+                        s_tracer.TraceError("Token is required for V2SocketServerMode.");
+                        s_theConsoleHost?.ui.WriteErrorLine(string.Format(CultureInfo.CurrentCulture, ConsoleHostStrings.MissingMandatoryParameter, "-Token", "-V2SocketServerMode"));
+                        return ExitCodeBadCommandLineParameter;
+                    }
+
+                    if (s_cpp.UTCTimestamp == null)
+                    {
+                        s_tracer.TraceError("UTCTimestamp is required for V2SocketServerMode.");
+                        s_theConsoleHost?.ui.WriteErrorLine(string.Format(CultureInfo.CurrentCulture, ConsoleHostStrings.MissingMandatoryParameter, "-UTCTimestamp", "-v2socketservermode"));
+                        return ExitCodeBadCommandLineParameter;
+                    }
+
+                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("V2SocketServerMode", s_cpp.ParametersUsedAsDouble);
+                    ProfileOptimization.StartProfile("StartupProfileData-V2SocketServerMode");
+                    HyperVSocketMediator.Run(
+                        initialCommand: s_cpp.InitialCommand,
+                        configurationName: s_cpp.ConfigurationName,
+                        token: s_cpp.Token,
+                        tokenCreationTime: s_cpp.UTCTimestamp.Value);
+
+                    exitCode = 0;
+                }
+#endif
                 else if (s_cpp.SocketServerMode)
                 {
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SocketServerMode", s_cpp.ParametersUsedAsDouble);
@@ -264,7 +321,7 @@ internal static int Start(
                     }
 
                     s_theConsoleHost.BindBreakHandler();
-                    PSHost.IsStdOutputRedirected = Console.IsOutputRedirected;
+                    IsStdOutputRedirected = Console.IsOutputRedirected;
 
                     // Send startup telemetry for ConsoleHost startup
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("Normal", s_cpp.ParametersUsedAsDouble);
@@ -610,15 +667,18 @@ public override PSHostUserInterface UI
         /// <summary>
         /// See base class.
         /// </summary>
-        public void PushRunspace(Runspace newRunspace)
+        public void PushRunspace(Runspace runspace)
         {
             if (_runspaceRef == null)
             {
                 return;
             }
 
-            RemoteRunspace remoteRunspace = newRunspace as RemoteRunspace;
-            Dbg.Assert(remoteRunspace != null, "Expected remoteRunspace != null");
+            if (runspace is not RemoteRunspace remoteRunspace)
+            {
+                throw new ArgumentException(ConsoleHostStrings.PushRunspaceNotRemote, nameof(runspace));
+            }
+
             remoteRunspace.StateChanged += HandleRemoteRunspaceStateChanged;
 
             // Unsubscribe the local session debugger.
@@ -1618,35 +1678,6 @@ private void CreateRunspace(RunspaceCreationEventArgs 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-friendly enough as of today.
-        /// </summary>
-        private bool IsScreenReaderActive()
-        {
-            if (_screenReaderActive.HasValue)
-            {
-                return _screenReaderActive.Value;
-            }
-
-            _screenReaderActive = false;
-            if (Platform.IsWindowsDesktop)
-            {
-                // Note: this API can detect if a third-party screen reader is active, such as NVDA, but not the in-box Windows Narrator.
-                // Quoted from https://learn.microsoft.com/windows/win32/api/winuser/nf-winuser-systemparametersinfoa about the
-                // accessibility parameter 'SPI_GETSCREENREADER':
-                // "Narrator, the screen reader that is included with Windows, does not set the SPI_SETSCREENREADER or SPI_GETSCREENREADER flags."
-                bool enabled = false;
-                if (SystemParametersInfo(SPI_GETSCREENREADER, 0, ref enabled, 0))
-                {
-                    _screenReaderActive = enabled;
-                }
-            }
-
-            return _screenReaderActive.Value;
-        }
-
         private static bool LoadPSReadline()
         {
             // Don't load PSReadline if:
@@ -1697,7 +1728,6 @@ private void DoCreateRunspace(RunspaceCreationEventArgs args)
                 bool psReadlineFailed = false;
 
                 // Load PSReadline by default unless there is no use:
-                //    - screen reader is active, such as NVDA, indicating non-visual access
                 //    - we're running a command/file and just exiting
                 //    - stdin is redirected by a parent process
                 //    - we're not interactive
@@ -1708,26 +1738,18 @@ private void DoCreateRunspace(RunspaceCreationEventArgs args)
                 ReadOnlyCollection<ModuleSpecification> defaultImportModulesList = null;
                 if (!customConfigurationProvided && LoadPSReadline())
                 {
-                    if (IsScreenReaderActive())
+                    // Create and open Runspace with PSReadline.
+                    defaultImportModulesList = DefaultInitialSessionState.Modules;
+                    DefaultInitialSessionState.ImportPSModule(new[] { "PSReadLine" });
+                    consoleRunspace = RunspaceFactory.CreateRunspace(this, DefaultInitialSessionState);
+                    try
                     {
-                        s_theConsoleHost.UI.WriteLine(ManagedEntranceStrings.PSReadLineDisabledWhenScreenReaderIsActive);
-                        s_theConsoleHost.UI.WriteLine();
+                        OpenConsoleRunspace(consoleRunspace, args.StaMode);
                     }
-                    else
+                    catch (Exception)
                     {
-                        // Create and open Runspace with PSReadline.
-                        defaultImportModulesList = DefaultInitialSessionState.Modules;
-                        DefaultInitialSessionState.ImportPSModule(new[] { "PSReadLine" });
-                        consoleRunspace = RunspaceFactory.CreateRunspace(this, DefaultInitialSessionState);
-                        try
-                        {
-                            OpenConsoleRunspace(consoleRunspace, args.StaMode);
-                        }
-                        catch (Exception)
-                        {
-                            consoleRunspace = null;
-                            psReadlineFailed = true;
-                        }
+                        consoleRunspace = null;
+                        psReadlineFailed = true;
                     }
                 }
 
@@ -1864,6 +1886,7 @@ private void DoRunspaceInitialization(RunspaceCreationEventArgs args)
                             {
                                 s_theConsoleHost.UI.WriteLine(ManagedEntranceStrings.ShellBannerCLAuditMode);
                             }
+
                             break;
 
                         case PSLanguageMode.NoLanguage:
@@ -2178,7 +2201,6 @@ private void ReportException(Exception e, Executor exec)
             if (e1 != null)
             {
                 // that didn't work.  Write out the error ourselves as a last resort.
-
                 ReportExceptionFallback(e, null);
             }
         }
@@ -2199,7 +2221,7 @@ private void ReportExceptionFallback(Exception e, string header)
                 Console.Error.WriteLine(header);
             }
 
-            if (e == null)
+            if (e is null)
             {
                 return;
             }
@@ -2207,7 +2229,9 @@ private void ReportExceptionFallback(Exception e, string header)
             // See if the exception has an error record attached to it...
             ErrorRecord er = null;
             if (e is IContainsErrorRecord icer)
+            {
                 er = icer.ErrorRecord;
+            }
 
             if (e is PSRemotingTransportException)
             {
@@ -2224,8 +2248,22 @@ private void ReportExceptionFallback(Exception e, string header)
             }
 
             // Add the position message for the error if it's available.
-            if (er != null && er.InvocationInfo != null)
+            if (er?.InvocationInfo is { })
+            {
                 Console.Error.WriteLine(er.InvocationInfo.PositionMessage);
+            }
+
+            // Print the stack trace.
+            Console.Error.WriteLine($"\n--- {e.GetType().FullName} ---");
+            Console.Error.WriteLine(e.StackTrace);
+
+            Exception inner = e.InnerException;
+            while (inner is { })
+            {
+                Console.Error.WriteLine($"--- inner {inner.GetType().FullName} ---");
+                Console.Error.WriteLine(inner.StackTrace);
+                inner = inner.InnerException;
+            }
         }
 
         /// <summary>
@@ -2545,14 +2583,7 @@ internal void Run(bool inputLoopIsNested)
                                 // Evaluate any suggestions
                                 if (previousResponseWasEmpty == false)
                                 {
-                                    if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSFeedbackProvider))
-                                    {
-                                        EvaluateFeedbacks(ui);
-                                    }
-                                    else
-                                    {
-                                        EvaluateSuggestions(ui);
-                                    }
+                                    EvaluateFeedbacks(ui);
                                 }
 
                                 // Then output the prompt
@@ -2730,6 +2761,7 @@ e is RemoteException ||
 #endif
                         }
                     }
+
                     // NTRAID#Windows Out Of Band Releases-915506-2005/09/09
                     // Removed HandleUnexpectedExceptions infrastructure
                     finally
@@ -2875,44 +2907,6 @@ private void EvaluateFeedbacks(ConsoleHostUserInterface ui)
                 }
             }
 
-            private void EvaluateSuggestions(ConsoleHostUserInterface ui)
-            {
-                // Output any training suggestions
-                try
-                {
-                    List<string> suggestions = HostUtilities.GetSuggestion(_parent.Runspace);
-
-                    if (suggestions.Count > 0)
-                    {
-                        ui.WriteLine();
-                    }
-
-                    bool first = true;
-                    foreach (string suggestion in suggestions)
-                    {
-                        if (!first)
-                            ui.WriteLine();
-
-                        ui.WriteLine(suggestion);
-
-                        first = false;
-                    }
-                }
-                catch (TerminateException)
-                {
-                    // A variable breakpoint may be hit by HostUtilities.GetSuggestion. The debugger throws TerminateExceptions to stop the execution
-                    // of the current statement; we do not want to treat these exceptions as errors.
-                }
-                catch (Exception e)
-                {
-                    // Catch-all OK. This is a third-party call-out.
-                    ui.WriteErrorLine(e.Message);
-
-                    LocalRunspace localRunspace = (LocalRunspace)_parent.Runspace;
-                    localRunspace.GetExecutionContext.AppendDollarError(e);
-                }
-            }
-
             private string EvaluatePrompt()
             {
                 string promptString = _promptExec.ExecuteCommandAndGetResultAsString("prompt", out _);
@@ -3038,7 +3032,6 @@ private sealed class ConsoleHostStartupException : Exception
         private bool _setShouldExitCalled;
         private bool _isRunningPromptLoop;
         private bool _wasInitialCommandEncoded;
-        private bool? _screenReaderActive;
 
         // hostGlobalLock is used to sync public method calls (in case multiple threads call into the host) and access to
         // state that persists across method calls, like progress data. It's internal because the ui object also
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
index 6e3359275e0..f0da0d99547 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -578,7 +578,7 @@ private static bool shouldUnsetMode(
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void WriteToConsole(char c, bool transcribeResult)
         {
-            ReadOnlySpan<char> value = stackalloc char[1] { c };
+            ReadOnlySpan<char> value = [c];
             WriteToConsole(value, transcribeResult);
         }
 
@@ -709,9 +709,14 @@ private void WriteLineToConsole()
         /// </exception>
         public override void Write(string value)
         {
-            WriteImpl(value, newLine: false);
+            lock (_instanceLock)
+            {
+                WriteImpl(value, newLine: false);
+            }
         }
 
+        // The WriteImpl() method should always be called within a lock on _instanceLock
+        // to ensure thread safety and prevent issues in multi-threaded scenarios.
         private void WriteImpl(string value, bool newLine)
         {
             if (string.IsNullOrEmpty(value) && !newLine)
@@ -845,7 +850,10 @@ private void Write(ConsoleColor foregroundColor, ConsoleColor backgroundColor, s
         /// </exception>
         public override void WriteLine(string value)
         {
-            this.WriteImpl(value, newLine: true);
+            lock (_instanceLock)
+            {
+                this.WriteImpl(value, newLine: true);
+            }
         }
 
         /// <summary>
@@ -862,7 +870,10 @@ public override void WriteLine(string value)
         /// </exception>
         public override void WriteLine()
         {
-            this.WriteImpl(Environment.NewLine, newLine: false);
+            lock (_instanceLock)
+            {
+                this.WriteImpl(Environment.NewLine, newLine: false);
+            }
         }
 
         #region Word Wrapping
@@ -1331,13 +1342,6 @@ public override void WriteProgress(long sourceId, ProgressRecord record)
         {
             Dbg.Assert(record != null, "WriteProgress called with null ProgressRecord");
 
-            if (Console.IsOutputRedirected)
-            {
-                // Do not write progress bar when the stdout is redirected.
-                return;
-            }
-
-            // We allow only one thread at a time to update the progress state.)
             if (_parent.ErrorFormat == Serialization.DataFormat.XML)
             {
                 PSObject obj = new PSObject();
@@ -1345,8 +1349,14 @@ public override void WriteProgress(long sourceId, ProgressRecord record)
                 obj.Properties.Add(new PSNoteProperty("Record", record));
                 _parent.ErrorSerializer.Serialize(obj, "progress");
             }
+            else if (Console.IsOutputRedirected)
+            {
+                // Do not write progress bar when the stdout is redirected.
+                return;
+            }
             else
             {
+                // We allow only one thread at a time to update the progress state.)
                 lock (_instanceLock)
                 {
                     HandleIncomingProgressRecord(sourceId, record);
@@ -1386,6 +1396,7 @@ public override void WriteErrorLine(string value)
                 }
                 else
                 {
+                    value = GetOutputString(value, SupportsVirtualTerminal);
                     Console.Error.WriteLine(value);
                 }
             }
@@ -2251,7 +2262,7 @@ internal void HandleThrowOnReadAndPrompt()
         private readonly ConsoleHostRawUserInterface _rawui;
         private readonly ConsoleHost _parent;
 
-        [TraceSourceAttribute("ConsoleHostUserInterface", "Console host's subclass of S.M.A.Host.Console")]
+        [TraceSource("ConsoleHostUserInterface", "Console host's subclass of S.M.A.Host.Console")]
         private static readonly PSTraceSource s_tracer = PSTraceSource.GetTracer("ConsoleHostUserInterface", "Console host's subclass of S.M.A.Host.Console");
     }
 }   // namespace
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
index 7b81bb8a97a..5895dcf2b83 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
@@ -354,7 +354,7 @@ out object convertedObj
         /// <param name="fieldEchoOnPrompt">True to echo user input.</param>
         /// <param name="listInput">True if the field is a list.</param>
         /// <param name="endListInput">Valid only if listInput is true. set to true if the input signals end of list input.</param>
-        /// <param name="cancelled">True iff the input is canceled, e.g., by Ctrl-C or Ctrl-Break.</param>
+        /// <param name="cancelled">True if-and-only-if the input is canceled, e.g., by Ctrl-C or Ctrl-Break.</param>
         /// <returns>Processed input string to be converted with LanguagePrimitives.ConvertTo.</returns>
         private string PromptReadInput(string fieldPrompt, FieldDescription desc, bool fieldEchoOnPrompt,
                         bool listInput, out bool endListInput, out bool cancelled)
@@ -484,7 +484,7 @@ private PromptCommonInputErrors PromptTryConvertTo(Type fieldType, bool isFromRe
         /// !h  prints out field's Quick Help, returns null
         /// All others tilde comments are invalid and return null
         ///
-        /// returns null iff there's nothing the caller can process.
+        /// returns null if-and-only-if there's nothing the caller can process.
         /// </summary>
         /// <param name="input"></param>
         /// <param name="desc"></param>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleTextWriter.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleTextWriter.cs
index 97a02cb7123..a82156ce1c8 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleTextWriter.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleTextWriter.cs
@@ -76,8 +76,8 @@ public override
         void
         Write(char c)
         {
-            ReadOnlySpan<char> c1 = stackalloc char[1] { c };
-            _ui.WriteToConsole(c1, transcribeResult: true);
+            ReadOnlySpan<char> value = [c];
+            _ui.WriteToConsole(value, transcribeResult: true);
         }
 
         public override
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
index 38924f3e397..354c61fb8f3 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
@@ -15,7 +15,7 @@ namespace Microsoft.PowerShell
     /// <summary>
     /// Executor wraps a Pipeline instance, and provides helper methods for executing commands in that pipeline. It is used to
     /// provide bookkeeping and structure to the use of pipeline in such a way that they can be interrupted and cancelled by a
-    /// break event handler, and to track nesting of pipelines (which happens with interrupted input loops (aka subshells) and 
+    /// break event handler, and to track nesting of pipelines (which happens with interrupted input loops (aka subshells) and
     /// use of tab-completion in prompts). The bookkeeping is necessary because the break handler is static and global, and
     /// there is no means for tying a break handler to an instance of an object.
     ///
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
index 6dfd5d54e6f..acfdea07153 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
@@ -86,9 +86,9 @@ public static int Start([MarshalAs(UnmanagedType.LPArray, ArraySubType = Unmanag
             int exitCode = 0;
             try
             {
-                var banner = string.Format(
+                string banner = string.Format(
                     CultureInfo.InvariantCulture,
-                    ManagedEntranceStrings.ShellBannerNonWindowsPowerShell,
+                    ManagedEntranceStrings.ShellBannerPowerShell,
                     PSVersionInfo.GitCommitId);
 
                 ConsoleHost.DefaultInitialSessionState = InitialSessionState.CreateDefault2();
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/StartTranscriptCmdlet.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/StartTranscriptCmdlet.cs
index b220eae3bf8..18725b5ddb7 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/StartTranscriptCmdlet.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/StartTranscriptCmdlet.cs
@@ -177,7 +177,7 @@ protected override void BeginProcessing()
                 }
                 else
                 {
-                    _outFilename = (string)value;
+                    _outFilename = (string)PSObject.Base(value);
                 }
             }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/StopTranscriptCmdlet.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/StopTranscriptCmdlet.cs
index 71e90854dc4..093f7c147dc 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/StopTranscriptCmdlet.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/StopTranscriptCmdlet.cs
@@ -25,7 +25,7 @@ protected override
             {
                 return;
             }
-            
+
             try
             {
                 string outFilename = Host.UI.StopTranscribing();
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
index 28cd31473dd..eb4557c04d2 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
@@ -28,6 +28,9 @@ internal static class UpdatesNotification
         private const string StableBuildInfoURL = "https://aka.ms/pwsh-buildinfo-stable";
         private const string PreviewBuildInfoURL = "https://aka.ms/pwsh-buildinfo-preview";
 
+        private const int NotificationDelayDays = 7;
+        private const int UpdateCheckBackoffDays = 7;
+
         /// <summary>
         /// The version of new update is persisted using a file, not as the file content, but instead baked in the file name in the following template:
         ///  `update{notification-type}_{version}_{publish-date}` -- held by 's_updateFileNameTemplate',
@@ -57,12 +60,12 @@ internal static class UpdatesNotification
         static UpdatesNotification()
         {
             s_notificationType = GetNotificationType();
-            CanNotifyUpdates = s_notificationType != NotificationType.Off;
+            CanNotifyUpdates = s_notificationType != NotificationType.Off
+                && Platform.TryDeriveFromCache(PSVersionInfo.GitCommitId, out s_cacheDirectory);
 
             if (CanNotifyUpdates)
             {
                 s_enumOptions = new EnumerationOptions();
-                s_cacheDirectory = Path.Combine(Platform.CacheDirectory, PSVersionInfo.GitCommitId);
 
                 // Build the template/pattern strings for the configured notification type.
                 string typeNum = ((int)s_notificationType).ToString();
@@ -89,9 +92,18 @@ internal static void ShowUpdateNotification(PSHostUserInterface hostUI)
             if (TryParseUpdateFile(
                     updateFilePath: out _,
                     out SemanticVersion lastUpdateVersion,
-                    lastUpdateDate: out _)
+                    out DateTime lastUpdateDate)
                && lastUpdateVersion != null)
             {
+                DateTime today = DateTime.UtcNow;
+                if ((today - lastUpdateDate).TotalDays < NotificationDelayDays)
+                {
+                    // The update was out less than 1 week ago and it's possible the packages are still rolling out.
+                    // We only show the notification when the update is at least 1 week old, to reduce the chance that
+                    // users see the notification but cannot get the new update when they try to install it.
+                    return;
+                }
+
                 string releaseTag = lastUpdateVersion.ToString();
                 string notificationMsgTemplate = s_notificationType == NotificationType.LTS
                     ? ManagedEntranceStrings.LTSUpdateNotificationMessage
@@ -169,7 +181,7 @@ internal static async Task CheckForUpdates()
                 out DateTime lastUpdateDate);
 
             DateTime today = DateTime.UtcNow;
-            if (parseSuccess && updateFilePath != null && (today - lastUpdateDate).TotalDays < 7)
+            if (parseSuccess && updateFilePath != null && (today - lastUpdateDate).TotalDays < UpdateCheckBackoffDays)
             {
                 // There is an existing update file, and the last update was less than 1 week ago.
                 // It's unlikely a new version is released within 1 week, so we can skip this check.
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
index 34bb696c33c..33445ceebd2 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
@@ -225,4 +225,7 @@ Valid formats are:
   <data name="InvalidExecutionPolicyArgument" xml:space="preserve">
     <value>Invalid ExecutionPolicy value '{0}'.</value>
   </data>
+  <data name="MissingMandatoryArgument" xml:space="preserve">
+    <value>An argument is required to be supplied to the '{0}' parameter.</value>
+  </data>
 </root>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx
index ce124ec084c..9bc06e0d42f 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx
@@ -182,4 +182,10 @@ The current session does not support debugging; execution will continue.
   <data name="RunAsAdministrator" xml:space="preserve">
     <value>Run as Administrator</value>
   </data>
+  <data name="PushRunspaceNotRemote" xml:space="preserve">
+    <value>PushRunspace can only push a remote runspace.</value>
+  </data>
+  <data name="MissingMandatoryParameter" xml:space="preserve">
+    <value>The '{0}' parameter is mandatory and must be specified when using the '{1}' parameter.</value>
+  </data>
 </root>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index 40f02e7a37f..44ebf0fb538 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ShellBannerNonWindowsPowerShell" xml:space="preserve">
+  <data name="ShellBannerPowerShell" xml:space="preserve">
     <value>PowerShell {0}</value>
   </data>
   <data name="ShellBannerCLMode" xml:space="preserve">
@@ -132,9 +132,6 @@
   <data name="ShellBannerRLMode" xml:space="preserve">
     <value>[Restricted Language Mode]</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>
-  </data>
   <data name="PreviewUpdateNotificationMessage" xml:space="preserve">
     <value>  {1} A new PowerShell preview release is available: v{0} {2}
   {1} Upgrade now, or check out the release page at:{3}{2}
@@ -162,9 +159,9 @@
                   [-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}] 
-                  [-SettingsFile &lt;filePath&gt;] [-SSHServerMode] [-STA] 
-                  [-Version] [-WindowStyle &lt;style&gt;] 
+                  [-NoProfileLoadTime] [-OutputFormat {Text | XML}]
+                  [-SettingsFile &lt;filePath&gt;] [-SSHServerMode] [-STA]
+                  [-Version] [-WindowStyle &lt;style&gt;]
                   [-WorkingDirectory &lt;directoryPath&gt;]
 
        pwsh[.exe] -h | -Help | -? | /?
@@ -478,7 +475,7 @@ All parameters are case-insensitive.</value>
 -WindowStyle | -w
 
     Sets the window style for the session. Valid values are Normal, Minimized,
-    Maximized and Hidden.
+    Maximized, and Hidden.
 
 -WorkingDirectory | -wd
 
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 3c00ae295b8..dadff652e53 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="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="11.0.0-preview.3.26207.106" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
index c8e95628687..356cde68152 100644
--- a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
+++ b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 
@@ -30,9 +31,10 @@ public static int Main(string[] args)
 
             string platformFolder = isWindows ? WinFolderName : UnixFolderName;
 
-            string argsString = args.Length > 0 ? string.Join(" ", args) : null;
+            var arguments = new List<string>(args.Length + 1);
             var pwshPath = Path.Combine(currentPath, platformFolder, PwshDllName);
-            string processArgs = string.IsNullOrEmpty(argsString) ? $"\"{pwshPath}\"" : $"\"{pwshPath}\" {argsString}";
+            arguments.Add(pwshPath);
+            arguments.AddRange(args);
 
             if (File.Exists(pwshPath))
             {
@@ -41,7 +43,7 @@ public static int Main(string[] args)
                     e.Cancel = true;
                 };
 
-                var process = System.Diagnostics.Process.Start("dotnet", processArgs);
+                var process = System.Diagnostics.Process.Start("dotnet", arguments);
                 process.WaitForExit();
                 return process.ExitCode;
             }
diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/runtimeconfig.template.json b/src/Microsoft.PowerShell.GlobalTool.Shim/runtimeconfig.template.json
index 8ba6dc2eba9..4a5e3e367ec 100644
--- a/src/Microsoft.PowerShell.GlobalTool.Shim/runtimeconfig.template.json
+++ b/src/Microsoft.PowerShell.GlobalTool.Shim/runtimeconfig.template.json
@@ -1,4 +1,4 @@
-// This is required to roll forward to runtime 3.x when 2.x is not installed
+// This is required to roll forward to supported minor.patch versions of the runtime.
 {
-  "rollForwardOnNoCandidateFx": 2
+  "rollForwardOnNoCandidateFx": 1
 }
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/AddLocalGroupMemberCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/AddLocalGroupMemberCommand.cs
index 375a8101075..59cb3067efc 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/AddLocalGroupMemberCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/AddLocalGroupMemberCommand.cs
@@ -301,4 +301,3 @@ private void ProcessSid(SecurityIdentifier groupSid)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/DisableLocalUserCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/DisableLocalUserCommand.cs
index 09e7bdf9452..592c77726fe 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/DisableLocalUserCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/DisableLocalUserCommand.cs
@@ -217,4 +217,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/EnableLocalUserCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/EnableLocalUserCommand.cs
index e321a03e266..88627ba2e33 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/EnableLocalUserCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/EnableLocalUserCommand.cs
@@ -217,4 +217,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupCommand.cs
index 3965c362335..4c11a3c4c36 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupCommand.cs
@@ -168,4 +168,3 @@ private void ProcessSids()
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupMemberCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupMemberCommand.cs
index 8be09e1ded5..0b3625f6ef7 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupMemberCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalGroupMemberCommand.cs
@@ -233,4 +233,3 @@ private IEnumerable<LocalPrincipal> ProcessSid(SecurityIdentifier groupSid)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalUserCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalUserCommand.cs
index e469d043ffa..9f8d3b9311b 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalUserCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/GetLocalUserCommand.cs
@@ -170,4 +170,3 @@ private void ProcessSids()
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalGroupCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalGroupCommand.cs
index 59e4f4ca13f..b709d22a485 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalGroupCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalGroupCommand.cs
@@ -118,4 +118,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalUserCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalUserCommand.cs
index b3916f46071..d3402b5a4c9 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalUserCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/NewLocalUserCommand.cs
@@ -292,4 +292,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupCommand.cs
index 0c0af710af1..981643cf04c 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupCommand.cs
@@ -210,4 +210,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupMemberCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupMemberCommand.cs
index 7e132405b2a..47d0a77784e 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupMemberCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalGroupMemberCommand.cs
@@ -299,4 +299,3 @@ private void ProcessSid(SecurityIdentifier groupSid)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalUserCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalUserCommand.cs
index 0c61da2e117..6d6081fef7e 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalUserCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RemoveLocalUserCommand.cs
@@ -211,4 +211,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalGroupCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalGroupCommand.cs
index f32e3365086..c594fccb889 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalGroupCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalGroupCommand.cs
@@ -230,4 +230,3 @@ private bool CheckShouldProcess(string groupName, string newName)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalUserCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalUserCommand.cs
index e6b1297a7d5..c23cf41ac61 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalUserCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/RenameLocalUserCommand.cs
@@ -230,4 +230,3 @@ private bool CheckShouldProcess(string userName, string newName)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalGroupCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalGroupCommand.cs
index b1943971e3d..49ae31dacc7 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalGroupCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalGroupCommand.cs
@@ -177,4 +177,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalUserCommand.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalUserCommand.cs
index 8fafa52c9e4..3bfdc24ac03 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalUserCommand.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Commands/SetLocalUserCommand.cs
@@ -320,4 +320,3 @@ private bool CheckShouldProcess(string target)
     }
 
 }
-
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 749e916eab5..50d431225c7 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -16,25 +16,40 @@
 
   <ItemGroup>
     <!-- This section is to force the version of non-direct dependencies -->
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="11.0.0-preview.3.26207.106" />
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-rc.2.23479.6" />
-    <!--
-        the following package(s) are from https://github.com/dotnet/wcf
-        they are pinned to the version 4.10.x due to a breaking change in newer versions.
-        see https://github.com/PowerShell/PowerShell/issues/19238 for details.
-     -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.3" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.10.3" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.3" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.3" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.10.3" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
+    <PackageReference Include="System.IO.Packaging" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="11.0.0-preview.3.26207.106" />
+    <!-- the following package(s) are from https://github.com/dotnet/wcf -->
+    <PackageReference Include="System.ServiceModel.Http" Version="10.0.652802" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="10.0.652802" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="10.0.652802" />
     <!-- the source could not be found for the following package(s) -->
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-rc.2.23479.10" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="11.0.0-preview.3.26207.106" />
   </ItemGroup>
 
-</Project>
+  <!--
+    This target is invoked explicitly by Start-TypeGen in build.psm1 to collect the list of
+    reference assembly paths needed by TypeCatalogGen. It is not run during a normal build.
+
+    To find the available properties of '_ReferencesFromRAR' when switching to a new dotnet sdk:
+      1. Create a dummy project using the new dotnet sdk.
+      2. Build the dummy project with:
+         dotnet msbuild ./dummy.csproj /t:ResolveAssemblyReferencesDesignTime /fileLogger /noconsolelogger /v:diag
+      3. Search '_ReferencesFromRAR' in the produced 'msbuild.log' file.
+  -->
+  <Target Name="_GetDependencies" DependsOnTargets="ResolveAssemblyReferencesDesignTime">
+    <ItemGroup>
+      <!--
+        Excludes 'Microsoft.Management.Infrastructure' from the type catalog reference list,
+        as it is provided separately at runtime and must not be included in the generated catalog.
+      -->
+      <_RefAssemblyPath Include="%(_ReferencesFromRAR.OriginalItemSpec)%3B" Condition=" '%(_ReferencesFromRAR.NuGetPackageId)' != 'Microsoft.Management.Infrastructure' " />
+    </ItemGroup>
+    <WriteLinesToFile File="$(_DependencyFile)" Lines="@(_RefAssemblyPath)" Overwrite="true" />
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.PowerShell.ScheduledJob/AssemblyInfo.cs b/src/Microsoft.PowerShell.ScheduledJob/AssemblyInfo.cs
deleted file mode 100644
index 3e2e4ff3268..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Reflection;
-using System.Resources;
-
-[assembly:AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly:AssemblyVersion("3.0.0.0")]
-
-[assembly:AssemblyCulture("")]
-[assembly:NeutralResourcesLanguage("en-US")]
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJob.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJob.cs
deleted file mode 100644
index 5641b2d6540..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJob.cs
+++ /dev/null
@@ -1,1286 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.IO;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Runspaces;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Text;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This is a Job2 derived class that contains a DefinitionJob for
-    /// running job definition based jobs but can also save and load job
-    /// results data from file.  This class is used to load job result
-    /// data from previously run jobs so that a user can view results of
-    /// scheduled job runs.  This class also contains the definition of
-    /// the scheduled job and so can run an instance of the scheduled
-    /// job and optionally save results to file.
-    /// </summary>
-    public sealed class ScheduledJob : Job2, ISerializable
-    {
-        #region Private Members
-
-        private ScheduledJobDefinition _jobDefinition;
-        private Runspace _runspace;
-        private System.Management.Automation.PowerShell _powerShell;
-        private Job _job = null;
-        private bool _asyncJobStop;
-        private bool _allowSetShouldExit;
-        private PSHost _host;
-
-        private const string AllowHostSetShouldExit = "AllowSetShouldExitFromRemote";
-
-        private StatusInfo _statusInfo;
-
-        #endregion
-
-        #region Public Properties
-
-        /// <summary>
-        /// ScheduledJobDefinition.
-        /// </summary>
-        public ScheduledJobDefinition Definition
-        {
-            get { return _jobDefinition; }
-
-            internal set { _jobDefinition = value; }
-        }
-
-        /// <summary>
-        /// Location of job being run.
-        /// </summary>
-        public override string Location
-        {
-            get
-            {
-                return Status.Location;
-            }
-        }
-
-        /// <summary>
-        /// Status Message associated with the Job.
-        /// </summary>
-        public override string StatusMessage
-        {
-            get
-            {
-                return Status.StatusMessage;
-            }
-        }
-
-        /// <summary>
-        /// Indicates whether more data is available from Job.
-        /// </summary>
-        public override bool HasMoreData
-        {
-            get
-            {
-                return (_job != null) ?
-                    _job.HasMoreData
-                    :
-                    (Output.Count > 0 ||
-                     Error.Count > 0 ||
-                     Warning.Count > 0 ||
-                     Verbose.Count > 0 ||
-                     Progress.Count > 0 ||
-                     Debug.Count > 0 ||
-                     Information.Count > 0
-                     );
-            }
-        }
-
-        /// <summary>
-        /// Job command string.
-        /// </summary>
-        public new string Command
-        {
-            get
-            {
-                return Status.Command;
-            }
-        }
-
-        /// <summary>
-        /// Internal property indicating whether a SetShouldExit is honored
-        /// while running the scheduled job script.
-        /// </summary>
-        internal bool AllowSetShouldExit
-        {
-            get { return _allowSetShouldExit; }
-
-            set { _allowSetShouldExit = value; }
-        }
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="command">Job command string for display.</param>
-        /// <param name="name">Name of job.</param>
-        /// <param name="jobDefinition">ScheduledJobDefinition defining job to run.</param>
-        public ScheduledJob(
-            string command,
-            string name,
-            ScheduledJobDefinition jobDefinition) :
-            base(command, name)
-        {
-            if (command == null)
-            {
-                throw new PSArgumentNullException("command");
-            }
-
-            if (name == null)
-            {
-                throw new PSArgumentNullException("name");
-            }
-
-            if (jobDefinition == null)
-            {
-                throw new PSArgumentNullException("jobDefinition");
-            }
-
-            _jobDefinition = jobDefinition;
-
-            PSJobTypeName = ScheduledJobSourceAdapter.AdapterTypeName;
-        }
-
-        #endregion
-
-        #region Public Overrides
-
-        /// <summary>
-        /// Starts a job as defined by the contained ScheduledJobDefinition object.
-        /// </summary>
-        public override void StartJob()
-        {
-            lock (SyncRoot)
-            {
-                if (_job != null && !IsFinishedState(_job.JobStateInfo.State))
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.JobAlreadyRunning, _jobDefinition.Name);
-                    throw new PSInvalidOperationException(msg);
-                }
-
-                _statusInfo = null;
-                _asyncJobStop = false;
-                PSBeginTime = DateTime.Now;
-
-                if (_powerShell == null)
-                {
-                    InitialSessionState iss = InitialSessionState.CreateDefault2();
-                    iss.Commands.Clear();
-                    iss.Formats.Clear();
-                    iss.Commands.Add(
-                        new SessionStateCmdletEntry("Start-Job", typeof(Microsoft.PowerShell.Commands.StartJobCommand), null));
-
-                    // Get the default host from the default runspace.
-                    _host = GetDefaultHost();
-                    _runspace = RunspaceFactory.CreateRunspace(_host, iss);
-                    _runspace.Open();
-                    _powerShell = System.Management.Automation.PowerShell.Create();
-                    _powerShell.Runspace = _runspace;
-
-                    // Indicate SetShouldExit to host.
-                    AddSetShouldExitToHost();
-                }
-                else
-                {
-                    _powerShell.Commands.Clear();
-                }
-
-                _job = StartJobCommand(_powerShell);
-
-                _job.StateChanged += new EventHandler<JobStateEventArgs>(HandleJobStateChanged);
-                SetJobState(_job.JobStateInfo.State);
-
-                // Add all child jobs to this object's list so that
-                // the user and Receive-Job can retrieve results.
-                foreach (Job childJob in _job.ChildJobs)
-                {
-                    this.ChildJobs.Add(childJob);
-                }
-
-                // Add this job to the local repository.
-                ScheduledJobSourceAdapter.AddToRepository(this);
-            }
-        }
-
-        /// <summary>
-        /// Start job asynchronously.
-        /// </summary>
-        public override void StartJobAsync()
-        {
-            // StartJob();
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// Stop the job.
-        /// </summary>
-        public override void StopJob()
-        {
-            Job job;
-            JobState state;
-            lock (SyncRoot)
-            {
-                job = _job;
-                state = Status.State;
-                _asyncJobStop = false;
-            }
-
-            if (IsFinishedState(state))
-            {
-                return;
-            }
-
-            if (job == null)
-            {
-                // Set job state to failed so that it can be removed from the
-                // cache using Remove-Job.
-                SetJobState(JobState.Failed);
-            }
-            else
-            {
-                job.StopJob();
-            }
-        }
-
-        /// <summary>
-        /// Stop the job asynchronously.
-        /// </summary>
-        public override void StopJobAsync()
-        {
-            Job job;
-            JobState state;
-            lock (SyncRoot)
-            {
-                job = _job;
-                state = Status.State;
-                _asyncJobStop = true;
-            }
-
-            if (IsFinishedState(state))
-            {
-                return;
-            }
-
-            if (job == null)
-            {
-                // Set job state to failed so that it can be removed from the
-                // cache using Remove-Job.
-                SetJobState(JobState.Failed);
-                HandleJobStateChanged(this,
-                    new JobStateEventArgs(
-                        new JobStateInfo(JobState.Failed)));
-            }
-            else
-            {
-                job.StopJob();
-            }
-        }
-
-        /// <summary>
-        /// SuspendJob.
-        /// </summary>
-        public override void SuspendJob()
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// SuspendJobAsync.
-        /// </summary>
-        public override void SuspendJobAsync()
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// ResumeJob.
-        /// </summary>
-        public override void ResumeJob()
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// ResumeJobAsync.
-        /// </summary>
-        public override void ResumeJobAsync()
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// UnblockJob.
-        /// </summary>
-        public override void UnblockJob()
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// UnblockJobAsync.
-        /// </summary>
-        public override void UnblockJobAsync()
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// StopJob.
-        /// </summary>
-        /// <param name="force"></param>
-        /// <param name="reason"></param>
-        public override void StopJob(bool force, string reason)
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// StopJobAsync.
-        /// </summary>
-        /// <param name="force"></param>
-        /// <param name="reason"></param>
-        public override void StopJobAsync(bool force, string reason)
-        {
-            throw new PSNotSupportedException();
-        }
-        /// <summary>
-        /// SuspendJob.
-        /// </summary>
-        /// <param name="force"></param>
-        /// <param name="reason"></param>
-        public override void SuspendJob(bool force, string reason)
-        {
-            throw new PSNotSupportedException();
-        }
-
-        /// <summary>
-        /// SuspendJobAsync.
-        /// </summary>
-        /// <param name="force"></param>
-        /// <param name="reason"></param>
-        public override void SuspendJobAsync(bool force, string reason)
-        {
-            throw new PSNotSupportedException();
-        }
-
-        #endregion
-
-        #region Implementation of ISerializable
-
-        /// <summary>
-        /// Deserialize constructor.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        private ScheduledJob(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            DeserializeStatusInfo(info);
-            DeserializeResultsInfo(info);
-            PSJobTypeName = ScheduledJobSourceAdapter.AdapterTypeName;
-        }
-
-        /// <summary>
-        /// Serialize method.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        public void GetObjectData(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentException("info");
-            }
-
-            SerializeStatusInfo(info);
-            SerializeResultsInfo(info);
-        }
-
-        private void SerializeStatusInfo(SerializationInfo info)
-        {
-            StatusInfo statusInfo = new StatusInfo(
-                InstanceId,
-                Name,
-                Location,
-                Command,
-                StatusMessage,
-                (_job != null) ? _job.JobStateInfo.State : JobStateInfo.State,
-                HasMoreData,
-                PSBeginTime,
-                PSEndTime,
-                _jobDefinition);
-
-            info.AddValue("StatusInfo", statusInfo);
-        }
-
-        private void SerializeResultsInfo(SerializationInfo info)
-        {
-            // All other job information is in the child jobs.
-            Collection<PSObject> output = new Collection<PSObject>();
-            Collection<ErrorRecord> error = new Collection<ErrorRecord>();
-            Collection<WarningRecord> warning = new Collection<WarningRecord>();
-            Collection<VerboseRecord> verbose = new Collection<VerboseRecord>();
-            Collection<ProgressRecord> progress = new Collection<ProgressRecord>();
-            Collection<DebugRecord> debug = new Collection<DebugRecord>();
-            Collection<InformationRecord> information = new Collection<InformationRecord>();
-
-            if (_job != null)
-            {
-                // Collect data from "live" job.
-
-                if (JobStateInfo.Reason != null)
-                {
-                    error.Add(new ErrorRecord(JobStateInfo.Reason, "ScheduledJobFailedState", ErrorCategory.InvalidResult, null));
-                }
-
-                foreach (var item in _job.Error)
-                {
-                    error.Add(item);
-                }
-
-                foreach (Job childJob in ChildJobs)
-                {
-                    if (childJob.JobStateInfo.Reason != null)
-                    {
-                        error.Add(new ErrorRecord(childJob.JobStateInfo.Reason, "ScheduledJobFailedState", ErrorCategory.InvalidResult, null));
-                    }
-
-                    foreach (var item in childJob.Output)
-                    {
-                        output.Add(item);
-                    }
-
-                    foreach (var item in childJob.Error)
-                    {
-                        error.Add(item);
-                    }
-
-                    foreach (var item in childJob.Warning)
-                    {
-                        warning.Add(item);
-                    }
-
-                    foreach (var item in childJob.Verbose)
-                    {
-                        verbose.Add(item);
-                    }
-
-                    foreach (var item in childJob.Progress)
-                    {
-                        progress.Add(item);
-                    }
-
-                    foreach (var item in childJob.Debug)
-                    {
-                        debug.Add(item);
-                    }
-
-                    foreach (var item in childJob.Information)
-                    {
-                        information.Add(item);
-                    }
-                }
-            }
-            else
-            {
-                // Collect data from object collections.
-
-                foreach (var item in Output)
-                {
-                    // Wrap the base object in a new PSObject.  This is necessary because the
-                    // source deserialized PSObject doesn't serialize again correctly and breaks
-                    // PS F&O.  Not sure if this is a PSObject serialization bug or not.
-                    output.Add(new PSObject(item.BaseObject));
-                }
-
-                foreach (var item in Error)
-                {
-                    error.Add(item);
-                }
-
-                foreach (var item in Warning)
-                {
-                    warning.Add(item);
-                }
-
-                foreach (var item in Verbose)
-                {
-                    verbose.Add(item);
-                }
-
-                foreach (var item in Progress)
-                {
-                    progress.Add(item);
-                }
-
-                foreach (var item in Debug)
-                {
-                    debug.Add(item);
-                }
-
-                foreach (var item in Information)
-                {
-                    information.Add(item);
-                }
-            }
-
-            ResultsInfo resultsInfo = new ResultsInfo(
-                output, error, warning, verbose, progress, debug, information);
-
-           info.AddValue("ResultsInfo", resultsInfo);
-        }
-
-        private void DeserializeStatusInfo(SerializationInfo info)
-        {
-            StatusInfo statusInfo = (StatusInfo)info.GetValue("StatusInfo", typeof(StatusInfo));
-
-            Name = statusInfo.Name;
-            PSBeginTime = statusInfo.StartTime;
-            PSEndTime = statusInfo.StopTime;
-            _jobDefinition = statusInfo.Definition;
-            SetJobState(statusInfo.State, null);
-
-            lock (SyncRoot)
-            {
-                _statusInfo = statusInfo;
-            }
-        }
-
-        private void DeserializeResultsInfo(SerializationInfo info)
-        {
-            ResultsInfo resultsInfo = (ResultsInfo)info.GetValue("ResultsInfo", typeof(ResultsInfo));
-
-            // Output
-            CopyOutput(resultsInfo.Output);
-
-            // Error
-            CopyError(resultsInfo.Error);
-
-            // Warning
-            CopyWarning(resultsInfo.Warning);
-
-            // Verbose
-            CopyVerbose(resultsInfo.Verbose);
-
-            // Progress
-            CopyProgress(resultsInfo.Progress);
-
-            // Debug
-            CopyDebug(resultsInfo.Debug);
-
-            // Information
-            CopyInformation(resultsInfo.Information);
-        }
-
-        #endregion
-
-        #region Internal Methods
-
-        /// <summary>
-        /// Method to update a ScheduledJob based on new state and
-        /// result data from a provided Job.
-        /// </summary>
-        /// <param name="fromJob">ScheduledJob to update from.</param>
-        internal void Update(ScheduledJob fromJob)
-        {
-            // We do not update "live" jobs.
-            if (_job != null || fromJob == null)
-            {
-                return;
-            }
-
-            //
-            // Update status.
-            //
-            PSEndTime = fromJob.PSEndTime;
-            JobState state = fromJob.JobStateInfo.State;
-            if (Status.State != state)
-            {
-                SetJobState(state, null);
-            }
-
-            lock (SyncRoot)
-            {
-                _statusInfo = new StatusInfo(
-                    fromJob.InstanceId,
-                    fromJob.Name,
-                    fromJob.Location,
-                    fromJob.Command,
-                    fromJob.StatusMessage,
-                    state,
-                    fromJob.HasMoreData,
-                    fromJob.PSBeginTime,
-                    fromJob.PSEndTime,
-                    fromJob._jobDefinition);
-            }
-
-            //
-            // Update results.
-            //
-            CopyOutput(fromJob.Output);
-            CopyError(fromJob.Error);
-            CopyWarning(fromJob.Warning);
-            CopyVerbose(fromJob.Verbose);
-            CopyProgress(fromJob.Progress);
-            CopyDebug(fromJob.Debug);
-            CopyInformation(fromJob.Information);
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private System.Management.Automation.Host.PSHost GetDefaultHost()
-        {
-            System.Management.Automation.PowerShell ps = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace).AddScript("$host");
-            Collection<System.Management.Automation.Host.PSHost> hosts = ps.Invoke<System.Management.Automation.Host.PSHost>();
-            if (hosts == null || hosts.Count == 0)
-            {
-                System.Diagnostics.Debug.Assert(false, "Current runspace should always return default host.");
-                return null;
-            }
-
-            return hosts[0];
-        }
-
-        private Job StartJobCommand(System.Management.Automation.PowerShell powerShell)
-        {
-            Job job = null;
-
-            // Use PowerShell Start-Job cmdlet to run job.
-            powerShell.AddCommand("Start-Job");
-
-            powerShell.AddParameter("Name", _jobDefinition.Name);
-
-            // Add job parameters from the JobInvocationInfo object.
-            CommandParameterCollection parameters = _jobDefinition.InvocationInfo.Parameters[0];
-            foreach (CommandParameter parameter in parameters)
-            {
-                switch (parameter.Name)
-                {
-                    case "ScriptBlock":
-                        powerShell.AddParameter("ScriptBlock", parameter.Value as ScriptBlock);
-                        break;
-
-                    case "FilePath":
-                        powerShell.AddParameter("FilePath", parameter.Value as string);
-                        break;
-
-                    case "RunAs32":
-                        powerShell.AddParameter("RunAs32", (bool)parameter.Value);
-                        break;
-
-                    case "Authentication":
-                        powerShell.AddParameter("Authentication", (AuthenticationMechanism)parameter.Value);
-                        break;
-
-                    case "InitializationScript":
-                        powerShell.AddParameter("InitializationScript", parameter.Value as ScriptBlock);
-                        break;
-
-                    case "ArgumentList":
-                        powerShell.AddParameter("ArgumentList", parameter.Value as object[]);
-                        break;
-                }
-            }
-
-            // Start the job.
-            Collection<PSObject> rtn = powerShell.Invoke();
-            if (rtn != null && rtn.Count == 1)
-            {
-                job = rtn[0].BaseObject as Job;
-            }
-
-            return job;
-        }
-
-        private void HandleJobStateChanged(object sender, JobStateEventArgs e)
-        {
-            SetJobState(e.JobStateInfo.State);
-
-            if (IsFinishedState(e.JobStateInfo.State))
-            {
-                PSEndTime = DateTime.Now;
-
-                // Dispose the PowerShell and Runspace objects.
-                System.Management.Automation.PowerShell disposePowerShell = null;
-                Runspace disposeRunspace = null;
-                lock (SyncRoot)
-                {
-                    if (_job != null &&
-                        IsFinishedState(_job.JobStateInfo.State))
-                    {
-                        disposePowerShell = _powerShell;
-                        _powerShell = null;
-                        disposeRunspace = _runspace;
-                        _runspace = null;
-                    }
-                }
-
-                if (disposePowerShell != null)
-                {
-                    disposePowerShell.Dispose();
-                }
-
-                if (disposeRunspace != null)
-                {
-                    disposeRunspace.Dispose();
-                }
-
-                // Raise async job stopped event, if needed.
-                if (_asyncJobStop)
-                {
-                    _asyncJobStop = false;
-                    OnStopJobCompleted(new AsyncCompletedEventArgs(null, false, null));
-                }
-
-                // Remove AllowSetShouldExit from host.
-                RemoveSetShouldExitFromHost();
-            }
-        }
-
-        internal bool IsFinishedState(JobState state)
-        {
-            return (state == JobState.Completed || state == JobState.Failed || state == JobState.Stopped);
-        }
-
-        private StatusInfo Status
-        {
-            get
-            {
-                StatusInfo statusInfo;
-                lock (SyncRoot)
-                {
-                    if (_statusInfo != null)
-                    {
-                        // Pass back static status.
-                        statusInfo = _statusInfo;
-                    }
-                    else if (_job != null)
-                    {
-                        // Create current job status.
-                        statusInfo = new StatusInfo(
-                            _job.InstanceId,
-                            _job.Name,
-                            _job.Location,
-                            _job.Command,
-                            _job.StatusMessage,
-                            _job.JobStateInfo.State,
-                            _job.HasMoreData,
-                            PSBeginTime,
-                            PSEndTime,
-                            _jobDefinition);
-                    }
-                    else
-                    {
-                        // Create default static empty status.
-                        _statusInfo = new StatusInfo(
-                            Guid.Empty,
-                            string.Empty,
-                            string.Empty,
-                            string.Empty,
-                            string.Empty,
-                            JobState.NotStarted,
-                            false,
-                            PSBeginTime,
-                            PSEndTime,
-                            _jobDefinition);
-
-                        statusInfo = _statusInfo;
-                    }
-                }
-
-                return statusInfo;
-            }
-        }
-
-        private void CopyOutput(ICollection<PSObject> fromOutput)
-        {
-            PSDataCollection<PSObject> output = CopyResults<PSObject>(fromOutput);
-            if (output != null)
-            {
-                try
-                {
-                    Output = output;
-                }
-                catch (InvalidJobStateException) { }
-            }
-        }
-
-        private void CopyError(ICollection<ErrorRecord> fromError)
-        {
-            PSDataCollection<ErrorRecord> error = CopyResults<ErrorRecord>(fromError);
-            if (error != null)
-            {
-                try
-                {
-                    Error = error;
-                }
-                catch (InvalidJobStateException) { }
-            }
-        }
-
-        private void CopyWarning(ICollection<WarningRecord> fromWarning)
-        {
-            PSDataCollection<WarningRecord> warning = CopyResults<WarningRecord>(fromWarning);
-            if (warning != null)
-            {
-                try
-                {
-                    Warning = warning;
-                }
-                catch (InvalidJobStateException) { }
-            }
-        }
-
-        private void CopyVerbose(ICollection<VerboseRecord> fromVerbose)
-        {
-            PSDataCollection<VerboseRecord> verbose = CopyResults<VerboseRecord>(fromVerbose);
-            if (verbose != null)
-            {
-                try
-                {
-                    Verbose = verbose;
-                }
-                catch (InvalidJobStateException) { }
-            }
-        }
-
-        private void CopyProgress(ICollection<ProgressRecord> fromProgress)
-        {
-            PSDataCollection<ProgressRecord> progress = CopyResults<ProgressRecord>(fromProgress);
-            if (progress != null)
-            {
-                try
-                {
-                    Progress = progress;
-                }
-                catch (InvalidJobStateException) { }
-            }
-        }
-
-        private void CopyDebug(ICollection<DebugRecord> fromDebug)
-        {
-            PSDataCollection<DebugRecord> debug = CopyResults<DebugRecord>(fromDebug);
-            if (debug != null)
-            {
-                try
-                {
-                    Debug = debug;
-                }
-                catch (InvalidJobStateException) { }
-            }
-        }
-
-        private void CopyInformation(ICollection<InformationRecord> fromInformation)
-        {
-            PSDataCollection<InformationRecord> information = CopyResults<InformationRecord>(fromInformation);
-            if (information != null)
-            {
-                try
-                {
-                    Information = information;
-                }
-                catch (InvalidJobStateException) { }
-            }
-        }
-
-        private PSDataCollection<T> CopyResults<T>(ICollection<T> fromResults)
-        {
-            if (fromResults != null && fromResults.Count > 0)
-            {
-                PSDataCollection<T> returnResults = new PSDataCollection<T>();
-                foreach (var item in fromResults)
-                {
-                    returnResults.Add(item);
-                }
-
-                return returnResults;
-            }
-
-            return null;
-        }
-
-        private void AddSetShouldExitToHost()
-        {
-            if (!_allowSetShouldExit || _host == null)
-            {
-                return;
-            }
-
-            PSObject hostPrivateData = _host.PrivateData as PSObject;
-            if (hostPrivateData != null)
-            {
-                // Adds or replaces.
-                hostPrivateData.Properties.Add(new PSNoteProperty(AllowHostSetShouldExit, true));
-            }
-        }
-
-        private void RemoveSetShouldExitFromHost()
-        {
-            if (!_allowSetShouldExit || _host == null)
-            {
-                return;
-            }
-
-            PSObject hostPrivateData = _host.PrivateData as PSObject;
-            if (hostPrivateData != null)
-            {
-                // Removes if exists.
-                hostPrivateData.Properties.Remove(AllowHostSetShouldExit);
-            }
-        }
-
-        #endregion
-
-        #region Private ResultsInfo class
-        private sealed class ResultsInfo : ISerializable
-        {
-            // Private Members
-            private Collection<PSObject> _output;
-            private Collection<ErrorRecord> _error;
-            private Collection<WarningRecord> _warning;
-            private Collection<VerboseRecord> _verbose;
-            private Collection<ProgressRecord> _progress;
-            private Collection<DebugRecord> _debug;
-            private Collection<InformationRecord> _information;
-
-            // Properties
-            internal Collection<PSObject> Output
-            {
-                get { return _output; }
-            }
-
-            internal Collection<ErrorRecord> Error
-            {
-                get { return _error; }
-            }
-
-            internal Collection<WarningRecord> Warning
-            {
-                get { return _warning; }
-            }
-
-            internal Collection<VerboseRecord> Verbose
-            {
-                get { return _verbose; }
-            }
-
-            internal Collection<ProgressRecord> Progress
-            {
-                get { return _progress; }
-            }
-
-            internal Collection<DebugRecord> Debug
-            {
-                get { return _debug; }
-            }
-
-            internal Collection<InformationRecord> Information
-            {
-                get { return _information; }
-            }
-
-            // Constructors
-            internal ResultsInfo(
-                Collection<PSObject> output,
-                Collection<ErrorRecord> error,
-                Collection<WarningRecord> warning,
-                Collection<VerboseRecord> verbose,
-                Collection<ProgressRecord> progress,
-                Collection<DebugRecord> debug,
-                Collection<InformationRecord> information
-                )
-            {
-                if (output == null)
-                {
-                    throw new PSArgumentNullException("output");
-                }
-
-                if (error == null)
-                {
-                    throw new PSArgumentNullException("error");
-                }
-
-                if (warning == null)
-                {
-                    throw new PSArgumentNullException("warning");
-                }
-
-                if (verbose == null)
-                {
-                    throw new PSArgumentNullException("verbose");
-                }
-
-                if (progress == null)
-                {
-                    throw new PSArgumentNullException("progress");
-                }
-
-                if (debug == null)
-                {
-                    throw new PSArgumentNullException("debug");
-                }
-
-                if (information == null)
-                {
-                    throw new PSArgumentNullException("information");
-                }
-
-                _output = output;
-                _error = error;
-                _warning = warning;
-                _verbose = verbose;
-                _progress = progress;
-                _debug = debug;
-                _information = information;
-            }
-
-            // ISerializable
-            private ResultsInfo(
-                SerializationInfo info,
-                StreamingContext context)
-            {
-                if (info == null)
-                {
-                    throw new PSArgumentNullException("info");
-                }
-
-                _output = (Collection<PSObject>)info.GetValue("Results_Output", typeof(Collection<PSObject>));
-                _error = (Collection<ErrorRecord>)info.GetValue("Results_Error", typeof(Collection<ErrorRecord>));
-                _warning = (Collection<WarningRecord>)info.GetValue("Results_Warning", typeof(Collection<WarningRecord>));
-                _verbose = (Collection<VerboseRecord>)info.GetValue("Results_Verbose", typeof(Collection<VerboseRecord>));
-                _progress = (Collection<ProgressRecord>)info.GetValue("Results_Progress", typeof(Collection<ProgressRecord>));
-                _debug = (Collection<DebugRecord>)info.GetValue("Results_Debug", typeof(Collection<DebugRecord>));
-
-                try
-                {
-                    _information = (Collection<InformationRecord>)info.GetValue("Results_Information", typeof(Collection<InformationRecord>));
-                }
-                catch (SerializationException)
-                {
-                    // The job might not have the info stream. Ignore.
-                    _information = new Collection<InformationRecord>();
-                }
-            }
-
-            public void GetObjectData(
-                SerializationInfo info,
-                StreamingContext context)
-            {
-                if (info == null)
-                {
-                    throw new PSArgumentException("info");
-                }
-
-                info.AddValue("Results_Output", _output);
-                info.AddValue("Results_Error", _error);
-                info.AddValue("Results_Warning", _warning);
-                info.AddValue("Results_Verbose", _verbose);
-                info.AddValue("Results_Progress", _progress);
-                info.AddValue("Results_Debug", _debug);
-                info.AddValue("Results_Information", _information);
-            }
-        }
-
-        #endregion
-    }
-
-    #region Internal StatusInfo Class
-    internal class StatusInfo : ISerializable
-    {
-        // Private Members
-        private Guid _instanceId;
-        private string _name;
-        private string _location;
-        private string _command;
-        private string _statusMessage;
-        private JobState _jobState;
-        private bool _hasMoreData;
-        private DateTime? _startTime;
-        private DateTime? _stopTime;
-        private ScheduledJobDefinition _definition;
-
-        // Properties
-        internal Guid InstanceId
-        {
-            get { return _instanceId; }
-        }
-
-        internal string Name
-        {
-            get { return _name; }
-        }
-
-        internal string Location
-        {
-            get { return _location; }
-        }
-
-        internal string Command
-        {
-            get { return _command; }
-        }
-
-        internal string StatusMessage
-        {
-            get { return _statusMessage; }
-        }
-
-        internal JobState State
-        {
-            get { return _jobState; }
-        }
-
-        internal bool HasMoreData
-        {
-            get { return _hasMoreData; }
-        }
-
-        internal DateTime? StartTime
-        {
-            get { return _startTime; }
-        }
-
-        internal DateTime? StopTime
-        {
-            get { return _stopTime; }
-        }
-
-        internal ScheduledJobDefinition Definition
-        {
-            get { return _definition; }
-        }
-
-        // Constructors
-        internal StatusInfo(
-            Guid instanceId,
-            string name,
-            string location,
-            string command,
-            string statusMessage,
-            JobState jobState,
-            bool hasMoreData,
-            DateTime? startTime,
-            DateTime? stopTime,
-            ScheduledJobDefinition definition)
-        {
-            if (definition == null)
-            {
-                throw new PSArgumentNullException("definition");
-            }
-
-            _instanceId = instanceId;
-            _name = name;
-            _location = location;
-            _command = command;
-            _statusMessage = statusMessage;
-            _jobState = jobState;
-            _hasMoreData = hasMoreData;
-            _startTime = startTime;
-            _stopTime = stopTime;
-            _definition = definition;
-        }
-
-        // ISerializable
-        private StatusInfo(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            _instanceId = Guid.Parse(info.GetString("Status_InstanceId"));
-            _name = info.GetString("Status_Name");
-            _location = info.GetString("Status_Location");
-            _command = info.GetString("Status_Command");
-            _statusMessage = info.GetString("Status_Message");
-            _jobState = (JobState)info.GetValue("Status_State", typeof(JobState));
-            _hasMoreData = info.GetBoolean("Status_MoreData");
-            _definition = (ScheduledJobDefinition)info.GetValue("Status_Definition", typeof(ScheduledJobDefinition));
-
-            DateTime startTime = info.GetDateTime("Status_StartTime");
-            if (startTime != DateTime.MinValue)
-            {
-                _startTime = startTime;
-            }
-            else
-            {
-                _startTime = null;
-            }
-
-            DateTime stopTime = info.GetDateTime("Status_StopTime");
-            if (stopTime != DateTime.MinValue)
-            {
-                _stopTime = stopTime;
-            }
-            else
-            {
-                _stopTime = null;
-            }
-        }
-
-        public void GetObjectData(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            info.AddValue("Status_InstanceId", _instanceId);
-            info.AddValue("Status_Name", _name);
-            info.AddValue("Status_Location", _location);
-            info.AddValue("Status_Command", _command);
-            info.AddValue("Status_Message", _statusMessage);
-            info.AddValue("Status_State", _jobState);
-            info.AddValue("Status_MoreData", _hasMoreData);
-            info.AddValue("Status_Definition", _definition);
-
-            if (_startTime != null)
-            {
-                info.AddValue("Status_StartTime", _startTime);
-            }
-            else
-            {
-                info.AddValue("Status_StartTime", DateTime.MinValue);
-            }
-
-            if (_stopTime != null)
-            {
-                info.AddValue("Status_StopTime", _stopTime);
-            }
-            else
-            {
-                info.AddValue("Status_StopTime", DateTime.MinValue);
-            }
-        }
-    }
-
-    #endregion
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobDefinition.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobDefinition.cs
deleted file mode 100644
index bfe2e87f6ee..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobDefinition.cs
+++ /dev/null
@@ -1,2583 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.IO;
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
-using System.Management.Automation.Tracing;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This class contains all information needed to define a PowerShell job that
-    /// can be scheduled to run through either stand-alone or through the Windows
-    /// Task Scheduler.
-    /// </summary>
-    public sealed class ScheduledJobDefinition : ISerializable, IDisposable
-    {
-        #region Private Members
-
-        private JobInvocationInfo _invocationInfo;
-        private ScheduledJobOptions _options;
-        private PSCredential _credential;
-        private Guid _globalId = Guid.NewGuid();
-        private string _name = string.Empty;
-        private int _id = GetCurrentId();
-        private int _executionHistoryLength = DefaultExecutionHistoryLength;
-        private bool _enabled = true;
-        private Dictionary<Int32, ScheduledJobTrigger> _triggers = new Dictionary<Int32, ScheduledJobTrigger>();
-        private Int32 _currentTriggerId;
-
-        private string _definitionFilePath;
-        private string _definitionOutputPath;
-
-        private bool _isDisposed;
-
-        // Task Action strings.
-        private const string TaskExecutionPath = @"pwsh.exe";
-        private const string TaskArguments = @"-NoLogo -NonInteractive -WindowStyle Hidden -Command ""Import-Module PSScheduledJob; $jobDef = [Microsoft.PowerShell.ScheduledJob.ScheduledJobDefinition]::LoadFromStore('{0}', '{1}'); $jobDef.Run()""";
-        private static object LockObject = new object();
-        private static int CurrentId = 0;
-        private static int DefaultExecutionHistoryLength = 32;
-
-        internal static ScheduledJobDefinitionRepository Repository = new ScheduledJobDefinitionRepository();
-
-        // Task Scheduler COM error codes.
-        private const int TSErrorDisabledTask = -2147216602;
-
-        #endregion
-
-        #region Public Properties
-
-        /// <summary>
-        /// Contains information needed to run the job such as script parameters,
-        /// job definition, user credentials, etc.
-        /// </summary>
-        public JobInvocationInfo InvocationInfo
-        {
-            get { return _invocationInfo; }
-        }
-
-        /// <summary>
-        /// Contains the script commands that define the job.
-        /// </summary>
-        public JobDefinition Definition
-        {
-            get { return _invocationInfo.Definition; }
-        }
-
-        /// <summary>
-        /// Specifies Task Scheduler options for the scheduled job.
-        /// </summary>
-        public ScheduledJobOptions Options
-        {
-            get { return new ScheduledJobOptions(_options); }
-        }
-
-        /// <summary>
-        /// Credential.
-        /// </summary>
-        public PSCredential Credential
-        {
-            get { return _credential; }
-
-            internal set { _credential = value; }
-        }
-
-        /// <summary>
-        /// An array of trigger objects that specify a time/condition
-        /// for when the job is run.
-        /// </summary>
-        public List<ScheduledJobTrigger> JobTriggers
-        {
-            get
-            {
-                List<Int32> notFoundIds;
-                return GetTriggers(null, out notFoundIds);
-            }
-        }
-
-        /// <summary>
-        /// Local instance Id for object instance.
-        /// </summary>
-        public int Id
-        {
-            get { return _id; }
-        }
-
-        /// <summary>
-        /// Global Id for scheduled job definition.
-        /// </summary>
-        public Guid GlobalId
-        {
-            get { return _globalId; }
-        }
-
-        /// <summary>
-        /// Name of scheduled job definition.
-        /// </summary>
-        public string Name
-        {
-            get { return _name; }
-        }
-
-        /// <summary>
-        /// Job command.
-        /// </summary>
-        public string Command
-        {
-            get { return _invocationInfo.Command; }
-        }
-
-        /// <summary>
-        /// Returns the maximum number of job execution data
-        /// allowed in the job store.
-        /// </summary>
-        public int ExecutionHistoryLength
-        {
-            get { return _executionHistoryLength; }
-        }
-
-        /// <summary>
-        /// Determines whether this scheduled job definition is enabled
-        /// in Task Scheduler.
-        /// </summary>
-        public bool Enabled
-        {
-            get { return _enabled; }
-        }
-
-        /// <summary>
-        /// Returns the PowerShell command line execution path.
-        /// </summary>
-        public string PSExecutionPath
-        {
-            get { return TaskExecutionPath; }
-        }
-
-        /// <summary>
-        /// Returns PowerShell command line arguments to run
-        /// the scheduled job.
-        /// </summary>
-        public string PSExecutionArgs
-        {
-            get
-            {
-                // Escape single quotes in name.  Double quotes are not allowed
-                // and are caught during name validation.
-                string nameEscapeQuotes = _invocationInfo.Name.Replace("'", "''");
-
-                return string.Format(CultureInfo.InvariantCulture, TaskArguments, nameEscapeQuotes, _definitionFilePath);
-            }
-        }
-
-        /// <summary>
-        /// Returns the job run output path for this job definition.
-        /// </summary>
-        internal string OutputPath
-        {
-            get { return _definitionOutputPath; }
-        }
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Default constructor is not accessible.
-        /// </summary>
-        private ScheduledJobDefinition()
-        { }
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="invocationInfo">Information to invoke Job.</param>
-        /// <param name="triggers">ScheduledJobTriggers.</param>
-        /// <param name="options">ScheduledJobOptions.</param>
-        /// <param name="credential">Credential.</param>
-        public ScheduledJobDefinition(
-            JobInvocationInfo invocationInfo,
-            IEnumerable<ScheduledJobTrigger> triggers,
-            ScheduledJobOptions options,
-            PSCredential credential)
-        {
-            if (invocationInfo == null)
-            {
-                throw new PSArgumentNullException("invocationInfo");
-            }
-
-            _name = invocationInfo.Name;
-            _invocationInfo = invocationInfo;
-
-            SetTriggers(triggers, false);
-            _options = (options != null) ? new ScheduledJobOptions(options) :
-                                           new ScheduledJobOptions();
-            _options.JobDefinition = this;
-
-            _credential = credential;
-        }
-
-        #endregion
-
-        #region ISerializable Implementation
-
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        private ScheduledJobDefinition(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            _options = (ScheduledJobOptions)info.GetValue("Options_Member", typeof(ScheduledJobOptions));
-            _globalId = Guid.Parse(info.GetString("GlobalId_Member"));
-            _name = info.GetString("Name_Member");
-            _executionHistoryLength = info.GetInt32("HistoryLength_Member");
-            _enabled = info.GetBoolean("Enabled_Member");
-            _triggers = (Dictionary<Int32, ScheduledJobTrigger>)info.GetValue("Triggers_Member", typeof(Dictionary<Int32, ScheduledJobTrigger>));
-            _currentTriggerId = info.GetInt32("CurrentTriggerId_Member");
-            _definitionFilePath = info.GetString("FilePath_Member");
-            _definitionOutputPath = info.GetString("OutputPath_Member");
-
-            object invocationObject = info.GetValue("InvocationInfo_Member", typeof(object));
-            _invocationInfo = invocationObject as JobInvocationInfo;
-
-            // Set the JobDefinition reference for the ScheduledJobTrigger and
-            // ScheduledJobOptions objects.
-            _options.JobDefinition = this;
-            foreach (ScheduledJobTrigger trigger in _triggers.Values)
-            {
-                trigger.JobDefinition = this;
-            }
-
-            // Instance information.
-            _isDisposed = false;
-        }
-
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        public void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            info.AddValue("Options_Member", _options);
-            info.AddValue("GlobalId_Member", _globalId.ToString());
-            info.AddValue("Name_Member", _name);
-            info.AddValue("HistoryLength_Member", _executionHistoryLength);
-            info.AddValue("Enabled_Member", _enabled);
-            info.AddValue("Triggers_Member", _triggers);
-            info.AddValue("CurrentTriggerId_Member", _currentTriggerId);
-            info.AddValue("FilePath_Member", _definitionFilePath);
-            info.AddValue("OutputPath_Member", _definitionOutputPath);
-
-            info.AddValue("InvocationInfo_Member", _invocationInfo);
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Updates existing information if scheduled job already exists.
-        /// WTS entry includes command line, options, and trigger conditions.
-        /// </summary>
-        private void UpdateWTSFromDefinition()
-        {
-            using (ScheduledJobWTS taskScheduler = new ScheduledJobWTS())
-            {
-                taskScheduler.UpdateTask(this);
-            }
-        }
-
-        /// <summary>
-        /// Compares the current ScheduledJobDefinition task scheduler information
-        /// with the corresponding information stored in Task Scheduler.  If the
-        /// information is different then the task scheduler information in this
-        /// object is updated to match what is in Task Scheduler, since that information
-        /// takes precedence.
-        ///
-        /// Task Scheduler information:
-        /// - Triggers
-        /// - Options
-        /// - Enabled state.
-        /// </summary>
-        /// <returns>Boolean if this object data is modified.</returns>
-        private bool UpdateDefinitionFromWTS()
-        {
-            bool dataModified = false;
-
-            // Get information from Task Scheduler.
-            using (ScheduledJobWTS taskScheduler = new ScheduledJobWTS())
-            {
-                bool wtsEnabled = taskScheduler.GetTaskEnabled(_name);
-                ScheduledJobOptions wtsOptions = taskScheduler.GetJobOptions(_name);
-                Collection<ScheduledJobTrigger> wtsTriggers = taskScheduler.GetJobTriggers(_name);
-
-                //
-                // Compare with existing object data and modify if necessary.
-                //
-
-                // Enabled.
-                if (wtsEnabled != _enabled)
-                {
-                    _enabled = wtsEnabled;
-                    dataModified = true;
-                }
-
-                // Options.
-                if (wtsOptions.DoNotAllowDemandStart != _options.DoNotAllowDemandStart ||
-                    wtsOptions.IdleDuration != _options.IdleDuration ||
-                    wtsOptions.IdleTimeout != _options.IdleTimeout ||
-                    wtsOptions.MultipleInstancePolicy != _options.MultipleInstancePolicy ||
-                    wtsOptions.RestartOnIdleResume != _options.RestartOnIdleResume ||
-                    wtsOptions.RunElevated != _options.RunElevated ||
-                    wtsOptions.RunWithoutNetwork != _options.RunWithoutNetwork ||
-                    wtsOptions.ShowInTaskScheduler != _options.ShowInTaskScheduler ||
-                    wtsOptions.StartIfNotIdle != _options.StartIfNotIdle ||
-                    wtsOptions.StartIfOnBatteries != _options.StartIfOnBatteries ||
-                    wtsOptions.StopIfGoingOffIdle != _options.StopIfGoingOffIdle ||
-                    wtsOptions.StopIfGoingOnBatteries != _options.StopIfGoingOnBatteries ||
-                    wtsOptions.WakeToRun != _options.WakeToRun)
-                {
-                    // Keep the current scheduled job definition reference.
-                    wtsOptions.JobDefinition = _options.JobDefinition;
-                    _options = wtsOptions;
-                    dataModified = true;
-                }
-
-                // Triggers.
-                if (_triggers.Count != wtsTriggers.Count)
-                {
-                    SetTriggers(wtsTriggers, false);
-                    dataModified = true;
-                }
-                else
-                {
-                    bool foundTriggerDiff = false;
-
-                    // Compare each trigger object.
-                    foreach (var wtsTrigger in wtsTriggers)
-                    {
-                        if (_triggers.ContainsKey(wtsTrigger.Id) == false)
-                        {
-                            foundTriggerDiff = true;
-                            break;
-                        }
-
-                        ScheduledJobTrigger trigger = _triggers[wtsTrigger.Id];
-                        if (trigger.DaysOfWeek != wtsTrigger.DaysOfWeek ||
-                            trigger.Enabled != wtsTrigger.Enabled ||
-                            trigger.Frequency != wtsTrigger.Frequency ||
-                            trigger.Interval != wtsTrigger.Interval ||
-                            trigger.RandomDelay != wtsTrigger.RandomDelay ||
-                            trigger.At != wtsTrigger.At ||
-                            trigger.User != wtsTrigger.User)
-                        {
-                            foundTriggerDiff = true;
-                            break;
-                        }
-                    }
-
-                    if (foundTriggerDiff)
-                    {
-                        SetTriggers(wtsTriggers, false);
-                        dataModified = true;
-                    }
-                }
-            }
-
-            return dataModified;
-        }
-
-        /// <summary>
-        /// Adds this scheduled job definition to the Task Scheduler.
-        /// </summary>
-        private void AddToWTS()
-        {
-            using (ScheduledJobWTS taskScheduler = new ScheduledJobWTS())
-            {
-                taskScheduler.CreateTask(this);
-            }
-        }
-
-        /// <summary>
-        /// Removes this scheduled job definition from the Task Scheduler.
-        /// This operation will fail if a current instance of this job definition
-        /// is running.
-        /// If force == true then all current instances will be stopped.
-        /// </summary>
-        /// <param name="force">Force removal and stop all running instances.</param>
-        private void RemoveFromWTS(bool force)
-        {
-            using (ScheduledJobWTS taskScheduler = new ScheduledJobWTS())
-            {
-                taskScheduler.RemoveTask(this, force);
-            }
-        }
-
-        /// <summary>
-        /// Adds this scheduled job definition to the job definition store.
-        /// </summary>
-        private void AddToJobStore()
-        {
-            FileStream fs = null;
-            try
-            {
-                fs = ScheduledJobStore.CreateFileForJobDefinition(Name);
-                _definitionFilePath = ScheduledJobStore.GetJobDefinitionLocation();
-                _definitionOutputPath = ScheduledJobStore.GetJobRunOutputDirectory(Name);
-
-                XmlObjectSerializer serializer = new System.Runtime.Serialization.NetDataContractSerializer();
-                serializer.WriteObject(fs, this);
-                fs.Flush();
-            }
-            finally
-            {
-                if (fs != null)
-                {
-                    fs.Close();
-                }
-            }
-
-            // If credentials are provided then update permissions.
-            if (Credential != null)
-            {
-                UpdateFilePermissions(Credential.UserName);
-            }
-        }
-
-        /// <summary>
-        /// Updates existing file with this definition information.
-        /// </summary>
-        private void UpdateJobStore()
-        {
-            FileStream fs = null;
-            try
-            {
-                // Overwrite the existing file.
-                fs = GetFileStream(
-                    Name,
-                    _definitionFilePath,
-                    FileMode.Create,
-                    FileAccess.Write,
-                    FileShare.None);
-
-                XmlObjectSerializer serializer = new System.Runtime.Serialization.NetDataContractSerializer();
-                serializer.WriteObject(fs, this);
-                fs.Flush();
-            }
-            finally
-            {
-                if (fs != null)
-                {
-                    fs.Close();
-                }
-            }
-
-            // If credentials are provided then update permissions.
-            if (Credential != null)
-            {
-                UpdateFilePermissions(Credential.UserName);
-            }
-        }
-
-        /// <summary>
-        /// Updates definition file permissions for provided user account.
-        /// </summary>
-        /// <param name="user">Account user name.</param>
-        private void UpdateFilePermissions(string user)
-        {
-            Exception ex = null;
-            try
-            {
-                // Add user for read access to the job definition file.
-                ScheduledJobStore.SetReadAccessOnDefinitionFile(Name, user);
-
-                // Add user for write access to the job run Output directory.
-                ScheduledJobStore.SetWriteAccessOnJobRunOutput(Name, user);
-            }
-            catch (System.Security.Principal.IdentityNotMappedException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (ArgumentNullException e)
-            {
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorSettingAccessPermissions, this.Name, Credential.UserName);
-                throw new ScheduledJobException(msg, ex);
-            }
-        }
-
-        /// <summary>
-        /// Removes this scheduled job definition from the job definition store.
-        /// </summary>
-        private void RemoveFromJobStore()
-        {
-            ScheduledJobStore.RemoveJobDefinition(Name);
-        }
-
-        /// <summary>
-        /// Throws exception if object is disposed.
-        /// </summary>
-        private void IsDisposed()
-        {
-            if (_isDisposed == true)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.DefinitionObjectDisposed, Name);
-                throw new RuntimeException(msg);
-            }
-        }
-
-        /// <summary>
-        /// If repository is empty try refreshing it from the store.
-        /// </summary>
-        private void LoadRepository()
-        {
-            ScheduledJobDefinition.RefreshRepositoryFromStore();
-        }
-
-        /// <summary>
-        /// Validates all triggers in collection.  An exception is thrown
-        /// for invalid triggers.
-        /// </summary>
-        /// <param name="triggers"></param>
-        private void ValidateTriggers(IEnumerable<ScheduledJobTrigger> triggers)
-        {
-            if (triggers != null)
-            {
-                foreach (var trigger in triggers)
-                {
-                    trigger.Validate();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Validates the job definition name.  Since the job definition
-        /// name is used in the job store as a directory name, make sure
-        /// it does not contain any invalid characters.
-        /// </summary>
-        private static void ValidateName(string name)
-        {
-            if (name.IndexOfAny(System.IO.Path.GetInvalidFileNameChars()) != -1)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidJobDefName, name);
-                throw new ScheduledJobException(msg);
-            }
-        }
-
-        /// <summary>
-        /// Iterates through all job run files, opens each job
-        /// run and renames it to the provided new name.
-        /// </summary>
-        /// <param name="newDefName">New job run name.</param>
-        private void UpdateJobRunNames(
-            string newDefName)
-        {
-            // Job run results will be under the new scheduled job definition name.
-            Collection<DateTime> jobRuns = ScheduledJobSourceAdapter.GetJobRuns(newDefName);
-            if (jobRuns == null)
-            {
-                return;
-            }
-
-            // Load and rename each job.
-            ScheduledJobDefinition definition = ScheduledJobDefinition.LoadFromStore(newDefName, null);
-            foreach (DateTime jobRun in jobRuns)
-            {
-                ScheduledJob job = null;
-                try
-                {
-                    job = ScheduledJobSourceAdapter.LoadJobFromStore(definition.Name, jobRun) as ScheduledJob;
-                }
-                catch (ScheduledJobException)
-                {
-                    continue;
-                }
-                catch (DirectoryNotFoundException)
-                {
-                    continue;
-                }
-                catch (FileNotFoundException)
-                {
-                    continue;
-                }
-                catch (UnauthorizedAccessException)
-                {
-                    continue;
-                }
-                catch (IOException)
-                {
-                    continue;
-                }
-
-                if (job != null)
-                {
-                    job.Name = newDefName;
-                    job.Definition = definition;
-                    ScheduledJobSourceAdapter.SaveJobToStore(job);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Handles known Task Scheduler COM error codes.
-        /// </summary>
-        /// <param name="e">COMException.</param>
-        /// <returns>Error message.</returns>
-        private string ConvertCOMErrorCode(System.Runtime.InteropServices.COMException e)
-        {
-            string msg = null;
-            switch (e.ErrorCode)
-            {
-                case TSErrorDisabledTask:
-                    msg = ScheduledJobErrorStrings.ReasonTaskDisabled;
-                    break;
-            }
-
-            return msg;
-        }
-
-        #endregion
-
-        #region Internal Methods
-
-        /// <summary>
-        /// Save object to store.
-        /// </summary>
-        internal void SaveToStore()
-        {
-            IsDisposed();
-
-            UpdateJobStore();
-        }
-
-        /// <summary>
-        /// Compares the task scheduler information in this object with
-        /// what is stored in Task Scheduler.  If there is a difference
-        /// then this object is updated with the information from Task
-        /// Scheduler and saved to the job store.
-        /// </summary>
-        internal void SyncWithWTS()
-        {
-            Exception notFoundEx = null;
-            try
-            {
-                if (UpdateDefinitionFromWTS())
-                {
-                    SaveToStore();
-                }
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                notFoundEx = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                notFoundEx = e;
-            }
-
-            if (notFoundEx != null)
-            {
-                // There is no corresponding Task Scheduler item for this
-                // scheduled job definition.  Remove this definition from
-                // the job store for consistency.
-                Remove(true);
-                throw notFoundEx;
-            }
-        }
-
-        /// <summary>
-        /// Renames scheduled job definition, store directory and task scheduler task.
-        /// </summary>
-        /// <param name="newName">New name of job definition.</param>
-        internal void RenameAndSave(string newName)
-        {
-            if (InvocationInfo.Name.Equals(newName, StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            ValidateName(newName);
-
-            // Attempt to rename job store directory.  Detect if new name
-            // is not unique.
-            string oldName = InvocationInfo.Name;
-            Exception ex = null;
-            try
-            {
-                ScheduledJobStore.RenameScheduledJobDefDir(oldName, newName);
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                string msg;
-                if (!string.IsNullOrEmpty(ex.Message))
-                {
-                    msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorRenamingScheduledJobWithMessage, oldName, newName, ex.Message);
-                }
-                else
-                {
-                    msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorRenamingScheduledJob, oldName, newName);
-                }
-
-                throw new ScheduledJobException(msg, ex);
-            }
-
-            try
-            {
-                // Remove old named Task Scheduler task.
-                // This also stops any existing running job.
-                RemoveFromWTS(true);
-
-                // Update job definition names.
-                _name = newName;
-                InvocationInfo.Name = newName;
-                InvocationInfo.Definition.Name = newName;
-                _definitionOutputPath = ScheduledJobStore.GetJobRunOutputDirectory(Name);
-
-                // Update job definition in new job store location.
-                UpdateJobStore();
-
-                // Add new Task Scheduler task with new name.
-                // Jobs can start running again.
-                AddToWTS();
-
-                // Update any existing job run names.
-                UpdateJobRunNames(newName);
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            finally
-            {
-                // Clear job run cache since job runs now appear in new directory location.
-                ScheduledJobSourceAdapter.ClearRepository();
-            }
-
-            // If any part of renaming the various scheduled job components fail,
-            // aggressively remove scheduled job corrupted state and inform user.
-            if (ex != null)
-            {
-                try
-                {
-                    Remove(true);
-                }
-                catch (ScheduledJobException e)
-                {
-                    ex.Data.Add("SchedJobRemoveError", e);
-                }
-
-                string msg;
-                if (!string.IsNullOrEmpty(ex.Message))
-                {
-                    msg = StringUtil.Format(ScheduledJobErrorStrings.BrokenRenamingScheduledJobWithMessage, oldName, newName, ex.Message);
-                }
-                else
-                {
-                    msg = StringUtil.Format(ScheduledJobErrorStrings.BrokenRenamingScheduledJob, oldName, newName);
-                }
-
-                throw new ScheduledJobException(msg, ex);
-            }
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Registers this scheduled job definition object by doing the
-        /// following:
-        ///  a) Writing this object to the scheduled job object store.
-        ///  b) Registering this job as a Windows Task Scheduler task.
-        ///  c) Adding this object to the local repository.
-        /// </summary>
-        public void Register()
-        {
-            IsDisposed();
-
-            LoadRepository();
-
-            ValidateName(Name);
-
-            // First add to the job store.  If an exception occurs here
-            // then this method fails with no clean up.
-            Exception ex = null;
-            bool corruptedFile = false;
-            try
-            {
-                AddToJobStore();
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            catch (System.Runtime.Serialization.SerializationException e)
-            {
-                corruptedFile = true;
-                ex = e;
-            }
-            catch (System.Runtime.Serialization.InvalidDataContractException e)
-            {
-                corruptedFile = true;
-                ex = e;
-            }
-            catch (ScheduledJobException e)
-            {
-                // Can be thrown for error setting file access permissions with supplied credentials.
-                // But file is not considered corrupted if it already exists.
-                corruptedFile = !(e.FQEID.Equals(ScheduledJobStore.ScheduledJobDefExistsFQEID, StringComparison.OrdinalIgnoreCase));
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                if (corruptedFile)
-                {
-                    // Remove from store.
-                    try
-                    {
-                        ScheduledJobStore.RemoveJobDefinition(Name);
-                    }
-                    catch (DirectoryNotFoundException)
-                    { }
-                    catch (FileNotFoundException)
-                    { }
-                    catch (UnauthorizedAccessException)
-                    { }
-                    catch (IOException)
-                    { }
-                }
-
-                if (ex is not ScheduledJobException)
-                {
-                    // Wrap in ScheduledJobException type.
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorRegisteringDefinitionStore, this.Name);
-                    throw new ScheduledJobException(msg, ex);
-                }
-                else
-                {
-                    // Otherwise just re-throw.
-                    throw ex;
-                }
-            }
-
-            // Next register with the Task Scheduler.
-            ex = null;
-            try
-            {
-                AddToWTS();
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            catch (System.Runtime.InteropServices.COMException e)
-            {
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                // Clean up job store.
-                RemoveFromJobStore();
-
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorRegisteringDefinitionTask,
-                    this.Name,
-                    (string.IsNullOrEmpty(ex.Message) == false) ? ex.Message : string.Empty);
-                throw new ScheduledJobException(msg, ex);
-            }
-
-            // Finally add to the local repository.
-            Repository.AddOrReplace(this);
-        }
-
-        /// <summary>
-        /// Saves this scheduled job definition object:
-        ///  a) Rewrites this object to the scheduled job object store.
-        ///  b) Updates the Windows Task Scheduler task.
-        /// </summary>
-        public void Save()
-        {
-            IsDisposed();
-
-            LoadRepository();
-
-            ValidateName(Name);
-
-            // First update the Task Scheduler.  If an exception occurs here then
-            // we fail with no clean up.
-            Exception ex = null;
-            try
-            {
-                UpdateWTSFromDefinition();
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            catch (System.Runtime.InteropServices.COMException e)
-            {
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                // We want this object to remain synchronized with what is in WTS.
-                SyncWithWTS();
-
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorUpdatingDefinitionTask, this.Name);
-                throw new ScheduledJobException(msg, ex);
-            }
-
-            // Next save to job store.
-            ex = null;
-            try
-            {
-                UpdateJobStore();
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                // Remove this from WTS for consistency.
-                RemoveFromWTS(true);
-
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorUpdatingDefinitionStore, this.Name);
-                throw new ScheduledJobException(msg, ex);
-            }
-
-            // Finally update this object in the local repository.
-            ScheduledJobDefinition.RefreshRepositoryFromStore();
-            Repository.AddOrReplace(this);
-        }
-
-        /// <summary>
-        /// Removes this definition object:
-        ///  a) Removes from the Task Scheduler
-        ///      or fails if an instance is currently running.
-        ///      or stops any running instances if force is true.
-        ///  b) Removes from the scheduled job definition store.
-        ///  c) Removes from the local repository.
-        ///  d) Disposes this object.
-        /// </summary>
-        public void Remove(bool force)
-        {
-            IsDisposed();
-
-            // First remove from Task Scheduler.  Catch not found
-            // exceptions and continue.
-            try
-            {
-                RemoveFromWTS(force);
-            }
-            catch (System.IO.DirectoryNotFoundException)
-            {
-                // Continue with removal.
-            }
-            catch (System.IO.FileNotFoundException)
-            {
-                // Continue with removal.
-            }
-
-            // Remove from the Job Store.  Catch exceptions and continue
-            // with removal.
-            Exception ex = null;
-            try
-            {
-                RemoveFromJobStore();
-            }
-            catch (DirectoryNotFoundException)
-            {
-            }
-            catch (FileNotFoundException)
-            {
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            finally
-            {
-                // Remove from the local repository.
-                Repository.Remove(this);
-
-                // Remove job runs for this definition from local repository.
-                ScheduledJobSourceAdapter.ClearRepositoryForDefinition(this.Name);
-
-                // Dispose this object.
-                Dispose();
-            }
-
-            if (ex != null)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorRemovingDefinitionStore, this.Name);
-                throw new ScheduledJobException(msg, ex);
-            }
-        }
-
-        /// <summary>
-        /// Starts the scheduled job immediately.  A ScheduledJob object is
-        /// returned that represents the running command, and this returned
-        /// job is also added to the local job repository.  Job results are
-        /// not written to the job store.
-        /// </summary>
-        /// <returns>ScheduledJob object for running job.</returns>
-        public ScheduledJob StartJob()
-        {
-            IsDisposed();
-
-            ScheduledJob job = new ScheduledJob(_invocationInfo.Command, _invocationInfo.Name, this);
-            job.StartJob();
-
-            return job;
-        }
-
-        /// <summary>
-        /// Starts registered job definition running from the Task Scheduler.
-        /// </summary>
-        public void RunAsTask()
-        {
-            IsDisposed();
-
-            Exception ex = null;
-            string reason = null;
-            try
-            {
-                using (ScheduledJobWTS taskScheduler = new ScheduledJobWTS())
-                {
-                    taskScheduler.RunTask(this);
-                }
-            }
-            catch (System.IO.DirectoryNotFoundException e)
-            {
-                reason = ScheduledJobErrorStrings.reasonJobNotFound;
-                ex = e;
-            }
-            catch (System.IO.FileNotFoundException e)
-            {
-                reason = ScheduledJobErrorStrings.reasonJobNotFound;
-                ex = e;
-            }
-            catch (System.Runtime.InteropServices.COMException e)
-            {
-                reason = ConvertCOMErrorCode(e);
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                string msg;
-                if (reason != null)
-                {
-                    msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorRunningAsTaskWithReason, this.Name, reason);
-                }
-                else
-                {
-                    msg = StringUtil.Format(ScheduledJobErrorStrings.ErrorRunningAsTask, this.Name);
-                }
-
-                throw new ScheduledJobException(msg, ex);
-            }
-        }
-
-        #endregion
-
-        #region Public Trigger Methods
-
-        /// <summary>
-        /// Adds new ScheduledJobTriggers.
-        /// </summary>
-        /// <param name="triggers">Collection of ScheduledJobTrigger objects.</param>
-        /// <param name="save">Update Windows Task Scheduler and save to store.</param>
-        public void AddTriggers(
-            IEnumerable<ScheduledJobTrigger> triggers,
-            bool save)
-        {
-            IsDisposed();
-
-            if (triggers == null)
-            {
-                throw new PSArgumentNullException("triggers");
-            }
-
-            // First validate all triggers.
-            ValidateTriggers(triggers);
-
-            Collection<int> newTriggerIds = new Collection<int>();
-            foreach (ScheduledJobTrigger trigger in triggers)
-            {
-                ScheduledJobTrigger newTrigger = new ScheduledJobTrigger(trigger);
-
-                newTrigger.Id = ++_currentTriggerId;
-                newTriggerIds.Add(newTrigger.Id);
-                newTrigger.JobDefinition = this;
-                _triggers.Add(newTrigger.Id, newTrigger);
-            }
-
-            if (save)
-            {
-                Save();
-            }
-        }
-
-        /// <summary>
-        /// Removes triggers matching passed in trigger Ids.
-        /// </summary>
-        /// <param name="triggerIds">Trigger Ids to remove.</param>
-        /// <param name="save">Update Windows Task Scheduler and save to store.</param>
-        /// <returns>Trigger Ids not found.</returns>
-        public List<Int32> RemoveTriggers(
-            IEnumerable<Int32> triggerIds,
-            bool save)
-        {
-            IsDisposed();
-
-            List<Int32> idsNotFound = new List<Int32>();
-            bool triggerFound = false;
-
-            // triggerIds is null then remove all triggers.
-            if (triggerIds == null)
-            {
-                _currentTriggerId = 0;
-                if (_triggers.Count > 0)
-                {
-                    triggerFound = true;
-
-                    foreach (ScheduledJobTrigger trigger in _triggers.Values)
-                    {
-                        trigger.Id = 0;
-                        trigger.JobDefinition = null;
-                    }
-
-                    // Create new empty trigger collection.
-                    _triggers = new Dictionary<int, ScheduledJobTrigger>();
-                }
-            }
-            else
-            {
-                foreach (Int32 removeId in triggerIds)
-                {
-                    if (_triggers.ContainsKey(removeId))
-                    {
-                        _triggers[removeId].JobDefinition = null;
-                        _triggers[removeId].Id = 0;
-                        _triggers.Remove(removeId);
-                        triggerFound = true;
-                    }
-                    else
-                    {
-                        idsNotFound.Add(removeId);
-                    }
-                }
-            }
-
-            if (save && triggerFound)
-            {
-                Save();
-            }
-
-            return idsNotFound;
-        }
-
-        /// <summary>
-        /// Updates triggers with provided trigger objects, matching passed in
-        /// trigger Id with existing trigger Id.
-        /// </summary>
-        /// <param name="triggers">Collection of ScheduledJobTrigger objects to update.</param>
-        /// <param name="save">Update Windows Task Scheduler and save to store.</param>
-        /// <returns>Trigger Ids not found.</returns>
-        public List<Int32> UpdateTriggers(
-            IEnumerable<ScheduledJobTrigger> triggers,
-            bool save)
-        {
-            IsDisposed();
-
-            if (triggers == null)
-            {
-                throw new PSArgumentNullException("triggers");
-            }
-
-            // First validate all triggers.
-            ValidateTriggers(triggers);
-
-            List<Int32> idsNotFound = new List<Int32>();
-            bool triggerFound = false;
-            foreach (ScheduledJobTrigger updateTrigger in triggers)
-            {
-                if (_triggers.ContainsKey(updateTrigger.Id))
-                {
-                    // Disassociate old trigger from this definition.
-                    _triggers[updateTrigger.Id].JobDefinition = null;
-
-                    // Replace older trigger object with new updated one.
-                    ScheduledJobTrigger newTrigger = new ScheduledJobTrigger(updateTrigger);
-                    newTrigger.Id = updateTrigger.Id;
-                    newTrigger.JobDefinition = this;
-                    _triggers[newTrigger.Id] = newTrigger;
-                    triggerFound = true;
-                }
-                else
-                {
-                    idsNotFound.Add(updateTrigger.Id);
-                }
-            }
-
-            if (save && triggerFound)
-            {
-                Save();
-            }
-
-            return idsNotFound;
-        }
-
-        /// <summary>
-        /// Creates a new set of ScheduledJobTriggers for this object.
-        /// </summary>
-        /// <param name="newTriggers">Array of ScheduledJobTrigger objects to set.</param>
-        /// <param name="save">Update Windows Task Scheduler and save to store.</param>
-        public void SetTriggers(
-            IEnumerable<ScheduledJobTrigger> newTriggers,
-            bool save)
-        {
-            IsDisposed();
-
-            // First validate all triggers.
-            ValidateTriggers(newTriggers);
-
-            // Disassociate any old trigger objects from this definition.
-            foreach (ScheduledJobTrigger trigger in _triggers.Values)
-            {
-                trigger.JobDefinition = null;
-            }
-
-            _currentTriggerId = 0;
-            _triggers = new Dictionary<Int32, ScheduledJobTrigger>();
-            if (newTriggers != null)
-            {
-                foreach (ScheduledJobTrigger trigger in newTriggers)
-                {
-                    ScheduledJobTrigger newTrigger = new ScheduledJobTrigger(trigger);
-
-                    newTrigger.Id = ++_currentTriggerId;
-                    newTrigger.JobDefinition = this;
-                    _triggers.Add(newTrigger.Id, newTrigger);
-                }
-            }
-
-            if (save)
-            {
-                Save();
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of new ScheduledJobTrigger objects corresponding
-        /// to the passed in trigger Ids.  Also returns an array of trigger Ids
-        /// that were not found in an out parameter.
-        /// </summary>
-        /// <param name="triggerIds">List of trigger Ids.</param>
-        /// <param name="notFoundIds">List of not found trigger Ids.</param>
-        /// <returns>List of ScheduledJobTrigger objects.</returns>
-        public List<ScheduledJobTrigger> GetTriggers(
-            IEnumerable<Int32> triggerIds,
-            out List<Int32> notFoundIds)
-        {
-            IsDisposed();
-
-            List<ScheduledJobTrigger> newTriggers;
-            List<Int32> notFoundList = new List<Int32>();
-            if (triggerIds == null)
-            {
-                // Return all triggers.
-                newTriggers = new List<ScheduledJobTrigger>();
-                foreach (ScheduledJobTrigger trigger in _triggers.Values)
-                {
-                    newTriggers.Add(new ScheduledJobTrigger(trigger));
-                }
-            }
-            else
-            {
-                // Filter returned triggers to match requested.
-                newTriggers = new List<ScheduledJobTrigger>();
-                foreach (Int32 triggerId in triggerIds)
-                {
-                    if (_triggers.ContainsKey(triggerId))
-                    {
-                        newTriggers.Add(new ScheduledJobTrigger(_triggers[triggerId]));
-                    }
-                    else
-                    {
-                        notFoundList.Add(triggerId);
-                    }
-                }
-            }
-
-            notFoundIds = notFoundList;
-
-            // Return array of ScheduledJobTrigger objects sorted by Id.
-            newTriggers.Sort((firstTrigger, secondTrigger) =>
-                {
-                    return ((int)firstTrigger.Id - (int)secondTrigger.Id);
-                });
-
-            return newTriggers;
-        }
-
-        /// <summary>
-        /// Finds and returns a copy of the ScheduledJobTrigger corresponding to
-        /// the passed in trigger Id.
-        /// </summary>
-        /// <param name="triggerId">Trigger Id.</param>
-        /// <returns>ScheduledJobTrigger object.</returns>
-        public ScheduledJobTrigger GetTrigger(
-            Int32 triggerId)
-        {
-            IsDisposed();
-
-            if (_triggers.ContainsKey(triggerId))
-            {
-                return new ScheduledJobTrigger(_triggers[triggerId]);
-            }
-
-            return null;
-        }
-
-        #endregion
-
-        #region Public Update Methods
-
-        /// <summary>
-        /// Updates scheduled job options.
-        /// </summary>
-        /// <param name="options">ScheduledJobOptions or null for default.</param>
-        /// <param name="save">Update Windows Task Scheduler and save to store.</param>
-        public void UpdateOptions(
-            ScheduledJobOptions options,
-            bool save)
-        {
-            IsDisposed();
-
-            // Disassociate current options object from this definition.
-            _options.JobDefinition = null;
-
-            // options == null is allowed and signals the use default
-            // Task Scheduler options.
-            _options = (options != null) ? new ScheduledJobOptions(options) :
-                                           new ScheduledJobOptions();
-            _options.JobDefinition = this;
-
-            if (save)
-            {
-                Save();
-            }
-        }
-
-        /// <summary>
-        /// Sets the execution history length property.
-        /// </summary>
-        /// <param name="executionHistoryLength">Execution history length.</param>
-        /// <param name="save">Save to store.</param>
-        public void SetExecutionHistoryLength(
-            int executionHistoryLength,
-            bool save)
-        {
-            IsDisposed();
-
-            _executionHistoryLength = executionHistoryLength;
-
-            if (save)
-            {
-                SaveToStore();
-            }
-        }
-
-        /// <summary>
-        /// Clears all execution results in the job store.
-        /// </summary>
-        public void ClearExecutionHistory()
-        {
-            IsDisposed();
-
-            ScheduledJobStore.RemoveAllJobRuns(Name);
-            ScheduledJobSourceAdapter.ClearRepositoryForDefinition(Name);
-        }
-
-        /// <summary>
-        /// Updates the JobInvocationInfo object.
-        /// </summary>
-        /// <param name="jobInvocationInfo">JobInvocationInfo.</param>
-        /// <param name="save">Save to store.</param>
-        public void UpdateJobInvocationInfo(
-            JobInvocationInfo jobInvocationInfo,
-            bool save)
-        {
-            IsDisposed();
-
-            if (jobInvocationInfo == null)
-            {
-                throw new PSArgumentNullException("jobInvocationInfo");
-            }
-
-            _invocationInfo = jobInvocationInfo;
-            _name = jobInvocationInfo.Name;
-
-            if (save)
-            {
-                SaveToStore();
-            }
-        }
-
-        /// <summary>
-        /// Sets the enabled state of this object.
-        /// </summary>
-        /// <param name="enabled">True if enabled.</param>
-        /// <param name="save">Update Windows Task Scheduler and save to store.</param>
-        public void SetEnabled(
-            bool enabled,
-            bool save)
-        {
-            IsDisposed();
-
-            _enabled = enabled;
-
-            if (save)
-            {
-                Save();
-            }
-        }
-
-        /// <summary>
-        /// Sets the name of this scheduled job definition.
-        /// </summary>
-        /// <param name="name">Name.</param>
-        /// <param name="save">Update Windows Task Scheduler and save to store.</param>
-        public void SetName(
-            string name,
-            bool save)
-        {
-            IsDisposed();
-
-            _name = (name != null) ? name : string.Empty;
-
-            if (save)
-            {
-                Save();
-            }
-        }
-
-        #endregion
-
-        #region IDisposable
-
-        /// <summary>
-        /// Dispose.
-        /// </summary>
-        public void Dispose()
-        {
-            _isDisposed = true;
-
-            GC.SuppressFinalize(this);
-        }
-
-        #endregion
-
-        #region Static Methods
-
-        /// <summary>
-        /// Synchronizes the local ScheduledJobDefinition repository with the
-        /// scheduled job definitions in the job store.
-        /// </summary>
-        /// <param name="itemFound">Callback delegate for each discovered item.</param>
-        /// <returns>Dictionary of errors.</returns>
-        internal static Dictionary<string, Exception> RefreshRepositoryFromStore(
-            Action<ScheduledJobDefinition> itemFound = null)
-        {
-            Dictionary<string, Exception> errors = new Dictionary<string, Exception>();
-
-            // Get current list of job definition files in store, and create hash
-            // table for quick look up.
-            IEnumerable<string> jobDefinitionPathNames = ScheduledJobStore.GetJobDefinitions();
-            HashSet<string> jobDefinitionNamesHash = new HashSet<string>();
-            foreach (string pathName in jobDefinitionPathNames)
-            {
-                // Remove path information and use job definition name only.
-                int indx = pathName.LastIndexOf('\\');
-                string jobDefName = (indx != -1) ? pathName.Substring(indx + 1) : pathName;
-                jobDefinitionNamesHash.Add(jobDefName);
-            }
-
-            // First remove definition objects not in store.
-            // Repository.Definitions returns a *copy* of current repository items.
-            foreach (ScheduledJobDefinition jobDef in Repository.Definitions)
-            {
-                if (jobDefinitionNamesHash.Contains(jobDef.Name) == false)
-                {
-                    Repository.Remove(jobDef);
-                }
-                else
-                {
-                    jobDefinitionNamesHash.Remove(jobDef.Name);
-
-                    if (itemFound != null)
-                    {
-                        itemFound(jobDef);
-                    }
-                }
-            }
-
-            // Next add definition items not in local repository.
-            foreach (string jobDefinitionName in jobDefinitionNamesHash)
-            {
-                try
-                {
-                    // Read the job definition object from file and add to local repository.
-                    ScheduledJobDefinition jobDefinition = ScheduledJobDefinition.LoadDefFromStore(jobDefinitionName, null);
-                    Repository.AddOrReplace(jobDefinition);
-
-                    if (itemFound != null)
-                    {
-                        itemFound(jobDefinition);
-                    }
-                }
-                catch (System.IO.IOException e)
-                {
-                    errors.Add(jobDefinitionName, e);
-                }
-                catch (System.Xml.XmlException e)
-                {
-                    errors.Add(jobDefinitionName, e);
-                }
-                catch (System.TypeInitializationException e)
-                {
-                    errors.Add(jobDefinitionName, e);
-                }
-                catch (System.Runtime.Serialization.SerializationException e)
-                {
-                    errors.Add(jobDefinitionName, e);
-                }
-                catch (System.ArgumentNullException e)
-                {
-                    errors.Add(jobDefinitionName, e);
-                }
-                catch (System.UnauthorizedAccessException e)
-                {
-                    errors.Add(jobDefinitionName, e);
-                }
-            }
-
-            return errors;
-        }
-
-        /// <summary>
-        /// Reads a ScheduledJobDefinition object from file and
-        /// returns object.
-        /// </summary>
-        /// <param name="definitionName">Name of definition to load.</param>
-        /// <param name="definitionPath">Path to definition file.</param>
-        /// <returns>ScheduledJobDefinition object.</returns>
-        internal static ScheduledJobDefinition LoadDefFromStore(
-            string definitionName,
-            string definitionPath)
-        {
-            ScheduledJobDefinition definition = null;
-            FileStream fs = null;
-            try
-            {
-                fs = GetFileStream(
-                    definitionName,
-                    definitionPath,
-                    FileMode.Open,
-                    FileAccess.Read,
-                    FileShare.Read);
-
-                XmlObjectSerializer serializer = new System.Runtime.Serialization.NetDataContractSerializer();
-                definition = serializer.ReadObject(fs) as ScheduledJobDefinition;
-            }
-            finally
-            {
-                if (fs != null)
-                {
-                    fs.Close();
-                }
-            }
-
-            return definition;
-        }
-
-        /// <summary>
-        /// Creates a new ScheduledJobDefinition object from a file.
-        /// </summary>
-        /// <param name="definitionName">Name of definition to load.</param>
-        /// <param name="definitionPath">Path to definition file.</param>
-        /// <returns>ScheduledJobDefinition object.</returns>
-        public static ScheduledJobDefinition LoadFromStore(
-            string definitionName,
-            string definitionPath)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentNullException("definitionName");
-            }
-
-            ScheduledJobDefinition definition = null;
-            bool corruptedFile = false;
-            Exception ex = null;
-
-            try
-            {
-                definition = LoadDefFromStore(definitionName, definitionPath);
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-                corruptedFile = true;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            catch (System.Xml.XmlException e)
-            {
-                ex = e;
-                corruptedFile = true;
-            }
-            catch (System.TypeInitializationException e)
-            {
-                ex = e;
-                corruptedFile = true;
-            }
-            catch (System.ArgumentNullException e)
-            {
-                ex = e;
-                corruptedFile = true;
-            }
-            catch (System.Runtime.Serialization.SerializationException e)
-            {
-                ex = e;
-                corruptedFile = true;
-            }
-
-            if (ex != null)
-            {
-                //
-                // Remove definition if corrupted.
-                // But only if the corrupted file is in the default scheduled jobs
-                // path for the current user.
-                //
-                if (corruptedFile &&
-                    (definitionPath == null ||
-                     ScheduledJobStore.IsDefaultUserPath(definitionPath)))
-                {
-                    // Remove corrupted scheduled job definition.
-                    RemoveDefinition(definitionName);
-
-                    // Throw exception for corrupted/removed job definition.
-                    throw new ScheduledJobException(
-                        StringUtil.Format(ScheduledJobErrorStrings.CantLoadDefinitionFromStore, definitionName),
-                        ex);
-                }
-
-                // Throw exception for not found job definition.
-                throw new ScheduledJobException(
-                    StringUtil.Format(ScheduledJobErrorStrings.CannotFindJobDefinition, definitionName),
-                    ex);
-            }
-
-            // Make sure the deserialized ScheduledJobDefinition object contains the same
-            // Task Scheduler information that is stored in Task Scheduler.
-            definition.SyncWithWTS();
-
-            return definition;
-        }
-
-        /// <summary>
-        /// Internal helper method to remove a scheduled job definition
-        /// by name from job store and Task Scheduler.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        internal static void RemoveDefinition(
-            string definitionName)
-        {
-            // Remove from store.
-            try
-            {
-                ScheduledJobStore.RemoveJobDefinition(definitionName);
-            }
-            catch (DirectoryNotFoundException)
-            { }
-            catch (FileNotFoundException)
-            { }
-            catch (UnauthorizedAccessException)
-            { }
-            catch (IOException)
-            { }
-
-            // Check and remove from Task Scheduler.
-            using (ScheduledJobWTS taskScheduler = new ScheduledJobWTS())
-            {
-                try
-                {
-                    taskScheduler.RemoveTaskByName(definitionName, true, true);
-                }
-                catch (UnauthorizedAccessException)
-                { }
-                catch (IOException)
-                { }
-            }
-        }
-
-        private static int GetCurrentId()
-        {
-            lock (LockObject)
-            {
-                return ++CurrentId;
-            }
-        }
-
-        /// <summary>
-        /// Starts a scheduled job based on definition name and returns the
-        /// running job object.  Returned job is also added to the local
-        /// job repository.  Job results are not written to store.
-        /// </summary>
-        /// <param name="DefinitionName">ScheduledJobDefinition name.</param>
-        public static Job2 StartJob(
-            string DefinitionName)
-        {
-            // Load scheduled job definition.
-            ScheduledJobDefinition jobDefinition = ScheduledJobDefinition.LoadFromStore(DefinitionName, null);
-
-            // Start job.
-            return jobDefinition.StartJob();
-        }
-
-        private static FileStream GetFileStream(
-            string definitionName,
-            string definitionPath,
-            FileMode fileMode,
-            FileAccess fileAccess,
-            FileShare fileShare)
-        {
-            FileStream fs;
-
-            if (definitionPath == null)
-            {
-                // Look for definition in default current user location.
-                fs = ScheduledJobStore.GetFileForJobDefinition(
-                    definitionName,
-                    fileMode,
-                    fileAccess,
-                    fileShare);
-            }
-            else
-            {
-                // Look for definition in known path.
-                fs = ScheduledJobStore.GetFileForJobDefinition(
-                    definitionName,
-                    definitionPath,
-                    fileMode,
-                    fileAccess,
-                    fileShare);
-            }
-
-            return fs;
-        }
-
-        #endregion
-
-        #region Running Job
-
-        /// <summary>
-        /// Create a Job2 job, runs it and waits for it to complete.
-        /// Job status and results are written to the job store.
-        /// </summary>
-        /// <returns>Job2 job object that was run.</returns>
-        public Job2 Run()
-        {
-            Job2 job = null;
-
-            using (PowerShellTraceSource _tracer = PowerShellTraceSourceFactory.GetTraceSource())
-            {
-                Exception ex = null;
-                try
-                {
-                    JobManager jobManager = Runspace.DefaultRunspace.JobManager;
-
-                    job = jobManager.NewJob(InvocationInfo);
-
-                    // If this is a scheduled job type then include this object so
-                    // so that ScheduledJobSourceAdapter knows where the results are
-                    // to be stored.
-                    ScheduledJob schedJob = job as ScheduledJob;
-                    if (schedJob != null)
-                    {
-                        schedJob.Definition = this;
-                        schedJob.AllowSetShouldExit = true;
-                    }
-
-                    // Update job store data when job begins.
-                    job.StateChanged += (object sender, JobStateEventArgs e) =>
-                        {
-                            if (e.JobStateInfo.State == JobState.Running)
-                            {
-                                // Write job to store with this running state.
-                                jobManager.PersistJob(job, Definition);
-                            }
-                        };
-
-                    job.StartJob();
-
-                    // Log scheduled job start.
-                    _tracer.WriteScheduledJobStartEvent(
-                        job.Name,
-                        job.PSBeginTime.ToString());
-
-                    // Wait for job to finish.
-                    job.Finished.WaitOne();
-
-                    // Ensure that the job run results are persisted to store.
-                    jobManager.PersistJob(job, Definition);
-
-                    // Perform a Receive-Job on the job object.  Output data will be dropped
-                    // but we do this to execute any client method calls, in particular we
-                    // want SetShouldExit to set the correct exit code on the process for
-                    // use inside Task Scheduler.
-                    using (System.Management.Automation.PowerShell ps = System.Management.Automation.PowerShell.Create())
-                    {
-                        // Run on the default runspace.
-                        ps.AddCommand("Receive-Job").AddParameter("Job", job).AddParameter("Keep", true);
-                        ps.Invoke();
-                    }
-
-                    // Log scheduled job finish.
-                    _tracer.WriteScheduledJobCompleteEvent(
-                        job.Name,
-                        job.PSEndTime.ToString(),
-                        job.JobStateInfo.State.ToString());
-                }
-                catch (RuntimeException e)
-                {
-                    ex = e;
-                }
-                catch (InvalidOperationException e)
-                {
-                    ex = e;
-                }
-                catch (System.Security.SecurityException e)
-                {
-                    ex = e;
-                }
-                catch (IOException e)
-                {
-                    ex = e;
-                }
-                catch (UnauthorizedAccessException e)
-                {
-                    ex = e;
-                }
-                catch (ArgumentException e)
-                {
-                    ex = e;
-                }
-                catch (ScriptCallDepthException e)
-                {
-                    ex = e;
-                }
-                catch (System.Runtime.Serialization.SerializationException e)
-                {
-                    ex = e;
-                }
-                catch (System.Runtime.Serialization.InvalidDataContractException e)
-                {
-                    ex = e;
-                }
-                catch (System.Xml.XmlException e)
-                {
-                    ex = e;
-                }
-                catch (Microsoft.PowerShell.ScheduledJob.ScheduledJobException e)
-                {
-                    ex = e;
-                }
-
-                if (ex != null)
-                {
-                    // Log error.
-                    _tracer.WriteScheduledJobErrorEvent(
-                        this.Name,
-                        ex.Message,
-                        ex.StackTrace.ToString(),
-                        (ex.InnerException != null) ? ex.InnerException.Message : string.Empty);
-
-                    throw ex;
-                }
-            }
-
-            return job;
-        }
-
-        #endregion
-    }
-
-    #region ScheduledJobDefinition Repository
-
-    /// <summary>
-    /// Collection of ScheduledJobDefinition objects.
-    /// </summary>
-    internal class ScheduledJobDefinitionRepository
-    {
-        #region Private Members
-
-        private object _syncObject = new object();
-        private Dictionary<string, ScheduledJobDefinition> _definitions = new Dictionary<string, ScheduledJobDefinition>();
-
-        #endregion
-
-        #region Public Properties
-
-        /// <summary>
-        /// Returns all definition objects in the repository as a List.
-        /// </summary>
-        public List<ScheduledJobDefinition> Definitions
-        {
-            get
-            {
-                lock (_syncObject)
-                {
-                    // Sort returned list by Ids.
-                    List<ScheduledJobDefinition> rtnList =
-                            new List<ScheduledJobDefinition>(_definitions.Values);
-
-                    rtnList.Sort((firstJob, secondJob) =>
-                        {
-                            if (firstJob.Id > secondJob.Id)
-                            {
-                                return 1;
-                            }
-                            else if (firstJob.Id < secondJob.Id)
-                            {
-                                return -1;
-                            }
-                            else
-                            {
-                                return 0;
-                            }
-                        });
-
-                    return rtnList;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns count of object in repository.
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                lock (_syncObject)
-                {
-                    return _definitions.Count;
-                }
-            }
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Add ScheduledJobDefinition to repository.
-        /// </summary>
-        /// <param name="jobDef"></param>
-        public void Add(ScheduledJobDefinition jobDef)
-        {
-            if (jobDef == null)
-            {
-                throw new PSArgumentNullException("jobDef");
-            }
-
-            lock (_syncObject)
-            {
-                if (_definitions.ContainsKey(jobDef.Name))
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.DefinitionAlreadyExistsInLocal, jobDef.Name, jobDef.GlobalId);
-                    throw new ScheduledJobException(msg);
-                }
-
-                _definitions.Add(jobDef.Name, jobDef);
-            }
-        }
-
-        /// <summary>
-        /// Add or replace passed in ScheduledJobDefinition object to repository.
-        /// </summary>
-        /// <param name="jobDef"></param>
-        public void AddOrReplace(ScheduledJobDefinition jobDef)
-        {
-            if (jobDef == null)
-            {
-                throw new PSArgumentNullException("jobDef");
-            }
-
-            lock (_syncObject)
-            {
-                if (_definitions.ContainsKey(jobDef.Name))
-                {
-                    _definitions.Remove(jobDef.Name);
-                }
-
-                _definitions.Add(jobDef.Name, jobDef);
-            }
-        }
-
-        /// <summary>
-        /// Remove ScheduledJobDefinition from repository.
-        /// </summary>
-        /// <param name="jobDef"></param>
-        public void Remove(ScheduledJobDefinition jobDef)
-        {
-            if (jobDef == null)
-            {
-                throw new PSArgumentNullException("jobDef");
-            }
-
-            lock (_syncObject)
-            {
-                if (_definitions.ContainsKey(jobDef.Name))
-                {
-                    _definitions.Remove(jobDef.Name);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Checks to see if a ScheduledJobDefinition object exists with
-        /// the provided definition name.
-        /// </summary>
-        /// <param name="jobDefName">Definition name.</param>
-        /// <returns>True if definition exists.</returns>
-        public bool Contains(string jobDefName)
-        {
-            lock (_syncObject)
-            {
-                return _definitions.ContainsKey(jobDefName);
-            }
-        }
-
-        /// <summary>
-        /// Clears all ScheduledJobDefinition items from the repository.
-        /// </summary>
-        public void Clear()
-        {
-            lock (_syncObject)
-            {
-                _definitions.Clear();
-            }
-        }
-
-        #endregion
-    }
-
-    #endregion
-
-    #region Exceptions
-
-    /// <summary>
-    /// Exception thrown for errors in Scheduled Jobs.
-    /// </summary>
-    public class ScheduledJobException : SystemException
-    {
-        /// <summary>
-        /// Creates a new instance of ScheduledJobException class.
-        /// </summary>
-        public ScheduledJobException()
-            : base
-            (
-                StringUtil.Format(ScheduledJobErrorStrings.GeneralWTSError)
-            )
-        {
-        }
-
-        /// <summary>
-        /// Creates a new instance of ScheduledJobException class.
-        /// </summary>
-        /// <param name="message">
-        /// The error message that explains the reason for the exception.
-        /// </param>
-        public ScheduledJobException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new instance of ScheduledJobException class.
-        /// </summary>
-        /// <param name="message">
-        /// The error message that explains the reason for the exception.
-        /// </param>
-        /// <param name="innerException">
-        /// The exception that is the cause of the current exception.
-        /// </param>
-        public ScheduledJobException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        /// <summary>
-        /// Fully qualified error id for exception.
-        /// </summary>
-        internal string FQEID
-        {
-            get { return _fqeid; }
-
-            set { _fqeid = value ?? string.Empty; }
-        }
-
-        private string _fqeid = string.Empty;
-    }
-
-    #endregion
-
-    #region Utilities
-
-    /// <summary>
-    /// Simple string formatting helper.
-    /// </summary>
-    internal class StringUtil
-    {
-        internal static string Format(string formatSpec, object o)
-        {
-            return string.Format(System.Threading.Thread.CurrentThread.CurrentCulture, formatSpec, o);
-        }
-
-        internal static string Format(string formatSpec, params object[] o)
-        {
-            return string.Format(System.Threading.Thread.CurrentThread.CurrentCulture, formatSpec, o);
-        }
-    }
-
-    #endregion
-
-    #region ScheduledJobInvocationInfo Class
-
-    /// <summary>
-    /// This class defines the JobInvocationInfo class for PowerShell jobs
-    /// for job scheduling.  The following parameters are supported:
-    ///
-    ///  "ScriptBlock"             -> ScriptBlock
-    ///  "FilePath"                -> String
-    ///  "InitializationScript"    -> ScriptBlock
-    ///  "ArgumentList"            -> object[]
-    ///  "RunAs32"                 -> Boolean
-    ///  "Authentication"          -> AuthenticationMechanism.
-    /// </summary>
-    [Serializable]
-    public sealed class ScheduledJobInvocationInfo : JobInvocationInfo
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="definition">JobDefinition.</param>
-        /// <param name="parameters">Dictionary of parameters.</param>
-        public ScheduledJobInvocationInfo(JobDefinition definition, Dictionary<string, object> parameters)
-            : base(definition, parameters)
-        {
-            if (definition == null)
-            {
-                throw new PSArgumentNullException("definition");
-            }
-
-            Name = definition.Name;
-        }
-
-        #endregion
-
-        #region Public Strings
-
-        /// <summary>
-        /// ScriptBlock parameter.
-        /// </summary>
-        public const string ScriptBlockParameter = "ScriptBlock";
-
-        /// <summary>
-        /// FilePath parameter.
-        /// </summary>
-        public const string FilePathParameter = "FilePath";
-
-        /// <summary>
-        /// RunAs32 parameter.
-        /// </summary>
-        public const string RunAs32Parameter = "RunAs32";
-
-        /// <summary>
-        /// Authentication parameter.
-        /// </summary>
-        public const string AuthenticationParameter = "Authentication";
-
-        /// <summary>
-        /// InitializationScript parameter.
-        /// </summary>
-        public const string InitializationScriptParameter = "InitializationScript";
-
-        /// <summary>
-        /// ArgumentList parameter.
-        /// </summary>
-        public const string ArgumentListParameter = "ArgumentList";
-
-        #endregion
-
-        #region ISerializable Implementation
-
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        internal ScheduledJobInvocationInfo(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            DeserializeInvocationInfo(info);
-        }
-
-        /// <summary>
-        /// Serialization implementation.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            SerializeInvocationInfo(info);
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void SerializeInvocationInfo(SerializationInfo info)
-        {
-            info.AddValue("InvocationInfo_Command", this.Command);
-            info.AddValue("InvocationInfo_Name", this.Name);
-            info.AddValue("InvocationInfo_AdapterType", this.Definition.JobSourceAdapterType);
-            info.AddValue("InvocationInfo_ModuleName", this.Definition.ModuleName);
-            info.AddValue("InvocationInfo_AdapterTypeName", this.Definition.JobSourceAdapterTypeName);
-
-            // Get the job parameters.
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            foreach (var commandParam in this.Parameters[0])
-            {
-                if (!parameters.ContainsKey(commandParam.Name))
-                {
-                    parameters.Add(commandParam.Name, commandParam.Value);
-                }
-            }
-
-            //
-            // Serialize only parameters that scheduled job knows about.
-            //
-
-            // ScriptBlock
-            if (parameters.ContainsKey(ScriptBlockParameter))
-            {
-                ScriptBlock scriptBlock = (ScriptBlock)parameters[ScriptBlockParameter];
-                info.AddValue("InvocationParam_ScriptBlock", scriptBlock.ToString());
-            }
-            else
-            {
-                info.AddValue("InvocationParam_ScriptBlock", null);
-            }
-
-            // FilePath
-            if (parameters.ContainsKey(FilePathParameter))
-            {
-                string filePath = (string)parameters[FilePathParameter];
-                info.AddValue("InvocationParam_FilePath", filePath);
-            }
-            else
-            {
-                info.AddValue("InvocationParam_FilePath", string.Empty);
-            }
-
-            // InitializationScript
-            if (parameters.ContainsKey(InitializationScriptParameter))
-            {
-                ScriptBlock scriptBlock = (ScriptBlock)parameters[InitializationScriptParameter];
-                info.AddValue("InvocationParam_InitScript", scriptBlock.ToString());
-            }
-            else
-            {
-                info.AddValue("InvocationParam_InitScript", string.Empty);
-            }
-
-            // RunAs32
-            if (parameters.ContainsKey(RunAs32Parameter))
-            {
-                bool runAs32 = (bool)parameters[RunAs32Parameter];
-                info.AddValue("InvocationParam_RunAs32", runAs32);
-            }
-            else
-            {
-                info.AddValue("InvocationParam_RunAs32", false);
-            }
-
-            // Authentication
-            if (parameters.ContainsKey(AuthenticationParameter))
-            {
-                AuthenticationMechanism authentication = (AuthenticationMechanism)parameters[AuthenticationParameter];
-                info.AddValue("InvocationParam_Authentication", authentication);
-            }
-            else
-            {
-                info.AddValue("InvocationParam_Authentication", AuthenticationMechanism.Default);
-            }
-
-            // ArgumentList
-            if (parameters.ContainsKey(ArgumentListParameter))
-            {
-                object[] argList = (object[])parameters[ArgumentListParameter];
-                info.AddValue("InvocationParam_ArgList", argList);
-            }
-            else
-            {
-                info.AddValue("InvocationParam_ArgList", null);
-            }
-        }
-
-        private void DeserializeInvocationInfo(SerializationInfo info)
-        {
-            string command = info.GetString("InvocationInfo_Command");
-            string name = info.GetString("InvocationInfo_Name");
-            string moduleName = info.GetString("InvocationInfo_ModuleName");
-            string adapterTypeName = info.GetString("InvocationInfo_AdapterTypeName");
-
-            //
-            // Parameters
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-
-            // ScriptBlock
-            string script = info.GetString("InvocationParam_ScriptBlock");
-            if (script != null)
-            {
-                parameters.Add(ScriptBlockParameter, ScriptBlock.Create(script));
-            }
-
-            // FilePath
-            string filePath = info.GetString("InvocationParam_FilePath");
-            if (!string.IsNullOrEmpty(filePath))
-            {
-                parameters.Add(FilePathParameter, filePath);
-            }
-
-            // InitializationScript
-            script = info.GetString("InvocationParam_InitScript");
-            if (!string.IsNullOrEmpty(script))
-            {
-                parameters.Add(InitializationScriptParameter, ScriptBlock.Create(script));
-            }
-
-            // RunAs32
-            bool runAs32 = info.GetBoolean("InvocationParam_RunAs32");
-            parameters.Add(RunAs32Parameter, runAs32);
-
-            // Authentication
-            AuthenticationMechanism authentication = (AuthenticationMechanism)info.GetValue("InvocationParam_Authentication",
-                typeof(AuthenticationMechanism));
-            parameters.Add(AuthenticationParameter, authentication);
-
-            // ArgumentList
-            object[] argList = (object[])info.GetValue("InvocationParam_ArgList", typeof(object[]));
-            if (argList != null)
-            {
-                parameters.Add(ArgumentListParameter, argList);
-            }
-
-            JobDefinition jobDefinition = new JobDefinition(null, command, name);
-            jobDefinition.ModuleName = moduleName;
-            jobDefinition.JobSourceAdapterTypeName = adapterTypeName;
-
-            // Convert to JobInvocationParameter collection
-            CommandParameterCollection paramCollection = new CommandParameterCollection();
-            foreach (KeyValuePair<string, object> param in parameters)
-            {
-                CommandParameter paramItem = new CommandParameter(param.Key, param.Value);
-                paramCollection.Add(paramItem);
-            }
-
-            this.Definition = jobDefinition;
-            this.Name = name;
-            this.Command = command;
-            this.Parameters.Add(paramCollection);
-        }
-
-        #endregion
-    }
-
-    #endregion
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobOptions.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobOptions.cs
deleted file mode 100644
index 8f171cd02ba..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobOptions.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Management.Automation;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Text;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This class contains Windows Task Scheduler options.
-    /// </summary>
-    [Serializable]
-    public sealed class ScheduledJobOptions : ISerializable
-    {
-        #region Private Members
-
-        // Power settings
-        private bool _startIfOnBatteries;
-        private bool _stopIfGoingOnBatteries;
-        private bool _wakeToRun;
-
-        // Idle settings
-        private bool _startIfNotIdle;
-        private bool _stopIfGoingOffIdle;
-        private bool _restartOnIdleResume;
-        private TimeSpan _idleDuration;
-        private TimeSpan _idleTimeout;
-
-        // Security settings
-        private bool _showInTaskScheduler;
-        private bool _runElevated;
-
-        // Misc
-        private bool _runWithoutNetwork;
-        private bool _donotAllowDemandStart;
-        private TaskMultipleInstancePolicy _multipleInstancePolicy;
-
-        // ScheduledJobDefinition object associated with this options object.
-        private ScheduledJobDefinition _jobDefAssociation;
-
-        #endregion
-
-        #region Public Properties
-
-        /// <summary>
-        /// Start task if on batteries.
-        /// </summary>
-        public bool StartIfOnBatteries
-        {
-            get { return _startIfOnBatteries; }
-
-            set { _startIfOnBatteries = value; }
-        }
-
-        /// <summary>
-        /// Stop task if computer is going on batteries.
-        /// </summary>
-        public bool StopIfGoingOnBatteries
-        {
-            get { return _stopIfGoingOnBatteries; }
-
-            set { _stopIfGoingOnBatteries = value; }
-        }
-
-        /// <summary>
-        /// Wake computer to run task.
-        /// </summary>
-        public bool WakeToRun
-        {
-            get { return _wakeToRun; }
-
-            set { _wakeToRun = value; }
-        }
-
-        /// <summary>
-        /// Start task only if computer is not idle.
-        /// </summary>
-        public bool StartIfNotIdle
-        {
-            get { return _startIfNotIdle; }
-
-            set { _startIfNotIdle = value; }
-        }
-
-        /// <summary>
-        /// Stop task if computer is no longer idle.
-        /// </summary>
-        public bool StopIfGoingOffIdle
-        {
-            get { return _stopIfGoingOffIdle; }
-
-            set { _stopIfGoingOffIdle = value; }
-        }
-        /// <summary>
-        /// Restart task on idle resuming.
-        /// </summary>
-        public bool RestartOnIdleResume
-        {
-            get { return _restartOnIdleResume; }
-
-            set { _restartOnIdleResume = value; }
-        }
-
-        /// <summary>
-        /// How long computer must be idle before task starts.
-        /// </summary>
-        public TimeSpan IdleDuration
-        {
-            get { return _idleDuration; }
-
-            set { _idleDuration = value; }
-        }
-
-        /// <summary>
-        /// How long task manager will wait for required idle duration.
-        /// </summary>
-        public TimeSpan IdleTimeout
-        {
-            get { return _idleTimeout; }
-
-            set { _idleTimeout = value; }
-        }
-
-        /// <summary>
-        /// When true task is not shown in Task Scheduler UI.
-        /// </summary>
-        public bool ShowInTaskScheduler
-        {
-            get { return _showInTaskScheduler; }
-
-            set { _showInTaskScheduler = value; }
-        }
-
-        /// <summary>
-        /// Run task with elevated privileges.
-        /// </summary>
-        public bool RunElevated
-        {
-            get { return _runElevated; }
-
-            set { _runElevated = value; }
-        }
-
-        /// <summary>
-        /// Run task even if network is not available.
-        /// </summary>
-        public bool RunWithoutNetwork
-        {
-            get { return _runWithoutNetwork; }
-
-            set { _runWithoutNetwork = value; }
-        }
-
-        /// <summary>
-        /// Do not allow a task to be started on demand.
-        /// </summary>
-        public bool DoNotAllowDemandStart
-        {
-            get { return _donotAllowDemandStart; }
-
-            set { _donotAllowDemandStart = value; }
-        }
-
-        /// <summary>
-        /// Multiple task instance policy.
-        /// </summary>
-        public TaskMultipleInstancePolicy MultipleInstancePolicy
-        {
-            get { return _multipleInstancePolicy; }
-
-            set { _multipleInstancePolicy = value; }
-        }
-
-        /// <summary>
-        /// ScheduledJobDefinition object associated with this options object.
-        /// </summary>
-        public ScheduledJobDefinition JobDefinition
-        {
-            get { return _jobDefAssociation; }
-
-            internal set { _jobDefAssociation = value; }
-        }
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public ScheduledJobOptions()
-        {
-            _startIfOnBatteries = false;
-            _stopIfGoingOnBatteries = true;
-            _wakeToRun = false;
-            _startIfNotIdle = true;
-            _stopIfGoingOffIdle = false;
-            _restartOnIdleResume = false;
-            _idleDuration = new TimeSpan(0, 10, 0);
-            _idleTimeout = new TimeSpan(1, 0, 0);
-            _showInTaskScheduler = true;
-            _runElevated = false;
-            _runWithoutNetwork = true;
-            _donotAllowDemandStart = false;
-            _multipleInstancePolicy = TaskMultipleInstancePolicy.IgnoreNew;
-        }
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="startIfOnBatteries"></param>
-        /// <param name="stopIfGoingOnBatters"></param>
-        /// <param name="wakeToRun"></param>
-        /// <param name="startIfNotIdle"></param>
-        /// <param name="stopIfGoingOffIdle"></param>
-        /// <param name="restartOnIdleResume"></param>
-        /// <param name="idleDuration"></param>
-        /// <param name="idleTimeout"></param>
-        /// <param name="showInTaskScheduler"></param>
-        /// <param name="runElevated"></param>
-        /// <param name="runWithoutNetwork"></param>
-        /// <param name="donotAllowDemandStart"></param>
-        /// <param name="multipleInstancePolicy"></param>
-        internal ScheduledJobOptions(
-            bool startIfOnBatteries,
-            bool stopIfGoingOnBatters,
-            bool wakeToRun,
-            bool startIfNotIdle,
-            bool stopIfGoingOffIdle,
-            bool restartOnIdleResume,
-            TimeSpan idleDuration,
-            TimeSpan idleTimeout,
-            bool showInTaskScheduler,
-            bool runElevated,
-            bool runWithoutNetwork,
-            bool donotAllowDemandStart,
-            TaskMultipleInstancePolicy multipleInstancePolicy)
-        {
-            _startIfOnBatteries = startIfOnBatteries;
-            _stopIfGoingOnBatteries = stopIfGoingOnBatters;
-            _wakeToRun = wakeToRun;
-            _startIfNotIdle = startIfNotIdle;
-            _stopIfGoingOffIdle = stopIfGoingOffIdle;
-            _restartOnIdleResume = restartOnIdleResume;
-            _idleDuration = idleDuration;
-            _idleTimeout = idleTimeout;
-            _showInTaskScheduler = showInTaskScheduler;
-            _runElevated = runElevated;
-            _runWithoutNetwork = runWithoutNetwork;
-            _donotAllowDemandStart = donotAllowDemandStart;
-            _multipleInstancePolicy = multipleInstancePolicy;
-        }
-
-        /// <summary>
-        /// Copy Constructor.
-        /// </summary>
-        /// <param name="copyOptions">Copy from.</param>
-        internal ScheduledJobOptions(
-            ScheduledJobOptions copyOptions)
-        {
-            if (copyOptions == null)
-            {
-                throw new PSArgumentNullException("copyOptions");
-            }
-
-            _startIfOnBatteries = copyOptions.StartIfOnBatteries;
-            _stopIfGoingOnBatteries = copyOptions.StopIfGoingOnBatteries;
-            _wakeToRun = copyOptions.WakeToRun;
-            _startIfNotIdle = copyOptions.StartIfNotIdle;
-            _stopIfGoingOffIdle = copyOptions.StopIfGoingOffIdle;
-            _restartOnIdleResume = copyOptions.RestartOnIdleResume;
-            _idleDuration = copyOptions.IdleDuration;
-            _idleTimeout = copyOptions.IdleTimeout;
-            _showInTaskScheduler = copyOptions.ShowInTaskScheduler;
-            _runElevated = copyOptions.RunElevated;
-            _runWithoutNetwork = copyOptions.RunWithoutNetwork;
-            _donotAllowDemandStart = copyOptions.DoNotAllowDemandStart;
-            _multipleInstancePolicy = copyOptions.MultipleInstancePolicy;
-
-            _jobDefAssociation = copyOptions.JobDefinition;
-        }
-
-        #endregion
-
-        #region ISerializable Implementation
-
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        private ScheduledJobOptions(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            _startIfOnBatteries = info.GetBoolean("StartIfOnBatteries_Value");
-            _stopIfGoingOnBatteries = info.GetBoolean("StopIfGoingOnBatteries_Value");
-            _wakeToRun = info.GetBoolean("WakeToRun_Value");
-            _startIfNotIdle = info.GetBoolean("StartIfNotIdle_Value");
-            _stopIfGoingOffIdle = info.GetBoolean("StopIfGoingOffIdle_Value");
-            _restartOnIdleResume = info.GetBoolean("RestartOnIdleResume_Value");
-            _idleDuration = (TimeSpan)info.GetValue("IdleDuration_Value", typeof(TimeSpan));
-            _idleTimeout = (TimeSpan)info.GetValue("IdleTimeout_Value", typeof(TimeSpan));
-            _showInTaskScheduler = info.GetBoolean("ShowInTaskScheduler_Value");
-            _runElevated = info.GetBoolean("RunElevated_Value");
-            _runWithoutNetwork = info.GetBoolean("RunWithoutNetwork_Value");
-            _donotAllowDemandStart = info.GetBoolean("DoNotAllowDemandStart_Value");
-            _multipleInstancePolicy = (TaskMultipleInstancePolicy)info.GetValue("TaskMultipleInstancePolicy_Value", typeof(TaskMultipleInstancePolicy));
-
-            // Runtime reference and not saved to store.
-            _jobDefAssociation = null;
-        }
-
-        /// <summary>
-        /// GetObjectData for ISerializable implementation.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        public void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            info.AddValue("StartIfOnBatteries_Value", _startIfOnBatteries);
-            info.AddValue("StopIfGoingOnBatteries_Value", _stopIfGoingOnBatteries);
-            info.AddValue("WakeToRun_Value", _wakeToRun);
-            info.AddValue("StartIfNotIdle_Value", _startIfNotIdle);
-            info.AddValue("StopIfGoingOffIdle_Value", _stopIfGoingOffIdle);
-            info.AddValue("RestartOnIdleResume_Value", _restartOnIdleResume);
-            info.AddValue("IdleDuration_Value", _idleDuration);
-            info.AddValue("IdleTimeout_Value", _idleTimeout);
-            info.AddValue("ShowInTaskScheduler_Value", _showInTaskScheduler);
-            info.AddValue("RunElevated_Value", _runElevated);
-            info.AddValue("RunWithoutNetwork_Value", _runWithoutNetwork);
-            info.AddValue("DoNotAllowDemandStart_Value", _donotAllowDemandStart);
-            info.AddValue("TaskMultipleInstancePolicy_Value", _multipleInstancePolicy);
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Update the associated ScheduledJobDefinition object with the
-        /// current properties of this object.
-        /// </summary>
-        public void UpdateJobDefinition()
-        {
-            if (_jobDefAssociation == null)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.NoAssociatedJobDefinitionForOption);
-
-                throw new RuntimeException(msg);
-            }
-
-            _jobDefAssociation.UpdateOptions(this, true);
-        }
-
-        #endregion
-    }
-
-    #region Public Enums
-
-    /// <summary>
-    /// Enumerates Task Scheduler options for multiple instance polices of
-    /// scheduled tasks (jobs).
-    /// </summary>
-    public enum TaskMultipleInstancePolicy
-    {
-        /// <summary>
-        /// None.
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// Ignore a new instance of the task (job)
-        /// </summary>
-        IgnoreNew = 1,
-        /// <summary>
-        /// Allow parallel running of a task (job)
-        /// </summary>
-        Parallel = 2,
-        /// <summary>
-        /// Queue up multiple instances of a task (job)
-        /// </summary>
-        Queue = 3,
-        /// <summary>
-        /// Stop currently running task (job) and start a new one.
-        /// </summary>
-        StopExisting = 4
-    }
-
-    #endregion
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobSourceAdapter.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobSourceAdapter.cs
deleted file mode 100644
index 53434c729e7..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobSourceAdapter.cs
+++ /dev/null
@@ -1,1088 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
-using System.Runtime.Serialization;
-using System.Text;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This class provides functionality for retrieving scheduled job run results
-    /// from the scheduled job store.  An instance of this object will be registered
-    /// with the PowerShell JobManager so that GetJobs commands will retrieve schedule
-    /// job runs from the file based scheduled job store.  This allows scheduled job
-    /// runs to be managed from PowerShell in the same way workflow jobs are managed.
-    /// </summary>
-    public sealed class ScheduledJobSourceAdapter : JobSourceAdapter
-    {
-        #region Private Members
-
-        private static FileSystemWatcher StoreWatcher;
-        private static object SyncObject = new object();
-        private static ScheduledJobRepository JobRepository = new ScheduledJobRepository();
-        internal const string AdapterTypeName = "PSScheduledJob";
-
-        #endregion
-
-        #region Public Strings
-
-        /// <summary>
-        /// BeforeFilter.
-        /// </summary>
-        public const string BeforeFilter = "Before";
-
-        /// <summary>
-        /// AfterFilter.
-        /// </summary>
-        public const string AfterFilter = "After";
-
-        /// <summary>
-        /// NewestFilter.
-        /// </summary>
-        public const string NewestFilter = "Newest";
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        public ScheduledJobSourceAdapter()
-        {
-            Name = AdapterTypeName;
-        }
-
-        #endregion
-
-        #region JobSourceAdapter Implementation
-
-        /// <summary>
-        /// Create a new Job2 results instance.
-        /// </summary>
-        /// <param name="specification">Job specification.</param>
-        /// <returns>Job2.</returns>
-        public override Job2 NewJob(JobInvocationInfo specification)
-        {
-            if (specification == null)
-            {
-                throw new PSArgumentNullException("specification");
-            }
-
-            ScheduledJobDefinition scheduledJobDef = new ScheduledJobDefinition(
-                specification, null, null, null);
-
-            return new ScheduledJob(
-                specification.Command,
-                specification.Name,
-                scheduledJobDef);
-        }
-
-        /// <summary>
-        /// Creates a new Job2 object based on a definition name
-        /// that can be run manually.  If the path parameter is
-        /// null then a default location will be used to find the
-        /// job definition by name.
-        /// </summary>
-        /// <param name="definitionName">ScheduledJob definition name.</param>
-        /// <param name="definitionPath">ScheduledJob definition file path.</param>
-        /// <returns>Job2 object.</returns>
-        public override Job2 NewJob(string definitionName, string definitionPath)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            Job2 rtnJob = null;
-            try
-            {
-                ScheduledJobDefinition scheduledJobDef =
-                    ScheduledJobDefinition.LoadFromStore(definitionName, definitionPath);
-
-                rtnJob = new ScheduledJob(
-                    scheduledJobDef.Command,
-                    scheduledJobDef.Name,
-                    scheduledJobDef);
-            }
-            catch (FileNotFoundException)
-            {
-                // Return null if no job definition exists.
-            }
-
-            return rtnJob;
-        }
-
-        /// <summary>
-        /// Get the list of jobs that are currently available in this
-        /// store.
-        /// </summary>
-        /// <returns>Collection of job objects.</returns>
-        public override IList<Job2> GetJobs()
-        {
-            RefreshRepository();
-
-            List<Job2> rtnJobs = new List<Job2>();
-            foreach (var job in JobRepository.Jobs)
-            {
-                rtnJobs.Add(job);
-            }
-
-            return rtnJobs;
-        }
-
-        /// <summary>
-        /// Get list of jobs that matches the specified names.
-        /// </summary>
-        /// <param name="name">names to match, can support
-        ///   wildcard if the store supports</param>
-        /// <param name="recurse"></param>
-        /// <returns>Collection of jobs that match the specified
-        /// criteria.</returns>
-        public override IList<Job2> GetJobsByName(string name, bool recurse)
-        {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new PSArgumentException("name");
-            }
-
-            RefreshRepository();
-
-            WildcardPattern namePattern = new WildcardPattern(name, WildcardOptions.IgnoreCase);
-            List<Job2> rtnJobs = new List<Job2>();
-            foreach (var job in JobRepository.Jobs)
-            {
-                if (namePattern.IsMatch(job.Name))
-                {
-                    rtnJobs.Add(job);
-                }
-            }
-
-            return rtnJobs;
-        }
-
-        /// <summary>
-        /// Get list of jobs that run the specified command.
-        /// </summary>
-        /// <param name="command">Command to match.</param>
-        /// <param name="recurse"></param>
-        /// <returns>Collection of jobs that match the specified
-        /// criteria.</returns>
-        public override IList<Job2> GetJobsByCommand(string command, bool recurse)
-        {
-            if (string.IsNullOrEmpty(command))
-            {
-                throw new PSArgumentException("command");
-            }
-
-            RefreshRepository();
-
-            WildcardPattern commandPattern = new WildcardPattern(command, WildcardOptions.IgnoreCase);
-            List<Job2> rtnJobs = new List<Job2>();
-            foreach (var job in JobRepository.Jobs)
-            {
-                if (commandPattern.IsMatch(job.Command))
-                {
-                    rtnJobs.Add(job);
-                }
-            }
-
-            return rtnJobs;
-        }
-
-        /// <summary>
-        /// Get job that has the specified id.
-        /// </summary>
-        /// <param name="instanceId">Guid to match.</param>
-        /// <param name="recurse"></param>
-        /// <returns>Job with the specified guid.</returns>
-        public override Job2 GetJobByInstanceId(Guid instanceId, bool recurse)
-        {
-            RefreshRepository();
-
-            foreach (var job in JobRepository.Jobs)
-            {
-                if (Guid.Equals(job.InstanceId, instanceId))
-                {
-                    return job;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Get job that has specific session id.
-        /// </summary>
-        /// <param name="id">Id to match.</param>
-        /// <param name="recurse"></param>
-        /// <returns>Job with the specified id.</returns>
-        public override Job2 GetJobBySessionId(int id, bool recurse)
-        {
-            RefreshRepository();
-
-            foreach (var job in JobRepository.Jobs)
-            {
-                if (id == job.Id)
-                {
-                    return job;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Get list of jobs that are in the specified state.
-        /// </summary>
-        /// <param name="state">State to match.</param>
-        /// <param name="recurse"></param>
-        /// <returns>Collection of jobs with the specified
-        /// state.</returns>
-        public override IList<Job2> GetJobsByState(JobState state, bool recurse)
-        {
-            RefreshRepository();
-
-            List<Job2> rtnJobs = new List<Job2>();
-            foreach (var job in JobRepository.Jobs)
-            {
-                if (state == job.JobStateInfo.State)
-                {
-                    rtnJobs.Add(job);
-                }
-            }
-
-            return rtnJobs;
-        }
-
-        /// <summary>
-        /// Get list of jobs based on the adapter specific
-        /// filter parameters.
-        /// </summary>
-        /// <param name="filter">dictionary containing name value
-        ///   pairs for adapter specific filters</param>
-        /// <param name="recurse"></param>
-        /// <returns>Collection of jobs that match the
-        /// specified criteria.</returns>
-        public override IList<Job2> GetJobsByFilter(Dictionary<string, object> filter, bool recurse)
-        {
-            if (filter == null)
-            {
-                throw new PSArgumentNullException("filter");
-            }
-
-            List<Job2> rtnJobs = new List<Job2>();
-            foreach (var filterItem in filter)
-            {
-                switch (filterItem.Key)
-                {
-                    case BeforeFilter:
-                        GetJobsBefore((DateTime)filterItem.Value, ref rtnJobs);
-                        break;
-
-                    case AfterFilter:
-                        GetJobsAfter((DateTime)filterItem.Value, ref rtnJobs);
-                        break;
-
-                    case NewestFilter:
-                        GetNewestJobs((int)filterItem.Value, ref rtnJobs);
-                        break;
-                }
-            }
-
-            return rtnJobs;
-        }
-
-        /// <summary>
-        /// Remove a job from the store.
-        /// </summary>
-        /// <param name="job">Job object to remove.</param>
-        public override void RemoveJob(Job2 job)
-        {
-            if (job == null)
-            {
-                throw new PSArgumentNullException("job");
-            }
-
-            RefreshRepository();
-
-            try
-            {
-                JobRepository.Remove(job);
-                ScheduledJobStore.RemoveJobRun(
-                    job.Name,
-                    job.PSBeginTime ?? DateTime.MinValue);
-            }
-            catch (DirectoryNotFoundException)
-            {
-            }
-            catch (FileNotFoundException)
-            {
-            }
-        }
-
-        /// <summary>
-        /// Saves job to scheduled job run store.
-        /// </summary>
-        /// <param name="job">ScheduledJob.</param>
-        public override void PersistJob(Job2 job)
-        {
-            if (job == null)
-            {
-                throw new PSArgumentNullException("job");
-            }
-
-            SaveJobToStore(job as ScheduledJob);
-        }
-
-        #endregion
-
-        #region Save Job
-
-        /// <summary>
-        /// Serializes a ScheduledJob and saves it to store.
-        /// </summary>
-        /// <param name="job">ScheduledJob.</param>
-        internal static void SaveJobToStore(ScheduledJob job)
-        {
-            string outputPath = job.Definition.OutputPath;
-            if (string.IsNullOrEmpty(outputPath))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.CantSaveJobNoFilePathSpecified,
-                    job.Name);
-                throw new ScheduledJobException(msg);
-            }
-
-            FileStream fsStatus = null;
-            FileStream fsResults = null;
-            try
-            {
-                // Check the job store results and if maximum number of results exist
-                // remove the oldest results folder to make room for these new results.
-                CheckJobStoreResults(outputPath, job.Definition.ExecutionHistoryLength);
-
-                fsStatus = ScheduledJobStore.CreateFileForJobRunItem(
-                    outputPath,
-                    job.PSBeginTime ?? DateTime.MinValue,
-                    ScheduledJobStore.JobRunItem.Status);
-
-                // Save status only in status file stream.
-                SaveStatusToFile(job, fsStatus);
-
-                fsResults = ScheduledJobStore.CreateFileForJobRunItem(
-                    outputPath,
-                    job.PSBeginTime ?? DateTime.MinValue,
-                    ScheduledJobStore.JobRunItem.Results);
-
-                // Save entire job in results file stream.
-                SaveResultsToFile(job, fsResults);
-            }
-            finally
-            {
-                if (fsStatus != null)
-                {
-                    fsStatus.Close();
-                }
-
-                if (fsResults != null)
-                {
-                    fsResults.Close();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the job status information to the provided
-        /// file stream.
-        /// </summary>
-        /// <param name="job">ScheduledJob job to save.</param>
-        /// <param name="fs">FileStream.</param>
-        private static void SaveStatusToFile(ScheduledJob job, FileStream fs)
-        {
-            StatusInfo statusInfo = new StatusInfo(
-                job.InstanceId,
-                job.Name,
-                job.Location,
-                job.Command,
-                job.StatusMessage,
-                job.JobStateInfo.State,
-                job.HasMoreData,
-                job.PSBeginTime,
-                job.PSEndTime,
-                job.Definition);
-
-            XmlObjectSerializer serializer = new System.Runtime.Serialization.NetDataContractSerializer();
-            serializer.WriteObject(fs, statusInfo);
-            fs.Flush();
-        }
-
-        /// <summary>
-        /// Writes the job (which implements ISerializable) to the provided
-        /// file stream.
-        /// </summary>
-        /// <param name="job">ScheduledJob job to save.</param>
-        /// <param name="fs">FileStream.</param>
-        private static void SaveResultsToFile(ScheduledJob job, FileStream fs)
-        {
-            XmlObjectSerializer serializer = new System.Runtime.Serialization.NetDataContractSerializer();
-            serializer.WriteObject(fs, job);
-            fs.Flush();
-        }
-
-        /// <summary>
-        /// Check the job store results and if maximum number of results exist
-        /// remove the oldest results folder to make room for these new results.
-        /// </summary>
-        /// <param name="outputPath">Output path.</param>
-        /// <param name="executionHistoryLength">Maximum size of stored job results.</param>
-        private static void CheckJobStoreResults(string outputPath, int executionHistoryLength)
-        {
-            // Get current results for this job definition.
-            Collection<DateTime> jobRuns = ScheduledJobStore.GetJobRunsForDefinitionPath(outputPath);
-            if (jobRuns.Count <= executionHistoryLength)
-            {
-                // There is room for another job run in the store.
-                return;
-            }
-
-            // Remove the oldest job run from the store.
-            DateTime jobRunToRemove = DateTime.MaxValue;
-            foreach (DateTime jobRun in jobRuns)
-            {
-                jobRunToRemove = (jobRun < jobRunToRemove) ? jobRun : jobRunToRemove;
-            }
-
-            try
-            {
-                ScheduledJobStore.RemoveJobRunFromOutputPath(outputPath, jobRunToRemove);
-            }
-            catch (UnauthorizedAccessException)
-            { }
-        }
-
-        #endregion
-
-        #region Retrieve Job
-
-        /// <summary>
-        /// Finds and load the Job associated with this ScheduledJobDefinition object
-        /// having the job run date time provided.
-        /// </summary>
-        /// <param name="jobRun">DateTime of job run to load.</param>
-        /// <param name="definitionName">ScheduledJobDefinition name.</param>
-        /// <returns>Job2 job loaded from store.</returns>
-        internal static Job2 LoadJobFromStore(string definitionName, DateTime jobRun)
-        {
-            FileStream fsResults = null;
-            Exception ex = null;
-            bool corruptedFile = false;
-            Job2 job = null;
-
-            try
-            {
-                // Results
-                fsResults = ScheduledJobStore.GetFileForJobRunItem(
-                    definitionName,
-                    jobRun,
-                    ScheduledJobStore.JobRunItem.Results,
-                    FileMode.Open,
-                    FileAccess.Read,
-                    FileShare.Read);
-
-                job = LoadResultsFromFile(fsResults);
-            }
-            catch (ArgumentException e)
-            {
-                ex = e;
-            }
-            catch (DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (FileNotFoundException e)
-            {
-                ex = e;
-                corruptedFile = true;
-            }
-            catch (UnauthorizedAccessException e)
-            {
-                ex = e;
-            }
-            catch (IOException e)
-            {
-                ex = e;
-            }
-            catch (System.Runtime.Serialization.SerializationException)
-            {
-                corruptedFile = true;
-            }
-            catch (System.Runtime.Serialization.InvalidDataContractException)
-            {
-                corruptedFile = true;
-            }
-            catch (System.Xml.XmlException)
-            {
-                corruptedFile = true;
-            }
-            catch (System.TypeInitializationException)
-            {
-                corruptedFile = true;
-            }
-            finally
-            {
-                if (fsResults != null)
-                {
-                    fsResults.Close();
-                }
-            }
-
-            if (corruptedFile)
-            {
-                // Remove the corrupted job results file.
-                ScheduledJobStore.RemoveJobRun(definitionName, jobRun);
-            }
-
-            if (ex != null)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.CantLoadJobRunFromStore, definitionName, jobRun);
-                throw new ScheduledJobException(msg, ex);
-            }
-
-            return job;
-        }
-
-        /// <summary>
-        /// Loads the Job2 object from provided files stream.
-        /// </summary>
-        /// <param name="fs">FileStream from which to read job object.</param>
-        /// <returns>Created Job2 from file stream.</returns>
-        private static Job2 LoadResultsFromFile(FileStream fs)
-        {
-            XmlObjectSerializer serializer = new System.Runtime.Serialization.NetDataContractSerializer();
-            return (Job2)serializer.ReadObject(fs);
-        }
-
-        #endregion
-
-        #region Static Methods
-
-        /// <summary>
-        /// Adds a Job2 object to the repository.
-        /// </summary>
-        /// <param name="job">Job2.</param>
-        internal static void AddToRepository(Job2 job)
-        {
-            if (job == null)
-            {
-                throw new PSArgumentNullException("job");
-            }
-
-            JobRepository.AddOrReplace(job);
-        }
-
-        /// <summary>
-        /// Clears all items in the repository.
-        /// </summary>
-        internal static void ClearRepository()
-        {
-            JobRepository.Clear();
-        }
-
-        /// <summary>
-        /// Clears all items for given job definition name in the
-        /// repository.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        internal static void ClearRepositoryForDefinition(string definitionName)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            // This returns a new list object of repository jobs.
-            List<Job2> jobList = JobRepository.Jobs;
-            foreach (var job in jobList)
-            {
-                if (string.Compare(definitionName, job.Name,
-                    StringComparison.OrdinalIgnoreCase) == 0)
-                {
-                    JobRepository.Remove(job);
-                }
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void RefreshRepository()
-        {
-            ScheduledJobStore.CreateDirectoryIfNotExists();
-            CreateFileSystemWatcher();
-
-            IEnumerable<string> jobDefinitions = ScheduledJobStore.GetJobDefinitions();
-            foreach (string definitionName in jobDefinitions)
-            {
-                // Create Job2 objects for each job run in store.
-                Collection<DateTime> jobRuns = GetJobRuns(definitionName);
-                if (jobRuns == null)
-                {
-                    continue;
-                }
-
-                ScheduledJobDefinition definition = null;
-                foreach (DateTime jobRun in jobRuns)
-                {
-                    if (jobRun > JobRepository.GetLatestJobRun(definitionName))
-                    {
-                        Job2 job;
-                        try
-                        {
-                            if (definition == null)
-                            {
-                                definition = ScheduledJobDefinition.LoadFromStore(definitionName, null);
-                            }
-
-                            job = LoadJobFromStore(definition.Name, jobRun);
-                        }
-                        catch (ScheduledJobException)
-                        {
-                            continue;
-                        }
-                        catch (DirectoryNotFoundException)
-                        {
-                            continue;
-                        }
-                        catch (FileNotFoundException)
-                        {
-                            continue;
-                        }
-                        catch (UnauthorizedAccessException)
-                        {
-                            continue;
-                        }
-                        catch (IOException)
-                        {
-                            continue;
-                        }
-
-                        JobRepository.AddOrReplace(job);
-                        JobRepository.SetLatestJobRun(definitionName, jobRun);
-                    }
-                }
-            }
-        }
-
-        private void CreateFileSystemWatcher()
-        {
-            // Lazily create the static file system watcher
-            // on first use.
-            if (StoreWatcher == null)
-            {
-                lock (SyncObject)
-                {
-                    if (StoreWatcher == null)
-                    {
-                        StoreWatcher = new FileSystemWatcher(ScheduledJobStore.GetJobDefinitionLocation());
-                        StoreWatcher.IncludeSubdirectories = true;
-                        StoreWatcher.NotifyFilter = NotifyFilters.LastWrite;
-                        StoreWatcher.Filter = "Results.xml";
-                        StoreWatcher.EnableRaisingEvents = true;
-                        StoreWatcher.Changed += (object sender, FileSystemEventArgs e) =>
-                        {
-                            UpdateRepositoryObjects(e);
-                        };
-                    }
-                }
-            }
-        }
-
-        private static void UpdateRepositoryObjects(FileSystemEventArgs e)
-        {
-            // Extract job run information from change file path.
-            string updateDefinitionName;
-            DateTime updateJobRun;
-            if (!GetJobRunInfo(e.Name, out updateDefinitionName, out updateJobRun))
-            {
-                System.Diagnostics.Debug.Assert(false, "All job run updates should have valid directory names.");
-                return;
-            }
-
-            // Find corresponding job in repository.
-            ScheduledJob updateJob = JobRepository.GetJob(updateDefinitionName, updateJobRun);
-            if (updateJob == null)
-            {
-                return;
-            }
-
-            // Load updated job information from store.
-            Job2 job = null;
-            try
-            {
-                job = LoadJobFromStore(updateDefinitionName, updateJobRun);
-            }
-            catch (ScheduledJobException)
-            { }
-            catch (DirectoryNotFoundException)
-            { }
-            catch (FileNotFoundException)
-            { }
-            catch (UnauthorizedAccessException)
-            { }
-            catch (IOException)
-            { }
-
-            // Update job in repository based on new job store data.
-            if (job != null)
-            {
-                updateJob.Update(job as ScheduledJob);
-            }
-        }
-
-        /// <summary>
-        /// Parses job definition name and job run DateTime from provided path string.
-        /// Example:
-        ///   path = "ScheduledJob1\\Output\\20111219-200921-369\\Results.xml"
-        ///      'ScheduledJob1' is the definition name.
-        ///      '20111219-200921-369' is the jobRun DateTime.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="definitionName"></param>
-        /// <param name="jobRunReturn"></param>
-        /// <returns></returns>
-        private static bool GetJobRunInfo(
-            string path,
-            out string definitionName,
-            out DateTime jobRunReturn)
-        {
-            // Parse definition name from path.
-            string[] pathItems = path.Split(System.IO.Path.DirectorySeparatorChar);
-            if (pathItems.Length == 4)
-            {
-                definitionName = pathItems[0];
-                return ScheduledJobStore.ConvertJobRunNameToDateTime(pathItems[2], out jobRunReturn);
-            }
-
-            definitionName = null;
-            jobRunReturn = DateTime.MinValue;
-            return false;
-        }
-
-        internal static Collection<DateTime> GetJobRuns(string definitionName)
-        {
-            Collection<DateTime> jobRuns = null;
-            try
-            {
-                jobRuns = ScheduledJobStore.GetJobRunsForDefinition(definitionName);
-            }
-            catch (DirectoryNotFoundException)
-            { }
-            catch (FileNotFoundException)
-            { }
-            catch (UnauthorizedAccessException)
-            { }
-            catch (IOException)
-            { }
-
-            return jobRuns;
-        }
-
-        private void GetJobsBefore(
-            DateTime dateTime,
-            ref List<Job2> jobList)
-        {
-            foreach (var job in JobRepository.Jobs)
-            {
-                if (job.PSEndTime < dateTime &&
-                    !jobList.Contains(job))
-                {
-                    jobList.Add(job);
-                }
-            }
-        }
-
-        private void GetJobsAfter(
-            DateTime dateTime,
-            ref List<Job2> jobList)
-        {
-            foreach (var job in JobRepository.Jobs)
-            {
-                if (job.PSEndTime > dateTime &&
-                    !jobList.Contains(job))
-                {
-                    jobList.Add(job);
-                }
-            }
-        }
-
-        private void GetNewestJobs(
-            int maxNumber,
-            ref List<Job2> jobList)
-        {
-            List<Job2> allJobs = JobRepository.Jobs;
-
-            // Sort descending.
-            allJobs.Sort((firstJob, secondJob) =>
-                {
-                    if (firstJob.PSEndTime > secondJob.PSEndTime)
-                    {
-                        return -1;
-                    }
-                    else if (firstJob.PSEndTime < secondJob.PSEndTime)
-                    {
-                        return 1;
-                    }
-                    else
-                    {
-                        return 0;
-                    }
-                });
-
-            int count = 0;
-            foreach (var job in allJobs)
-            {
-                if (++count > maxNumber)
-                {
-                    break;
-                }
-
-                if (!jobList.Contains(job))
-                {
-                    jobList.Add(job);
-                }
-            }
-        }
-
-        #endregion
-
-        #region Private Repository Class
-
-        /// <summary>
-        /// Collection of Job2 objects.
-        /// </summary>
-        internal class ScheduledJobRepository
-        {
-            #region Private Members
-
-            private object _syncObject = new object();
-            private Dictionary<Guid, Job2> _jobs = new Dictionary<Guid, Job2>();
-            private Dictionary<string, DateTime> _latestJobRuns = new Dictionary<string, DateTime>();
-
-            #endregion
-
-            #region Public Properties
-
-            /// <summary>
-            /// Returns all job objects in the repository as a List.
-            /// </summary>
-            public List<Job2> Jobs
-            {
-                get
-                {
-                    lock (_syncObject)
-                    {
-                        return new List<Job2>(_jobs.Values);
-                    }
-                }
-            }
-
-            /// <summary>
-            /// Returns count of jobs in repository.
-            /// </summary>
-            public int Count
-            {
-                get
-                {
-                    lock (_syncObject)
-                    {
-                        return _jobs.Count;
-                    }
-                }
-            }
-
-            #endregion
-
-            #region Public Methods
-
-            /// <summary>
-            /// Add Job2 to repository.
-            /// </summary>
-            /// <param name="job">Job2 to add.</param>
-            public void Add(Job2 job)
-            {
-                if (job == null)
-                {
-                    throw new PSArgumentNullException("job");
-                }
-
-                lock (_syncObject)
-                {
-                    if (_jobs.ContainsKey(job.InstanceId))
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.ScheduledJobAlreadyExistsInLocal, job.Name, job.InstanceId);
-                        throw new ScheduledJobException(msg);
-                    }
-
-                    _jobs.Add(job.InstanceId, job);
-                }
-            }
-
-            /// <summary>
-            /// Add or replace passed in Job2 object to repository.
-            /// </summary>
-            /// <param name="job">Job2 to add.</param>
-            public void AddOrReplace(Job2 job)
-            {
-                if (job == null)
-                {
-                    throw new PSArgumentNullException("job");
-                }
-
-                lock (_syncObject)
-                {
-                    if (_jobs.ContainsKey(job.InstanceId))
-                    {
-                        _jobs.Remove(job.InstanceId);
-                    }
-
-                    _jobs.Add(job.InstanceId, job);
-                }
-            }
-
-            /// <summary>
-            /// Remove Job2 from repository.
-            /// </summary>
-            /// <param name="job"></param>
-            public void Remove(Job2 job)
-            {
-                if (job == null)
-                {
-                    throw new PSArgumentNullException("job");
-                }
-
-                lock (_syncObject)
-                {
-                    if (_jobs.ContainsKey(job.InstanceId) == false)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.ScheduledJobNotInRepository, job.Name);
-                        throw new ScheduledJobException(msg);
-                    }
-
-                    _jobs.Remove(job.InstanceId);
-                }
-            }
-
-            /// <summary>
-            /// Clears all Job2 items from the repository.
-            /// </summary>
-            public void Clear()
-            {
-                lock (_syncObject)
-                {
-                    _jobs.Clear();
-                }
-            }
-
-            /// <summary>
-            /// Gets the latest job run Date/Time for the given definition name.
-            /// </summary>
-            /// <param name="definitionName">ScheduledJobDefinition name.</param>
-            /// <returns>Job Run DateTime.</returns>
-            public DateTime GetLatestJobRun(string definitionName)
-            {
-                if (string.IsNullOrEmpty(definitionName))
-                {
-                    throw new PSArgumentException("definitionName");
-                }
-
-                lock (_syncObject)
-                {
-                    if (_latestJobRuns.ContainsKey(definitionName))
-                    {
-                        return _latestJobRuns[definitionName];
-                    }
-                    else
-                    {
-                        DateTime startJobRun = DateTime.MinValue;
-                        _latestJobRuns.Add(definitionName, startJobRun);
-                        return startJobRun;
-                    }
-                }
-            }
-
-            /// <summary>
-            /// Sets the latest job run Date/Time for the given definition name.
-            /// </summary>
-            /// <param name="definitionName"></param>
-            /// <param name="jobRun"></param>
-            public void SetLatestJobRun(string definitionName, DateTime jobRun)
-            {
-                if (string.IsNullOrEmpty(definitionName))
-                {
-                    throw new PSArgumentException("definitionName");
-                }
-
-                lock (_syncObject)
-                {
-                    if (_latestJobRuns.ContainsKey(definitionName))
-                    {
-                        _latestJobRuns.Remove(definitionName);
-                        _latestJobRuns.Add(definitionName, jobRun);
-                    }
-                    else
-                    {
-                        _latestJobRuns.Add(definitionName, jobRun);
-                    }
-                }
-            }
-
-            /// <summary>
-            /// Search repository for specific job run.
-            /// </summary>
-            /// <param name="definitionName">Definition name.</param>
-            /// <param name="jobRun">Job run DateTime.</param>
-            /// <returns>Scheduled job if found.</returns>
-            public ScheduledJob GetJob(string definitionName, DateTime jobRun)
-            {
-                lock (_syncObject)
-                {
-                    foreach (ScheduledJob job in _jobs.Values)
-                    {
-                        if (job.PSBeginTime == null)
-                        {
-                            continue;
-                        }
-
-                        DateTime PSBeginTime = job.PSBeginTime ?? DateTime.MinValue;
-                        if (definitionName.Equals(job.Definition.Name, StringComparison.OrdinalIgnoreCase) &&
-                            jobRun.Year == PSBeginTime.Year &&
-                            jobRun.Month == PSBeginTime.Month &&
-                            jobRun.Day == PSBeginTime.Day &&
-                            jobRun.Hour == PSBeginTime.Hour &&
-                            jobRun.Minute == PSBeginTime.Minute &&
-                            jobRun.Second == PSBeginTime.Second &&
-                            jobRun.Millisecond == PSBeginTime.Millisecond)
-                        {
-                            return job;
-                        }
-                    }
-                }
-
-                return null;
-            }
-
-            #endregion
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
deleted file mode 100644
index e6bcd1c3b8d..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
+++ /dev/null
@@ -1,676 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.IO;
-using System.Management.Automation;
-using System.Security.AccessControl;
-using System.Security.Principal;
-using System.Text;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This class encapsulates the work of determining the file location where
-    /// a job definition will be stored and retrieved and where job runs will
-    /// be stored and retrieved.  Scheduled job definitions are stored in a
-    /// location based on the current user.  Job runs are stored in the
-    /// corresponding scheduled job definition location under an "Output"
-    /// directory, where each run will have a subdirectory with a name derived
-    /// from the job run date/time.
-    ///
-    /// File Structure for "JobDefinitionFoo":
-    /// $env:User\AppData\Local\Windows\PowerShell\ScheduledJobs\JobDefinitionFoo\
-    ///     ScheduledJobDefinition.xml
-    ///     Output\
-    ///         110321-130942\
-    ///             Status.xml
-    ///             Results.xml
-    ///         110319-173502\
-    ///             Status.xml
-    ///             Results.xml
-    ///         ...
-    /// </summary>
-    internal class ScheduledJobStore
-    {
-        #region Public Enums
-
-        public enum JobRunItem
-        {
-            None = 0,
-            Status = 1,
-            Results = 2
-        }
-
-        #endregion
-
-        #region Public Strings
-
-        public const string ScheduledJobsPath = @"Microsoft\Windows\PowerShell\ScheduledJobs";
-        public const string DefinitionFileName = "ScheduledJobDefinition";
-        public const string JobRunOutput = "Output";
-        public const string ScheduledJobDefExistsFQEID = "ScheduledJobDefExists";
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Returns FileStream object for existing scheduled job definition.
-        /// Definition file is looked for in the default user local appdata path.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        /// <param name="fileMode">File mode.</param>
-        /// <param name="fileAccess">File access.</param>
-        /// <param name="fileShare">File share.</param>
-        /// <returns>FileStream object.</returns>
-        public static FileStream GetFileForJobDefinition(
-            string definitionName,
-            FileMode fileMode,
-            FileAccess fileAccess,
-            FileShare fileShare)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            string filePathName = GetFilePathName(definitionName, DefinitionFileName);
-            return File.Open(filePathName, fileMode, fileAccess, fileShare);
-        }
-
-        /// <summary>
-        /// Returns FileStream object for existing scheduled job definition.
-        /// Definition file is looked for in the path provided.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        /// <param name="definitionPath">Scheduled job definition file path.</param>
-        /// <param name="fileMode">File mode.</param>
-        /// <param name="fileAccess">File share.</param>
-        /// <param name="fileShare">File share.</param>
-        /// <returns></returns>
-        public static FileStream GetFileForJobDefinition(
-            string definitionName,
-            string definitionPath,
-            FileMode fileMode,
-            FileAccess fileAccess,
-            FileShare fileShare)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            if (string.IsNullOrEmpty(definitionPath))
-            {
-                throw new PSArgumentException("definitionPath");
-            }
-
-            string filePathName = string.Create(CultureInfo.InvariantCulture, $@"{definitionPath}\{definitionName}\{DefinitionFileName}.xml");
-            return File.Open(filePathName, fileMode, fileAccess, fileShare);
-        }
-
-        /// <summary>
-        /// 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>
-        /// <returns>True if paths are equal.</returns>
-        public static bool IsDefaultUserPath(string definitionPath)
-        {
-            return definitionPath.Equals(GetJobDefinitionLocation(), StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <summary>
-        /// Returns a FileStream object for a new scheduled job definition name.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        /// <returns>FileStream object.</returns>
-        public static FileStream CreateFileForJobDefinition(
-            string definitionName)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            string filePathName = CreateFilePathName(definitionName, DefinitionFileName);
-            return File.Create(filePathName);
-        }
-
-        /// <summary>
-        /// Returns an IEnumerable object of scheduled job definition names in
-        /// the job store.
-        /// </summary>
-        /// <returns>IEnumerable of job definition names.</returns>
-        public static IEnumerable<string> GetJobDefinitions()
-        {
-            // Directory names are identical to the corresponding scheduled job definition names.
-            string directoryPath = GetDirectoryPath();
-            IEnumerable<string> definitions = Directory.EnumerateDirectories(directoryPath);
-            return (definitions != null) ? definitions : new Collection<string>() as IEnumerable<string>;
-        }
-
-        /// <summary>
-        /// Returns a FileStream object for an existing scheduled job definition
-        /// run.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        /// <param name="runStart">DateTime of job run start time.</param>
-        /// <param name="runItem">Job run item.</param>
-        /// <param name="fileAccess">File access.</param>
-        /// <param name="fileMode">File mode.</param>
-        /// <param name="fileShare">File share.</param>
-        /// <returns>FileStream object.</returns>
-        public static FileStream GetFileForJobRunItem(
-            string definitionName,
-            DateTime runStart,
-            JobRunItem runItem,
-            FileMode fileMode,
-            FileAccess fileAccess,
-            FileShare fileShare)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            string filePathName = GetRunFilePathName(definitionName, runItem, runStart);
-            return File.Open(filePathName, fileMode, fileAccess, fileShare);
-        }
-
-        /// <summary>
-        /// Returns a FileStream object for a new scheduled job definition run.
-        /// </summary>
-        /// <param name="definitionOutputPath">Scheduled job definition path.</param>
-        /// <param name="runStart">DateTime of job run start time.</param>
-        /// <param name="runItem">Job run item.</param>
-        /// <returns>FileStream object.</returns>
-        public static FileStream CreateFileForJobRunItem(
-            string definitionOutputPath,
-            DateTime runStart,
-            JobRunItem runItem)
-        {
-            if (string.IsNullOrEmpty(definitionOutputPath))
-            {
-                throw new PSArgumentException("definitionOutputPath");
-            }
-
-            string filePathName = GetRunFilePathNameFromPath(definitionOutputPath, runItem, runStart);
-
-            // If the file already exists, we overwrite it because the job run
-            // can be updated multiple times while the job is running.
-            return File.Create(filePathName);
-        }
-
-        /// <summary>
-        /// Returns a collection of DateTime objects which specify job run directories
-        /// that are currently in the store.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        /// <returns>Collection of DateTime objects.</returns>
-        public static Collection<DateTime> GetJobRunsForDefinition(
-            string definitionName)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            string definitionOutputPath = GetJobRunOutputDirectory(definitionName);
-
-            return GetJobRunsForDefinitionPath(definitionOutputPath);
-        }
-
-        /// <summary>
-        /// Returns a collection of DateTime objects which specify job run directories
-        /// that are currently in the store.
-        /// </summary>
-        /// <param name="definitionOutputPath">Scheduled job definition job run Output path.</param>
-        /// <returns>Collection of DateTime objects.</returns>
-        public static Collection<DateTime> GetJobRunsForDefinitionPath(
-            string definitionOutputPath)
-        {
-            if (string.IsNullOrEmpty(definitionOutputPath))
-            {
-                throw new PSArgumentException("definitionOutputPath");
-            }
-
-            Collection<DateTime> jobRunInfos = new Collection<DateTime>();
-            IEnumerable<string> jobRuns = Directory.EnumerateDirectories(definitionOutputPath);
-            if (jobRuns != null)
-            {
-                // Job run directory names are the date/times that the job was started.
-                foreach (string jobRun in jobRuns)
-                {
-                    DateTime jobRunDateTime;
-                    int indx = jobRun.LastIndexOf('\\');
-                    string jobRunName = (indx != -1) ? jobRun.Substring(indx + 1) : jobRun;
-                    if (ConvertJobRunNameToDateTime(jobRunName, out jobRunDateTime))
-                    {
-                        jobRunInfos.Add(jobRunDateTime);
-                    }
-                }
-            }
-
-            return jobRunInfos;
-        }
-
-        /// <summary>
-        /// Remove the job definition and all job runs from job store.
-        /// </summary>
-        /// <param name="definitionName">Scheduled Job Definition name.</param>
-        public static void RemoveJobDefinition(
-            string definitionName)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            // Remove job runs, job definition file, and job definition directory.
-            string jobDefDirectory = GetJobDefinitionPath(definitionName);
-            Directory.Delete(jobDefDirectory, true);
-        }
-
-        /// <summary>
-        /// Renames the directory containing the old job definition name
-        /// to the new name provided.
-        /// </summary>
-        /// <param name="oldDefName">Existing job definition directory.</param>
-        /// <param name="newDefName">Renamed job definition directory.</param>
-        public static void RenameScheduledJobDefDir(
-            string oldDefName,
-            string newDefName)
-        {
-            if (string.IsNullOrEmpty(oldDefName))
-            {
-                throw new PSArgumentException("oldDefName");
-            }
-
-            if (string.IsNullOrEmpty(newDefName))
-            {
-                throw new PSArgumentException("newDefName");
-            }
-
-            string oldDirPath = GetJobDefinitionPath(oldDefName);
-            string newDirPath = GetJobDefinitionPath(newDefName);
-            Directory.Move(oldDirPath, newDirPath);
-        }
-
-        /// <summary>
-        /// Remove a single job definition job run from the job store.
-        /// </summary>
-        /// <param name="definitionName">Scheduled Job Definition name.</param>
-        /// <param name="runStart">DateTime of job run.</param>
-        public static void RemoveJobRun(
-            string definitionName,
-            DateTime runStart)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            // Remove the job run files and directory.
-            string runDirectory = GetRunDirectory(definitionName, runStart);
-            Directory.Delete(runDirectory, true);
-        }
-
-        /// <summary>
-        /// Remove a single job definition job run from the job store.
-        /// </summary>
-        /// <param name="definitionOutputPath">Scheduled Job Definition Output path.</param>
-        /// <param name="runStart">DateTime of job run.</param>
-        public static void RemoveJobRunFromOutputPath(
-            string definitionOutputPath,
-            DateTime runStart)
-        {
-            if (string.IsNullOrEmpty(definitionOutputPath))
-            {
-                throw new PSArgumentException("definitionOutputPath");
-            }
-
-            // Remove the job run files and directory.
-            string runDirectory = GetRunDirectoryFromPath(definitionOutputPath, runStart);
-            Directory.Delete(runDirectory, true);
-        }
-
-        /// <summary>
-        /// Remove all job runs for this job definition.
-        /// </summary>
-        /// <param name="definitionName">Scheduled Job Definition name.</param>
-        public static void RemoveAllJobRuns(
-            string definitionName)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            Collection<DateTime> jobRuns = GetJobRunsForDefinition(definitionName);
-            foreach (DateTime jobRun in jobRuns)
-            {
-                string jobRunPath = GetRunDirectory(definitionName, jobRun);
-                Directory.Delete(jobRunPath, true);
-            }
-        }
-
-        /// <summary>
-        /// Set read access on provided definition file for specified user.
-        /// </summary>
-        /// <param name="definitionName">Definition name.</param>
-        /// <param name="user">Account user name.</param>
-        public static void SetReadAccessOnDefinitionFile(
-            string definitionName,
-            string user)
-        {
-            string filePath = GetFilePathName(definitionName, DefinitionFileName);
-
-            // Get file security for existing file.
-            FileSecurity fileSecurity = new FileSecurity(
-                filePath,
-                AccessControlSections.Access);
-
-            // Create rule.
-            FileSystemAccessRule fileAccessRule = new FileSystemAccessRule(
-                user,
-                FileSystemRights.Read,
-                AccessControlType.Allow);
-            fileSecurity.AddAccessRule(fileAccessRule);
-
-            // Apply rule.
-            File.SetAccessControl(filePath, fileSecurity);
-        }
-
-        /// <summary>
-        /// Set write access on Output directory for provided definition for
-        /// specified user.
-        /// </summary>
-        /// <param name="definitionName">Definition name.</param>
-        /// <param name="user">Account user name.</param>
-        public static void SetWriteAccessOnJobRunOutput(
-            string definitionName,
-            string user)
-        {
-            string outputDirectoryPath = GetJobRunOutputDirectory(definitionName);
-            AddFullAccessToDirectory(user, outputDirectoryPath);
-        }
-
-        /// <summary>
-        /// Returns the directory path for job run output for the specified
-        /// scheduled job definition.
-        /// </summary>
-        /// <param name="definitionName">Definition name.</param>
-        /// <returns>Directory Path.</returns>
-        public static string GetJobRunOutputDirectory(
-            string definitionName)
-        {
-            if (string.IsNullOrEmpty(definitionName))
-            {
-                throw new PSArgumentException("definitionName");
-            }
-
-            return Path.Combine(GetJobDefinitionPath(definitionName), JobRunOutput);
-        }
-
-        /// <summary>
-        /// Gets the directory path for a Scheduled Job Definition.
-        /// </summary>
-        /// <returns>Directory Path.</returns>
-        public static string GetJobDefinitionLocation()
-        {
-#if UNIX
-            return Path.Combine(Platform.SelectProductNameForDirectory(Platform.XDG_Type.CACHE), "ScheduledJobs"));
-#else
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), ScheduledJobsPath);
-#endif
-        }
-
-        public static void CreateDirectoryIfNotExists()
-        {
-            GetDirectoryPath();
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Gets the directory path for Scheduled Jobs.  Will create the directory if
-        /// it does not exist.
-        /// </summary>
-        /// <returns>Directory Path.</returns>
-        private static string GetDirectoryPath()
-        {
-            string pathName;
-#if UNIX
-            pathName = Path.Combine(Platform.SelectProductNameForDirectory(Platform.XDG_Type.CACHE), "ScheduledJobs"));
-#else
-            pathName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), ScheduledJobsPath);
-#endif
-            if (!Directory.Exists(pathName))
-            {
-                Directory.CreateDirectory(pathName);
-            }
-
-            return pathName;
-        }
-
-        /// <summary>
-        /// Creates a ScheduledJob definition directory with provided definition name
-        /// along with a job run Output directory, and returns a file path/name.
-        ///  ...\ScheduledJobs\definitionName\fileName.xml
-        ///  ...\ScheduledJobs\definitionName\Output\
-        /// </summary>
-        /// <param name="definitionName">Definition name.</param>
-        /// <param name="fileName">File name.</param>
-        /// <returns>File path/name.</returns>
-        private static string CreateFilePathName(string definitionName, string fileName)
-        {
-            string filePath = GetJobDefinitionPath(definitionName);
-            string outputPath = GetJobRunOutputDirectory(definitionName);
-            if (Directory.Exists(filePath))
-            {
-                ScheduledJobException ex = new ScheduledJobException(StringUtil.Format(ScheduledJobErrorStrings.JobDefFileAlreadyExists, definitionName));
-                ex.FQEID = ScheduledJobDefExistsFQEID;
-                throw ex;
-            }
-
-            Directory.CreateDirectory(filePath);
-            Directory.CreateDirectory(outputPath);
-            return string.Create(CultureInfo.InstalledUICulture, $@"{filePath}\{fileName}.xml");
-        }
-
-        /// <summary>
-        /// Returns a file path/name for an existing Scheduled job definition directory.
-        /// </summary>
-        /// <param name="definitionName">Definition name.</param>
-        /// <param name="fileName">File name.</param>
-        /// <returns>File path/name.</returns>
-        private static string GetFilePathName(string definitionName, string fileName)
-        {
-            string filePath = GetJobDefinitionPath(definitionName);
-            return string.Create(CultureInfo.InvariantCulture, $@"{filePath}\{fileName}.xml");
-        }
-
-        /// <summary>
-        /// Gets the directory path for a Scheduled Job Definition.
-        /// </summary>
-        /// <param name="definitionName">Scheduled job definition name.</param>
-        /// <returns>Directory Path.</returns>
-        private static string GetJobDefinitionPath(string definitionName)
-        {
-#if UNIX
-            return Path.Combine(Platform.SelectProductNameForDirectory(Platform.XDG_Type.CACHE), "ScheduledJobs", definitionName);
-#else
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                                ScheduledJobsPath,
-                                definitionName);
-#endif
-        }
-
-        /// <summary>
-        /// Returns a directory path for an existing ScheduledJob run result directory.
-        /// </summary>
-        /// <param name="definitionName">Definition name.</param>
-        /// <param name="runStart">File name.</param>
-        /// <returns>Directory Path.</returns>
-        private static string GetRunDirectory(
-            string definitionName,
-            DateTime runStart)
-        {
-            string directoryPath = GetJobRunOutputDirectory(definitionName);
-            return string.Create(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");
-        }
-
-        /// <summary>
-        /// Returns a directory path for an existing ScheduledJob run based on
-        /// provided definition Output directory path.
-        /// </summary>
-        /// <param name="definitionOutputPath">Output directory path.</param>
-        /// <param name="runStart">File name.</param>
-        /// <returns>Directory Path.</returns>
-        private static string GetRunDirectoryFromPath(
-            string definitionOutputPath,
-            DateTime runStart)
-        {
-            return string.Create(CultureInfo.InvariantCulture, $@"{definitionOutputPath}\{ConvertDateTimeToJobRunName(runStart)}");
-        }
-
-        /// <summary>
-        /// Returns a file path/name for a run result file.  Will create the
-        /// job run directory if it does not exist.
-        /// </summary>
-        /// <param name="definitionName">Definition name.</param>
-        /// <param name="runItem">Result type.</param>
-        /// <param name="runStart">Run date.</param>
-        /// <returns>File path/name.</returns>
-        private static string GetRunFilePathName(
-            string definitionName,
-            JobRunItem runItem,
-            DateTime runStart)
-        {
-            string directoryPath = GetJobRunOutputDirectory(definitionName);
-            string jobRunPath = string.Create(CultureInfo.InvariantCulture, $@"{directoryPath}\{ConvertDateTimeToJobRunName(runStart)}");
-
-            return string.Create(CultureInfo.InvariantCulture, $@"{jobRunPath}\{runItem}.xml");
-        }
-
-        /// <summary>
-        /// Returns a file path/name for a job run result, based on the passed in
-        /// job run output path.  Will create the job run directory if it does not
-        /// exist.
-        /// </summary>
-        /// <param name="outputPath">Definition job run output path.</param>
-        /// <param name="runItem">Result type.</param>
-        /// <param name="runStart">Run date.</param>
-        /// <returns></returns>
-        private static string GetRunFilePathNameFromPath(
-            string outputPath,
-            JobRunItem runItem,
-            DateTime runStart)
-        {
-            string jobRunPath = string.Create(CultureInfo.InvariantCulture, $@"{outputPath}\{ConvertDateTimeToJobRunName(runStart)}");
-
-            if (!Directory.Exists(jobRunPath))
-            {
-                // Create directory for this job run date.
-                Directory.CreateDirectory(jobRunPath);
-            }
-
-            return string.Create(CultureInfo.InvariantCulture, $@"{jobRunPath}\{runItem}.xml");
-        }
-
-        private static void AddFullAccessToDirectory(
-            string user,
-            string directoryPath)
-        {
-            // Create rule.
-            DirectoryInfo info = new DirectoryInfo(directoryPath);
-            DirectorySecurity dSecurity = info.GetAccessControl();
-            FileSystemAccessRule fileAccessRule = new FileSystemAccessRule(
-                user,
-                FileSystemRights.FullControl,
-                InheritanceFlags.ContainerInherit | InheritanceFlags.ObjectInherit,
-                PropagationFlags.None,
-                AccessControlType.Allow);
-
-            // Apply rule.
-            dSecurity.AddAccessRule(fileAccessRule);
-            info.SetAccessControl(dSecurity);
-        }
-
-        //
-        // String format: 'YYYYMMDD-HHMMSS-SSS'
-        // ,where SSS is milliseconds.
-        //
-
-        private static string ConvertDateTimeToJobRunName(DateTime dt)
-        {
-            return string.Format(CultureInfo.InvariantCulture,
-                @"{0:d4}{1:d2}{2:d2}-{3:d2}{4:d2}{5:d2}-{6:d3}",
-                dt.Year, dt.Month, dt.Day,
-                dt.Hour, dt.Minute, dt.Second, dt.Millisecond);
-        }
-
-        /// <summary>
-        /// Converts a jobRun name string to an equivalent DateTime.
-        /// </summary>
-        /// <param name="jobRunName"></param>
-        /// <param name="jobRun"></param>
-        /// <returns></returns>
-        internal static bool ConvertJobRunNameToDateTime(string jobRunName, out DateTime jobRun)
-        {
-            if (jobRunName == null || jobRunName.Length != 19)
-            {
-                jobRun = new DateTime();
-                return false;
-            }
-
-            int year = 0;
-            int month = 0;
-            int day = 0;
-            int hour = 0;
-            int minute = 0;
-            int second = 0;
-            int msecs = 0;
-            bool success = true;
-
-            try
-            {
-                year = Convert.ToInt32(jobRunName.Substring(0, 4));
-                month = Convert.ToInt32(jobRunName.Substring(4, 2));
-                day = Convert.ToInt32(jobRunName.Substring(6, 2));
-                hour = Convert.ToInt32(jobRunName.Substring(9, 2));
-                minute = Convert.ToInt32(jobRunName.Substring(11, 2));
-                second = Convert.ToInt32(jobRunName.Substring(13, 2));
-                msecs = Convert.ToInt32(jobRunName.Substring(16, 3));
-            }
-            catch (FormatException)
-            {
-                success = false;
-            }
-            catch (OverflowException)
-            {
-                success = false;
-            }
-
-            if (success)
-            {
-                jobRun = new DateTime(year, month, day, hour, minute, second, msecs);
-            }
-            else
-            {
-                jobRun = new DateTime();
-            }
-
-            return success;
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobTrigger.cs
deleted file mode 100644
index 0f40ded9f95..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobTrigger.cs
+++ /dev/null
@@ -1,887 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Management.Automation;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Text;
-using System.Threading;
-
-using Microsoft.Management.Infrastructure;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This class contains parameters used to define how/when a PowerShell job is
-    /// run via the Windows Task Scheduler (WTS).
-    /// </summary>
-    public sealed class ScheduledJobTrigger : ISerializable
-    {
-        #region Private Members
-
-        private DateTime? _time;
-        private List<DayOfWeek> _daysOfWeek;
-        private TimeSpan _randomDelay;
-        private Int32 _interval = 1;
-        private string _user;
-        private TriggerFrequency _frequency = TriggerFrequency.None;
-        private TimeSpan? _repInterval;
-        private TimeSpan? _repDuration;
-
-        private Int32 _id;
-        private bool _enabled = true;
-        private ScheduledJobDefinition _jobDefAssociation;
-
-        private static string _allUsers = "*";
-
-        #endregion
-
-        #region Public Properties
-
-        /// <summary>
-        /// Trigger time.
-        /// </summary>
-        public DateTime? At
-        {
-            get { return _time; }
-
-            set { _time = value; }
-        }
-
-        /// <summary>
-        /// Trigger days of week.
-        /// </summary>
-        public List<DayOfWeek> DaysOfWeek
-        {
-            get { return _daysOfWeek; }
-
-            set { _daysOfWeek = value; }
-        }
-
-        /// <summary>
-        /// Trigger days or weeks interval.
-        /// </summary>
-        public Int32 Interval
-        {
-            get { return _interval; }
-
-            set { _interval = value; }
-        }
-
-        /// <summary>
-        /// Trigger frequency.
-        /// </summary>
-        public TriggerFrequency Frequency
-        {
-            get { return _frequency; }
-
-            set { _frequency = value; }
-        }
-
-        /// <summary>
-        /// Trigger random delay.
-        /// </summary>
-        public TimeSpan RandomDelay
-        {
-            get { return _randomDelay; }
-
-            set { _randomDelay = value; }
-        }
-
-        /// <summary>
-        /// Trigger Once frequency repetition interval.
-        /// </summary>
-        public TimeSpan? RepetitionInterval
-        {
-            get { return _repInterval; }
-
-            set
-            {
-                // A TimeSpan value of zero is equivalent to a null value.
-                _repInterval = (value != null && value.Value == TimeSpan.Zero) ?
-                    null : value;
-            }
-        }
-
-        /// <summary>
-        /// Trigger Once frequency repetition duration.
-        /// </summary>
-        public TimeSpan? RepetitionDuration
-        {
-            get { return _repDuration; }
-
-            set
-            {
-                // A TimeSpan value of zero is equivalent to a null value.
-                _repDuration = (value != null && value.Value == TimeSpan.Zero) ?
-                    null : value;
-            }
-        }
-
-        /// <summary>
-        /// Trigger user name.
-        /// </summary>
-        public string User
-        {
-            get { return _user; }
-
-            set { _user = value; }
-        }
-
-        /// <summary>
-        /// Returns the trigger local Id.
-        /// </summary>
-        public Int32 Id
-        {
-            get { return _id; }
-
-            internal set { _id = value; }
-        }
-
-        /// <summary>
-        /// Defines enabled state of trigger.
-        /// </summary>
-        public bool Enabled
-        {
-            get { return _enabled; }
-
-            set { _enabled = value; }
-        }
-
-        /// <summary>
-        /// ScheduledJobDefinition object this trigger is associated with.
-        /// </summary>
-        public ScheduledJobDefinition JobDefinition
-        {
-            get { return _jobDefAssociation; }
-
-            internal set { _jobDefAssociation = value; }
-        }
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public ScheduledJobTrigger()
-        { }
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="enabled">Enabled.</param>
-        /// <param name="frequency">Trigger frequency.</param>
-        /// <param name="time">Trigger time.</param>
-        /// <param name="daysOfWeek">Weekly days of week.</param>
-        /// <param name="interval">Daily or Weekly interval.</param>
-        /// <param name="randomDelay">Random delay.</param>
-        /// <param name="repetitionInterval">Repetition interval.</param>
-        /// <param name="repetitionDuration">Repetition duration.</param>
-        /// <param name="user">Logon user.</param>
-        /// <param name="id">Trigger id.</param>
-        private ScheduledJobTrigger(
-            bool enabled,
-            TriggerFrequency frequency,
-            DateTime? time,
-            List<DayOfWeek> daysOfWeek,
-            Int32 interval,
-            TimeSpan randomDelay,
-            TimeSpan? repetitionInterval,
-            TimeSpan? repetitionDuration,
-            string user,
-            Int32 id)
-        {
-            _enabled = enabled;
-            _frequency = frequency;
-            _time = time;
-            _daysOfWeek = daysOfWeek;
-            _interval = interval;
-            _randomDelay = randomDelay;
-            RepetitionInterval = repetitionInterval;
-            RepetitionDuration = repetitionDuration;
-            _user = user;
-            _id = id;
-        }
-
-        /// <summary>
-        /// Copy constructor.
-        /// </summary>
-        /// <param name="copyTrigger">ScheduledJobTrigger.</param>
-        internal ScheduledJobTrigger(ScheduledJobTrigger copyTrigger)
-        {
-            if (copyTrigger == null)
-            {
-                throw new PSArgumentNullException("copyTrigger");
-            }
-
-            _enabled = copyTrigger.Enabled;
-            _frequency = copyTrigger.Frequency;
-            _id = copyTrigger.Id;
-            _time = copyTrigger.At;
-            _daysOfWeek = copyTrigger.DaysOfWeek;
-            _interval = copyTrigger.Interval;
-            _randomDelay = copyTrigger.RandomDelay;
-            _repInterval = copyTrigger.RepetitionInterval;
-            _repDuration = copyTrigger.RepetitionDuration;
-            _user = copyTrigger.User;
-
-            _jobDefAssociation = copyTrigger.JobDefinition;
-        }
-
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        /// <param name="info">SerializationInfo.</param>
-        /// <param name="context">StreamingContext.</param>
-        private ScheduledJobTrigger(
-            SerializationInfo info,
-            StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            DateTime time = info.GetDateTime("Time_Value");
-            if (time != DateTime.MinValue)
-            {
-                _time = time;
-            }
-            else
-            {
-                _time = null;
-            }
-
-            RepetitionInterval = (TimeSpan?)info.GetValue("RepetitionInterval_Value", typeof(TimeSpan));
-            RepetitionDuration = (TimeSpan?)info.GetValue("RepetitionDuration_Value", typeof(TimeSpan));
-
-            _daysOfWeek = (List<DayOfWeek>)info.GetValue("DaysOfWeek_Value", typeof(List<DayOfWeek>));
-            _randomDelay = (TimeSpan)info.GetValue("RandomDelay_Value", typeof(TimeSpan));
-            _interval = info.GetInt32("Interval_Value");
-            _user = info.GetString("User_Value");
-            _frequency = (TriggerFrequency)info.GetValue("TriggerFrequency_Value", typeof(TriggerFrequency));
-            _id = info.GetInt32("ID_Value");
-            _enabled = info.GetBoolean("Enabled_Value");
-
-            // Runtime reference and not saved to store.
-            _jobDefAssociation = null;
-        }
-
-        #endregion
-
-        #region ISerializable Implementation
-
-        /// <summary>
-        /// GetObjectData for ISerializable implementation.
-        /// </summary>
-        /// <param name="info"></param>
-        /// <param name="context"></param>
-        public void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new PSArgumentNullException("info");
-            }
-
-            if (_time == null)
-            {
-                info.AddValue("Time_Value", DateTime.MinValue);
-            }
-            else
-            {
-                info.AddValue("Time_Value", _time);
-            }
-
-            if (_repInterval == null)
-            {
-                info.AddValue("RepetitionInterval_Value", TimeSpan.Zero);
-            }
-            else
-            {
-                info.AddValue("RepetitionInterval_Value", _repInterval);
-            }
-
-            if (_repDuration == null)
-            {
-                info.AddValue("RepetitionDuration_Value", TimeSpan.Zero);
-            }
-            else
-            {
-                info.AddValue("RepetitionDuration_Value", _repDuration);
-            }
-
-            info.AddValue("DaysOfWeek_Value", _daysOfWeek);
-            info.AddValue("RandomDelay_Value", _randomDelay);
-            info.AddValue("Interval_Value", _interval);
-            info.AddValue("User_Value", _user);
-            info.AddValue("TriggerFrequency_Value", _frequency);
-            info.AddValue("ID_Value", _id);
-            info.AddValue("Enabled_Value", _enabled);
-        }
-
-        #endregion
-
-        #region Internal Methods
-
-        internal void ClearProperties()
-        {
-            _time = null;
-            _daysOfWeek = null;
-            _interval = 1;
-            _randomDelay = TimeSpan.Zero;
-            _repInterval = null;
-            _repDuration = null;
-            _user = null;
-            _frequency = TriggerFrequency.None;
-            _enabled = false;
-            _id = 0;
-        }
-
-        internal void Validate()
-        {
-            switch (_frequency)
-            {
-                case TriggerFrequency.None:
-                    throw new ScheduledJobException(ScheduledJobErrorStrings.MissingJobTriggerType);
-
-                case TriggerFrequency.AtStartup:
-                    // AtStartup has no required parameters.
-                    break;
-
-                case TriggerFrequency.AtLogon:
-                    // AtLogon has no required parameters.
-                    break;
-
-                case TriggerFrequency.Once:
-                    if (_time == null)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingJobTriggerTime, ScheduledJobErrorStrings.TriggerOnceType);
-                        throw new ScheduledJobException(msg);
-                    }
-
-                    if (_repInterval != null || _repDuration != null)
-                    {
-                        ValidateOnceRepetitionParams(_repInterval, _repDuration);
-                    }
-
-                    break;
-
-                case TriggerFrequency.Daily:
-                    if (_time == null)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingJobTriggerTime, ScheduledJobErrorStrings.TriggerDailyType);
-                        throw new ScheduledJobException(msg);
-                    }
-
-                    if (_interval < 1)
-                    {
-                        throw new ScheduledJobException(ScheduledJobErrorStrings.InvalidDaysIntervalParam);
-                    }
-
-                    break;
-
-                case TriggerFrequency.Weekly:
-                    if (_time == null)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingJobTriggerTime, ScheduledJobErrorStrings.TriggerWeeklyType);
-                        throw new ScheduledJobException(msg);
-                    }
-
-                    if (_interval < 1)
-                    {
-                        throw new ScheduledJobException(ScheduledJobErrorStrings.InvalidWeeksIntervalParam);
-                    }
-
-                    if (_daysOfWeek == null || _daysOfWeek.Count == 0)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingJobTriggerDaysOfWeek, ScheduledJobErrorStrings.TriggerWeeklyType);
-                        throw new ScheduledJobException(msg);
-                    }
-
-                    break;
-            }
-        }
-
-        internal static void ValidateOnceRepetitionParams(
-            TimeSpan? repInterval,
-            TimeSpan? repDuration)
-        {
-            // Both Interval and Duration parameters must be specified together.
-            if (repInterval == null || repDuration == null)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionParams);
-            }
-
-            // Interval and Duration parameters must not have negative value.
-            if (repInterval < TimeSpan.Zero || repDuration < TimeSpan.Zero)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionParamValues);
-            }
-
-            // Zero values are allowed but only if both parameters are set to zero.
-            // This removes repetition from the Once trigger.
-            if (repInterval == TimeSpan.Zero && repDuration != TimeSpan.Zero)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.MismatchedRepetitionParamValues);
-            }
-
-            // Parameter values must be GE to one minute unless both are zero to remove repetition.
-            if (repInterval < TimeSpan.FromMinutes(1) &&
-                !(repInterval == TimeSpan.Zero && repDuration == TimeSpan.Zero))
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionIntervalValue);
-            }
-
-            // Interval parameter must be LE to Duration parameter.
-            if (repInterval > repDuration)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionInterval);
-            }
-        }
-
-        internal void CopyTo(ScheduledJobTrigger targetTrigger)
-        {
-            if (targetTrigger == null)
-            {
-                throw new PSArgumentNullException("targetTrigger");
-            }
-
-            targetTrigger.Enabled = _enabled;
-            targetTrigger.Frequency = _frequency;
-            targetTrigger.Id = _id;
-            targetTrigger.At = _time;
-            targetTrigger.DaysOfWeek = _daysOfWeek;
-            targetTrigger.Interval = _interval;
-            targetTrigger.RandomDelay = _randomDelay;
-            targetTrigger.RepetitionInterval = _repInterval;
-            targetTrigger.RepetitionDuration = _repDuration;
-            targetTrigger.User = _user;
-            targetTrigger.JobDefinition = _jobDefAssociation;
-        }
-
-        #endregion
-
-        #region Static methods
-
-        /// <summary>
-        /// Creates a one time ScheduledJobTrigger object.
-        /// </summary>
-        /// <param name="time">DateTime when trigger activates.</param>
-        /// <param name="delay">Random delay.</param>
-        /// <param name="repetitionInterval">Repetition interval.</param>
-        /// <param name="repetitionDuration">Repetition duration.</param>
-        /// <param name="id">Trigger Id.</param>
-        /// <param name="enabled">Trigger enabled state.</param>
-        /// <returns>ScheduledJobTrigger.</returns>
-        public static ScheduledJobTrigger CreateOnceTrigger(
-            DateTime time,
-            TimeSpan delay,
-            TimeSpan? repetitionInterval,
-            TimeSpan? repetitionDuration,
-            Int32 id,
-            bool enabled)
-        {
-            return new ScheduledJobTrigger(
-                enabled,
-                TriggerFrequency.Once,
-                time,
-                null,
-                1,
-                delay,
-                repetitionInterval,
-                repetitionDuration,
-                null,
-                id);
-        }
-
-        /// <summary>
-        /// Creates a daily ScheduledJobTrigger object.
-        /// </summary>
-        /// <param name="time">Time of day when trigger activates.</param>
-        /// <param name="interval">Days interval for trigger activation.</param>
-        /// <param name="delay">Random delay.</param>
-        /// <param name="id">Trigger Id.</param>
-        /// <param name="enabled">Trigger enabled state.</param>
-        /// <returns>ScheduledJobTrigger.</returns>
-        public static ScheduledJobTrigger CreateDailyTrigger(
-            DateTime time,
-            Int32 interval,
-            TimeSpan delay,
-            Int32 id,
-            bool enabled)
-        {
-            return new ScheduledJobTrigger(
-                enabled,
-                TriggerFrequency.Daily,
-                time,
-                null,
-                interval,
-                delay,
-                null,
-                null,
-                null,
-                id);
-        }
-
-        /// <summary>
-        /// Creates a weekly ScheduledJobTrigger object.
-        /// </summary>
-        /// <param name="time">Time of day when trigger activates.</param>
-        /// <param name="interval">Weeks interval for trigger activation.</param>
-        /// <param name="daysOfWeek">Days of the week for trigger activation.</param>
-        /// <param name="delay">Random delay.</param>
-        /// <param name="id">Trigger Id.</param>
-        /// <param name="enabled">Trigger enabled state.</param>
-        /// <returns>ScheduledJobTrigger.</returns>
-        public static ScheduledJobTrigger CreateWeeklyTrigger(
-            DateTime time,
-            Int32 interval,
-            IEnumerable<DayOfWeek> daysOfWeek,
-            TimeSpan delay,
-            Int32 id,
-            bool enabled)
-        {
-            List<DayOfWeek> lDaysOfWeek = (daysOfWeek != null) ? new List<DayOfWeek>(daysOfWeek) : null;
-
-            return new ScheduledJobTrigger(
-                enabled,
-                TriggerFrequency.Weekly,
-                time,
-                lDaysOfWeek,
-                interval,
-                delay,
-                null,
-                null,
-                null,
-                id);
-        }
-
-        /// <summary>
-        /// Creates a trigger that activates after user log on.
-        /// </summary>
-        /// <param name="user">Name of user.</param>
-        /// <param name="delay">Random delay.</param>
-        /// <param name="id">Trigger Id.</param>
-        /// <param name="enabled">Trigger enabled state.</param>
-        /// <returns>ScheduledJobTrigger.</returns>
-        public static ScheduledJobTrigger CreateAtLogOnTrigger(
-            string user,
-            TimeSpan delay,
-            Int32 id,
-            bool enabled)
-        {
-            return new ScheduledJobTrigger(
-                enabled,
-                TriggerFrequency.AtLogon,
-                null,
-                null,
-                1,
-                delay,
-                null,
-                null,
-                string.IsNullOrEmpty(user) ? AllUsers : user,
-                id);
-        }
-
-        /// <summary>
-        /// Creates a trigger that activates after OS boot.
-        /// </summary>
-        /// <param name="delay">Random delay.</param>
-        /// <param name="id">Trigger Id.</param>
-        /// <param name="enabled">Trigger enabled state.</param>
-        /// <returns>ScheduledJobTrigger.</returns>
-        public static ScheduledJobTrigger CreateAtStartupTrigger(
-            TimeSpan delay,
-            Int32 id,
-            bool enabled)
-        {
-            return new ScheduledJobTrigger(
-                enabled,
-                TriggerFrequency.AtStartup,
-                null,
-                null,
-                1,
-                delay,
-                null,
-                null,
-                null,
-                id);
-        }
-
-        /// <summary>
-        /// Compares provided user name to All Users string ("*").
-        /// </summary>
-        /// <param name="userName">Logon user name.</param>
-        /// <returns>Boolean, true if All Users.</returns>
-        internal static bool IsAllUsers(string userName)
-        {
-            return (string.Compare(userName, ScheduledJobTrigger.AllUsers,
-                StringComparison.OrdinalIgnoreCase) == 0);
-        }
-
-        /// <summary>
-        /// Returns the All Users string.
-        /// </summary>
-        internal static string AllUsers
-        {
-            get { return _allUsers; }
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Update the associated ScheduledJobDefinition object with the
-        /// current properties of this object.
-        /// </summary>
-        public void UpdateJobDefinition()
-        {
-            if (_jobDefAssociation == null)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.NoAssociatedJobDefinitionForTrigger, _id);
-                throw new RuntimeException(msg);
-            }
-
-            _jobDefAssociation.UpdateTriggers(new ScheduledJobTrigger[1] { this }, true);
-        }
-
-        #endregion
-    }
-
-    #region Public Enums
-
-    /// <summary>
-    /// Specifies trigger types in terms of the frequency that
-    /// the trigger is activated.
-    /// </summary>
-    public enum TriggerFrequency
-    {
-        /// <summary>
-        /// None.
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// Trigger activates once at a specified time.
-        /// </summary>
-        Once = 1,
-        /// <summary>
-        /// Trigger activates daily.
-        /// </summary>
-        Daily = 2,
-        /// <summary>
-        /// Trigger activates on a weekly basis and multiple days
-        /// during the week.
-        /// </summary>
-        Weekly = 3,
-        /// <summary>
-        /// Trigger activates at user logon to the operating system.
-        /// </summary>
-        AtLogon = 4,
-        /// <summary>
-        /// Trigger activates after machine boot up.
-        /// </summary>
-        AtStartup = 5
-    }
-
-    #endregion
-
-    #region JobTriggerToCimInstanceConverter
-    /// <summary>
-    /// Class providing implementation of PowerShell conversions for types in Microsoft.Management.Infrastructure namespace.
-    /// </summary>
-    public sealed class JobTriggerToCimInstanceConverter : PSTypeConverter
-    {
-        private static readonly string CIM_TRIGGER_NAMESPACE = @"Root\Microsoft\Windows\TaskScheduler";
-
-        /// <summary>
-        /// Determines if the converter can convert the <paramref name="sourceValue"/> parameter to the <paramref name="destinationType"/> parameter.
-        /// </summary>
-        /// <param name="sourceValue">The value to convert from.</param>
-        /// <param name="destinationType">The type to convert to.</param>
-        /// <returns>True if the converter can convert the <paramref name="sourceValue"/> parameter to the <paramref name="destinationType"/> parameter, otherwise false.</returns>
-        public override bool CanConvertFrom(object sourceValue, Type destinationType)
-        {
-            ArgumentNullException.ThrowIfNull(destinationType);
-
-            return (sourceValue is ScheduledJobTrigger) && (destinationType.Equals(typeof(CimInstance)));
-        }
-
-        /// <summary>
-        /// Converts the <paramref name="sourceValue"/> parameter to the <paramref name="destinationType"/> parameter using formatProvider and ignoreCase.
-        /// </summary>
-        /// <param name="sourceValue">The value to convert from.</param>
-        /// <param name="destinationType">The type to convert to.</param>
-        /// <param name="formatProvider">The format provider to use like in IFormattable's ToString.</param>
-        /// <param name="ignoreCase">True if case should be ignored.</param>
-        /// <returns>The <paramref name="sourceValue"/> parameter converted to the <paramref name="destinationType"/> parameter using formatProvider and ignoreCase.</returns>
-        /// <exception cref="InvalidCastException">If no conversion was possible.</exception>
-        public override object ConvertFrom(object sourceValue, Type destinationType, IFormatProvider formatProvider, bool ignoreCase)
-        {
-            ArgumentNullException.ThrowIfNull(destinationType);
-
-            ArgumentNullException.ThrowIfNull(sourceValue);
-
-            ScheduledJobTrigger originalTrigger = (ScheduledJobTrigger) sourceValue;
-            using (CimSession cimSession = CimSession.Create(null))
-            {
-                switch (originalTrigger.Frequency)
-                {
-                    case TriggerFrequency.Weekly:
-                        return ConvertToWeekly(originalTrigger, cimSession);
-                    case TriggerFrequency.Once:
-                        return ConvertToOnce(originalTrigger, cimSession);
-                    case TriggerFrequency.Daily:
-                        return ConvertToDaily(originalTrigger, cimSession);
-                    case TriggerFrequency.AtStartup:
-                        return ConvertToAtStartup(originalTrigger, cimSession);
-                    case TriggerFrequency.AtLogon:
-                        return ConvertToAtLogon(originalTrigger, cimSession);
-                    case TriggerFrequency.None:
-                        return ConvertToDefault(originalTrigger, cimSession);
-                    default:
-                        string errorMsg = StringUtil.Format(ScheduledJobErrorStrings.UnknownTriggerFrequency,
-                                                            originalTrigger.Frequency.ToString());
-                        throw new PSInvalidOperationException(errorMsg);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns true if the converter can convert the <paramref name="sourceValue"/> parameter to the <paramref name="destinationType"/> parameter.
-        /// </summary>
-        /// <param name="sourceValue">The value to convert from.</param>
-        /// <param name="destinationType">The type to convert to.</param>
-        /// <returns>True if the converter can convert the <paramref name="sourceValue"/> parameter to the <paramref name="destinationType"/> parameter, otherwise false.</returns>
-        public override bool CanConvertTo(object sourceValue, Type destinationType)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// Converts the <paramref name="sourceValue"/> parameter to the <paramref name="destinationType"/> parameter using formatProvider and ignoreCase.
-        /// </summary>
-        /// <param name="sourceValue">The value to convert from.</param>
-        /// <param name="destinationType">The type to convert to.</param>
-        /// <param name="formatProvider">The format provider to use like in IFormattable's ToString.</param>
-        /// <param name="ignoreCase">True if case should be ignored.</param>
-        /// <returns>SourceValue converted to the <paramref name="destinationType"/> parameter using formatProvider and ignoreCase.</returns>
-        /// <exception cref="InvalidCastException">If no conversion was possible.</exception>
-        public override object ConvertTo(object sourceValue, Type destinationType, IFormatProvider formatProvider, bool ignoreCase)
-        {
-            throw new NotImplementedException();
-        }
-
-        #region Helper Methods
-
-        private CimInstance ConvertToWeekly(ScheduledJobTrigger trigger, CimSession cimSession)
-        {
-            CimClass cimClass = cimSession.GetClass(CIM_TRIGGER_NAMESPACE, "MSFT_TaskWeeklyTrigger");
-            CimInstance cimInstance = new CimInstance(cimClass);
-
-            cimInstance.CimInstanceProperties["DaysOfWeek"].Value = ScheduledJobWTS.ConvertDaysOfWeekToMask(trigger.DaysOfWeek);
-            cimInstance.CimInstanceProperties["RandomDelay"].Value = ScheduledJobWTS.ConvertTimeSpanToWTSString(trigger.RandomDelay);
-            cimInstance.CimInstanceProperties["WeeksInterval"].Value = trigger.Interval;
-
-            AddCommonProperties(trigger, cimInstance);
-            return cimInstance;
-        }
-
-        private CimInstance ConvertToOnce(ScheduledJobTrigger trigger, CimSession cimSession)
-        {
-            CimClass cimClass = cimSession.GetClass(CIM_TRIGGER_NAMESPACE, "MSFT_TaskTimeTrigger");
-            CimInstance cimInstance = new CimInstance(cimClass);
-
-            cimInstance.CimInstanceProperties["RandomDelay"].Value = ScheduledJobWTS.ConvertTimeSpanToWTSString(trigger.RandomDelay);
-
-            if (trigger.RepetitionInterval != null && trigger.RepetitionDuration != null)
-            {
-                CimClass cimRepClass = cimSession.GetClass(CIM_TRIGGER_NAMESPACE, "MSFT_TaskRepetitionPattern");
-                CimInstance cimRepInstance = new CimInstance(cimRepClass);
-
-                cimRepInstance.CimInstanceProperties["Interval"].Value = ScheduledJobWTS.ConvertTimeSpanToWTSString(trigger.RepetitionInterval.Value);
-
-                if (trigger.RepetitionDuration == TimeSpan.MaxValue)
-                {
-                    cimRepInstance.CimInstanceProperties["StopAtDurationEnd"].Value = false;
-                }
-                else
-                {
-                    cimRepInstance.CimInstanceProperties["StopAtDurationEnd"].Value = true;
-                    cimRepInstance.CimInstanceProperties["Duration"].Value = ScheduledJobWTS.ConvertTimeSpanToWTSString(trigger.RepetitionDuration.Value);
-                }
-
-                cimInstance.CimInstanceProperties["Repetition"].Value = cimRepInstance;
-            }
-
-            AddCommonProperties(trigger, cimInstance);
-            return cimInstance;
-        }
-
-        private CimInstance ConvertToDaily(ScheduledJobTrigger trigger, CimSession cimSession)
-        {
-            CimClass cimClass = cimSession.GetClass(CIM_TRIGGER_NAMESPACE, "MSFT_TaskDailyTrigger");
-            CimInstance cimInstance = new CimInstance(cimClass);
-
-            cimInstance.CimInstanceProperties["RandomDelay"].Value = ScheduledJobWTS.ConvertTimeSpanToWTSString(trigger.RandomDelay);
-            cimInstance.CimInstanceProperties["DaysInterval"].Value = trigger.Interval;
-
-            AddCommonProperties(trigger, cimInstance);
-            return cimInstance;
-        }
-
-        private CimInstance ConvertToAtLogon(ScheduledJobTrigger trigger, CimSession cimSession)
-        {
-            CimClass cimClass = cimSession.GetClass(CIM_TRIGGER_NAMESPACE, "MSFT_TaskLogonTrigger");
-            CimInstance cimInstance = new CimInstance(cimClass);
-
-            cimInstance.CimInstanceProperties["Delay"].Value = ScheduledJobWTS.ConvertTimeSpanToWTSString(trigger.RandomDelay);
-
-            // Convert the "AllUsers" name ("*" character) to null for Task Scheduler.
-            string userId = (ScheduledJobTrigger.IsAllUsers(trigger.User)) ? null : trigger.User;
-            cimInstance.CimInstanceProperties["UserId"].Value = userId;
-
-            AddCommonProperties(trigger, cimInstance);
-            return cimInstance;
-        }
-
-        private CimInstance ConvertToAtStartup(ScheduledJobTrigger trigger, CimSession cimSession)
-        {
-            CimClass cimClass = cimSession.GetClass(CIM_TRIGGER_NAMESPACE, "MSFT_TaskBootTrigger");
-            CimInstance cimInstance = new CimInstance(cimClass);
-
-            cimInstance.CimInstanceProperties["Delay"].Value = ScheduledJobWTS.ConvertTimeSpanToWTSString(trigger.RandomDelay);
-
-            AddCommonProperties(trigger, cimInstance);
-            return cimInstance;
-        }
-
-        private CimInstance ConvertToDefault(ScheduledJobTrigger trigger, CimSession cimSession)
-        {
-            CimClass cimClass = cimSession.GetClass(CIM_TRIGGER_NAMESPACE, "MSFT_TaskTrigger");
-            CimInstance result = new CimInstance(cimClass);
-            AddCommonProperties(trigger, result);
-            return result;
-        }
-
-        private static void AddCommonProperties(ScheduledJobTrigger trigger, CimInstance cimInstance)
-        {
-            cimInstance.CimInstanceProperties["Enabled"].Value = trigger.Enabled;
-
-            if (trigger.At != null)
-            {
-                cimInstance.CimInstanceProperties["StartBoundary"].Value = ScheduledJobWTS.ConvertDateTimeToString(trigger.At);
-            }
-        }
-
-        #endregion
-    }
-
-    #endregion
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobWTS.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobWTS.cs
deleted file mode 100644
index b8714816a71..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobWTS.cs
+++ /dev/null
@@ -1,982 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Management.Automation;
-using System.Runtime.InteropServices;
-using System.Security.AccessControl;
-using System.Text;
-
-using TaskScheduler;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// Managed code class to provide Windows Task Scheduler functionality for
-    /// scheduled jobs.
-    /// </summary>
-    internal sealed class ScheduledJobWTS : IDisposable
-    {
-        #region Private Members
-
-        private ITaskService _taskScheduler;
-        private ITaskFolder _iRootFolder;
-
-        private const short WTSSunday = 0x01;
-        private const short WTSMonday = 0x02;
-        private const short WTSTuesday = 0x04;
-        private const short WTSWednesday = 0x08;
-        private const short WTSThursday = 0x10;
-        private const short WTSFriday = 0x20;
-        private const short WTSSaturday = 0x40;
-
-        // Task Scheduler folders for PowerShell scheduled job tasks.
-        private const string TaskSchedulerWindowsFolder = @"\Microsoft\Windows";
-        private const string ScheduledJobSubFolder = @"PowerShell\ScheduledJobs";
-        private const string ScheduledJobTasksRootFolder = @"\Microsoft\Windows\PowerShell\ScheduledJobs";
-
-        // Define a single Action Id since PowerShell Scheduled Job tasks will have only one action.
-        private const string ScheduledJobTaskActionId = "StartPowerShellJob";
-
-        #endregion
-
-        #region Constructors
-
-        public ScheduledJobWTS()
-        {
-            // Create the Windows Task Scheduler object.
-            _taskScheduler = (ITaskService)new TaskScheduler.TaskScheduler();
-
-            // Connect the task scheduler object to the local machine
-            // using the current user security token.
-            _taskScheduler.Connect(null, null, null, null);
-
-            // Get or create the root folder in Task Scheduler for PowerShell scheduled jobs.
-            _iRootFolder = GetRootFolder();
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Retrieves job triggers from WTS with provided task Id.
-        /// </summary>
-        /// <param name="taskId">Task Id.</param>
-        /// <exception cref="ScheduledJobException">Task not found.</exception>
-        /// <returns>ScheduledJobTriggers.</returns>
-        public Collection<ScheduledJobTrigger> GetJobTriggers(
-            string taskId)
-        {
-            if (string.IsNullOrEmpty(taskId))
-            {
-                throw new PSArgumentException("taskId");
-            }
-
-            ITaskDefinition iTaskDefinition = FindTask(taskId);
-
-            Collection<ScheduledJobTrigger> jobTriggers = new Collection<ScheduledJobTrigger>();
-            ITriggerCollection iTriggerCollection = iTaskDefinition.Triggers;
-            if (iTriggerCollection != null)
-            {
-                foreach (ITrigger iTrigger in iTriggerCollection)
-                {
-                    ScheduledJobTrigger jobTrigger = CreateJobTrigger(iTrigger);
-                    if (jobTrigger == null)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.UnknownTriggerType, taskId, iTrigger.Id);
-                        throw new ScheduledJobException(msg);
-                    }
-
-                    jobTriggers.Add(jobTrigger);
-                }
-            }
-
-            return jobTriggers;
-        }
-
-        /// <summary>
-        /// Retrieves options for the provided task Id.
-        /// </summary>
-        /// <param name="taskId">Task Id.</param>
-        /// <exception cref="ScheduledJobException">Task not found.</exception>
-        /// <returns>ScheduledJobOptions.</returns>
-        public ScheduledJobOptions GetJobOptions(
-            string taskId)
-        {
-            if (string.IsNullOrEmpty(taskId))
-            {
-                throw new PSArgumentException("taskId");
-            }
-
-            ITaskDefinition iTaskDefinition = FindTask(taskId);
-
-            return CreateJobOptions(iTaskDefinition);
-        }
-
-        /// <summary>
-        /// Returns a boolean indicating whether the job/task is enabled
-        /// in the Task Scheduler.
-        /// </summary>
-        /// <param name="taskId"></param>
-        /// <returns></returns>
-        public bool GetTaskEnabled(
-            string taskId)
-        {
-            if (string.IsNullOrEmpty(taskId))
-            {
-                throw new PSArgumentException("taskId");
-            }
-
-            ITaskDefinition iTaskDefinition = FindTask(taskId);
-
-            return iTaskDefinition.Settings.Enabled;
-        }
-
-        /// <summary>
-        /// Creates a new task in WTS with information from ScheduledJobDefinition.
-        /// </summary>
-        /// <param name="definition">ScheduledJobDefinition.</param>
-        public void CreateTask(
-            ScheduledJobDefinition definition)
-        {
-            if (definition == null)
-            {
-                throw new PSArgumentNullException("definition");
-            }
-
-            // Create task definition
-            ITaskDefinition iTaskDefinition = _taskScheduler.NewTask(0);
-
-            // Add task options.
-            AddTaskOptions(iTaskDefinition, definition.Options);
-
-            // Add task triggers.
-            foreach (ScheduledJobTrigger jobTrigger in definition.JobTriggers)
-            {
-                AddTaskTrigger(iTaskDefinition, jobTrigger);
-            }
-
-            // Add task action.
-            AddTaskAction(iTaskDefinition, definition);
-
-            // Create a security descriptor for the current user so that only the user
-            // (and Local System account) can see/access the registered task.
-            string startSddl = "D:P(A;;GA;;;SY)(A;;GA;;;BA)";   // DACL Allow Generic Access to System and BUILTIN\Administrators.
-            System.Security.Principal.SecurityIdentifier userSid =
-                System.Security.Principal.WindowsIdentity.GetCurrent().User;
-            CommonSecurityDescriptor SDesc = new CommonSecurityDescriptor(false, false, startSddl);
-            SDesc.DiscretionaryAcl.AddAccess(AccessControlType.Allow, userSid, 0x10000000, InheritanceFlags.None, PropagationFlags.None);
-            string sddl = SDesc.GetSddlForm(AccessControlSections.All);
-
-            // Register this new task with the Task Scheduler.
-            if (definition.Credential == null)
-            {
-                // Register task to run as currently logged on user.
-                _iRootFolder.RegisterTaskDefinition(
-                    definition.Name,
-                    iTaskDefinition,
-                    (int)_TASK_CREATION.TASK_CREATE,
-                    null,       // User name
-                    null,       // Password
-                    _TASK_LOGON_TYPE.TASK_LOGON_S4U,
-                    sddl);
-            }
-            else
-            {
-                // Register task to run under provided user account/credentials.
-                _iRootFolder.RegisterTaskDefinition(
-                    definition.Name,
-                    iTaskDefinition,
-                    (int)_TASK_CREATION.TASK_CREATE,
-                    definition.Credential.UserName,
-                    GetCredentialPassword(definition.Credential),
-                    _TASK_LOGON_TYPE.TASK_LOGON_PASSWORD,
-                    sddl);
-            }
-        }
-
-        /// <summary>
-        /// Removes the WTS task for this ScheduledJobDefinition.
-        /// Throws error if one or more instances of this task are running.
-        /// Force parameter will stop all running instances and remove task.
-        /// </summary>
-        /// <param name="definition">ScheduledJobDefinition.</param>
-        /// <param name="force">Force running instances to stop and remove task.</param>
-        public void RemoveTask(
-            ScheduledJobDefinition definition,
-            bool force = false)
-        {
-            if (definition == null)
-            {
-                throw new PSArgumentNullException("definition");
-            }
-
-            RemoveTaskByName(definition.Name, force, false);
-        }
-
-        /// <summary>
-        /// Removes a Task Scheduler task from the PowerShell/ScheduledJobs folder
-        /// based on a task name.
-        /// </summary>
-        /// <param name="taskName">Task Scheduler task name.</param>
-        /// <param name="force">Force running instances to stop and remove task.</param>
-        /// <param name="firstCheckForTask">First check for existence of task.</param>
-        public void RemoveTaskByName(
-            string taskName,
-            bool force,
-            bool firstCheckForTask)
-        {
-            // Get registered task.
-            IRegisteredTask iRegisteredTask = null;
-            try
-            {
-                iRegisteredTask = _iRootFolder.GetTask(taskName);
-            }
-            catch (System.IO.DirectoryNotFoundException)
-            {
-                if (!firstCheckForTask)
-                {
-                    throw;
-                }
-            }
-            catch (System.IO.FileNotFoundException)
-            {
-                if (!firstCheckForTask)
-                {
-                    throw;
-                }
-            }
-
-            if (iRegisteredTask == null)
-            {
-                return;
-            }
-
-            // Check to see if any instances of this job/task is running.
-            IRunningTaskCollection iRunningTasks = iRegisteredTask.GetInstances(0);
-            if (iRunningTasks.Count > 0)
-            {
-                if (!force)
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.CannotRemoveTaskRunningInstance, taskName);
-                    throw new ScheduledJobException(msg);
-                }
-
-                // Stop all running tasks.
-                iRegisteredTask.Stop(0);
-            }
-
-            // Remove task.
-            _iRootFolder.DeleteTask(taskName, 0);
-        }
-
-        /// <summary>
-        /// Starts task running from Task Scheduler.
-        /// </summary>
-        /// <param name="definition">ScheduledJobDefinition.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
-        /// <exception cref="System.IO.FileNotFoundException"></exception>
-        public void RunTask(
-            ScheduledJobDefinition definition)
-        {
-            // Get registered task.
-            IRegisteredTask iRegisteredTask = _iRootFolder.GetTask(definition.Name);
-
-            // Run task.
-            iRegisteredTask.Run(null);
-        }
-
-        /// <summary>
-        /// Updates an existing task in WTS with information from
-        /// ScheduledJobDefinition.
-        /// </summary>
-        /// <param name="definition">ScheduledJobDefinition.</param>
-        public void UpdateTask(
-            ScheduledJobDefinition definition)
-        {
-            if (definition == null)
-            {
-                throw new PSArgumentNullException("definition");
-            }
-
-            // Get task to update.
-            ITaskDefinition iTaskDefinition = FindTask(definition.Name);
-
-            // Replace options.
-            AddTaskOptions(iTaskDefinition, definition.Options);
-
-            // Set enabled state.
-            iTaskDefinition.Settings.Enabled = definition.Enabled;
-
-            // Replace triggers.
-            iTaskDefinition.Triggers.Clear();
-            foreach (ScheduledJobTrigger jobTrigger in definition.JobTriggers)
-            {
-                AddTaskTrigger(iTaskDefinition, jobTrigger);
-            }
-
-            // Replace action.
-            iTaskDefinition.Actions.Clear();
-            AddTaskAction(iTaskDefinition, definition);
-
-            // Register updated task.
-            if (definition.Credential == null)
-            {
-                // Register task to run as currently logged on user.
-                _iRootFolder.RegisterTaskDefinition(
-                    definition.Name,
-                    iTaskDefinition,
-                    (int)_TASK_CREATION.TASK_UPDATE,
-                    null,           // User name
-                    null,           // Password
-                    _TASK_LOGON_TYPE.TASK_LOGON_S4U,
-                    null);
-            }
-            else
-            {
-                // Register task to run under provided user account/credentials.
-                _iRootFolder.RegisterTaskDefinition(
-                    definition.Name,
-                    iTaskDefinition,
-                    (int)_TASK_CREATION.TASK_UPDATE,
-                    definition.Credential.UserName,
-                    GetCredentialPassword(definition.Credential),
-                    _TASK_LOGON_TYPE.TASK_LOGON_PASSWORD,
-                    null);
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Creates a new WTS trigger based on the provided ScheduledJobTrigger object
-        /// and adds it to the provided ITaskDefinition object.
-        /// </summary>
-        /// <param name="iTaskDefinition">ITaskDefinition.</param>
-        /// <param name="jobTrigger">ScheduledJobTrigger.</param>
-        private void AddTaskTrigger(
-            ITaskDefinition iTaskDefinition,
-            ScheduledJobTrigger jobTrigger)
-        {
-            ITrigger iTrigger = null;
-
-            switch (jobTrigger.Frequency)
-            {
-                case TriggerFrequency.AtStartup:
-                    {
-                        iTrigger = iTaskDefinition.Triggers.Create(_TASK_TRIGGER_TYPE2.TASK_TRIGGER_BOOT);
-                        IBootTrigger iBootTrigger = iTrigger as IBootTrigger;
-                        Debug.Assert(iBootTrigger != null);
-
-                        iBootTrigger.Delay = ConvertTimeSpanToWTSString(jobTrigger.RandomDelay);
-
-                        iTrigger.Id = jobTrigger.Id.ToString(CultureInfo.InvariantCulture);
-                        iTrigger.Enabled = jobTrigger.Enabled;
-                    }
-
-                    break;
-
-                case TriggerFrequency.AtLogon:
-                    {
-                        iTrigger = iTaskDefinition.Triggers.Create(_TASK_TRIGGER_TYPE2.TASK_TRIGGER_LOGON);
-                        ILogonTrigger iLogonTrigger = iTrigger as ILogonTrigger;
-                        Debug.Assert(iLogonTrigger != null);
-
-                        iLogonTrigger.UserId = ScheduledJobTrigger.IsAllUsers(jobTrigger.User) ? null : jobTrigger.User;
-                        iLogonTrigger.Delay = ConvertTimeSpanToWTSString(jobTrigger.RandomDelay);
-
-                        iTrigger.Id = jobTrigger.Id.ToString(CultureInfo.InvariantCulture);
-                        iTrigger.Enabled = jobTrigger.Enabled;
-                    }
-
-                    break;
-
-                case TriggerFrequency.Once:
-                    {
-                        iTrigger = iTaskDefinition.Triggers.Create(_TASK_TRIGGER_TYPE2.TASK_TRIGGER_TIME);
-                        ITimeTrigger iTimeTrigger = iTrigger as ITimeTrigger;
-                        Debug.Assert(iTimeTrigger != null);
-
-                        iTimeTrigger.RandomDelay = ConvertTimeSpanToWTSString(jobTrigger.RandomDelay);
-
-                        // Time trigger repetition.
-                        if (jobTrigger.RepetitionInterval != null &&
-                            jobTrigger.RepetitionDuration != null)
-                        {
-                            iTimeTrigger.Repetition.Interval = ConvertTimeSpanToWTSString(jobTrigger.RepetitionInterval.Value);
-                            if (jobTrigger.RepetitionDuration.Value == TimeSpan.MaxValue)
-                            {
-                                iTimeTrigger.Repetition.StopAtDurationEnd = false;
-                            }
-                            else
-                            {
-                                iTimeTrigger.Repetition.StopAtDurationEnd = true;
-                                iTimeTrigger.Repetition.Duration = ConvertTimeSpanToWTSString(jobTrigger.RepetitionDuration.Value);
-                            }
-                        }
-
-                        iTrigger.StartBoundary = ConvertDateTimeToString(jobTrigger.At);
-                        iTrigger.Id = jobTrigger.Id.ToString(CultureInfo.InvariantCulture);
-                        iTrigger.Enabled = jobTrigger.Enabled;
-                    }
-
-                    break;
-
-                case TriggerFrequency.Daily:
-                    {
-                        iTrigger = iTaskDefinition.Triggers.Create(_TASK_TRIGGER_TYPE2.TASK_TRIGGER_DAILY);
-                        IDailyTrigger iDailyTrigger = iTrigger as IDailyTrigger;
-                        Debug.Assert(iDailyTrigger != null);
-
-                        iDailyTrigger.RandomDelay = ConvertTimeSpanToWTSString(jobTrigger.RandomDelay);
-                        iDailyTrigger.DaysInterval = (short)jobTrigger.Interval;
-
-                        iTrigger.StartBoundary = ConvertDateTimeToString(jobTrigger.At);
-                        iTrigger.Id = jobTrigger.Id.ToString(CultureInfo.InvariantCulture);
-                        iTrigger.Enabled = jobTrigger.Enabled;
-                    }
-
-                    break;
-
-                case TriggerFrequency.Weekly:
-                    {
-                        iTrigger = iTaskDefinition.Triggers.Create(_TASK_TRIGGER_TYPE2.TASK_TRIGGER_WEEKLY);
-                        IWeeklyTrigger iWeeklyTrigger = iTrigger as IWeeklyTrigger;
-                        Debug.Assert(iWeeklyTrigger != null);
-
-                        iWeeklyTrigger.RandomDelay = ConvertTimeSpanToWTSString(jobTrigger.RandomDelay);
-                        iWeeklyTrigger.WeeksInterval = (short)jobTrigger.Interval;
-                        iWeeklyTrigger.DaysOfWeek = ConvertDaysOfWeekToMask(jobTrigger.DaysOfWeek);
-
-                        iTrigger.StartBoundary = ConvertDateTimeToString(jobTrigger.At);
-                        iTrigger.Id = jobTrigger.Id.ToString(CultureInfo.InvariantCulture);
-                        iTrigger.Enabled = jobTrigger.Enabled;
-                    }
-
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Creates a ScheduledJobTrigger object based on a provided WTS ITrigger.
-        /// </summary>
-        /// <param name="iTrigger">ITrigger.</param>
-        /// <returns>ScheduledJobTrigger.</returns>
-        private ScheduledJobTrigger CreateJobTrigger(
-            ITrigger iTrigger)
-        {
-            ScheduledJobTrigger rtnJobTrigger = null;
-
-            if (iTrigger is IBootTrigger)
-            {
-                IBootTrigger iBootTrigger = (IBootTrigger)iTrigger;
-                rtnJobTrigger = ScheduledJobTrigger.CreateAtStartupTrigger(
-                    ParseWTSTime(iBootTrigger.Delay),
-                    ConvertStringId(iBootTrigger.Id),
-                    iBootTrigger.Enabled);
-            }
-            else if (iTrigger is ILogonTrigger)
-            {
-                ILogonTrigger iLogonTrigger = (ILogonTrigger)iTrigger;
-                rtnJobTrigger = ScheduledJobTrigger.CreateAtLogOnTrigger(
-                    iLogonTrigger.UserId,
-                    ParseWTSTime(iLogonTrigger.Delay),
-                    ConvertStringId(iLogonTrigger.Id),
-                    iLogonTrigger.Enabled);
-            }
-            else if (iTrigger is ITimeTrigger)
-            {
-                ITimeTrigger iTimeTrigger = (ITimeTrigger)iTrigger;
-                TimeSpan repInterval = ParseWTSTime(iTimeTrigger.Repetition.Interval);
-                TimeSpan repDuration = (repInterval != TimeSpan.Zero && iTimeTrigger.Repetition.StopAtDurationEnd == false) ?
-                    TimeSpan.MaxValue : ParseWTSTime(iTimeTrigger.Repetition.Duration);
-                rtnJobTrigger = ScheduledJobTrigger.CreateOnceTrigger(
-                    DateTime.Parse(iTimeTrigger.StartBoundary, CultureInfo.InvariantCulture),
-                    ParseWTSTime(iTimeTrigger.RandomDelay),
-                    repInterval,
-                    repDuration,
-                    ConvertStringId(iTimeTrigger.Id),
-                    iTimeTrigger.Enabled);
-            }
-            else if (iTrigger is IDailyTrigger)
-            {
-                IDailyTrigger iDailyTrigger = (IDailyTrigger)iTrigger;
-                rtnJobTrigger = ScheduledJobTrigger.CreateDailyTrigger(
-                    DateTime.Parse(iDailyTrigger.StartBoundary, CultureInfo.InvariantCulture),
-                    (Int32)iDailyTrigger.DaysInterval,
-                    ParseWTSTime(iDailyTrigger.RandomDelay),
-                    ConvertStringId(iDailyTrigger.Id),
-                    iDailyTrigger.Enabled);
-            }
-            else if (iTrigger is IWeeklyTrigger)
-            {
-                IWeeklyTrigger iWeeklyTrigger = (IWeeklyTrigger)iTrigger;
-                rtnJobTrigger = ScheduledJobTrigger.CreateWeeklyTrigger(
-                    DateTime.Parse(iWeeklyTrigger.StartBoundary, CultureInfo.InvariantCulture),
-                    (Int32)iWeeklyTrigger.WeeksInterval,
-                    ConvertMaskToDaysOfWeekArray(iWeeklyTrigger.DaysOfWeek),
-                    ParseWTSTime(iWeeklyTrigger.RandomDelay),
-                    ConvertStringId(iWeeklyTrigger.Id),
-                    iWeeklyTrigger.Enabled);
-            }
-
-            return rtnJobTrigger;
-        }
-
-        private void AddTaskOptions(
-            ITaskDefinition iTaskDefinition,
-            ScheduledJobOptions jobOptions)
-        {
-            iTaskDefinition.Settings.DisallowStartIfOnBatteries = !jobOptions.StartIfOnBatteries;
-            iTaskDefinition.Settings.StopIfGoingOnBatteries = jobOptions.StopIfGoingOnBatteries;
-            iTaskDefinition.Settings.WakeToRun = jobOptions.WakeToRun;
-            iTaskDefinition.Settings.RunOnlyIfIdle = !jobOptions.StartIfNotIdle;
-            iTaskDefinition.Settings.IdleSettings.StopOnIdleEnd = jobOptions.StopIfGoingOffIdle;
-            iTaskDefinition.Settings.IdleSettings.RestartOnIdle = jobOptions.RestartOnIdleResume;
-            iTaskDefinition.Settings.IdleSettings.IdleDuration = ConvertTimeSpanToWTSString(jobOptions.IdleDuration);
-            iTaskDefinition.Settings.IdleSettings.WaitTimeout = ConvertTimeSpanToWTSString(jobOptions.IdleTimeout);
-            iTaskDefinition.Settings.Hidden = !jobOptions.ShowInTaskScheduler;
-            iTaskDefinition.Settings.RunOnlyIfNetworkAvailable = !jobOptions.RunWithoutNetwork;
-            iTaskDefinition.Settings.AllowDemandStart = !jobOptions.DoNotAllowDemandStart;
-            iTaskDefinition.Settings.MultipleInstances = ConvertFromMultiInstances(jobOptions.MultipleInstancePolicy);
-            iTaskDefinition.Principal.RunLevel = (jobOptions.RunElevated) ?
-                                                    _TASK_RUNLEVEL.TASK_RUNLEVEL_HIGHEST : _TASK_RUNLEVEL.TASK_RUNLEVEL_LUA;
-        }
-
-        private ScheduledJobOptions CreateJobOptions(
-            ITaskDefinition iTaskDefinition)
-        {
-            ITaskSettings iTaskSettings = iTaskDefinition.Settings;
-            IPrincipal iPrincipal = iTaskDefinition.Principal;
-
-            return new ScheduledJobOptions(
-                        !iTaskSettings.DisallowStartIfOnBatteries,
-                        iTaskSettings.StopIfGoingOnBatteries,
-                        iTaskSettings.WakeToRun,
-                        !iTaskSettings.RunOnlyIfIdle,
-                        iTaskSettings.IdleSettings.StopOnIdleEnd,
-                        iTaskSettings.IdleSettings.RestartOnIdle,
-                        ParseWTSTime(iTaskSettings.IdleSettings.IdleDuration),
-                        ParseWTSTime(iTaskSettings.IdleSettings.WaitTimeout),
-                        !iTaskSettings.Hidden,
-                        iPrincipal.RunLevel == _TASK_RUNLEVEL.TASK_RUNLEVEL_HIGHEST,
-                        !iTaskSettings.RunOnlyIfNetworkAvailable,
-                        !iTaskSettings.AllowDemandStart,
-                        ConvertToMultiInstances(iTaskSettings));
-        }
-
-        private void AddTaskAction(
-            ITaskDefinition iTaskDefinition,
-            ScheduledJobDefinition definition)
-        {
-            IExecAction iExecAction = iTaskDefinition.Actions.Create(_TASK_ACTION_TYPE.TASK_ACTION_EXEC) as IExecAction;
-            Debug.Assert(iExecAction != null);
-
-            iExecAction.Id = ScheduledJobTaskActionId;
-            iExecAction.Path = definition.PSExecutionPath;
-            iExecAction.Arguments = definition.PSExecutionArgs;
-        }
-
-        /// <summary>
-        /// Gets and returns the unsecured password for the provided
-        /// PSCredential object.
-        /// </summary>
-        /// <param name="credential">PSCredential.</param>
-        /// <returns>Unsecured password string.</returns>
-        private string GetCredentialPassword(PSCredential credential)
-        {
-            if (credential == null)
-            {
-                return null;
-            }
-
-            IntPtr unmanagedString = IntPtr.Zero;
-            try
-            {
-                unmanagedString = Marshal.SecureStringToGlobalAllocUnicode(credential.Password);
-                return Marshal.PtrToStringUni(unmanagedString);
-            }
-            finally
-            {
-                Marshal.ZeroFreeGlobalAllocUnicode(unmanagedString);
-            }
-        }
-
-        #endregion
-
-        #region Private Utility Methods
-
-        /// <summary>
-        /// Gets the Task Scheduler root folder for Scheduled Jobs or
-        /// creates it if it does not exist.
-        /// </summary>
-        /// <returns>Scheduled Jobs root folder.</returns>
-        private ITaskFolder GetRootFolder()
-        {
-            ITaskFolder iTaskRootFolder = null;
-
-            try
-            {
-                iTaskRootFolder = _taskScheduler.GetFolder(ScheduledJobTasksRootFolder);
-            }
-            catch (System.IO.DirectoryNotFoundException)
-            {
-            }
-            catch (System.IO.FileNotFoundException)
-            {
-                // This can be thrown if COM interop tries to load the Microsoft.PowerShell.ScheduledJob
-                // assembly again.
-            }
-
-            if (iTaskRootFolder == null)
-            {
-                // Create the PowerShell Scheduled Job root folder.
-                ITaskFolder iTSWindowsFolder = _taskScheduler.GetFolder(TaskSchedulerWindowsFolder);
-                iTaskRootFolder = iTSWindowsFolder.CreateFolder(ScheduledJobSubFolder);
-            }
-
-            return iTaskRootFolder;
-        }
-
-        /// <summary>
-        /// Finds a task with the provided Task Id and returns it as
-        /// a ITaskDefinition object.
-        /// </summary>
-        /// <param name="taskId">Task Id.</param>
-        /// <returns>ITaskDefinition.</returns>
-        private ITaskDefinition FindTask(string taskId)
-        {
-            try
-            {
-                ITaskFolder iTaskFolder = _taskScheduler.GetFolder(ScheduledJobTasksRootFolder);
-                IRegisteredTask iRegisteredTask = iTaskFolder.GetTask(taskId);
-                return iRegisteredTask.Definition;
-            }
-            catch (System.IO.DirectoryNotFoundException e)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.CannotFindTaskId, taskId);
-                throw new ScheduledJobException(msg, e);
-            }
-        }
-
-        private Int32 ConvertStringId(string triggerId)
-        {
-            Int32 triggerIdVal = 0;
-
-            try
-            {
-                triggerIdVal = Convert.ToInt32(triggerId);
-            }
-            catch (FormatException)
-            { }
-            catch (OverflowException)
-            { }
-
-            return triggerIdVal;
-        }
-
-        /// <summary>
-        /// Helper method to parse a WTS time string and return
-        /// a corresponding TimeSpan object.  Note that the
-        /// year and month values are ignored.
-        /// Format:
-        /// "PnYnMnDTnHnMnS"
-        /// "P" - Date separator
-        ///  "nY" - year value.
-        ///  "nM" - month value.
-        ///  "nD" - day value.
-        /// "T" - Time separator
-        ///  "nH" - hour value.
-        ///  "nM" - minute value.
-        ///  "nS" - second value.
-        /// </summary>
-        /// <param name="wtsTime">Formatted time string.</param>
-        /// <returns>TimeSpan.</returns>
-        private TimeSpan ParseWTSTime(string wtsTime)
-        {
-            if (string.IsNullOrEmpty(wtsTime))
-            {
-                return new TimeSpan(0);
-            }
-
-            int days = 0;
-            int hours = 0;
-            int minutes = 0;
-            int seconds = 0;
-            int indx = 0;
-            int length = wtsTime.Length;
-            StringBuilder str = new StringBuilder();
-
-            try
-            {
-                while (indx != length)
-                {
-                    char c = wtsTime[indx++];
-
-                    switch (c)
-                    {
-                        case 'P':
-                            str.Clear();
-                            while (indx != length &&
-                                   wtsTime[indx] != 'T')
-                            {
-                                char c2 = wtsTime[indx++];
-                                if (c2 == 'Y')
-                                {
-                                    // Ignore year value.
-                                    str.Clear();
-                                }
-                                else if (c2 == 'M')
-                                {
-                                    // Ignore month value.
-                                    str.Clear();
-                                }
-                                else if (c2 == 'D')
-                                {
-                                    days = Convert.ToInt32(str.ToString(), CultureInfo.InvariantCulture);
-                                    str.Clear();
-                                }
-                                else if (c2 >= '0' && c2 <= '9')
-                                {
-                                    str.Append(c2);
-                                }
-                            }
-
-                            break;
-
-                        case 'T':
-                            str.Clear();
-                            while (indx != length &&
-                                   wtsTime[indx] != 'P')
-                            {
-                                char c2 = wtsTime[indx++];
-                                if (c2 == 'H')
-                                {
-                                    hours = Convert.ToInt32(str.ToString(), CultureInfo.InvariantCulture);
-                                    str.Clear();
-                                }
-                                else if (c2 == 'M')
-                                {
-                                    minutes = Convert.ToInt32(str.ToString(), CultureInfo.InvariantCulture);
-                                    str.Clear();
-                                }
-                                else if (c2 == 'S')
-                                {
-                                    seconds = Convert.ToInt32(str.ToString(), CultureInfo.InvariantCulture);
-                                    str.Clear();
-                                }
-                                else if (c2 >= '0' && c2 <= '9')
-                                {
-                                    str.Append(c2);
-                                }
-                            }
-
-                            break;
-                    }
-                }
-            }
-            catch (FormatException)
-            { }
-            catch (OverflowException)
-            { }
-
-            return new TimeSpan(days, hours, minutes, seconds);
-        }
-
-        /// <summary>
-        /// Creates WTS formatted time string based on TimeSpan parameter.
-        /// </summary>
-        /// <param name="time">TimeSpan.</param>
-        /// <returns>WTS time string.</returns>
-        internal static string ConvertTimeSpanToWTSString(TimeSpan time)
-        {
-            return string.Format(
-                    CultureInfo.InvariantCulture,
-                    "P{0}DT{1}H{2}M{3}S",
-                    time.Days,
-                    time.Hours,
-                    time.Minutes,
-                    time.Seconds);
-        }
-
-        /// <summary>
-        /// Converts DateTime to string for WTS.
-        /// </summary>
-        /// <param name="dt">DateTime.</param>
-        /// <returns>DateTime string.</returns>
-        internal static string ConvertDateTimeToString(DateTime? dt)
-        {
-            if (dt == null)
-            {
-                return string.Empty;
-            }
-            else
-            {
-                return dt.Value.ToString("s", CultureInfo.InvariantCulture);
-            }
-        }
-
-        /// <summary>
-        /// Returns a bitmask representing days of week as
-        /// required by Windows Task Scheduler API.
-        /// </summary>
-        /// <param name="daysOfWeek">Array of DayOfWeek.</param>
-        /// <returns>WTS days of week mask.</returns>
-        internal static short ConvertDaysOfWeekToMask(IEnumerable<DayOfWeek> daysOfWeek)
-        {
-            short rtnValue = 0;
-            foreach (DayOfWeek day in daysOfWeek)
-            {
-                switch (day)
-                {
-                    case DayOfWeek.Sunday:
-                        rtnValue |= WTSSunday;
-                        break;
-
-                    case DayOfWeek.Monday:
-                        rtnValue |= WTSMonday;
-                        break;
-
-                    case DayOfWeek.Tuesday:
-                        rtnValue |= WTSTuesday;
-                        break;
-
-                    case DayOfWeek.Wednesday:
-                        rtnValue |= WTSWednesday;
-                        break;
-
-                    case DayOfWeek.Thursday:
-                        rtnValue |= WTSThursday;
-                        break;
-
-                    case DayOfWeek.Friday:
-                        rtnValue |= WTSFriday;
-                        break;
-
-                    case DayOfWeek.Saturday:
-                        rtnValue |= WTSSaturday;
-                        break;
-                }
-            }
-
-            return rtnValue;
-        }
-
-        /// <summary>
-        /// Converts WTS days of week mask to an array of DayOfWeek type.
-        /// </summary>
-        /// <param name="mask">WTS days of week mask.</param>
-        /// <returns>Days of week as List.</returns>
-        private List<DayOfWeek> ConvertMaskToDaysOfWeekArray(short mask)
-        {
-            List<DayOfWeek> daysOfWeek = new List<DayOfWeek>();
-
-            if ((mask & WTSSunday) != 0)
-            {
-                daysOfWeek.Add(DayOfWeek.Sunday);
-            }
-
-            if ((mask & WTSMonday) != 0)
-            {
-                daysOfWeek.Add(DayOfWeek.Monday);
-            }
-
-            if ((mask & WTSTuesday) != 0)
-            {
-                daysOfWeek.Add(DayOfWeek.Tuesday);
-            }
-
-            if ((mask & WTSWednesday) != 0)
-            {
-                daysOfWeek.Add(DayOfWeek.Wednesday);
-            }
-
-            if ((mask & WTSThursday) != 0)
-            {
-                daysOfWeek.Add(DayOfWeek.Thursday);
-            }
-
-            if ((mask & WTSFriday) != 0)
-            {
-                daysOfWeek.Add(DayOfWeek.Friday);
-            }
-
-            if ((mask & WTSSaturday) != 0)
-            {
-                daysOfWeek.Add(DayOfWeek.Saturday);
-            }
-
-            return daysOfWeek;
-        }
-
-        private TaskMultipleInstancePolicy ConvertToMultiInstances(
-            ITaskSettings iTaskSettings)
-        {
-            switch (iTaskSettings.MultipleInstances)
-            {
-                case _TASK_INSTANCES_POLICY.TASK_INSTANCES_IGNORE_NEW:
-                    return TaskMultipleInstancePolicy.IgnoreNew;
-
-                case _TASK_INSTANCES_POLICY.TASK_INSTANCES_PARALLEL:
-                    return TaskMultipleInstancePolicy.Parallel;
-
-                case _TASK_INSTANCES_POLICY.TASK_INSTANCES_QUEUE:
-                    return TaskMultipleInstancePolicy.Queue;
-
-                case _TASK_INSTANCES_POLICY.TASK_INSTANCES_STOP_EXISTING:
-                    return TaskMultipleInstancePolicy.StopExisting;
-            }
-
-            Debug.Assert(false);
-            return TaskMultipleInstancePolicy.None;
-        }
-
-        private _TASK_INSTANCES_POLICY ConvertFromMultiInstances(
-            TaskMultipleInstancePolicy jobPolicies)
-        {
-            switch (jobPolicies)
-            {
-                case TaskMultipleInstancePolicy.IgnoreNew:
-                    return _TASK_INSTANCES_POLICY.TASK_INSTANCES_IGNORE_NEW;
-
-                case TaskMultipleInstancePolicy.Parallel:
-                    return _TASK_INSTANCES_POLICY.TASK_INSTANCES_PARALLEL;
-
-                case TaskMultipleInstancePolicy.Queue:
-                    return _TASK_INSTANCES_POLICY.TASK_INSTANCES_QUEUE;
-
-                case TaskMultipleInstancePolicy.StopExisting:
-                    return _TASK_INSTANCES_POLICY.TASK_INSTANCES_STOP_EXISTING;
-
-                default:
-                    return _TASK_INSTANCES_POLICY.TASK_INSTANCES_IGNORE_NEW;
-            }
-        }
-
-        #endregion
-
-        #region IDisposable
-
-        /// <summary>
-        /// Dispose.
-        /// </summary>
-        public void Dispose()
-        {
-            // Release reference to Task Scheduler object so that the COM
-            // object can be released.
-            _iRootFolder = null;
-            _taskScheduler = null;
-
-            GC.SuppressFinalize(this);
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/AddJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/AddJobTrigger.cs
deleted file mode 100644
index 2936fcf78c6..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/AddJobTrigger.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Internal;
-using System.Threading;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet adds ScheduledJobTriggers to ScheduledJobDefinition objects.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Add, "JobTrigger", DefaultParameterSetName = AddJobTriggerCommand.JobDefinitionParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223913")]
-    public sealed class AddJobTriggerCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string JobDefinitionParameterSet = "JobDefinition";
-        private const string JobDefinitionIdParameterSet = "JobDefinitionId";
-        private const string JobDefinitionNameParameterSet = "JobDefinitionName";
-
-        /// <summary>
-        /// ScheduledJobTrigger.
-        /// </summary>
-        [Parameter(Position = 1, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = AddJobTriggerCommand.JobDefinitionParameterSet)]
-        [Parameter(Position = 1, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = AddJobTriggerCommand.JobDefinitionIdParameterSet)]
-        [Parameter(Position = 1, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = AddJobTriggerCommand.JobDefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobTrigger[] Trigger
-        {
-            get { return _triggers; }
-
-            set { _triggers = value; }
-        }
-
-        private ScheduledJobTrigger[] _triggers;
-
-        /// <summary>
-        /// ScheduledJobDefinition Id.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = AddJobTriggerCommand.JobDefinitionIdParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Int32[] Id
-        {
-            get { return _ids; }
-
-            set { _ids = value; }
-        }
-
-        private Int32[] _ids;
-
-        /// <summary>
-        /// ScheduledJobDefinition Name.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = AddJobTriggerCommand.JobDefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public string[] Name
-        {
-            get { return _names; }
-
-            set { _names = value; }
-        }
-
-        private string[] _names;
-
-        /// <summary>
-        /// ScheduledJobDefinition.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = AddJobTriggerCommand.JobDefinitionParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobDefinition[] InputObject
-        {
-            get { return _definitions; }
-
-            set { _definitions = value; }
-        }
-
-        private ScheduledJobDefinition[] _definitions;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            switch (ParameterSetName)
-            {
-                case JobDefinitionParameterSet:
-                    AddToJobDefinition(_definitions);
-                    break;
-
-                case JobDefinitionIdParameterSet:
-                    AddToJobDefinition(GetJobDefinitionsById(_ids));
-                    break;
-
-                case JobDefinitionNameParameterSet:
-                    AddToJobDefinition(GetJobDefinitionsByName(_names));
-                    break;
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void AddToJobDefinition(IEnumerable<ScheduledJobDefinition> jobDefinitions)
-        {
-            foreach (ScheduledJobDefinition definition in jobDefinitions)
-            {
-                try
-                {
-                    definition.AddTriggers(_triggers, true);
-                }
-                catch (ScheduledJobException e)
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.CantAddJobTriggersToDefinition, definition.Name);
-                    Exception reason = new RuntimeException(msg, e);
-                    ErrorRecord errorRecord = new ErrorRecord(reason, "CantAddJobTriggersToScheduledJobDefinition", ErrorCategory.InvalidOperation, definition);
-                    WriteError(errorRecord);
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobDefinition.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobDefinition.cs
deleted file mode 100644
index d76b1829d42..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobDefinition.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet disables the specified ScheduledJobDefinition.
-    /// </summary>
-    [Cmdlet(VerbsLifecycle.Disable, "ScheduledJob", SupportsShouldProcess = true, DefaultParameterSetName = DisableScheduledJobDefinitionBase.DefinitionParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223927")]
-    [OutputType(typeof(ScheduledJobDefinition))]
-    public sealed class DisableScheduledJobCommand : DisableScheduledJobDefinitionBase
-    {
-        #region Properties
-
-        /// <summary>
-        /// Returns true if scheduled job definition should be enabled,
-        /// false otherwise.
-        /// </summary>
-        protected override bool Enabled
-        {
-            get { return false; }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobDefinitionBase.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobDefinitionBase.cs
deleted file mode 100644
index d06020ed3d6..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobDefinitionBase.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// Base class for the DisableScheduledJobCommand, EnableScheduledJobCommand cmdlets.
-    /// </summary>
-    public abstract class DisableScheduledJobDefinitionBase : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        /// <summary>
-        /// DefinitionIdParameterSet.
-        /// </summary>
-        protected const string DefinitionIdParameterSet = "DefinitionId";
-
-        /// <summary>
-        /// DefinitionNameParameterSet.
-        /// </summary>
-        protected const string DefinitionNameParameterSet = "DefinitionName";
-
-        /// <summary>
-        /// DefinitionParameterSet.
-        /// </summary>
-        protected const string DefinitionParameterSet = "Definition";
-
-        /// <summary>
-        /// ScheduledJobDefinition.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = DisableScheduledJobDefinitionBase.DefinitionParameterSet)]
-        [ValidateNotNull]
-        public ScheduledJobDefinition InputObject
-        {
-            get { return _definition; }
-
-            set { _definition = value; }
-        }
-
-        private ScheduledJobDefinition _definition;
-
-        /// <summary>
-        /// ScheduledJobDefinition Id.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = DisableScheduledJobDefinitionBase.DefinitionIdParameterSet)]
-        public Int32 Id
-        {
-            get { return _definitionId; }
-
-            set { _definitionId = value; }
-        }
-
-        private Int32 _definitionId;
-
-        /// <summary>
-        /// ScheduledJobDefinition Name.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = DisableScheduledJobDefinitionBase.DefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public string Name
-        {
-            get { return _definitionName; }
-
-            set { _definitionName = value; }
-        }
-
-        private string _definitionName;
-
-        /// <summary>
-        /// Pass through ScheduledJobDefinition object.
-        /// </summary>
-        [Parameter(ParameterSetName = DisableScheduledJobDefinitionBase.DefinitionParameterSet)]
-        [Parameter(ParameterSetName = DisableScheduledJobDefinitionBase.DefinitionIdParameterSet)]
-        [Parameter(ParameterSetName = DisableScheduledJobDefinitionBase.DefinitionNameParameterSet)]
-        public SwitchParameter PassThru
-        {
-            get { return _passThru; }
-
-            set { _passThru = value; }
-        }
-
-        private SwitchParameter _passThru;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            ScheduledJobDefinition definition = null;
-
-            switch (ParameterSetName)
-            {
-                case DefinitionParameterSet:
-                    definition = _definition;
-                    break;
-
-                case DefinitionIdParameterSet:
-                    definition = GetJobDefinitionById(_definitionId);
-                    break;
-
-                case DefinitionNameParameterSet:
-                    definition = GetJobDefinitionByName(_definitionName);
-                    break;
-            }
-
-            string verbName = Enabled ? VerbsLifecycle.Enable : VerbsLifecycle.Disable;
-
-            if (definition != null &&
-                ShouldProcess(definition.Name, verbName))
-            {
-                try
-                {
-                    definition.SetEnabled(Enabled, true);
-                }
-                catch (ScheduledJobException e)
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.CantSetEnableOnJobDefinition, definition.Name);
-                    Exception reason = new RuntimeException(msg, e);
-                    ErrorRecord errorRecord = new ErrorRecord(reason, "CantSetEnableOnScheduledJobDefinition", ErrorCategory.InvalidOperation, definition);
-                    WriteError(errorRecord);
-                }
-
-                if (_passThru)
-                {
-                    WriteObject(definition);
-                }
-            }
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Returns true if scheduled job definition should be enabled,
-        /// false otherwise.
-        /// </summary>
-        protected abstract bool Enabled
-        {
-            get;
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobTrigger.cs
deleted file mode 100644
index 02e37c0acfb..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/DisableJobTrigger.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Internal;
-using System.Threading;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet enables triggers on a ScheduledJobDefinition object.
-    /// </summary>
-    [Cmdlet(VerbsLifecycle.Disable, "JobTrigger", SupportsShouldProcess = true, DefaultParameterSetName = DisableJobTriggerCommand.EnabledParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223918")]
-    public sealed class DisableJobTriggerCommand : EnableDisableScheduledJobCmdletBase
-    {
-        #region Enabled Implementation
-
-        /// <summary>
-        /// Property to determine if trigger should be enabled or disabled.
-        /// </summary>
-        internal override bool Enabled
-        {
-            get { return false; }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/EnableDisableCmdletBase.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/EnableDisableCmdletBase.cs
deleted file mode 100644
index c00626e6d64..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/EnableDisableCmdletBase.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Internal;
-using System.Threading;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// Base class for DisableJobTrigger, EnableJobTrigger cmdlets.
-    /// </summary>
-    public abstract class EnableDisableScheduledJobCmdletBase : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        /// <summary>
-        /// JobDefinition parameter set.
-        /// </summary>
-        protected const string EnabledParameterSet = "JobEnabled";
-
-        /// <summary>
-        /// ScheduledJobTrigger objects to set properties on.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = EnableDisableScheduledJobCmdletBase.EnabledParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobTrigger[] InputObject
-        {
-            get { return _triggers; }
-
-            set { _triggers = value; }
-        }
-
-        /// <summary>
-        /// Pass through for scheduledjobtrigger object.
-        /// </summary>
-        [Parameter(ParameterSetName = EnableDisableScheduledJobCmdletBase.EnabledParameterSet)]
-        public SwitchParameter PassThru
-        {
-            get { return _passThru; }
-
-            set { _passThru = value; }
-        }
-
-        private SwitchParameter _passThru;
-
-        private ScheduledJobTrigger[] _triggers;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            // Update each trigger with the current enabled state.
-            foreach (ScheduledJobTrigger trigger in _triggers)
-            {
-                trigger.Enabled = Enabled;
-                if (trigger.JobDefinition != null)
-                {
-                    trigger.UpdateJobDefinition();
-                }
-
-                if (_passThru)
-                {
-                    WriteObject(trigger);
-                }
-            }
-        }
-
-        #endregion
-
-        #region Internal Properties
-
-        /// <summary>
-        /// Property to determine if trigger should be enabled or disabled.
-        /// </summary>
-        internal abstract bool Enabled
-        {
-            get;
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/EnableJobDefinition.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/EnableJobDefinition.cs
deleted file mode 100644
index 6f236ea57af..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/EnableJobDefinition.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet enables the specified ScheduledJobDefinition.
-    /// </summary>
-    [Cmdlet(VerbsLifecycle.Enable, "ScheduledJob", SupportsShouldProcess = true, DefaultParameterSetName = DisableScheduledJobDefinitionBase.DefinitionParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223926")]
-    [OutputType(typeof(ScheduledJobDefinition))]
-    public sealed class EnableScheduledJobCommand : DisableScheduledJobDefinitionBase
-    {
-        #region Properties
-
-        /// <summary>
-        /// Returns true if scheduled job definition should be enabled,
-        /// false otherwise.
-        /// </summary>
-        protected override bool Enabled
-        {
-            get { return true; }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/EnableJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/EnableJobTrigger.cs
deleted file mode 100644
index 955dde31dfe..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/EnableJobTrigger.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Internal;
-using System.Threading;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet disables triggers on a ScheduledJobDefinition object.
-    /// </summary>
-    [Cmdlet(VerbsLifecycle.Enable, "JobTrigger", SupportsShouldProcess = true, DefaultParameterSetName = EnableJobTriggerCommand.EnabledParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223917")]
-    public sealed class EnableJobTriggerCommand : EnableDisableScheduledJobCmdletBase
-    {
-       #region Enabled Implementation
-
-        /// <summary>
-        /// Property to determine if trigger should be enabled or disabled.
-        /// </summary>
-        internal override bool Enabled
-        {
-            get { return true; }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/GetJobDefinition.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/GetJobDefinition.cs
deleted file mode 100644
index 772027f4fa5..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/GetJobDefinition.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet gets scheduled job definition objects from the local repository.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Get, "ScheduledJob", DefaultParameterSetName = GetScheduledJobCommand.DefinitionIdParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223923")]
-    [OutputType(typeof(ScheduledJobDefinition))]
-    public sealed class GetScheduledJobCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string DefinitionIdParameterSet = "DefinitionId";
-        private const string DefinitionNameParameterSet = "DefinitionName";
-
-        /// <summary>
-        /// ScheduledJobDefinition Id.
-        /// </summary>
-        [Parameter(Position = 0,
-                   ParameterSetName = GetScheduledJobCommand.DefinitionIdParameterSet)]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Int32[] Id
-        {
-            get { return _definitionIds; }
-
-            set { _definitionIds = value; }
-        }
-
-        private Int32[] _definitionIds;
-
-        /// <summary>
-        /// ScheduledJobDefinition Name.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = GetScheduledJobCommand.DefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public string[] Name
-        {
-            get { return _definitionNames; }
-
-            set { _definitionNames = value; }
-        }
-
-        private string[] _definitionNames;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            switch (ParameterSetName)
-            {
-                case DefinitionIdParameterSet:
-                    if (_definitionIds == null)
-                    {
-                        FindAllJobDefinitions(
-                            (definition) =>
-                            {
-                                WriteObject(definition);
-                            });
-                    }
-                    else
-                    {
-                        FindJobDefinitionsById(
-                            _definitionIds,
-                            (definition) =>
-                            {
-                                WriteObject(definition);
-                            });
-                    }
-
-                    break;
-
-                case DefinitionNameParameterSet:
-                    FindJobDefinitionsByName(
-                        _definitionNames,
-                        (definition) =>
-                        {
-                            WriteObject(definition);
-                        });
-                    break;
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/GetJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/GetJobTrigger.cs
deleted file mode 100644
index 0218395f3a1..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/GetJobTrigger.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Internal;
-using System.Threading;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet gets ScheduledJobTriggers for the specified ScheduledJobDefinition object.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Get, "JobTrigger", DefaultParameterSetName = GetJobTriggerCommand.JobDefinitionParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223915")]
-    [OutputType(typeof(ScheduledJobTrigger))]
-    public sealed class GetJobTriggerCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string JobDefinitionParameterSet = "JobDefinition";
-        private const string JobDefinitionIdParameterSet = "JobDefinitionId";
-        private const string JobDefinitionNameParameterSet = "JobDefinitionName";
-
-        /// <summary>
-        /// Trigger number to get.
-        /// </summary>
-        [Parameter(Position = 1,
-                   ParameterSetName = GetJobTriggerCommand.JobDefinitionParameterSet)]
-        [Parameter(Position = 1,
-                   ParameterSetName = GetJobTriggerCommand.JobDefinitionIdParameterSet)]
-        [Parameter(Position = 1,
-                   ParameterSetName = GetJobTriggerCommand.JobDefinitionNameParameterSet)]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Int32[] TriggerId
-        {
-            get { return _triggerIds; }
-
-            set { _triggerIds = value; }
-        }
-
-        private Int32[] _triggerIds;
-
-        /// <summary>
-        /// ScheduledJobDefinition.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = GetJobTriggerCommand.JobDefinitionParameterSet)]
-        [ValidateNotNull]
-        public ScheduledJobDefinition InputObject
-        {
-            get { return _definition; }
-
-            set { _definition = value; }
-        }
-
-        private ScheduledJobDefinition _definition;
-
-        /// <summary>
-        /// ScheduledJobDefinition Id.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = GetJobTriggerCommand.JobDefinitionIdParameterSet)]
-        public Int32 Id
-        {
-            get { return _definitionId; }
-
-            set { _definitionId = value; }
-        }
-
-        private Int32 _definitionId;
-
-        /// <summary>
-        /// ScheduledJobDefinition Name.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = GetJobTriggerCommand.JobDefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public string Name
-        {
-            get { return _name; }
-
-            set { _name = value; }
-        }
-
-        private string _name;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            switch (ParameterSetName)
-            {
-                case JobDefinitionParameterSet:
-                    WriteTriggers(_definition);
-                    break;
-
-                case JobDefinitionIdParameterSet:
-                    WriteTriggers(GetJobDefinitionById(_definitionId));
-                    break;
-
-                case JobDefinitionNameParameterSet:
-                    WriteTriggers(GetJobDefinitionByName(_name));
-                    break;
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void WriteTriggers(ScheduledJobDefinition definition)
-        {
-            if (definition == null)
-            {
-                return;
-            }
-
-            List<Int32> notFoundIds;
-            List<ScheduledJobTrigger> triggers = definition.GetTriggers(_triggerIds, out notFoundIds);
-
-            // Write found trigger objects.
-            foreach (ScheduledJobTrigger trigger in triggers)
-            {
-                WriteObject(trigger);
-            }
-
-            // Report any triggers that were not found.
-            foreach (Int32 notFoundId in notFoundIds)
-            {
-                WriteTriggerNotFoundError(notFoundId, definition.Name, definition);
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/GetScheduledJobOption.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/GetScheduledJobOption.cs
deleted file mode 100644
index 4de3131b223..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/GetScheduledJobOption.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet gets scheduled job option object from a provided ScheduledJobDefinition object.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Get, "ScheduledJobOption", DefaultParameterSetName = GetScheduledJobOptionCommand.JobDefinitionParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223920")]
-    [OutputType(typeof(ScheduledJobOptions))]
-    public sealed class GetScheduledJobOptionCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string JobDefinitionParameterSet = "JobDefinition";
-        private const string JobDefinitionIdParameterSet = "JobDefinitionId";
-        private const string JobDefinitionNameParameterSet = "JobDefinitionName";
-
-        /// <summary>
-        /// ScheduledJobDefinition Id.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = GetScheduledJobOptionCommand.JobDefinitionIdParameterSet)]
-        public Int32 Id
-        {
-            get { return _id; }
-
-            set { _id = value; }
-        }
-
-        private Int32 _id;
-
-        /// <summary>
-        /// ScheduledJobDefinition Name.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true,
-                   ParameterSetName = GetScheduledJobOptionCommand.JobDefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public string Name
-        {
-            get { return _name; }
-
-            set { _name = value; }
-        }
-
-        private string _name;
-
-        /// <summary>
-        /// ScheduledJobDefinition.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = GetScheduledJobOptionCommand.JobDefinitionParameterSet)]
-        [ValidateNotNull]
-        public ScheduledJobDefinition InputObject
-        {
-            get { return _definition; }
-
-            set { _definition = value; }
-        }
-
-        private ScheduledJobDefinition _definition;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            // Get ScheduledJobDefinition object.
-            ScheduledJobDefinition definition = null;
-            switch (ParameterSetName)
-            {
-                case JobDefinitionParameterSet:
-                    definition = _definition;
-                    break;
-
-                case JobDefinitionIdParameterSet:
-                    definition = GetJobDefinitionById(_id);
-                    break;
-
-                case JobDefinitionNameParameterSet:
-                    definition = GetJobDefinitionByName(_name);
-                    break;
-            }
-
-            // Return options from the definition object.
-            if (definition != null)
-            {
-                WriteObject(definition.Options);
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/NewJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/NewJobTrigger.cs
deleted file mode 100644
index 99ce575bec3..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/NewJobTrigger.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Internal;
-using System.Threading;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet creates a new scheduled job trigger based on the provided
-    /// parameter values.
-    /// </summary>
-    [Cmdlet(VerbsCommon.New, "JobTrigger", DefaultParameterSetName = NewJobTriggerCommand.OnceParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223912")]
-    [OutputType(typeof(ScheduledJobTrigger))]
-    public sealed class NewJobTriggerCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string AtLogonParameterSet = "AtLogon";
-        private const string AtStartupParameterSet = "AtStartup";
-        private const string OnceParameterSet = "Once";
-        private const string DailyParameterSet = "Daily";
-        private const string WeeklyParameterSet = "Weekly";
-
-        /// <summary>
-        /// Daily interval for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = NewJobTriggerCommand.DailyParameterSet)]
-        public Int32 DaysInterval
-        {
-            get { return _daysInterval; }
-
-            set { _daysInterval = value; }
-        }
-
-        private Int32 _daysInterval = 1;
-
-        /// <summary>
-        /// Weekly interval for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = NewJobTriggerCommand.WeeklyParameterSet)]
-        public Int32 WeeksInterval
-        {
-            get { return _weeksInterval; }
-
-            set { _weeksInterval = value; }
-        }
-
-        private Int32 _weeksInterval = 1;
-
-        /// <summary>
-        /// Random delay for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = NewJobTriggerCommand.AtLogonParameterSet)]
-        [Parameter(ParameterSetName = NewJobTriggerCommand.AtStartupParameterSet)]
-        [Parameter(ParameterSetName = NewJobTriggerCommand.OnceParameterSet)]
-        [Parameter(ParameterSetName = NewJobTriggerCommand.DailyParameterSet)]
-        [Parameter(ParameterSetName = NewJobTriggerCommand.WeeklyParameterSet)]
-        public TimeSpan RandomDelay
-        {
-            get { return _randomDelay; }
-
-            set { _randomDelay = value; }
-        }
-
-        private TimeSpan _randomDelay;
-
-        /// <summary>
-        /// Job start date/time for trigger.
-        /// </summary>
-        [Parameter(Mandatory = true,
-                   ParameterSetName = NewJobTriggerCommand.OnceParameterSet)]
-        [Parameter(Mandatory = true,
-                   ParameterSetName = NewJobTriggerCommand.DailyParameterSet)]
-        [Parameter(Mandatory = true,
-                   ParameterSetName = NewJobTriggerCommand.WeeklyParameterSet)]
-        public DateTime At
-        {
-            get { return _atTime; }
-
-            set { _atTime = value; }
-        }
-
-        private DateTime _atTime;
-
-        /// <summary>
-        /// User name for AtLogon trigger.  User name is used to determine which user
-        /// log on causes the trigger to activate.
-        /// </summary>
-        [Parameter(ParameterSetName = NewJobTriggerCommand.AtLogonParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public string User
-        {
-            get { return _user; }
-
-            set { _user = value; }
-        }
-
-        private string _user;
-
-        /// <summary>
-        /// Days of week for trigger applies only to the Weekly parameter set.
-        /// Specifies which day(s) of the week the weekly trigger is activated.
-        /// </summary>
-        [Parameter(Mandatory = true, ParameterSetName = NewJobTriggerCommand.WeeklyParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public DayOfWeek[] DaysOfWeek
-        {
-            get { return _daysOfWeek; }
-
-            set { _daysOfWeek = value; }
-        }
-
-        private DayOfWeek[] _daysOfWeek;
-
-        /// <summary>
-        /// Switch to specify an AtStartup trigger.
-        /// </summary>
-        [Parameter(Mandatory = true, Position = 0,
-            ParameterSetName = NewJobTriggerCommand.AtStartupParameterSet)]
-        public SwitchParameter AtStartup
-        {
-            get { return _atStartup; }
-
-            set { _atStartup = value; }
-        }
-
-        private SwitchParameter _atStartup;
-
-        /// <summary>
-        /// Switch to specify an AtLogon trigger.
-        /// </summary>
-        [Parameter(Mandatory = true, Position = 0,
-            ParameterSetName = NewJobTriggerCommand.AtLogonParameterSet)]
-        public SwitchParameter AtLogOn
-        {
-            get { return _atLogon; }
-
-            set { _atLogon = value; }
-        }
-
-        private SwitchParameter _atLogon;
-
-        /// <summary>
-        /// Switch to specify a Once (one time) trigger.
-        /// </summary>
-        [Parameter(Mandatory = true, Position = 0,
-            ParameterSetName = NewJobTriggerCommand.OnceParameterSet)]
-        public SwitchParameter Once
-        {
-            get { return _once; }
-
-            set { _once = value; }
-        }
-
-        private SwitchParameter _once;
-
-        /// <summary>
-        /// Repetition interval of a one time trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = NewJobTriggerCommand.OnceParameterSet)]
-        public TimeSpan RepetitionInterval
-        {
-            get { return _repInterval; }
-
-            set { _repInterval = value; }
-        }
-
-        private TimeSpan _repInterval;
-
-        /// <summary>
-        /// Repetition duration of a one time trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = NewJobTriggerCommand.OnceParameterSet)]
-        public TimeSpan RepetitionDuration
-        {
-            get { return _repDuration; }
-
-            set { _repDuration = value; }
-        }
-
-        private TimeSpan _repDuration;
-
-        /// <summary>
-        /// Repetition interval repeats indefinitely.
-        /// </summary>
-        [Parameter(ParameterSetName = NewJobTriggerCommand.OnceParameterSet)]
-        public SwitchParameter RepeatIndefinitely
-        {
-            get { return _repRepeatIndefinitely; }
-
-            set { _repRepeatIndefinitely = value; }
-        }
-
-        private SwitchParameter _repRepeatIndefinitely;
-
-        /// <summary>
-        /// Switch to specify a Daily trigger.
-        /// </summary>
-        [Parameter(Mandatory = true, Position = 0,
-            ParameterSetName = NewJobTriggerCommand.DailyParameterSet)]
-        public SwitchParameter Daily
-        {
-            get { return _daily; }
-
-            set { _daily = value; }
-        }
-
-        private SwitchParameter _daily;
-
-        /// <summary>
-        /// Switch to specify a Weekly trigger.
-        /// </summary>
-        [Parameter(Mandatory = true, Position = 0,
-            ParameterSetName = NewJobTriggerCommand.WeeklyParameterSet)]
-        public SwitchParameter Weekly
-        {
-            get { return _weekly; }
-
-            set { _weekly = value; }
-        }
-
-        private SwitchParameter _weekly;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Do begin processing.
-        /// </summary>
-        protected override void BeginProcessing()
-        {
-            base.BeginProcessing();
-
-            // Validate parameters.
-            if (_daysInterval < 1)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidDaysIntervalParam);
-            }
-
-            if (_weeksInterval < 1)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidWeeksIntervalParam);
-            }
-        }
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            switch (ParameterSetName)
-            {
-                case AtLogonParameterSet:
-                    CreateAtLogonTrigger();
-                    break;
-
-                case AtStartupParameterSet:
-                    CreateAtStartupTrigger();
-                    break;
-
-                case OnceParameterSet:
-                    CreateOnceTrigger();
-                    break;
-
-                case DailyParameterSet:
-                    CreateDailyTrigger();
-                    break;
-
-                case WeeklyParameterSet:
-                    CreateWeeklyTrigger();
-                    break;
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void CreateAtLogonTrigger()
-        {
-            WriteObject(ScheduledJobTrigger.CreateAtLogOnTrigger(_user, _randomDelay, 0, true));
-        }
-
-        private void CreateAtStartupTrigger()
-        {
-            WriteObject(ScheduledJobTrigger.CreateAtStartupTrigger(_randomDelay, 0, true));
-        }
-
-        private void CreateOnceTrigger()
-        {
-            TimeSpan? repInterval = null;
-            TimeSpan? repDuration = null;
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) || MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)) ||
-                MyInvocation.BoundParameters.ContainsKey(nameof(RepeatIndefinitely)))
-            {
-                if (MyInvocation.BoundParameters.ContainsKey(nameof(RepeatIndefinitely)))
-                {
-                    if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)))
-                    {
-                        throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepeatIndefinitelyParams);
-                    }
-
-                    if (!MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)))
-                    {
-                        throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionRepeatParams);
-                    }
-
-                    _repDuration = TimeSpan.MaxValue;
-                }
-                else if (!MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) || !MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)))
-                {
-                    throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionParams);
-                }
-
-                if (_repInterval < TimeSpan.Zero || _repDuration < TimeSpan.Zero)
-                {
-                    throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionParamValues);
-                }
-
-                if (_repInterval < TimeSpan.FromMinutes(1))
-                {
-                    throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionIntervalValue);
-                }
-
-                if (_repInterval > _repDuration)
-                {
-                    throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionInterval);
-                }
-
-                repInterval = _repInterval;
-                repDuration = _repDuration;
-            }
-
-            WriteObject(ScheduledJobTrigger.CreateOnceTrigger(_atTime, _randomDelay, repInterval, repDuration, 0, true));
-        }
-
-        private void CreateDailyTrigger()
-        {
-            WriteObject(ScheduledJobTrigger.CreateDailyTrigger(_atTime, _daysInterval, _randomDelay, 0, true));
-        }
-
-        private void CreateWeeklyTrigger()
-        {
-            WriteObject(ScheduledJobTrigger.CreateWeeklyTrigger(_atTime, _weeksInterval, _daysOfWeek, _randomDelay, 0, true));
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/NewScheduledJobOption.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/NewScheduledJobOption.cs
deleted file mode 100644
index 09eab549426..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/NewScheduledJobOption.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet creates a new scheduled job option object based on the provided
-    /// parameter values.
-    /// </summary>
-    [Cmdlet(VerbsCommon.New, "ScheduledJobOption", DefaultParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223919")]
-    [OutputType(typeof(ScheduledJobOptions))]
-    public sealed class NewScheduledJobOptionCommand : ScheduledJobOptionCmdletBase
-    {
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            WriteObject(new ScheduledJobOptions(
-                StartIfOnBattery,
-                !ContinueIfGoingOnBattery,
-                WakeToRun,
-                !StartIfIdle,
-                StopIfGoingOffIdle,
-                RestartOnIdleResume,
-                IdleDuration,
-                IdleTimeout,
-                !HideInTaskScheduler,
-                RunElevated,
-                !RequireNetwork,
-                DoNotAllowDemandStart,
-                MultipleInstancePolicy));
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/RegisterJobDefinition.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/RegisterJobDefinition.cs
deleted file mode 100644
index 608f6bcfd9f..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/RegisterJobDefinition.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
-
-using Microsoft.PowerShell.Commands;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet creates a new scheduled job definition object based on the provided
-    /// parameter values and registers it with the Task Scheduler.
-    /// </summary>
-    [SuppressMessage("Microsoft.PowerShell", "PS1012:CallShouldProcessOnlyIfDeclaringSupport")]
-    [Cmdlet(VerbsLifecycle.Register, "ScheduledJob", SupportsShouldProcess = true, DefaultParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223922")]
-    [OutputType(typeof(ScheduledJobDefinition))]
-    public sealed class RegisterScheduledJobCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string FilePathParameterSet = "FilePath";
-        private const string ScriptBlockParameterSet = "ScriptBlock";
-
-        /// <summary>
-        /// File path for script to be run in job.
-        /// </summary>
-        [Parameter(Position = 1, Mandatory = true,
-                   ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Alias("Path")]
-        [ValidateNotNullOrEmpty]
-        public string FilePath
-        {
-            get { return _filePath; }
-
-            set { _filePath = value; }
-        }
-
-        private string _filePath;
-
-        /// <summary>
-        /// ScriptBlock containing script to run in job.
-        /// </summary>
-        [Parameter(Position = 1, Mandatory = true,
-                   ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNull]
-        public ScriptBlock ScriptBlock
-        {
-            get { return _scriptBlock; }
-
-            set { _scriptBlock = value; }
-        }
-
-        private ScriptBlock _scriptBlock;
-
-        /// <summary>
-        /// Name of scheduled job definition.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public string Name
-        {
-            get { return _name; }
-
-            set { _name = value; }
-        }
-
-        private string _name;
-
-        /// <summary>
-        /// Triggers to define when job will run.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobTrigger[] Trigger
-        {
-            get { return _triggers; }
-
-            set { _triggers = value; }
-        }
-
-        private ScheduledJobTrigger[] _triggers;
-
-        /// <summary>
-        /// Initialization script to run before the job starts.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNull]
-        public ScriptBlock InitializationScript
-        {
-            get { return _initializationScript; }
-
-            set { _initializationScript = value; }
-        }
-
-        private ScriptBlock _initializationScript;
-
-        /// <summary>
-        /// Runs the job in a 32-bit PowerShell process.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        public SwitchParameter RunAs32
-        {
-            get { return _runAs32; }
-
-            set { _runAs32 = value; }
-        }
-
-        private SwitchParameter _runAs32;
-
-        /// <summary>
-        /// Credentials for job.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        [Credential]
-        public PSCredential Credential
-        {
-            get { return _credential; }
-
-            set { _credential = value; }
-        }
-
-        private PSCredential _credential;
-
-        /// <summary>
-        /// Authentication mechanism to use for job.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        public AuthenticationMechanism Authentication
-        {
-            get { return _authenticationMechanism; }
-
-            set { _authenticationMechanism = value; }
-        }
-
-        private AuthenticationMechanism _authenticationMechanism;
-
-        /// <summary>
-        /// Scheduling options for job.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNull]
-        public ScheduledJobOptions ScheduledJobOption
-        {
-            get { return _options; }
-
-            set { _options = value; }
-        }
-
-        private ScheduledJobOptions _options;
-
-        /// <summary>
-        /// Argument list for FilePath parameter.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public object[] ArgumentList
-        {
-            get { return _arguments; }
-
-            set { _arguments = value; }
-        }
-
-        private object[] _arguments;
-
-        /// <summary>
-        /// Maximum number of job results allowed in job store.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        public int MaxResultCount
-        {
-            get { return _executionHistoryLength; }
-
-            set { _executionHistoryLength = value; }
-        }
-
-        private int _executionHistoryLength;
-
-        /// <summary>
-        /// Runs scheduled job immediately after successful registration.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        public SwitchParameter RunNow
-        {
-            get { return _runNow; }
-
-            set { _runNow = value; }
-        }
-
-        private SwitchParameter _runNow;
-
-        /// <summary>
-        /// Runs scheduled job at the repetition interval indicated by the
-        /// TimeSpan value for an unending duration.
-        /// </summary>
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = RegisterScheduledJobCommand.ScriptBlockParameterSet)]
-        public TimeSpan RunEvery
-        {
-            get { return _runEvery; }
-
-            set { _runEvery = value; }
-        }
-
-        private TimeSpan _runEvery;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            string targetString = StringUtil.Format(ScheduledJobErrorStrings.DefinitionWhatIf, Name);
-            if (!ShouldProcess(targetString, VerbsLifecycle.Register))
-            {
-                return;
-            }
-
-            ScheduledJobDefinition definition = null;
-
-            switch (ParameterSetName)
-            {
-                case ScriptBlockParameterSet:
-                    definition = CreateScriptBlockDefinition();
-                    break;
-
-                case FilePathParameterSet:
-                    definition = CreateFilePathDefinition();
-                    break;
-            }
-
-            if (definition != null)
-            {
-                // Set the MaxCount value if available.
-                if (MyInvocation.BoundParameters.ContainsKey(nameof(MaxResultCount)))
-                {
-                    if (MaxResultCount < 1)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidMaxResultCount);
-                        Exception reason = new RuntimeException(msg);
-                        ErrorRecord errorRecord = new ErrorRecord(reason, "InvalidMaxResultCountParameterForRegisterScheduledJobDefinition", ErrorCategory.InvalidArgument, null);
-                        WriteError(errorRecord);
-
-                        return;
-                    }
-
-                    definition.SetExecutionHistoryLength(MaxResultCount, false);
-                }
-
-                try
-                {
-                    // If RunEvery parameter is specified then create a job trigger for the definition that
-                    // runs the job at the requested interval.
-                    if (MyInvocation.BoundParameters.ContainsKey(nameof(RunEvery)))
-                    {
-                        AddRepetitionJobTriggerToDefinition(
-                            definition,
-                            RunEvery,
-                            false);
-                    }
-
-                    definition.Register();
-                    WriteObject(definition);
-
-                    if (_runNow)
-                    {
-                        definition.RunAsTask();
-                    }
-                }
-                catch (ScheduledJobException e)
-                {
-                    // Check for access denied error.
-                    if (e.InnerException != null && e.InnerException is System.UnauthorizedAccessException)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.UnauthorizedAccessError, definition.Name);
-                        Exception reason = new RuntimeException(msg, e);
-                        ErrorRecord errorRecord = new ErrorRecord(reason, "UnauthorizedAccessToRegisterScheduledJobDefinition", ErrorCategory.PermissionDenied, definition);
-                        WriteError(errorRecord);
-                    }
-                    else if (e.InnerException != null && e.InnerException is System.IO.DirectoryNotFoundException)
-                    {
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.DirectoryNotFoundError, definition.Name);
-                        Exception reason = new RuntimeException(msg, e);
-                        ErrorRecord errorRecord = new ErrorRecord(reason, "DirectoryNotFoundWhenRegisteringScheduledJobDefinition", ErrorCategory.ObjectNotFound, definition);
-                        WriteError(errorRecord);
-                    }
-                    else if (e.InnerException != null && e.InnerException is System.Runtime.Serialization.InvalidDataContractException)
-                    {
-                        string innerMsg = (!string.IsNullOrEmpty(e.InnerException.Message)) ? e.InnerException.Message : string.Empty;
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.CannotSerializeData, definition.Name, innerMsg);
-                        Exception reason = new RuntimeException(msg, e);
-                        ErrorRecord errorRecord = new ErrorRecord(reason, "CannotSerializeDataWhenRegisteringScheduledJobDefinition", ErrorCategory.InvalidData, definition);
-                        WriteError(errorRecord);
-                    }
-                    else
-                    {
-                        // Create record around known exception type.
-                        ErrorRecord errorRecord = new ErrorRecord(e, "CantRegisterScheduledJobDefinition", ErrorCategory.InvalidOperation, definition);
-                        WriteError(errorRecord);
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private ScheduledJobDefinition CreateScriptBlockDefinition()
-        {
-            JobDefinition jobDefinition = new JobDefinition(typeof(ScheduledJobSourceAdapter), ScriptBlock.ToString(), _name);
-            jobDefinition.ModuleName = ModuleName;
-            Dictionary<string, object> parameterCollection = CreateCommonParameters();
-
-            // ScriptBlock, mandatory
-            parameterCollection.Add(ScheduledJobInvocationInfo.ScriptBlockParameter, ScriptBlock);
-
-            JobInvocationInfo jobInvocationInfo = new ScheduledJobInvocationInfo(jobDefinition, parameterCollection);
-
-            ScheduledJobDefinition definition = new ScheduledJobDefinition(jobInvocationInfo, Trigger,
-                ScheduledJobOption, _credential);
-
-            return definition;
-        }
-
-        private ScheduledJobDefinition CreateFilePathDefinition()
-        {
-            JobDefinition jobDefinition = new JobDefinition(typeof(ScheduledJobSourceAdapter), FilePath, _name);
-            jobDefinition.ModuleName = ModuleName;
-            Dictionary<string, object> parameterCollection = CreateCommonParameters();
-
-            // FilePath, mandatory
-            if (!FilePath.EndsWith(".ps1", StringComparison.OrdinalIgnoreCase))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidFilePathFile);
-                Exception reason = new RuntimeException(msg);
-                ErrorRecord errorRecord = new ErrorRecord(reason, "InvalidFilePathParameterForRegisterScheduledJobDefinition", ErrorCategory.InvalidArgument, this);
-                WriteError(errorRecord);
-
-                return null;
-            }
-
-            Collection<PathInfo> pathInfos = SessionState.Path.GetResolvedPSPathFromPSPath(FilePath);
-            if (pathInfos.Count != 1)
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidFilePath);
-                Exception reason = new RuntimeException(msg);
-                ErrorRecord errorRecord = new ErrorRecord(reason, "InvalidFilePathParameterForRegisterScheduledJobDefinition", ErrorCategory.InvalidArgument, this);
-                WriteError(errorRecord);
-
-                return null;
-            }
-
-            parameterCollection.Add(ScheduledJobInvocationInfo.FilePathParameter, pathInfos[0].Path);
-
-            JobInvocationInfo jobInvocationInfo = new ScheduledJobInvocationInfo(jobDefinition, parameterCollection);
-
-            ScheduledJobDefinition definition = new ScheduledJobDefinition(jobInvocationInfo, Trigger,
-                ScheduledJobOption, _credential);
-
-            return definition;
-        }
-
-        private Dictionary<string, object> CreateCommonParameters()
-        {
-            Dictionary<string, object> parameterCollection = new Dictionary<string, object>();
-
-            parameterCollection.Add(ScheduledJobInvocationInfo.RunAs32Parameter, RunAs32.ToBool());
-            parameterCollection.Add(ScheduledJobInvocationInfo.AuthenticationParameter, Authentication);
-
-            if (InitializationScript != null)
-            {
-                parameterCollection.Add(ScheduledJobInvocationInfo.InitializationScriptParameter, InitializationScript);
-            }
-
-            if (ArgumentList != null)
-            {
-                parameterCollection.Add(ScheduledJobInvocationInfo.ArgumentListParameter, ArgumentList);
-            }
-
-            return parameterCollection;
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/RemoveJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/RemoveJobTrigger.cs
deleted file mode 100644
index 81cdb8ecc35..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/RemoveJobTrigger.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Management.Automation;
-using System.Management.Automation.Host;
-using System.Management.Automation.Internal;
-using System.Threading;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet removes ScheduledJobTriggers from ScheduledJobDefinition objects.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Remove, "JobTrigger", DefaultParameterSetName = RemoveJobTriggerCommand.JobDefinitionParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223914")]
-    public sealed class RemoveJobTriggerCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string JobDefinitionParameterSet = "JobDefinition";
-        private const string JobDefinitionIdParameterSet = "JobDefinitionId";
-        private const string JobDefinitionNameParameterSet = "JobDefinitionName";
-
-        /// <summary>
-        /// Trigger number to remove.
-        /// </summary>
-        [Parameter(ParameterSetName = RemoveJobTriggerCommand.JobDefinitionParameterSet)]
-        [Parameter(ParameterSetName = RemoveJobTriggerCommand.JobDefinitionIdParameterSet)]
-        [Parameter(ParameterSetName = RemoveJobTriggerCommand.JobDefinitionNameParameterSet)]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Int32[] TriggerId
-        {
-            get { return _triggerIds; }
-
-            set { _triggerIds = value; }
-        }
-
-        private Int32[] _triggerIds;
-
-        /// <summary>
-        /// ScheduledJobDefinition Id.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = RemoveJobTriggerCommand.JobDefinitionIdParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Int32[] Id
-        {
-            get { return _definitionIds; }
-
-            set { _definitionIds = value; }
-        }
-
-        private Int32[] _definitionIds;
-
-        /// <summary>
-        /// ScheduledJobDefinition Name.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = RemoveJobTriggerCommand.JobDefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public string[] Name
-        {
-            get { return _names; }
-
-            set { _names = value; }
-        }
-
-        private string[] _names;
-
-        /// <summary>
-        /// ScheduledJobDefinition.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = RemoveJobTriggerCommand.JobDefinitionParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobDefinition[] InputObject
-        {
-            get { return _definitions; }
-
-            set { _definitions = value; }
-        }
-
-        private ScheduledJobDefinition[] _definitions;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            switch (ParameterSetName)
-            {
-                case JobDefinitionParameterSet:
-                    RemoveFromJobDefinition(_definitions);
-                    break;
-
-                case JobDefinitionIdParameterSet:
-                    RemoveFromJobDefinition(GetJobDefinitionsById(_definitionIds));
-                    break;
-
-                case JobDefinitionNameParameterSet:
-                    RemoveFromJobDefinition(GetJobDefinitionsByName(_names));
-                    break;
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void RemoveFromJobDefinition(IEnumerable<ScheduledJobDefinition> definitions)
-        {
-            foreach (ScheduledJobDefinition definition in definitions)
-            {
-                List<Int32> notFoundIds = new List<int>();
-                try
-                {
-                    notFoundIds = definition.RemoveTriggers(_triggerIds, true);
-                }
-                catch (ScheduledJobException e)
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.CantRemoveTriggersFromDefinition, definition.Name);
-                    Exception reason = new RuntimeException(msg, e);
-                    ErrorRecord errorRecord = new ErrorRecord(reason, "CantRemoveTriggersFromScheduledJobDefinition", ErrorCategory.InvalidOperation, definition);
-                    WriteError(errorRecord);
-                }
-
-                // Report not found errors.
-                foreach (Int32 idNotFound in notFoundIds)
-                {
-                    WriteTriggerNotFoundError(idNotFound, definition.Name, definition);
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/SchedJobCmdletBase.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/SchedJobCmdletBase.cs
deleted file mode 100644
index e8112877019..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/SchedJobCmdletBase.cs
+++ /dev/null
@@ -1,468 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// Base class for ScheduledJob cmdlets.
-    /// </summary>
-    public abstract class ScheduleJobCmdletBase : PSCmdlet
-    {
-        #region Cmdlet Strings
-
-        /// <summary>
-        /// Scheduled job module name.
-        /// </summary>
-        protected const string ModuleName = "PSScheduledJob";
-
-        #endregion
-
-        #region Utility Methods
-
-        /// <summary>
-        /// Makes delegate callback call for each scheduledjob definition object found.
-        /// </summary>
-        /// <param name="itemFound">Callback delegate for each discovered item.</param>
-        internal void FindAllJobDefinitions(
-            Action<ScheduledJobDefinition> itemFound)
-        {
-            Dictionary<string, Exception> errors = ScheduledJobDefinition.RefreshRepositoryFromStore((definition) =>
-                {
-                    if (ValidateJobDefinition(definition))
-                    {
-                        itemFound(definition);
-                    }
-                });
-            HandleAllLoadErrors(errors);
-        }
-
-        /// <summary>
-        /// Returns a single ScheduledJobDefinition object from the local
-        /// scheduled job definition repository corresponding to the provided id.
-        /// </summary>
-        /// <param name="id">Local repository scheduled job definition id.</param>
-        /// <param name="writeErrorsAndWarnings">Errors/warnings are written to host.</param>
-        /// <returns>ScheduledJobDefinition object.</returns>
-        internal ScheduledJobDefinition GetJobDefinitionById(
-            Int32 id,
-            bool writeErrorsAndWarnings = true)
-        {
-            Dictionary<string, Exception> errors = ScheduledJobDefinition.RefreshRepositoryFromStore(null);
-            HandleAllLoadErrors(errors);
-
-            foreach (var definition in ScheduledJobDefinition.Repository.Definitions)
-            {
-                if (definition.Id == id &&
-                    ValidateJobDefinition(definition))
-                {
-                    return definition;
-                }
-            }
-
-            if (writeErrorsAndWarnings)
-            {
-                WriteDefinitionNotFoundByIdError(id);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Returns an array of ScheduledJobDefinition objects from the local
-        /// scheduled job definition repository corresponding to the provided Ids.
-        /// </summary>
-        /// <param name="ids">Local repository scheduled job definition ids.</param>
-        /// <param name="writeErrorsAndWarnings">Errors/warnings are written to host.</param>
-        /// <returns>List of ScheduledJobDefinition objects.</returns>
-        internal List<ScheduledJobDefinition> GetJobDefinitionsById(
-            Int32[] ids,
-            bool writeErrorsAndWarnings = true)
-        {
-            Dictionary<string, Exception> errors = ScheduledJobDefinition.RefreshRepositoryFromStore(null);
-            HandleAllLoadErrors(errors);
-
-            List<ScheduledJobDefinition> definitions = new List<ScheduledJobDefinition>();
-            HashSet<Int32> findIds = new HashSet<Int32>(ids);
-            foreach (var definition in ScheduledJobDefinition.Repository.Definitions)
-            {
-                if (findIds.Contains(definition.Id) &&
-                    ValidateJobDefinition(definition))
-                {
-                    definitions.Add(definition);
-                    findIds.Remove(definition.Id);
-                }
-            }
-
-            if (writeErrorsAndWarnings)
-            {
-                foreach (int id in findIds)
-                {
-                    WriteDefinitionNotFoundByIdError(id);
-                }
-            }
-
-            return definitions;
-        }
-
-        /// <summary>
-        /// Makes delegate callback call for each scheduledjob definition object found.
-        /// </summary>
-        /// <param name="ids">Local repository scheduled job definition ids.</param>
-        /// <param name="itemFound">Callback delegate for each discovered item.</param>
-        /// <param name="writeErrorsAndWarnings">Errors/warnings are written to host.</param>
-        internal void FindJobDefinitionsById(
-            Int32[] ids,
-            Action<ScheduledJobDefinition> itemFound,
-            bool writeErrorsAndWarnings = true)
-        {
-            HashSet<Int32> findIds = new HashSet<Int32>(ids);
-            Dictionary<string, Exception> errors = ScheduledJobDefinition.RefreshRepositoryFromStore((definition) =>
-                {
-                    if (findIds.Contains(definition.Id) &&
-                        ValidateJobDefinition(definition))
-                    {
-                        itemFound(definition);
-                        findIds.Remove(definition.Id);
-                    }
-                });
-
-            HandleAllLoadErrors(errors);
-
-            if (writeErrorsAndWarnings)
-            {
-                foreach (Int32 id in findIds)
-                {
-                    WriteDefinitionNotFoundByIdError(id);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns an array of ScheduledJobDefinition objects from the local
-        /// scheduled job definition repository corresponding to the given name.
-        /// </summary>
-        /// <param name="name">Scheduled job definition name.</param>
-        /// <param name="writeErrorsAndWarnings">Errors/warnings are written to host.</param>
-        /// <returns>ScheduledJobDefinition object.</returns>
-        internal ScheduledJobDefinition GetJobDefinitionByName(
-            string name,
-            bool writeErrorsAndWarnings = true)
-        {
-            Dictionary<string, Exception> errors = ScheduledJobDefinition.RefreshRepositoryFromStore(null);
-
-            // Look for match.
-            WildcardPattern namePattern = new WildcardPattern(name, WildcardOptions.IgnoreCase);
-            foreach (var definition in ScheduledJobDefinition.Repository.Definitions)
-            {
-                if (namePattern.IsMatch(definition.Name) &&
-                    ValidateJobDefinition(definition))
-                {
-                    return definition;
-                }
-            }
-
-            // Look for load error.
-            foreach (var error in errors)
-            {
-                if (namePattern.IsMatch(error.Key))
-                {
-                    HandleLoadError(error.Key, error.Value);
-                }
-            }
-
-            if (writeErrorsAndWarnings)
-            {
-                WriteDefinitionNotFoundByNameError(name);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Returns an array of ScheduledJobDefinition objects from the local
-        /// scheduled job definition repository corresponding to the given names.
-        /// </summary>
-        /// <param name="names">Scheduled job definition names.</param>
-        /// <param name="writeErrorsAndWarnings">Errors/warnings are written to host.</param>
-        /// <returns>List of ScheduledJobDefinition objects.</returns>
-        internal List<ScheduledJobDefinition> GetJobDefinitionsByName(
-            string[] names,
-            bool writeErrorsAndWarnings = true)
-        {
-            Dictionary<string, Exception> errors = ScheduledJobDefinition.RefreshRepositoryFromStore(null);
-
-            List<ScheduledJobDefinition> definitions = new List<ScheduledJobDefinition>();
-            foreach (string name in names)
-            {
-                WildcardPattern namePattern = new WildcardPattern(name, WildcardOptions.IgnoreCase);
-
-                // Look for match.
-                bool nameFound = false;
-                foreach (var definition in ScheduledJobDefinition.Repository.Definitions)
-                {
-                    if (namePattern.IsMatch(definition.Name) &&
-                        ValidateJobDefinition(definition))
-                    {
-                        nameFound = true;
-                        definitions.Add(definition);
-                    }
-                }
-
-                // Look for load error.
-                foreach (var error in errors)
-                {
-                    if (namePattern.IsMatch(error.Key))
-                    {
-                        HandleLoadError(error.Key, error.Value);
-                    }
-                }
-
-                if (!nameFound && writeErrorsAndWarnings)
-                {
-                    WriteDefinitionNotFoundByNameError(name);
-                }
-            }
-
-            return definitions;
-        }
-
-        /// <summary>
-        /// Makes delegate callback call for each scheduledjob definition object found.
-        /// </summary>
-        /// <param name="names">Scheduled job definition names.</param>
-        /// <param name="itemFound">Callback delegate for each discovered item.</param>
-        /// <param name="writeErrorsAndWarnings">Errors/warnings are written to host.</param>
-        internal void FindJobDefinitionsByName(
-            string[] names,
-            Action<ScheduledJobDefinition> itemFound,
-            bool writeErrorsAndWarnings = true)
-        {
-            HashSet<string> notFoundNames = new HashSet<string>(names);
-            Dictionary<string, WildcardPattern> patterns = new Dictionary<string, WildcardPattern>();
-            foreach (string name in names)
-            {
-                if (!patterns.ContainsKey(name))
-                {
-                    patterns.Add(name, new WildcardPattern(name, WildcardOptions.IgnoreCase));
-                }
-            }
-
-            Dictionary<string, Exception> errors = ScheduledJobDefinition.RefreshRepositoryFromStore((definition) =>
-                {
-                    foreach (var item in patterns)
-                    {
-                        if (item.Value.IsMatch(definition.Name) &&
-                            ValidateJobDefinition(definition))
-                        {
-                            itemFound(definition);
-                            if (notFoundNames.Contains(item.Key))
-                            {
-                                notFoundNames.Remove(item.Key);
-                            }
-                        }
-                    }
-                });
-
-            // Look for load error.
-            foreach (var error in errors)
-            {
-                foreach (var item in patterns)
-                {
-                    if (item.Value.IsMatch(error.Key))
-                    {
-                        HandleLoadError(error.Key, error.Value);
-                    }
-                }
-            }
-
-            if (writeErrorsAndWarnings)
-            {
-                foreach (var name in notFoundNames)
-                {
-                    WriteDefinitionNotFoundByNameError(name);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes a "Trigger not found" error to host.
-        /// </summary>
-        /// <param name="notFoundId">Trigger Id not found.</param>
-        /// <param name="definitionName">ScheduledJobDefinition name.</param>
-        /// <param name="errorObject">Error object.</param>
-        internal void WriteTriggerNotFoundError(
-            Int32 notFoundId,
-            string definitionName,
-            object errorObject)
-        {
-            string msg = StringUtil.Format(ScheduledJobErrorStrings.TriggerNotFound, notFoundId, definitionName);
-            Exception reason = new RuntimeException(msg);
-            ErrorRecord errorRecord = new ErrorRecord(reason, "ScheduledJobTriggerNotFound", ErrorCategory.ObjectNotFound, errorObject);
-            WriteError(errorRecord);
-        }
-
-        /// <summary>
-        /// Writes a "Definition not found for Id" error to host.
-        /// </summary>
-        /// <param name="defId">Definition Id.</param>
-        internal void WriteDefinitionNotFoundByIdError(
-            Int32 defId)
-        {
-            string msg = StringUtil.Format(ScheduledJobErrorStrings.DefinitionNotFoundById, defId);
-            Exception reason = new RuntimeException(msg);
-            ErrorRecord errorRecord = new ErrorRecord(reason, "ScheduledJobDefinitionNotFoundById", ErrorCategory.ObjectNotFound, null);
-            WriteError(errorRecord);
-        }
-
-        /// <summary>
-        /// Writes a "Definition not found for Name" error to host.
-        /// </summary>
-        /// <param name="name">Definition Name.</param>
-        internal void WriteDefinitionNotFoundByNameError(
-            string name)
-        {
-            string msg = StringUtil.Format(ScheduledJobErrorStrings.DefinitionNotFoundByName, name);
-            Exception reason = new RuntimeException(msg);
-            ErrorRecord errorRecord = new ErrorRecord(reason, "ScheduledJobDefinitionNotFoundByName", ErrorCategory.ObjectNotFound, null);
-            WriteError(errorRecord);
-        }
-
-        /// <summary>
-        /// Writes a "Load from job store" error to host.
-        /// </summary>
-        /// <param name="name">Scheduled job definition name.</param>
-        /// <param name="error">Exception thrown during loading.</param>
-        internal void WriteErrorLoadingDefinition(string name, Exception error)
-        {
-            string msg = StringUtil.Format(ScheduledJobErrorStrings.CantLoadDefinitionFromStore, name);
-            Exception reason = new RuntimeException(msg, error);
-            ErrorRecord errorRecord = new ErrorRecord(reason, "CantLoadScheduledJobDefinitionFromStore", ErrorCategory.InvalidOperation, null);
-            WriteError(errorRecord);
-        }
-
-        /// <summary>
-        /// Creates a Once job trigger with provided repetition interval and an
-        /// infinite duration, and adds the trigger to the provided scheduled job
-        /// definition object.
-        /// </summary>
-        /// <param name="definition">ScheduledJobDefinition.</param>
-        /// <param name="repInterval">Rep interval.</param>
-        /// <param name="save">Save definition change.</param>
-        internal static void AddRepetitionJobTriggerToDefinition(
-            ScheduledJobDefinition definition,
-            TimeSpan repInterval,
-            bool save)
-        {
-            if (definition == null)
-            {
-                throw new PSArgumentNullException("definition");
-            }
-
-            TimeSpan repDuration = TimeSpan.MaxValue;
-
-            // Validate every interval value.
-            if (repInterval < TimeSpan.Zero || repDuration < TimeSpan.Zero)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionParamValues);
-            }
-
-            if (repInterval < TimeSpan.FromMinutes(1))
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionIntervalValue);
-            }
-
-            if (repInterval > repDuration)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidRepetitionInterval);
-            }
-
-            // Create job trigger.
-            var trigger = ScheduledJobTrigger.CreateOnceTrigger(
-                DateTime.Now,
-                TimeSpan.Zero,
-                repInterval,
-                repDuration,
-                0,
-                true);
-
-            definition.AddTriggers(new ScheduledJobTrigger[] { trigger }, save);
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void HandleAllLoadErrors(Dictionary<string, Exception> errors)
-        {
-            foreach (var error in errors)
-            {
-                HandleLoadError(error.Key, error.Value);
-            }
-        }
-
-        private void HandleLoadError(string name, Exception e)
-        {
-            if (e is System.IO.IOException ||
-                e is System.Xml.XmlException ||
-                e is System.TypeInitializationException ||
-                e is System.Runtime.Serialization.SerializationException ||
-                e is System.ArgumentNullException)
-            {
-                // Remove the corrupted scheduled job definition and
-                // notify user with error message.
-                ScheduledJobDefinition.RemoveDefinition(name);
-                WriteErrorLoadingDefinition(name, e);
-            }
-        }
-
-        private void ValidateJobDefinitions()
-        {
-            foreach (var definition in ScheduledJobDefinition.Repository.Definitions)
-            {
-                ValidateJobDefinition(definition);
-            }
-        }
-
-        /// <summary>
-        /// Validates the job definition object retrieved from store by syncing
-        /// its data with the corresponding Task Scheduler task.  If no task
-        /// is found then validation fails.
-        /// </summary>
-        /// <param name="definition"></param>
-        /// <returns></returns>
-        private bool ValidateJobDefinition(ScheduledJobDefinition definition)
-        {
-            Exception ex = null;
-            try
-            {
-                definition.SyncWithWTS();
-            }
-            catch (System.IO.DirectoryNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (System.IO.FileNotFoundException e)
-            {
-                ex = e;
-            }
-            catch (System.ArgumentNullException e)
-            {
-                ex = e;
-            }
-
-            if (ex != null)
-            {
-                WriteErrorLoadingDefinition(definition.Name, ex);
-            }
-
-            return (ex == null);
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/ScheduledJobOptionCmdletBase.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/ScheduledJobOptionCmdletBase.cs
deleted file mode 100644
index cd70dc0a8f1..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/ScheduledJobOptionCmdletBase.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// Base class for NewScheduledJobOption, SetScheduledJobOption cmdlets.
-    /// </summary>
-    public abstract class ScheduledJobOptionCmdletBase : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        /// <summary>
-        /// Options parameter set name.
-        /// </summary>
-        protected const string OptionsParameterSet = "Options";
-
-        /// <summary>
-        /// Scheduled job task is run with elevated privileges when this switch is selected.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter RunElevated
-        {
-            get { return _runElevated; }
-
-            set { _runElevated = value; }
-        }
-
-        private SwitchParameter _runElevated = false;
-
-        /// <summary>
-        /// Scheduled job task is hidden in Windows Task Scheduler when true.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter HideInTaskScheduler
-        {
-            get { return _hideInTaskScheduler; }
-
-            set { _hideInTaskScheduler = value; }
-        }
-
-        private SwitchParameter _hideInTaskScheduler = false;
-
-        /// <summary>
-        /// Scheduled job task will be restarted when machine becomes idle.  This is applicable
-        /// only if the job was configured to stop when no longer idle.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter RestartOnIdleResume
-        {
-            get { return _restartOnIdleResume; }
-
-            set { _restartOnIdleResume = value; }
-        }
-
-        private SwitchParameter _restartOnIdleResume = false;
-
-        /// <summary>
-        /// Provides task scheduler options for multiple running instances of the job.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public TaskMultipleInstancePolicy MultipleInstancePolicy
-        {
-            get { return _multipleInstancePolicy; }
-
-            set { _multipleInstancePolicy = value; }
-        }
-
-        private TaskMultipleInstancePolicy _multipleInstancePolicy = TaskMultipleInstancePolicy.IgnoreNew;
-
-        /// <summary>
-        /// Prevents the job task from being started manually via Task Scheduler UI.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter DoNotAllowDemandStart
-        {
-            get { return _doNotAllowDemandStart; }
-
-            set { _doNotAllowDemandStart = value; }
-        }
-
-        private SwitchParameter _doNotAllowDemandStart = false;
-
-        /// <summary>
-        /// Allows the job task to be run only when network connection available.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter RequireNetwork
-        {
-            get { return _requireNetwork; }
-
-            set { _requireNetwork = value; }
-        }
-
-        private SwitchParameter _requireNetwork = false;
-
-        /// <summary>
-        /// Stops running job started by Task Scheduler if computer is no longer idle.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter StopIfGoingOffIdle
-        {
-            get { return _stopIfGoingOffIdle; }
-
-            set { _stopIfGoingOffIdle = value; }
-        }
-
-        private SwitchParameter _stopIfGoingOffIdle = false;
-
-        /// <summary>
-        /// Will wake the computer to run the job if computer is in sleep mode when
-        /// trigger activates.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter WakeToRun
-        {
-            get { return _wakeToRun; }
-
-            set { _wakeToRun = value; }
-        }
-
-        private SwitchParameter _wakeToRun = false;
-
-        /// <summary>
-        /// Continue running task job if computer going on battery.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter ContinueIfGoingOnBattery
-        {
-            get { return _continueIfGoingOnBattery; }
-
-            set { _continueIfGoingOnBattery = value; }
-        }
-
-        private SwitchParameter _continueIfGoingOnBattery = false;
-
-        /// <summary>
-        /// Will start job task even if computer is running on battery power.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter StartIfOnBattery
-        {
-            get { return _startIfOnBattery; }
-
-            set { _startIfOnBattery = value; }
-        }
-
-        private SwitchParameter _startIfOnBattery = false;
-
-        /// <summary>
-        /// Specifies how long Task Scheduler will wait for idle time after a trigger has
-        /// activated before giving up trying to run job during computer idle.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public TimeSpan IdleTimeout
-        {
-            get { return _idleTimeout; }
-
-            set { _idleTimeout = value; }
-        }
-
-        private TimeSpan _idleTimeout = new TimeSpan(1, 0, 0);
-
-        /// <summary>
-        /// How long the computer needs to be idle before a triggered job task is started.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public TimeSpan IdleDuration
-        {
-            get { return _idleDuration; }
-
-            set { _idleDuration = value; }
-        }
-
-        private TimeSpan _idleDuration = new TimeSpan(0, 10, 0);
-
-        /// <summary>
-        /// Will start job task if machine is idle.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter StartIfIdle
-        {
-            get { return _startIfIdle; }
-
-            set { _startIfIdle = value; }
-        }
-
-        private SwitchParameter _startIfIdle = false;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Begin processing.
-        /// </summary>
-        protected override void BeginProcessing()
-        {
-            // Validate parameters.
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(IdleTimeout)) &&
-                _idleTimeout < TimeSpan.Zero)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidIdleTimeout);
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(IdleDuration)) &&
-                _idleDuration < TimeSpan.Zero)
-            {
-                throw new PSArgumentException(ScheduledJobErrorStrings.InvalidIdleDuration);
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/SetJobDefinition.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/SetJobDefinition.cs
deleted file mode 100644
index 0d56f5640e4..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/SetJobDefinition.cs
+++ /dev/null
@@ -1,552 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet updates a scheduled job definition object based on the provided
-    /// parameter values and saves changes to job store and Task Scheduler.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Set, "ScheduledJob", DefaultParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223924")]
-    [OutputType(typeof(ScheduledJobDefinition))]
-    public sealed class SetScheduledJobCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string ExecutionParameterSet = "Execution";
-        private const string ScriptBlockParameterSet = "ScriptBlock";
-        private const string FilePathParameterSet = "FilePath";
-
-        /// <summary>
-        /// Name of scheduled job definition.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public string Name
-        {
-            get { return _name; }
-
-            set { _name = value; }
-        }
-
-        private string _name;
-
-        /// <summary>
-        /// File path for script to be run in job.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [Alias("Path")]
-        [ValidateNotNullOrEmpty]
-        public string FilePath
-        {
-            get { return _filePath; }
-
-            set { _filePath = value; }
-        }
-
-        private string _filePath;
-
-        /// <summary>
-        /// ScriptBlock containing script to run in job.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [ValidateNotNull]
-        public ScriptBlock ScriptBlock
-        {
-            get { return _scriptBlock; }
-
-            set { _scriptBlock = value; }
-        }
-
-        private ScriptBlock _scriptBlock;
-
-        /// <summary>
-        /// Triggers to define when job will run.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobTrigger[] Trigger
-        {
-            get { return _triggers; }
-
-            set { _triggers = value; }
-        }
-
-        private ScheduledJobTrigger[] _triggers;
-
-        /// <summary>
-        /// Initialization script to run before the job starts.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [ValidateNotNull]
-        public ScriptBlock InitializationScript
-        {
-            get { return _initializationScript; }
-
-            set { _initializationScript = value; }
-        }
-
-        private ScriptBlock _initializationScript;
-
-        /// <summary>
-        /// Runs the job in a 32-bit PowerShell process.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        public SwitchParameter RunAs32
-        {
-            get { return _runAs32; }
-
-            set { _runAs32 = value; }
-        }
-
-        private SwitchParameter _runAs32;
-
-        /// <summary>
-        /// Credentials for job.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [Credential()]
-        public PSCredential Credential
-        {
-            get { return _credential; }
-
-            set { _credential = value; }
-        }
-
-        private PSCredential _credential;
-
-        /// <summary>
-        /// Authentication mechanism to use for job.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        public AuthenticationMechanism Authentication
-        {
-            get { return _authenticationMechanism; }
-
-            set { _authenticationMechanism = value; }
-        }
-
-        private AuthenticationMechanism _authenticationMechanism;
-
-        /// <summary>
-        /// Scheduling options for job.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [ValidateNotNull]
-        public ScheduledJobOptions ScheduledJobOption
-        {
-            get { return _options; }
-
-            set { _options = value; }
-        }
-
-        private ScheduledJobOptions _options;
-
-        /// <summary>
-        /// Input for the job.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = SetScheduledJobCommand.ExecutionParameterSet)]
-        [ValidateNotNull]
-        public ScheduledJobDefinition InputObject
-        {
-            get { return _definition; }
-
-            set { _definition = value; }
-        }
-
-        private ScheduledJobDefinition _definition;
-
-        /// <summary>
-        /// ClearExecutionHistory.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ExecutionParameterSet)]
-        public SwitchParameter ClearExecutionHistory
-        {
-            get { return _clearExecutionHistory; }
-
-            set { _clearExecutionHistory = value; }
-        }
-
-        private SwitchParameter _clearExecutionHistory;
-
-        /// <summary>
-        /// Maximum number of job results allowed in job store.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        public int MaxResultCount
-        {
-            get { return _executionHistoryLength; }
-
-            set { _executionHistoryLength = value; }
-        }
-
-        private int _executionHistoryLength;
-
-        /// <summary>
-        /// Pass the ScheduledJobDefinition object through to output.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ExecutionParameterSet)]
-        public SwitchParameter PassThru
-        {
-            get { return _passThru; }
-
-            set { _passThru = value; }
-        }
-
-        private SwitchParameter _passThru;
-
-        /// <summary>
-        /// Argument list.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public object[] ArgumentList
-        {
-            get { return _arguments; }
-
-            set { _arguments = value; }
-        }
-
-        private object[] _arguments;
-
-        /// <summary>
-        /// Runs scheduled job immediately after successfully setting job definition.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        public SwitchParameter RunNow
-        {
-            get { return _runNow; }
-
-            set { _runNow = value; }
-        }
-
-        private SwitchParameter _runNow;
-
-        /// <summary>
-        /// Runs scheduled job at the repetition interval indicated by the
-        /// TimeSpan value for an unending duration.
-        /// </summary>
-        [Parameter(ParameterSetName = SetScheduledJobCommand.ScriptBlockParameterSet)]
-        [Parameter(ParameterSetName = SetScheduledJobCommand.FilePathParameterSet)]
-        public TimeSpan RunEvery
-        {
-            get { return _runEvery; }
-
-            set { _runEvery = value; }
-        }
-
-        private TimeSpan _runEvery;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            switch (ParameterSetName)
-            {
-                case ExecutionParameterSet:
-                    UpdateExecutionDefinition();
-                    break;
-
-                case ScriptBlockParameterSet:
-                case FilePathParameterSet:
-                    UpdateDefinition();
-                    break;
-            }
-
-            try
-            {
-                // If RunEvery parameter is specified then create a job trigger for the definition that
-                // runs the job at the requested interval.
-                bool addedTrigger = false;
-                if (MyInvocation.BoundParameters.ContainsKey(nameof(RunEvery)))
-                {
-                    AddRepetitionJobTriggerToDefinition(
-                        _definition,
-                        RunEvery,
-                        false);
-
-                    addedTrigger = true;
-                }
-
-                if (Trigger != null || ScheduledJobOption != null || Credential != null || addedTrigger)
-                {
-                    // Save definition to file and update WTS.
-                    _definition.Save();
-                }
-                else
-                {
-                    // No WTS changes.  Save definition to store only.
-                    _definition.SaveToStore();
-                }
-
-                if (_runNow)
-                {
-                    _definition.RunAsTask();
-                }
-            }
-            catch (ScheduledJobException e)
-            {
-                ErrorRecord errorRecord;
-
-                if (e.InnerException != null &&
-                    e.InnerException is System.UnauthorizedAccessException)
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.NoAccessOnSetJobDefinition, _definition.Name);
-                    errorRecord = new ErrorRecord(new RuntimeException(msg, e),
-                        "NoAccessFailureOnSetJobDefinition", ErrorCategory.InvalidOperation, _definition);
-                }
-                else if (e.InnerException != null &&
-                         e.InnerException is System.IO.IOException)
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.IOFailureOnSetJobDefinition, _definition.Name);
-                    errorRecord = new ErrorRecord(new RuntimeException(msg, e),
-                        "IOFailureOnSetJobDefinition", ErrorCategory.InvalidOperation, _definition);
-                }
-                else
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.CantSetJobDefinition, _definition.Name);
-                    errorRecord = new ErrorRecord(new RuntimeException(msg, e),
-                        "CantSetPropertiesToScheduledJobDefinition", ErrorCategory.InvalidOperation, _definition);
-                }
-
-                WriteError(errorRecord);
-            }
-
-            if (_passThru)
-            {
-                WriteObject(_definition);
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void UpdateExecutionDefinition()
-        {
-            if (_clearExecutionHistory)
-            {
-                _definition.ClearExecutionHistory();
-            }
-        }
-
-        private void UpdateDefinition()
-        {
-            if (_name != null &&
-                string.Compare(_name, _definition.Name, StringComparison.OrdinalIgnoreCase) != 0)
-            {
-                _definition.RenameAndSave(_name);
-            }
-
-            UpdateJobInvocationInfo();
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(MaxResultCount)))
-            {
-                _definition.SetExecutionHistoryLength(MaxResultCount, false);
-            }
-
-            if (Credential != null)
-            {
-                _definition.Credential = Credential;
-            }
-
-            if (Trigger != null)
-            {
-                _definition.SetTriggers(Trigger, false);
-            }
-
-            if (ScheduledJobOption != null)
-            {
-                _definition.UpdateOptions(ScheduledJobOption, false);
-            }
-        }
-
-        /// <summary>
-        /// Create new ScheduledJobInvocationInfo object with update information and
-        /// update the job definition object.
-        /// </summary>
-        private void UpdateJobInvocationInfo()
-        {
-            Dictionary<string, object> parameters = UpdateParameters();
-            string name = _definition.Name;
-            string command;
-
-            if (ScriptBlock != null)
-            {
-                command = ScriptBlock.ToString();
-            }
-            else if (FilePath != null)
-            {
-                command = FilePath;
-            }
-            else
-            {
-                command = _definition.InvocationInfo.Command;
-            }
-
-            JobDefinition jobDefinition = new JobDefinition(typeof(ScheduledJobSourceAdapter), command, name);
-            jobDefinition.ModuleName = ModuleName;
-            JobInvocationInfo jobInvocationInfo = new ScheduledJobInvocationInfo(jobDefinition, parameters);
-
-            _definition.UpdateJobInvocationInfo(jobInvocationInfo, false);
-        }
-
-        /// <summary>
-        /// Creates a new parameter dictionary with update parameters.
-        /// </summary>
-        /// <returns>Updated parameters.</returns>
-        private Dictionary<string, object> UpdateParameters()
-        {
-            Debug.Assert(_definition.InvocationInfo.Parameters.Count != 0,
-                "ScheduledJobDefinition must always have some job invocation parameters");
-            Dictionary<string, object> newParameters = new Dictionary<string, object>();
-            foreach (CommandParameter parameter in _definition.InvocationInfo.Parameters[0])
-            {
-                newParameters.Add(parameter.Name, parameter.Value);
-            }
-
-            // RunAs32
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RunAs32)))
-            {
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.RunAs32Parameter))
-                {
-                    newParameters[ScheduledJobInvocationInfo.RunAs32Parameter] = RunAs32.ToBool();
-                }
-                else
-                {
-                    newParameters.Add(ScheduledJobInvocationInfo.RunAs32Parameter, RunAs32.ToBool());
-                }
-            }
-
-            // Authentication
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(Authentication)))
-            {
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.AuthenticationParameter))
-                {
-                    newParameters[ScheduledJobInvocationInfo.AuthenticationParameter] = Authentication;
-                }
-                else
-                {
-                    newParameters.Add(ScheduledJobInvocationInfo.AuthenticationParameter, Authentication);
-                }
-            }
-
-            // InitializationScript
-            if (InitializationScript == null)
-            {
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.InitializationScriptParameter))
-                {
-                    newParameters.Remove(ScheduledJobInvocationInfo.InitializationScriptParameter);
-                }
-            }
-            else
-            {
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.InitializationScriptParameter))
-                {
-                    newParameters[ScheduledJobInvocationInfo.InitializationScriptParameter] = InitializationScript;
-                }
-                else
-                {
-                    newParameters.Add(ScheduledJobInvocationInfo.InitializationScriptParameter, InitializationScript);
-                }
-            }
-
-            // ScriptBlock
-            if (ScriptBlock != null)
-            {
-                // FilePath cannot also be specified.
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.FilePathParameter))
-                {
-                    newParameters.Remove(ScheduledJobInvocationInfo.FilePathParameter);
-                }
-
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.ScriptBlockParameter))
-                {
-                    newParameters[ScheduledJobInvocationInfo.ScriptBlockParameter] = ScriptBlock;
-                }
-                else
-                {
-                    newParameters.Add(ScheduledJobInvocationInfo.ScriptBlockParameter, ScriptBlock);
-                }
-            }
-
-            // FilePath
-            if (FilePath != null)
-            {
-                // ScriptBlock cannot also be specified.
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.ScriptBlockParameter))
-                {
-                    newParameters.Remove(ScheduledJobInvocationInfo.ScriptBlockParameter);
-                }
-
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.FilePathParameter))
-                {
-                    newParameters[ScheduledJobInvocationInfo.FilePathParameter] = FilePath;
-                }
-                else
-                {
-                    newParameters.Add(ScheduledJobInvocationInfo.FilePathParameter, FilePath);
-                }
-            }
-
-            // ArgumentList
-            if (ArgumentList == null)
-            {
-                // Clear existing argument list only if new scriptblock or script file path was specified
-                // (in this case old argument list is invalid).
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.ArgumentListParameter) &&
-                    (ScriptBlock != null || FilePath != null))
-                {
-                    newParameters.Remove(ScheduledJobInvocationInfo.ArgumentListParameter);
-                }
-            }
-            else
-            {
-                if (newParameters.ContainsKey(ScheduledJobInvocationInfo.ArgumentListParameter))
-                {
-                    newParameters[ScheduledJobInvocationInfo.ArgumentListParameter] = ArgumentList;
-                }
-                else
-                {
-                    newParameters.Add(ScheduledJobInvocationInfo.ArgumentListParameter, ArgumentList);
-                }
-            }
-
-            return newParameters;
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/SetJobTrigger.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/SetJobTrigger.cs
deleted file mode 100644
index 4eeab7fcc72..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/SetJobTrigger.cs
+++ /dev/null
@@ -1,945 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet sets properties on a trigger for a ScheduledJobDefinition.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Set, "JobTrigger", DefaultParameterSetName = SetJobTriggerCommand.DefaultParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223916")]
-    [OutputType(typeof(ScheduledJobTrigger))]
-    public sealed class SetJobTriggerCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string DefaultParameterSet = "DefaultParams";
-
-        /// <summary>
-        /// ScheduledJobTrigger objects to set properties on.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobTrigger[] InputObject
-        {
-            get { return _triggers; }
-
-            set { _triggers = value; }
-        }
-
-        private ScheduledJobTrigger[] _triggers;
-
-        /// <summary>
-        /// Daily interval for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public Int32 DaysInterval
-        {
-            get { return _daysInterval; }
-
-            set { _daysInterval = value; }
-        }
-
-        private Int32 _daysInterval = 1;
-
-        /// <summary>
-        /// Weekly interval for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public Int32 WeeksInterval
-        {
-            get { return _weeksInterval; }
-
-            set { _weeksInterval = value; }
-        }
-
-        private Int32 _weeksInterval = 1;
-
-        /// <summary>
-        /// Random delay for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public TimeSpan RandomDelay
-        {
-            get { return _randomDelay; }
-
-            set { _randomDelay = value; }
-        }
-
-        private TimeSpan _randomDelay;
-
-        /// <summary>
-        /// Job start date/time for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public DateTime At
-        {
-            get { return _atTime; }
-
-            set { _atTime = value; }
-        }
-
-        private DateTime _atTime;
-
-        /// <summary>
-        /// User name for AtLogon trigger.  The AtLogon parameter set will create a trigger
-        /// that activates after log on for the provided user name.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public string User
-        {
-            get { return _user; }
-
-            set { _user = value; }
-        }
-
-        private string _user;
-
-        /// <summary>
-        /// Days of week for trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public DayOfWeek[] DaysOfWeek
-        {
-            get { return _daysOfWeek; }
-
-            set { _daysOfWeek = value; }
-        }
-
-        private DayOfWeek[] _daysOfWeek;
-
-        /// <summary>
-        /// Switch to specify an AtStartup trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public SwitchParameter AtStartup
-        {
-            get { return _atStartup; }
-
-            set { _atStartup = value; }
-        }
-
-        private SwitchParameter _atStartup;
-
-        /// <summary>
-        /// Switch to specify an AtLogon trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public SwitchParameter AtLogOn
-        {
-            get { return _atLogon; }
-
-            set { _atLogon = value; }
-        }
-
-        private SwitchParameter _atLogon;
-
-        /// <summary>
-        /// Switch to specify an Once trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public SwitchParameter Once
-        {
-            get { return _once; }
-
-            set { _once = value; }
-        }
-
-        private SwitchParameter _once;
-
-        /// <summary>
-        /// Repetition interval of a one time trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public TimeSpan RepetitionInterval
-        {
-            get { return _repInterval; }
-
-            set { _repInterval = value; }
-        }
-
-        private TimeSpan _repInterval;
-
-        /// <summary>
-        /// Repetition duration of a one time trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public TimeSpan RepetitionDuration
-        {
-            get { return _repDuration; }
-
-            set { _repDuration = value; }
-        }
-
-        private TimeSpan _repDuration;
-
-        /// <summary>
-        /// Repetition interval repeats indefinitely.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public SwitchParameter RepeatIndefinitely
-        {
-            get { return _repRepeatIndefinitely; }
-
-            set { _repRepeatIndefinitely = value; }
-        }
-
-        private SwitchParameter _repRepeatIndefinitely;
-
-        /// <summary>
-        /// Switch to specify an Daily trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public SwitchParameter Daily
-        {
-            get { return _daily; }
-
-            set { _daily = value; }
-        }
-
-        private SwitchParameter _daily;
-
-        /// <summary>
-        /// Switch to specify an Weekly trigger.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public SwitchParameter Weekly
-        {
-            get { return _weekly; }
-
-            set { _weekly = value; }
-        }
-
-        private SwitchParameter _weekly;
-
-        /// <summary>
-        /// Pass through job trigger object.
-        /// </summary>
-        [Parameter(ParameterSetName = SetJobTriggerCommand.DefaultParameterSet)]
-        public SwitchParameter PassThru
-        {
-            get { return _passThru; }
-
-            set { _passThru = value; }
-        }
-
-        private SwitchParameter _passThru;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            // Validate the parameter set and write any errors.
-            TriggerFrequency newTriggerFrequency = TriggerFrequency.None;
-            if (!ValidateParameterSet(ref newTriggerFrequency))
-            {
-                return;
-            }
-
-            // Update each trigger object with the current parameter set.
-            // The associated scheduled job definition will also be updated.
-            foreach (ScheduledJobTrigger trigger in _triggers)
-            {
-                ScheduledJobTrigger originalTrigger = new ScheduledJobTrigger(trigger);
-                if (!UpdateTrigger(trigger, newTriggerFrequency))
-                {
-                    continue;
-                }
-
-                ScheduledJobDefinition definition = trigger.JobDefinition;
-                if (definition != null)
-                {
-                    bool jobUpdateFailed = false;
-
-                    try
-                    {
-                        trigger.UpdateJobDefinition();
-                    }
-                    catch (ScheduledJobException e)
-                    {
-                        jobUpdateFailed = true;
-
-                        string msg = StringUtil.Format(ScheduledJobErrorStrings.CantUpdateTriggerOnJobDef, definition.Name, trigger.Id);
-                        Exception reason = new RuntimeException(msg, e);
-                        ErrorRecord errorRecord = new ErrorRecord(reason, "CantSetPropertiesOnJobTrigger", ErrorCategory.InvalidOperation, trigger);
-                        WriteError(errorRecord);
-                    }
-
-                    if (jobUpdateFailed)
-                    {
-                        // Restore trigger to original configuration.
-                        originalTrigger.CopyTo(trigger);
-                    }
-                }
-
-                if (_passThru)
-                {
-                    WriteObject(trigger);
-                }
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private bool ValidateParameterSet(ref TriggerFrequency newTriggerFrequency)
-        {
-            // First see if a switch parameter was set.
-            List<TriggerFrequency> switchParamList = new List<TriggerFrequency>();
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(AtStartup)))
-            {
-                switchParamList.Add(TriggerFrequency.AtStartup);
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(AtLogon)))
-            {
-                switchParamList.Add(TriggerFrequency.AtLogon);
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(Once)))
-            {
-                switchParamList.Add(TriggerFrequency.Once);
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(Daily)))
-            {
-                switchParamList.Add(TriggerFrequency.Daily);
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(Weekly)))
-            {
-                switchParamList.Add(TriggerFrequency.Weekly);
-            }
-
-            if (switchParamList.Count > 1)
-            {
-                WriteValidationError(ScheduledJobErrorStrings.ConflictingTypeParams);
-                return false;
-            }
-
-            newTriggerFrequency = (switchParamList.Count == 1) ? switchParamList[0] : TriggerFrequency.None;
-
-            // Validate parameters against the new trigger frequency value.
-            bool rtnValue = false;
-            switch (newTriggerFrequency)
-            {
-                case TriggerFrequency.None:
-                    rtnValue = true;
-                    break;
-
-                case TriggerFrequency.AtStartup:
-                    rtnValue = ValidateStartupParams();
-                    break;
-
-                case TriggerFrequency.AtLogon:
-                    rtnValue = ValidateLogonParams();
-                    break;
-
-                case TriggerFrequency.Once:
-                    rtnValue = ValidateOnceParams();
-                    break;
-
-                case TriggerFrequency.Daily:
-                    rtnValue = ValidateDailyParams();
-                    break;
-
-                case TriggerFrequency.Weekly:
-                    rtnValue = ValidateWeeklyParams();
-                    break;
-
-                default:
-                    Debug.Assert(false, "Invalid trigger frequency value.");
-                    rtnValue = false;
-                    break;
-            }
-
-            return rtnValue;
-        }
-
-        private bool ValidateStartupParams()
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysInterval, ScheduledJobErrorStrings.TriggerStartUpType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(WeeksInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidWeeksInterval, ScheduledJobErrorStrings.TriggerStartUpType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidAtTime, ScheduledJobErrorStrings.TriggerStartUpType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(User)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidUser, ScheduledJobErrorStrings.TriggerStartUpType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysOfWeek)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysOfWeek, ScheduledJobErrorStrings.TriggerStartUpType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) || MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)) ||
-                MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInfiniteDuration)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidSetTriggerRepetition, ScheduledJobErrorStrings.TriggerStartUpType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool ValidateLogonParams()
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysInterval, ScheduledJobErrorStrings.TriggerLogonType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(WeeksInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidWeeksInterval, ScheduledJobErrorStrings.TriggerLogonType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidAtTime, ScheduledJobErrorStrings.TriggerLogonType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysOfWeek)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysOfWeek, ScheduledJobErrorStrings.TriggerLogonType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) || MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)) ||
-                MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInfiniteDuration)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidSetTriggerRepetition, ScheduledJobErrorStrings.TriggerLogonType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool ValidateOnceParams(ScheduledJobTrigger trigger = null)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysInterval, ScheduledJobErrorStrings.TriggerOnceType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(WeeksInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidWeeksInterval, ScheduledJobErrorStrings.TriggerOnceType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(User)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidUser, ScheduledJobErrorStrings.TriggerOnceType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysOfWeek)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysOfWeek, ScheduledJobErrorStrings.TriggerOnceType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInfiniteDuration)))
-            {
-                _repDuration = TimeSpan.MaxValue;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) || MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)) ||
-                MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInfiniteDuration)))
-            {
-                // Validate Once trigger repetition parameters.
-                try
-                {
-                    ScheduledJobTrigger.ValidateOnceRepetitionParams(_repInterval, _repDuration);
-                }
-                catch (PSArgumentException e)
-                {
-                    WriteValidationError(e.Message);
-                    return false;
-                }
-            }
-
-            if (trigger != null)
-            {
-                if (trigger.At == null && !MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingAtTime, ScheduledJobErrorStrings.TriggerOnceType);
-                    WriteValidationError(msg);
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool ValidateDailyParams(ScheduledJobTrigger trigger = null)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysInterval)) &&
-                _daysInterval < 1)
-            {
-                WriteValidationError(ScheduledJobErrorStrings.InvalidDaysIntervalParam);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(WeeksInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidWeeksInterval, ScheduledJobErrorStrings.TriggerDailyType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(User)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidUser, ScheduledJobErrorStrings.TriggerDailyType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysOfWeek)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysOfWeek, ScheduledJobErrorStrings.TriggerDailyType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) || MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)) ||
-                MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInfiniteDuration)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidSetTriggerRepetition, ScheduledJobErrorStrings.TriggerDailyType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (trigger != null)
-            {
-                if (trigger.At == null && !MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingAtTime, ScheduledJobErrorStrings.TriggerDailyType);
-                    WriteValidationError(msg);
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool ValidateWeeklyParams(ScheduledJobTrigger trigger = null)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysInterval)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidDaysInterval, ScheduledJobErrorStrings.TriggerWeeklyType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(WeeksInterval)) &&
-                _weeksInterval < 1)
-            {
-                WriteValidationError(ScheduledJobErrorStrings.InvalidWeeksIntervalParam);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(User)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidUser, ScheduledJobErrorStrings.TriggerWeeklyType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) || MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)) ||
-                MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInfiniteDuration)))
-            {
-                string msg = StringUtil.Format(ScheduledJobErrorStrings.InvalidSetTriggerRepetition, ScheduledJobErrorStrings.TriggerWeeklyType);
-                WriteValidationError(msg);
-                return false;
-            }
-
-            if (trigger != null)
-            {
-                if (trigger.At == null && !MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingAtTime, ScheduledJobErrorStrings.TriggerDailyType);
-                    WriteValidationError(msg);
-                    return false;
-                }
-
-                if ((trigger.DaysOfWeek == null || trigger.DaysOfWeek.Count == 0) &&
-                    !MyInvocation.BoundParameters.ContainsKey(nameof(DaysOfWeek)))
-                {
-                    string msg = StringUtil.Format(ScheduledJobErrorStrings.MissingDaysOfWeek, ScheduledJobErrorStrings.TriggerDailyType);
-                    WriteValidationError(msg);
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private bool UpdateTrigger(ScheduledJobTrigger trigger, TriggerFrequency triggerFrequency)
-        {
-            if (triggerFrequency != TriggerFrequency.None)
-            {
-                //
-                // User has specified a specific trigger type.
-                // Parameters have been validated for this trigger type.
-                //
-                if (triggerFrequency != trigger.Frequency)
-                {
-                    // Changing to a new trigger type.
-                    return CreateTrigger(trigger, triggerFrequency);
-                }
-                else
-                {
-                    // Modifying existing trigger type.
-                    return ModifyTrigger(trigger, triggerFrequency);
-                }
-            }
-            else
-            {
-                // We are updating an existing trigger.  Need to validate params
-                // against each trigger type we are updating.
-                return ModifyTrigger(trigger, trigger.Frequency, true);
-            }
-        }
-
-        private bool CreateTrigger(ScheduledJobTrigger trigger, TriggerFrequency triggerFrequency)
-        {
-            switch (triggerFrequency)
-            {
-                case TriggerFrequency.AtStartup:
-                    CreateAtStartupTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.AtLogon:
-                    CreateAtLogonTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.Once:
-                    if (trigger.Frequency != triggerFrequency &&
-                        !ValidateOnceParams(trigger))
-                    {
-                        return false;
-                    }
-
-                    CreateOnceTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.Daily:
-                    if (trigger.Frequency != triggerFrequency &&
-                        !ValidateDailyParams(trigger))
-                    {
-                        return false;
-                    }
-
-                    CreateDailyTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.Weekly:
-                    if (trigger.Frequency != triggerFrequency &&
-                        !ValidateWeeklyParams(trigger))
-                    {
-                        return false;
-                    }
-
-                    CreateWeeklyTrigger(trigger);
-                    break;
-            }
-
-            return true;
-        }
-
-        private bool ModifyTrigger(ScheduledJobTrigger trigger, TriggerFrequency triggerFrequency, bool validate = false)
-        {
-            switch (triggerFrequency)
-            {
-                case TriggerFrequency.AtStartup:
-                    if (validate &&
-                        !ValidateStartupParams())
-                    {
-                        return false;
-                    }
-
-                    ModifyStartupTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.AtLogon:
-                    if (validate &&
-                        !ValidateLogonParams())
-                    {
-                        return false;
-                    }
-
-                    ModifyLogonTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.Once:
-                    if (validate &&
-                        !ValidateOnceParams())
-                    {
-                        return false;
-                    }
-
-                    ModifyOnceTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.Daily:
-                    if (validate &&
-                        !ValidateDailyParams())
-                    {
-                        return false;
-                    }
-
-                    ModifyDailyTrigger(trigger);
-                    break;
-
-                case TriggerFrequency.Weekly:
-                    if (validate &&
-                        !ValidateWeeklyParams())
-                    {
-                        return false;
-                    }
-
-                    ModifyWeeklyTrigger(trigger);
-                    break;
-            }
-
-            return true;
-        }
-
-        private void ModifyStartupTrigger(ScheduledJobTrigger trigger)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)))
-            {
-                trigger.RandomDelay = _randomDelay;
-            }
-        }
-
-        private void ModifyLogonTrigger(ScheduledJobTrigger trigger)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)))
-            {
-                trigger.RandomDelay = _randomDelay;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(User)))
-            {
-                trigger.User = string.IsNullOrEmpty(_user) ? ScheduledJobTrigger.AllUsers : _user;
-            }
-        }
-
-        private void ModifyOnceTrigger(ScheduledJobTrigger trigger)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)))
-            {
-                trigger.RandomDelay = _randomDelay;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)))
-            {
-                trigger.RepetitionInterval = _repInterval;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)))
-            {
-                trigger.RepetitionDuration = _repDuration;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-            {
-                trigger.At = _atTime;
-            }
-        }
-
-        private void ModifyDailyTrigger(ScheduledJobTrigger trigger)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)))
-            {
-                trigger.RandomDelay = _randomDelay;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-            {
-                trigger.At = _atTime;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysInterval)))
-            {
-                trigger.Interval = _daysInterval;
-            }
-        }
-
-        private void ModifyWeeklyTrigger(ScheduledJobTrigger trigger)
-        {
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)))
-            {
-                trigger.RandomDelay = _randomDelay;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(At)))
-            {
-                trigger.At = _atTime;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(WeeksInterval)))
-            {
-                trigger.Interval = _weeksInterval;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DaysOfWeek)))
-            {
-                trigger.DaysOfWeek = new List<DayOfWeek>(_daysOfWeek);
-            }
-        }
-
-        private void CreateAtLogonTrigger(ScheduledJobTrigger trigger)
-        {
-            bool enabled = trigger.Enabled;
-            int id = trigger.Id;
-            TimeSpan randomDelay = trigger.RandomDelay;
-            string user = string.IsNullOrEmpty(trigger.User) ? ScheduledJobTrigger.AllUsers : trigger.User;
-
-            trigger.ClearProperties();
-            trigger.Frequency = TriggerFrequency.AtLogon;
-            trigger.Enabled = enabled;
-            trigger.Id = id;
-
-            trigger.RandomDelay = MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)) ? _randomDelay : randomDelay;
-            trigger.User = MyInvocation.BoundParameters.ContainsKey(nameof(User)) ? _user : user;
-        }
-
-        private void CreateAtStartupTrigger(ScheduledJobTrigger trigger)
-        {
-            bool enabled = trigger.Enabled;
-            int id = trigger.Id;
-            TimeSpan randomDelay = trigger.RandomDelay;
-
-            trigger.ClearProperties();
-            trigger.Frequency = TriggerFrequency.AtStartup;
-            trigger.Enabled = enabled;
-            trigger.Id = id;
-
-            trigger.RandomDelay = MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)) ? _randomDelay : randomDelay;
-        }
-
-        private void CreateOnceTrigger(ScheduledJobTrigger trigger)
-        {
-            bool enabled = trigger.Enabled;
-            int id = trigger.Id;
-            TimeSpan randomDelay = trigger.RandomDelay;
-            DateTime? atTime = trigger.At;
-            TimeSpan? repInterval = trigger.RepetitionInterval;
-            TimeSpan? repDuration = trigger.RepetitionDuration;
-
-            trigger.ClearProperties();
-            trigger.Frequency = TriggerFrequency.Once;
-            trigger.Enabled = enabled;
-            trigger.Id = id;
-
-            trigger.RandomDelay = MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)) ? _randomDelay : randomDelay;
-            trigger.At = MyInvocation.BoundParameters.ContainsKey(nameof(At)) ? _atTime : atTime;
-            trigger.RepetitionInterval = MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionInterval)) ? _repInterval : repInterval;
-            trigger.RepetitionDuration = MyInvocation.BoundParameters.ContainsKey(nameof(RepetitionDuration)) ? _repDuration : repDuration;
-        }
-
-        private void CreateDailyTrigger(ScheduledJobTrigger trigger)
-        {
-            bool enabled = trigger.Enabled;
-            int id = trigger.Id;
-            TimeSpan randomDelay = trigger.RandomDelay;
-            DateTime? atTime = trigger.At;
-            int interval = trigger.Interval;
-
-            trigger.ClearProperties();
-            trigger.Frequency = TriggerFrequency.Daily;
-            trigger.Enabled = enabled;
-            trigger.Id = id;
-
-            trigger.RandomDelay = MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)) ? _randomDelay : randomDelay;
-            trigger.At = MyInvocation.BoundParameters.ContainsKey(nameof(At)) ? _atTime : atTime;
-            trigger.Interval = MyInvocation.BoundParameters.ContainsKey(nameof(DaysInterval)) ? _daysInterval : interval;
-        }
-
-        private void CreateWeeklyTrigger(ScheduledJobTrigger trigger)
-        {
-            bool enabled = trigger.Enabled;
-            int id = trigger.Id;
-            TimeSpan randomDelay = trigger.RandomDelay;
-            DateTime? atTime = trigger.At;
-            int interval = trigger.Interval;
-            List<DayOfWeek> daysOfWeek = trigger.DaysOfWeek;
-
-            trigger.ClearProperties();
-            trigger.Frequency = TriggerFrequency.Weekly;
-            trigger.Enabled = enabled;
-            trigger.Id = id;
-
-            trigger.RandomDelay = MyInvocation.BoundParameters.ContainsKey(nameof(RandomDelay)) ? _randomDelay : randomDelay;
-            trigger.At = MyInvocation.BoundParameters.ContainsKey(nameof(At)) ? _atTime : atTime;
-            trigger.Interval = MyInvocation.BoundParameters.ContainsKey(nameof(WeeksInterval)) ? _weeksInterval : interval;
-            trigger.DaysOfWeek = MyInvocation.BoundParameters.ContainsKey(nameof(DaysOfWeek)) ? new List<DayOfWeek>(_daysOfWeek) : daysOfWeek;
-        }
-
-        private void WriteValidationError(string msg)
-        {
-            Exception reason = new RuntimeException(msg);
-            ErrorRecord errorRecord = new ErrorRecord(reason, "SetJobTriggerParameterValidationError", ErrorCategory.InvalidArgument, null);
-            WriteError(errorRecord);
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/SetScheduledJobOption.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/SetScheduledJobOption.cs
deleted file mode 100644
index bc1e07b1473..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/SetScheduledJobOption.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet sets the provided scheduled job options to the provided ScheduledJobOptions objects.
-    /// </summary>
-    [Cmdlet(VerbsCommon.Set, "ScheduledJobOption", DefaultParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223921")]
-    [OutputType(typeof(ScheduledJobOptions))]
-    public class SetScheduledJobOptionCommand : ScheduledJobOptionCmdletBase
-    {
-        #region Parameters
-
-        /// <summary>
-        /// ScheduledJobOptions object.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        [ValidateNotNull]
-        public ScheduledJobOptions InputObject
-        {
-            get { return _jobOptions; }
-
-            set { _jobOptions = value; }
-        }
-
-        private ScheduledJobOptions _jobOptions;
-
-        /// <summary>
-        /// Pas the ScheduledJobOptions object through to output.
-        /// </summary>
-        [Parameter(ParameterSetName = ScheduledJobOptionCmdletBase.OptionsParameterSet)]
-        public SwitchParameter PassThru
-        {
-            get { return _passThru; }
-
-            set { _passThru = value; }
-        }
-
-        private SwitchParameter _passThru;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            // Update ScheduledJobOptions object with current parameters.
-            // Update switch parameters only if they were selected.
-            // Also update the ScheduledJobDefinition object associated with this options object.
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(StartIfOnBattery)))
-            {
-                _jobOptions.StartIfOnBatteries = StartIfOnBattery;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(ContinueIfGoingOnBattery)))
-            {
-                _jobOptions.StopIfGoingOnBatteries = !ContinueIfGoingOnBattery;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(WakeToRun)))
-            {
-                _jobOptions.WakeToRun = WakeToRun;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(StartIfIdle)))
-            {
-                _jobOptions.StartIfNotIdle = !StartIfIdle;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(StopIfGoingOffIdle)))
-            {
-                _jobOptions.StopIfGoingOffIdle = StopIfGoingOffIdle;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RestartOnIdleResume)))
-            {
-                _jobOptions.RestartOnIdleResume = RestartOnIdleResume;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(HideInTaskScheduler)))
-            {
-                _jobOptions.ShowInTaskScheduler = !HideInTaskScheduler;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RunElevated)))
-            {
-                _jobOptions.RunElevated = RunElevated;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(RequireNetwork)))
-            {
-                _jobOptions.RunWithoutNetwork = !RequireNetwork;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(DoNotAllowDemandStart)))
-            {
-                _jobOptions.DoNotAllowDemandStart = DoNotAllowDemandStart;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(IdleDuration)))
-            {
-                _jobOptions.IdleDuration = IdleDuration;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(IdleTimeout)))
-            {
-                _jobOptions.IdleTimeout = IdleTimeout;
-            }
-
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(MultipleInstancePolicy)))
-            {
-                _jobOptions.MultipleInstancePolicy = MultipleInstancePolicy;
-            }
-
-            // Update ScheduledJobDefinition with changes.
-            if (_jobOptions.JobDefinition != null)
-            {
-                _jobOptions.UpdateJobDefinition();
-            }
-
-            if (_passThru)
-            {
-                WriteObject(_jobOptions);
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/commands/UnregisterJobDefinition.cs b/src/Microsoft.PowerShell.ScheduledJob/commands/UnregisterJobDefinition.cs
deleted file mode 100644
index c6c3885fb90..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/commands/UnregisterJobDefinition.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.ScheduledJob
-{
-    /// <summary>
-    /// This cmdlet removes the specified ScheduledJobDefinition objects from the
-    /// Task Scheduler, job store, and local repository.
-    /// </summary>
-    [Cmdlet(VerbsLifecycle.Unregister, "ScheduledJob", SupportsShouldProcess = true, DefaultParameterSetName = UnregisterScheduledJobCommand.DefinitionParameterSet,
-        HelpUri = "https://go.microsoft.com/fwlink/?LinkID=223925")]
-    public sealed class UnregisterScheduledJobCommand : ScheduleJobCmdletBase
-    {
-        #region Parameters
-
-        private const string DefinitionIdParameterSet = "DefinitionId";
-        private const string DefinitionNameParameterSet = "DefinitionName";
-        private const string DefinitionParameterSet = "Definition";
-
-        /// <summary>
-        /// ScheduledJobDefinition Id.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = UnregisterScheduledJobCommand.DefinitionIdParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Int32[] Id
-        {
-            get { return _definitionIds; }
-
-            set { _definitionIds = value; }
-        }
-
-        private Int32[] _definitionIds;
-
-        /// <summary>
-        /// ScheduledJobDefinition Name.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true,
-                   ParameterSetName = UnregisterScheduledJobCommand.DefinitionNameParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public string[] Name
-        {
-            get { return _names; }
-
-            set { _names = value; }
-        }
-
-        private string[] _names;
-
-        /// <summary>
-        /// ScheduledJobDefinition.
-        /// </summary>
-        [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true,
-                   ParameterSetName = UnregisterScheduledJobCommand.DefinitionParameterSet)]
-        [ValidateNotNullOrEmpty]
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public ScheduledJobDefinition[] InputObject
-        {
-            get { return _definitions; }
-
-            set { _definitions = value; }
-        }
-
-        private ScheduledJobDefinition[] _definitions;
-
-        /// <summary>
-        /// When true this will stop any running instances of this job definition before
-        /// removing the definition.
-        /// </summary>
-        [Parameter(ParameterSetName = UnregisterScheduledJobCommand.DefinitionIdParameterSet)]
-        [Parameter(ParameterSetName = UnregisterScheduledJobCommand.DefinitionNameParameterSet)]
-        [Parameter(ParameterSetName = UnregisterScheduledJobCommand.DefinitionParameterSet)]
-        public SwitchParameter Force
-        {
-            get { return _force; }
-
-            set { _force = value; }
-        }
-
-        private SwitchParameter _force;
-
-        #endregion
-
-        #region Cmdlet Overrides
-
-        /// <summary>
-        /// Process input.
-        /// </summary>
-        protected override void ProcessRecord()
-        {
-            List<ScheduledJobDefinition> definitions = null;
-            switch (ParameterSetName)
-            {
-                case DefinitionParameterSet:
-                    definitions = new List<ScheduledJobDefinition>(_definitions);
-                    break;
-
-                case DefinitionNameParameterSet:
-                    definitions = GetJobDefinitionsByName(_names);
-                    break;
-
-                case DefinitionIdParameterSet:
-                    definitions = GetJobDefinitionsById(_definitionIds);
-                    break;
-            }
-
-            if (definitions != null)
-            {
-                foreach (ScheduledJobDefinition definition in definitions)
-                {
-                    string targetString = StringUtil.Format(ScheduledJobErrorStrings.DefinitionWhatIf, definition.Name);
-                    if (ShouldProcess(targetString, VerbsLifecycle.Unregister))
-                    {
-                        // Removes the ScheduledJobDefinition from the job store,
-                        // Task Scheduler, and disposes the object.
-                        try
-                        {
-                            definition.Remove(_force);
-                        }
-                        catch (ScheduledJobException e)
-                        {
-                            string msg = StringUtil.Format(ScheduledJobErrorStrings.CantUnregisterDefinition, definition.Name);
-                            Exception reason = new RuntimeException(msg, e);
-                            ErrorRecord errorRecord = new ErrorRecord(reason, "CantUnregisterScheduledJobDefinition", ErrorCategory.InvalidOperation, definition);
-                            WriteError(errorRecord);
-                        }
-                    }
-                }
-            }
-
-            // Check for unknown definition names.
-            if ((_names != null && _names.Length > 0) &&
-                (_definitions == null || _definitions.Length < _names.Length))
-            {
-                // Make sure there is no PowerShell task in Task Scheduler with removed names.
-                // This covers the case where the scheduled job definition was manually removed from
-                // the job store but remains as a PowerShell task in Task Scheduler.
-                using (ScheduledJobWTS taskScheduler = new ScheduledJobWTS())
-                {
-                    foreach (string name in _names)
-                    {
-                        taskScheduler.RemoveTaskByName(name, true, true);
-                    }
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.PowerShell.ScheduledJob/resources/ScheduledJobErrorStrings.resx b/src/Microsoft.PowerShell.ScheduledJob/resources/ScheduledJobErrorStrings.resx
deleted file mode 100644
index 047abfee829..00000000000
--- a/src/Microsoft.PowerShell.ScheduledJob/resources/ScheduledJobErrorStrings.resx
+++ /dev/null
@@ -1,387 +0,0 @@
-<?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="https://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="https://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="CannotFindJobDefinition" xml:space="preserve">
-    <value>Cannot find scheduled job {0}.</value>
-    <comment>{0} is the scheduled job definition name that cannot be found.</comment>
-  </data>
-  <data name="CannotFindTaskId" xml:space="preserve">
-    <value>Cannot find scheduled job definition {0} in the Task Scheduler.</value>
-  </data>
-  <data name="CannotRemoveTaskRunningInstance" xml:space="preserve">
-    <value>The scheduled job definition {0} cannot be removed because one or more instances are currently running.  You can remove and stop all running instances by using the Force parameter.</value>
-  </data>
-  <data name="CantAddJobTriggersToDefinition" xml:space="preserve">
-    <value>An error occurred while adding triggers to the scheduled job {0}.</value>
-  </data>
-  <data name="CantFindInWTS" xml:space="preserve">
-    <value>There is no entry in Task Scheduler for scheduled job definition {0}.  A new Task Scheduler entry has been created for this scheduled job definition.</value>
-  </data>
-  <data name="CantLoadDefinitionFromStore" xml:space="preserve">
-    <value>Cannot get the {0} scheduled job because it is corrupted or in an irresolvable state. Because it cannot run, PowerShell has deleted {0} and its results from the computer. To recreate the scheduled job, use the Register-ScheduledJob cmdlet. For more information about corrupted scheduled jobs, see about_Scheduled_Jobs_Troubleshooting.</value>
-    <comment>{0} is the name of the scheduled job definition.</comment>
-  </data>
-  <data name="CantLoadJobRunFromStore" xml:space="preserve">
-    <value>An error occurred while loading job run results for scheduled job {0} with job run date {1}.  </value>
-  </data>
-  <data name="CantRegisterJobDefinition" xml:space="preserve">
-    <value>An error occurred while registering the scheduled job {0}.</value>
-  </data>
-  <data name="CantRemoveTriggersFromDefinition" xml:space="preserve">
-    <value>An error occurred while removing job triggers from scheduled job {0}.</value>
-  </data>
-  <data name="CantRetrieveJobRuns" xml:space="preserve">
-    <value>One or more scheduled job runs could not be retrieved {0}.</value>
-  </data>
-  <data name="CantSaveJobNoFilePathSpecified" xml:space="preserve">
-    <value>Job {0} cannot be saved because no file path was specified.</value>
-  </data>
-  <data name="CantSaveJobNotRun" xml:space="preserve">
-    <value>Job {0} has not been run and cannot be saved.  Run the job first, and then save results.</value>
-  </data>
-  <data name="CantSetEnableOnJobDefinition" xml:space="preserve">
-    <value>An error occurred while enabling or disabling the scheduled job {0}.</value>
-  </data>
-  <data name="CantSetJobDefinition" xml:space="preserve">
-    <value>An error occurred while setting properties on the scheduled job {0}.</value>
-  </data>
-  <data name="CantStartJobDefinition" xml:space="preserve">
-    <value>Cannot start a job from the {0} scheduled job definition.</value>
-  </data>
-  <data name="CantUnregisterDefinition" xml:space="preserve">
-    <value>An error occurred while unregistering the scheduled job {0}.</value>
-  </data>
-  <data name="CantUpdateTriggerOnJobDef" xml:space="preserve">
-    <value>An error occurred while updating the scheduled job definition {0} with this trigger {1}. See exception details for more information.</value>
-  </data>
-  <data name="ConflictingTypeParams" xml:space="preserve">
-    <value>Only one JobTrigger type can be specified: AtStartup, AtLogon, Once, Daily, or Weekly.</value>
-  </data>
-  <data name="DefinitionAlreadyExistsInLocal" xml:space="preserve">
-    <value>A scheduled job definition object {0} already exists in the local scheduled job repository having this Global ID {1}.</value>
-  </data>
-  <data name="DefinitionNotFoundByGlobalId" xml:space="preserve">
-    <value>A scheduled job definition object with Global ID {0} could not be found.</value>
-  </data>
-  <data name="DefinitionNotFoundById" xml:space="preserve">
-    <value>A scheduled job definition with ID {0} could not be found.</value>
-  </data>
-  <data name="DefinitionNotFoundByName" xml:space="preserve">
-    <value>A scheduled job definition with Name {0} could not be found.</value>
-  </data>
-  <data name="DefinitionObjectDisposed" xml:space="preserve">
-    <value>This scheduled job definition object {0} has been disposed.</value>
-  </data>
-  <data name="DefinitionWhatIf" xml:space="preserve">
-    <value>Scheduled job definition {0}.</value>
-  </data>
-  <data name="DirectoryNotFoundError" xml:space="preserve">
-    <value>A directory not found error occurred while registering scheduled job definition {0}.  Make sure you are running PowerShell with elevated privileges.</value>
-  </data>
-  <data name="ErrorRegisteringDefinitionStore" xml:space="preserve">
-    <value>An error occurred while registering scheduled job definition {0}. Cannot add this definition object to the job store.</value>
-  </data>
-  <data name="ErrorRegisteringDefinitionTask" xml:space="preserve">
-    <value>An error occurred while registering scheduled job definition {0} to the Windows Task Scheduler.  The Task Scheduler error is: {1}.</value>
-  </data>
-  <data name="ErrorRemovingDefinitionStore" xml:space="preserve">
-    <value>An error occurred while unregistering scheduled job definition {0}.</value>
-  </data>
-  <data name="ErrorSettingAccessPermissions" xml:space="preserve">
-    <value>An error occurred while setting file access permissions for job definition {0} and user {1}.</value>
-  </data>
-  <data name="ErrorUpdatingDefinitionStore" xml:space="preserve">
-    <value>An error occurred while updating scheduled job definition {0}.  Cannot update this definition in the job store.</value>
-  </data>
-  <data name="ErrorUpdatingDefinitionTask" xml:space="preserve">
-    <value>An error occurred while updating scheduled job definition {0}.  Cannot update this definition with the Windows Task Scheduler.</value>
-  </data>
-  <data name="GeneralWTSError" xml:space="preserve">
-    <value>An error has occurred within the Task Scheduler.</value>
-  </data>
-  <data name="InvalidAtTime" xml:space="preserve">
-    <value>The At parameter is not valid for the {0} job trigger type.</value>
-  </data>
-  <data name="InvalidDaysInterval" xml:space="preserve">
-    <value>The DaysInterval parameter is not valid for the {0} job trigger type.</value>
-  </data>
-  <data name="InvalidDaysIntervalParam" xml:space="preserve">
-    <value>The DaysInterval parameter value must be greater than zero.</value>
-  </data>
-  <data name="InvalidDaysOfWeek" xml:space="preserve">
-    <value>The DaysOfWeek parameter is not valid for the {0} job trigger type.</value>
-  </data>
-  <data name="InvalidFilePath" xml:space="preserve">
-    <value>The FilePath parameter is not valid.</value>
-  </data>
-  <data name="InvalidFilePathFile" xml:space="preserve">
-    <value>Only PowerShell script files are allowed for FilePath parameter. Specify a file with .ps1 extension.</value>
-  </data>
-  <data name="InvalidIdleDuration" xml:space="preserve">
-    <value>The IdleDuration parameter cannot have a negative value.</value>
-  </data>
-  <data name="InvalidIdleTimeout" xml:space="preserve">
-    <value>The IdleTimeout parameter cannot have a negative value.</value>
-  </data>
-  <data name="InvalidJobDefName" xml:space="preserve">
-    <value>The scheduled job definition name {0} contains characters that are not valid.</value>
-  </data>
-  <data name="InvalidMaxResultCount" xml:space="preserve">
-    <value>The MaxResultCount parameter cannot have a negative or zero value.</value>
-  </data>
-  <data name="InvalidUser" xml:space="preserve">
-    <value>The User parameter is not valid for the {0} job trigger type.</value>
-  </data>
-  <data name="InvalidWeeksInterval" xml:space="preserve">
-    <value>The WeeksInterval parameter is not valid for the {0} job trigger type.</value>
-  </data>
-  <data name="InvalidWeeksIntervalParam" xml:space="preserve">
-    <value>The WeeksInterval parameter value must be greater than zero.</value>
-  </data>
-  <data name="IOFailureOnSetJobDefinition" xml:space="preserve">
-    <value>An I/O failure occurred while updating the scheduled job definition {0}.  This could mean a file is missing or corrupted, either in Task Scheduler or in the PowerShell scheduled job store. You might need to create the scheduled job definition again.</value>
-    <comment>{0} is the scheduled job definition name</comment>
-  </data>
-  <data name="JobAlreadyRunning" xml:space="preserve">
-    <value>Job {0} is currently running.</value>
-  </data>
-  <data name="JobDefFileAlreadyExists" xml:space="preserve">
-    <value>The scheduled job definition {0} already exists in the job definition store.</value>
-  </data>
-  <data name="JobRunResultsFileAlreadyExists" xml:space="preserve">
-    <value>The scheduled job results {0} already exist in the job results store.</value>
-  </data>
-  <data name="MissingAtTime" xml:space="preserve">
-    <value>The At parameter is required for the {0} job trigger type.</value>
-  </data>
-  <data name="MissingDaysOfWeek" xml:space="preserve">
-    <value>The DaysOfWeek parameter is required for the {0} job trigger type.</value>
-  </data>
-  <data name="MissingJobTriggerDaysOfWeek" xml:space="preserve">
-    <value>The job trigger {0} requires the DaysOfWeek parameter to be defined.</value>
-  </data>
-  <data name="MissingJobTriggerTime" xml:space="preserve">
-    <value>The Job trigger {0} requires the At parameter to be defined.</value>
-  </data>
-  <data name="MissingJobTriggerType" xml:space="preserve">
-    <value>No Frequency type has been specified for this job trigger. One of the following job trigger frequencies must be specified: AtStartup, AtLogon, Once, Daily, Weekly.</value>
-  </data>
-  <data name="NoAccessOnSetJobDefinition" xml:space="preserve">
-    <value>An access denied error occurred while updating the scheduled job definition {0}.  Try running PowerShell with elevated user rights; that is, Run as Administrator.</value>
-    <comment>{0} is the scheduled job definition name</comment>
-  </data>
-  <data name="NoAssociatedJobDefinitionForOption" xml:space="preserve">
-    <value>There is no scheduled job definition object associated with this options object.</value>
-  </data>
-  <data name="NoAssociatedJobDefinitionForTrigger" xml:space="preserve">
-    <value>There is no scheduled job definition object associated with this trigger {0}.</value>
-  </data>
-  <data name="ScheduledJobAlreadyExistsInLocal" xml:space="preserve">
-    <value>The scheduled job {0} already exists in the local repository.</value>
-  </data>
-  <data name="ScheduledJobNotInRepository" xml:space="preserve">
-    <value>The scheduled job {0} is not in the local job repository.</value>
-  </data>
-  <data name="TaskIdAlreadyExists" xml:space="preserve">
-    <value>The scheduled job definition {0} already exists in Task Scheduler.</value>
-  </data>
-  <data name="TriggerDailyType" xml:space="preserve">
-    <value>Daily</value>
-  </data>
-  <data name="TriggerLogonType" xml:space="preserve">
-    <value>AtLogon</value>
-  </data>
-  <data name="TriggerNotFound" xml:space="preserve">
-    <value>A scheduled job trigger with ID {0} was not found for the scheduled job definition {1}.</value>
-  </data>
-  <data name="TriggerOnceType" xml:space="preserve">
-    <value>Once</value>
-  </data>
-  <data name="TriggerStartUpType" xml:space="preserve">
-    <value>AtStartup</value>
-  </data>
-  <data name="TriggerWeeklyType" xml:space="preserve">
-    <value>Weekly</value>
-  </data>
-  <data name="UnauthorizedAccessError" xml:space="preserve">
-    <value>An access denied error occurred when registering scheduled job definition {0}.  Try running PowerShell with elevated user rights; that is, Run As Administrator.</value>
-  </data>
-  <data name="UnknownTriggerFrequency" xml:space="preserve">
-    <value>Cannot convert a ScheduledJobTrigger object with TriggerFrequency value of {0}.</value>
-  </data>
-  <data name="UnknownTriggerType" xml:space="preserve">
-    <value>An unknown trigger type was returned from Task Scheduler for scheduled job definition {0} with trigger ID {1}.</value>
-  </data>
-  <data name="CannotSerializeData" xml:space="preserve">
-    <value>The scheduled job definition {0} could not be saved because one of the values in the ArgumentList parameter cannot be converted to XML. If possible, change the ArgumentList values to types that are easily converted to XML, such as strings, integers, and hash tables. {1}</value>
-    <comment>{0} is the name of the scheduled job definition that cannot be registered
-{1} is the inner exception message from .Net serialization, or empty if no exception message.</comment>
-  </data>
-  <data name="UnsupportedHostFunction" xml:space="preserve">
-    <value>Commands that interact with the host program, such as Write-Host, cannot be included in PowerShell scheduled jobs because scheduled jobs do not interact with the host program.  Use an alternate command that does not interact with the host program, such as Write-Output or Out-File.</value>
-  </data>
-  <data name="InvalidRepetitionInterval" xml:space="preserve">
-    <value>The RepetitionInterval parameter value must be less than or equal to the RepetitionDuration parameter value.</value>
-  </data>
-  <data name="InvalidRepetitionIntervalValue" xml:space="preserve">
-    <value>The RepetitionInterval parameter value must be greater than 1 minute.</value>
-  </data>
-  <data name="InvalidRepetitionParams" xml:space="preserve">
-    <value>The RepetitionInterval and RepetitionDuration Job trigger parameters must be specified together.</value>
-  </data>
-  <data name="InvalidRepetitionParamValues" xml:space="preserve">
-    <value>The Repetition parameters cannot have negative values.</value>
-  </data>
-  <data name="InvalidSetTriggerRepetition" xml:space="preserve">
-    <value>The Repetition parameters are not valid for the {0} job trigger type.</value>
-  </data>
-  <data name="MismatchedRepetitionParamValues" xml:space="preserve">
-    <value>The RepetitionInterval parameter cannot have a value of zero unless the RepetitionDuration parameter also has a zero value. A zero value removes repetition behavior from the Job trigger.</value>
-  </data>
-  <data name="ErrorRenamingScheduledJob" xml:space="preserve">
-    <value>An error occurred while attempting to rename scheduled job from {0} to {1}.</value>
-  </data>
-  <data name="ErrorRenamingScheduledJobWithMessage" xml:space="preserve">
-    <value>An error occurred while attempting to rename scheduled job from {0} to {1} with error message: {2}.</value>
-  </data>
-  <data name="BrokenRenamingScheduledJob" xml:space="preserve">
-    <value>An unrecoverable error occurred while renaming the scheduled job from {0} to {1}. The scheduled job will be removed.</value>
-  </data>
-  <data name="BrokenRenamingScheduledJobWithMessage" xml:space="preserve">
-    <value>An unrecoverable error occurred while renaming the scheduled job from {0} to {1} with message {2}. The scheduled job will be removed.</value>
-  </data>
-  <data name="ErrorRunningAsTask" xml:space="preserve">
-    <value>An error occurred while running scheduled job definition {0} from the Task Scheduler.</value>
-  </data>
-  <data name="ErrorRunningAsTaskWithReason" xml:space="preserve">
-    <value>An error occurred while running scheduled job definition {0} from the Task Scheduler because {1}.</value>
-  </data>
-  <data name="InvalidRepeatIndefinitelyParams" xml:space="preserve">
-    <value>You cannot specify the RepetitionDuration and RepeatIndefinitely parameters in the same command.</value>
-  </data>
-  <data name="InvalidRepetitionRepeatParams" xml:space="preserve">
-    <value>When you use the RepeatIndefinitely parameter, the RepetitionInterval parameter is required.</value>
-  </data>
-  <data name="reasonJobNotFound" xml:space="preserve">
-    <value>the scheduled job definition could not be found</value>
-  </data>
-  <data name="ReasonTaskDisabled" xml:space="preserve">
-    <value>the scheduled job definition is disabled</value>
-  </data>
-</root>
diff --git a/src/Microsoft.PowerShell.Security/security/AclCommands.cs b/src/Microsoft.PowerShell.Security/security/AclCommands.cs
index 829df70d255..e39b296d154 100644
--- a/src/Microsoft.PowerShell.Security/security/AclCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/AclCommands.cs
@@ -207,7 +207,7 @@ public static string GetOwner(PSObject instance)
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
 
-            if (!(instance.BaseObject is ObjectSecurity sd))
+            if (instance.BaseObject is not ObjectSecurity sd)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
@@ -246,7 +246,7 @@ public static string GetGroup(PSObject instance)
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
 
-            if (!(instance.BaseObject is ObjectSecurity sd))
+            if (instance.BaseObject is not ObjectSecurity sd)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
@@ -570,7 +570,7 @@ public static string GetSddl(PSObject instance)
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
 
-            if (!(instance.BaseObject is ObjectSecurity sd))
+            if (instance.BaseObject is not ObjectSecurity sd)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
@@ -662,7 +662,7 @@ public PSObject InputObject
         /// security descriptor.  Default is the current location.
         /// </summary>
         [Parameter(ValueFromPipeline = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "ByLiteralPath")]
-        [Alias("PSPath")]
+        [Alias("PSPath", "LP")]
         [ValidateNotNullOrEmpty]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] LiteralPath
@@ -929,7 +929,7 @@ public PSObject InputObject
         /// security descriptor.
         /// </summary>
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "ByLiteralPath")]
-        [Alias("PSPath")]
+        [Alias("PSPath", "LP")]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] LiteralPath
         {
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs b/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
index 4723aa7fbf0..e3a386ee507 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
@@ -44,7 +44,7 @@ public string[] FilePath
         /// certificate.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, ParameterSetName = "ByLiteralPath")]
-        [Alias("PSPath")]
+        [Alias("PSPath", "LP")]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] LiteralPath
         {
@@ -208,8 +208,11 @@ protected override void ProcessRecord()
 
         private static X509Certificate2 GetCertFromPfxFile(string path, SecureString password)
         {
+            // No overload found in X509CertificateLoader that takes SecureString
+            #pragma warning disable SYSLIB0057
             var cert = new X509Certificate2(path, password, X509KeyStorageFlags.DefaultKeySet);
             return cert;
+            #pragma warning restore SYSLIB0057
         }
     }
 }
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
index 527bf6be675..37c687a7770 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
@@ -3309,20 +3309,30 @@ public EnhancedKeyUsageProperty(X509Certificate2 cert)
     public sealed class DnsNameProperty
     {
         private readonly List<DnsNameRepresentation> _dnsList = new();
-        private readonly System.Globalization.IdnMapping idnMapping = new();
+        private readonly IdnMapping idnMapping = new();
 
-        private const string dnsNamePrefix = "DNS Name=";
         private const string distinguishedNamePrefix = "CN=";
 
         /// <summary>
         /// Get property of DnsNameList.
         /// </summary>
-        public List<DnsNameRepresentation> DnsNameList
+        public List<DnsNameRepresentation> DnsNameList => _dnsList;
+
+        private DnsNameRepresentation GetDnsNameRepresentation(string dnsName)
         {
-            get
+            string unicodeName;
+
+            try
+            {
+                unicodeName = idnMapping.GetUnicode(dnsName);
+            }
+            catch (ArgumentException)
             {
-                return _dnsList;
+                // The name is not valid Punycode, assume it's valid ASCII.
+                unicodeName = dnsName;
             }
+
+            return new DnsNameRepresentation(dnsName, unicodeName);
         }
 
         /// <summary>
@@ -3330,61 +3340,32 @@ public List<DnsNameRepresentation> DnsNameList
         /// </summary>
         public DnsNameProperty(X509Certificate2 cert)
         {
-            string name;
-            string unicodeName;
-            DnsNameRepresentation dnsName;
             _dnsList = new List<DnsNameRepresentation>();
 
             // extract DNS name from subject distinguish name
             // if it exists and does not contain a comma
             // a comma, indicates it is not a DNS name
-            if (cert.Subject.StartsWith(distinguishedNamePrefix, System.StringComparison.OrdinalIgnoreCase) &&
+            if (cert.Subject.StartsWith(distinguishedNamePrefix, StringComparison.OrdinalIgnoreCase) &&
                 !cert.Subject.Contains(','))
             {
-                name = cert.Subject.Substring(distinguishedNamePrefix.Length);
-                try
-                {
-                    unicodeName = idnMapping.GetUnicode(name);
-                }
-                catch (System.ArgumentException)
-                {
-                    // The name is not valid punyCode, assume it's valid ascii.
-                    unicodeName = name;
-                }
-
-                dnsName = new DnsNameRepresentation(name, unicodeName);
+                string parsedSubjectDistinguishedDnsName = cert.Subject.Substring(distinguishedNamePrefix.Length);
+                DnsNameRepresentation dnsName = GetDnsNameRepresentation(parsedSubjectDistinguishedDnsName);
                 _dnsList.Add(dnsName);
             }
 
+            // Extract DNS names from SAN extensions
             foreach (X509Extension extension in cert.Extensions)
             {
-                // Filter to the OID for Subject Alternative Name
-                if (extension.Oid.Value == "2.5.29.17")
+                if (extension is X509SubjectAlternativeNameExtension sanExtension)
                 {
-                    string[] names = extension.Format(true).Split(Environment.NewLine);
-                    foreach (string nameLine in names)
+                    foreach (string dnsNameEntry in sanExtension.EnumerateDnsNames())
                     {
-                        // Get the part after 'DNS Name='
-                        if (nameLine.StartsWith(dnsNamePrefix, System.StringComparison.InvariantCultureIgnoreCase))
-                        {
-                            name = nameLine.Substring(dnsNamePrefix.Length);
-                            try
-                            {
-                                unicodeName = idnMapping.GetUnicode(name);
-                            }
-                            catch (System.ArgumentException)
-                            {
-                                // The name is not valid punyCode, assume it's valid ascii.
-                                unicodeName = name;
-                            }
-
-                            dnsName = new DnsNameRepresentation(name, unicodeName);
+                        DnsNameRepresentation dnsName = GetDnsNameRepresentation(dnsNameEntry);
 
-                            // Only add the name if it is not the same as an existing name.
-                            if (!_dnsList.Contains(dnsName))
-                            {
-                                _dnsList.Add(dnsName);
-                            }
+                        // Only add the name if it is not the same as an existing name.
+                        if (!_dnsList.Contains(dnsName))
+                        {
+                            _dnsList.Add(dnsName);
                         }
                     }
                 }
@@ -3443,7 +3424,6 @@ internal static IntPtr GetOwnerWindow(PSHost host)
             return IntPtr.Zero;
         }
 #else
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private static IntPtr hWnd = IntPtr.Zero;
         private static bool firstRun = true;
 
@@ -3478,8 +3458,7 @@ private static bool IsUIAllowed(PSHost host)
                 return false;
 
             uint SessionId;
-            uint ProcessId = (uint)System.Diagnostics.Process.GetCurrentProcess().Id;
-            if (!SMASecurity.NativeMethods.ProcessIdToSessionId(ProcessId, out SessionId))
+            if (!SMASecurity.NativeMethods.ProcessIdToSessionId((uint)Environment.ProcessId, out SessionId))
                 return false;
 
             if (SessionId == 0)
diff --git a/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs b/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs
index c727476c0a3..29179a7046d 100644
--- a/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs
@@ -311,8 +311,7 @@ protected override void ProcessRecord()
                 byte[] iv = null;
 
                 // If this is a V2 package
-                if (String.IndexOf(SecureStringHelper.SecureStringExportHeader,
-                        StringComparison.OrdinalIgnoreCase) == 0)
+                if (String.StartsWith(SecureStringHelper.SecureStringExportHeader, StringComparison.OrdinalIgnoreCase))
                 {
                     try
                     {
diff --git a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
index 581266d3ad9..53a662ca4f9 100644
--- a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
@@ -44,7 +44,7 @@ public string[] FilePath
         /// digital signature.
         /// </summary>
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "ByLiteralPath")]
-        [Alias("PSPath")]
+        [Alias("PSPath", "LP")]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] LiteralPath
         {
diff --git a/src/Microsoft.WSMan.Management/ConfigProvider.cs b/src/Microsoft.WSMan.Management/ConfigProvider.cs
index f1fc3a36277..55141379faa 100644
--- a/src/Microsoft.WSMan.Management/ConfigProvider.cs
+++ b/src/Microsoft.WSMan.Management/ConfigProvider.cs
@@ -62,7 +62,7 @@ public sealed class WSManConfigProvider : NavigationCmdletProvider, ICmdletProvi
         string ICmdletProviderSupportsHelp.GetHelpMaml(string helpItemName, string path)
         {
             // Get the leaf node from the path for which help is requested.
-            int ChildIndex = path.LastIndexOf("\\", StringComparison.OrdinalIgnoreCase);
+            int ChildIndex = path.LastIndexOf('\\');
             if (ChildIndex == -1)
             {
                 // Means we are at host level, where no new-item is supported. Return empty string.
diff --git a/src/Microsoft.WSMan.Management/CredSSP.cs b/src/Microsoft.WSMan.Management/CredSSP.cs
index 03c71f0edb1..a8457ab5bc2 100644
--- a/src/Microsoft.WSMan.Management/CredSSP.cs
+++ b/src/Microsoft.WSMan.Management/CredSSP.cs
@@ -514,7 +514,7 @@ private void EnableClientSideSettings()
                 try
                 {
                     XmlDocument xmldoc = new XmlDocument();
-                    
+
                     // push the xml string with credssp enabled
                     xmldoc.LoadXml(m_SessionObj.Put(helper.CredSSP_RUri, newxmlcontent, 0));
 
diff --git a/src/Microsoft.WSMan.Management/CurrentConfigurations.cs b/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
index f4c252c4d1d..3182c04c535 100644
--- a/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
+++ b/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
@@ -11,7 +11,7 @@ namespace Microsoft.WSMan.Management
     /// Class that queries the server and gets current configurations.
     /// Also provides a generic way to update the configurations.
     /// </summary>
-    internal class CurrentConfigurations
+    internal sealed class CurrentConfigurations
     {
         /// <summary>
         /// Prefix used to add NameSpace of root element to namespace manager.
diff --git a/src/Microsoft.WSMan.Management/Interop.cs b/src/Microsoft.WSMan.Management/Interop.cs
index 6685770b0ef..3abb938a572 100644
--- a/src/Microsoft.WSMan.Management/Interop.cs
+++ b/src/Microsoft.WSMan.Management/Interop.cs
@@ -173,7 +173,7 @@ public enum AuthenticationMechanism
     [ComImport]
     [TypeLibType((short)4304)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -255,7 +255,7 @@ string Error
     [ComImport]
     [TypeLibType((short)4288)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -312,7 +312,7 @@ string Password
     [ComImport]
     [TypeLibType((short)4288)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -336,7 +336,7 @@ string CertificateThumbprint
     [ComImport]
     [TypeLibType((short)4288)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -386,7 +386,7 @@ void SetProxy(int accessType,
     [ComImport]
     [TypeLibType((short)4288)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -450,7 +450,7 @@ string Error
     [TypeLibType((short)4304)]
     [SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix")]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -706,7 +706,7 @@ string Error
     [ComImport]
     [TypeLibType((short)4288)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -734,18 +734,19 @@ public interface IWSManResourceLocator
         [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings")]
         string ResourceUri
         {
-            // IDL: HRESULT resourceUri ([out, retval] BSTR* ReturnValue);
+            // IDL: HRESULT resourceUri (BSTR value);
+            [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:PropertyAccessorsMustFollowOrder", Justification = "COM interface defines put_ before get_.")]
             [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "resource")]
             [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings")]
             [DispId(1)]
-            [return: MarshalAs(UnmanagedType.BStr)]
-            get;
+            set;
 
-            // IDL: HRESULT resourceUri (BSTR value);
+            // IDL: HRESULT resourceUri ([out, retval] BSTR* ReturnValue);
             [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "resource")]
             [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings")]
             [DispId(1)]
-            set;
+            [return: MarshalAs(UnmanagedType.BStr)]
+            get;
         }
 
         /// <summary><para><c>AddSelector</c> method of <c>IWSManResourceLocator</c> interface.  </para><para>Add selector to resource locator</para></summary>
@@ -818,14 +819,16 @@ string FragmentDialect
 
         int MustUnderstandOptions
         {
-            // IDL: HRESULT MustUnderstandOptions ([out, retval] long* ReturnValue);
-
-            [DispId(7)]
-            get;
             // IDL: HRESULT MustUnderstandOptions (long value);
 
+            [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:PropertyAccessorsMustFollowOrder", Justification = "COM interface defines put_ before get_.")]
             [DispId(7)]
             set;
+
+            // IDL: HRESULT MustUnderstandOptions ([out, retval] long* ReturnValue);
+
+            [DispId(7)]
+            get;
         }
 
         /// <summary><para><c>ClearOptions</c> method of <c>IWSManResourceLocator</c> interface.  </para><para>Clear all options</para></summary>
@@ -860,7 +863,7 @@ string Error
     [ComImport]
     [TypeLibType((short)4288)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
@@ -1005,7 +1008,7 @@ int Timeout
     [ComImport]
     [TypeLibType((short)400)]
 #if CORECLR
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 #else
     [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIDispatch)]
 #endif
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 084ba8e2ffe..d7b6d1235da 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="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="11.0.0-preview.3.26207.106" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.WSMan.Management/WSManInstance.cs b/src/Microsoft.WSMan.Management/WSManInstance.cs
index a29741172e2..c96b002123d 100644
--- a/src/Microsoft.WSMan.Management/WSManInstance.cs
+++ b/src/Microsoft.WSMan.Management/WSManInstance.cs
@@ -326,7 +326,7 @@ public Uri ResourceURI
         [Parameter(ParameterSetName = "Enumerate")]
 
         [ValidateNotNullOrEmpty]
-        [ValidateSetAttribute(new string[] { "object", "epr", "objectandepr" })]
+        [ValidateSet(new string[] { "object", "epr", "objectandepr" })]
         [Alias("RT")]
         public string ReturnType
         {
diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs
index 482f24aa9c1..9249c7f4b88 100644
--- a/src/Microsoft.WSMan.Management/WsManHelper.cs
+++ b/src/Microsoft.WSMan.Management/WsManHelper.cs
@@ -22,7 +22,7 @@
 namespace Microsoft.WSMan.Management
 {
     [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "0#")]
-    internal class WSManHelper
+    internal sealed class WSManHelper
     {
         // regular expressions
         private const string PTRN_URI_LAST = @"([a-z_][-a-z0-9._]*)$";
@@ -89,7 +89,7 @@ internal class WSManHelper
         //
         //
         // Below class is just a static container which would release sessions in case this DLL is unloaded.
-        internal class Sessions
+        internal sealed class Sessions
         {
             /// <summary>
             /// Dictionary object to store the connection.
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index 0dd1a39c68f..3903b164b09 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>net8.0</TargetFramework>
+    <TargetFramework>net11.0</TargetFramework>
 
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
@@ -13,10 +13,10 @@
   <ItemGroup>
     <PackageReference Include="PowerShellGet" Version="2.2.5" />
     <PackageReference Include="PackageManagement" Version="1.4.8.1" />
-    <PackageReference Include="Microsoft.PowerShell.PSResourceGet" Version="1.0.1" />
+    <PackageReference Include="Microsoft.PowerShell.PSResourceGet" Version="1.2.0" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
-    <PackageReference Include="PSReadLine" Version="2.3.4" />
-    <PackageReference Include="ThreadJob" Version="2.0.3" />
+    <PackageReference Include="PSReadLine" Version="2.4.5" />
+    <PackageReference Include="Microsoft.PowerShell.ThreadJob" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
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 e6d616aa61d..3c2581795f7 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/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-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 6eb576cdf03..21563c1da7c 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/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-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 8268326aa74..adab0df2849 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/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-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 b17465abc5c..df841837696 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -25,10 +25,11 @@ CmdletsToExport = @(
   'Get-TraceSource', 'Set-TraceSource', 'Add-Type', 'Get-TypeData', 'Remove-TypeData', 'Update-TypeData',
   'Get-UICulture', 'Get-Unique', 'Get-Uptime', 'Clear-Variable', 'Get-Variable', 'New-Variable',
   'Remove-Variable', 'Set-Variable', 'Get-Verb', 'Write-Verbose', 'Write-Warning', 'Invoke-WebRequest',
-  'Format-Wide', 'ConvertTo-Xml', 'Select-Xml', 'Get-Error', 'Update-List', 'Unblock-File'
+  'Format-Wide', 'ConvertTo-Xml', 'Select-Xml', 'Get-Error', 'Update-List', 'Unblock-File', 'ConvertTo-CliXml',
+  'ConvertFrom-CliXml'
 )
 FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
-HelpInfoURI = 'https://aka.ms/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-help'
 }
diff --git a/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1 b/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1
index 93c68321ca1..734fe45016d 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/powershell73-help"
+HelpInfoUri="https://aka.ms/powershell75-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 50282d8d5b8..7f77777b137 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/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-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 0b49f178b25..f7582920935 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/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-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 7470c795fdc..0953b2d1cca 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -14,5 +14,5 @@ NestedModules = "Microsoft.PowerShell.Security.dll"
 # 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'
+HelpInfoURI = 'https://aka.ms/powershell75-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 396ed51a8fb..2043543a8a5 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -24,10 +24,10 @@ CmdletsToExport = @(
   'Add-Type', 'Get-TypeData', 'Remove-TypeData', 'Update-TypeData', 'Get-UICulture', 'Get-Unique', 'Get-Uptime',
   'Clear-Variable', 'Get-Variable', 'New-Variable', 'Remove-Variable', 'Set-Variable', 'Get-Verb', 'Write-Verbose',
   'Write-Warning', 'Invoke-WebRequest', 'Format-Wide', 'ConvertTo-Xml', 'Select-Xml', 'Get-Error', 'Update-List',
-  'Out-GridView', 'Show-Command', 'Out-Printer'
+  'Out-GridView', 'Show-Command', 'Out-Printer', 'ConvertTo-CliXml', 'ConvertFrom-CliXml'
 )
 FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
-HelpInfoURI = 'https://aka.ms/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-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 5eb367b7e7f..ced706c9fde 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/powershell73-help'
+HelpInfoURI = 'https://aka.ms/powershell75-help'
 }
diff --git a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1 b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1
index 6185b589a82..3b53d6740e5 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/powershell73-help"
+    HelpInfoUri="https://aka.ms/powershell75-help"
 }
diff --git a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1 b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
index ce0739eb622..c31e9f25963 100644
--- a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
+++ b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
@@ -4,21 +4,22 @@
 <#
   PowerShell Diagnostics Module
   This module contains a set of wrapper scripts that
-  enable a user to use ETW tracing in Windows
-  PowerShell.
+  enable a user to use ETW tracing in PowerShell 7.
  #>
 
-$script:Logman="$env:windir\system32\logman.exe"
-$script:wsmanlogfile = "$env:windir\system32\wsmtraces.log"
-$script:wsmprovfile = "$env:windir\system32\wsmtraceproviders.txt"
+$script:windir = [System.Environment]::GetEnvironmentVariable("windir", [System.EnvironmentVariableTarget]::Machine)
+
+$script:Logman = "${script:windir}\system32\logman.exe"
+$script:wsmanlogfile = "${script:windir}\system32\wsmtraces.log"
+$script:wsmprovfile = "${script:windir}\system32\wsmtraceproviders.txt"
 $script:wsmsession = "wsmlog"
 $script:pssession = "PSTrace"
-$script:psprovidername="Microsoft-Windows-PowerShell"
+$script:psprovidername = "PowerShellCore"
 $script:wsmprovidername = "Microsoft-Windows-WinRM"
 $script:oplog = "/Operational"
-$script:analyticlog="/Analytic"
-$script:debuglog="/Debug"
-$script:wevtutil="$env:windir\system32\wevtutil.exe"
+$script:analyticlog = "/Analytic"
+$script:debuglog = "/Debug"
+$script:wevtutil = "${script:windir}\system32\wevtutil.exe"
 $script:slparam = "sl"
 $script:glparam = "gl"
 
@@ -169,7 +170,6 @@ function Enable-PSWSManCombinedTrace
 
     $provfile = [io.path]::GetTempFilename()
 
-    $traceFileName = [string][Guid]::NewGuid()
     if ($DoNotOverwriteExistingTrace) {
         $fileName = [string][guid]::newguid()
         $logfile = $PSHOME + "\\Traces\\PSTrace_$fileName.etl"
@@ -177,8 +177,8 @@ function Enable-PSWSManCombinedTrace
         $logfile = $PSHOME + "\\Traces\\PSTrace.etl"
     }
 
-    "Microsoft-Windows-PowerShell 0 5" | Out-File $provfile -Encoding ascii
-    "Microsoft-Windows-WinRM 0 5" | Out-File $provfile -Encoding ascii -Append
+    "$script:psprovidername 0 5" | Out-File $provfile -Encoding ascii
+    "$script:wsmprovidername 0 5" | Out-File $provfile -Encoding ascii -Append
 
     if (!(Test-Path $PSHOME\Traces))
     {
@@ -192,7 +192,7 @@ function Enable-PSWSManCombinedTrace
 
     Start-Trace -SessionName $script:pssession -OutputFilePath $logfile -ProviderFilePath $provfile -ETS
 
-    Remove-Item $provfile -Force -ea 0
+    Remove-Item $provfile -Force -ErrorAction SilentlyContinue
 }
 
 function Disable-PSWSManCombinedTrace
diff --git a/src/Modules/nuget.config b/src/Modules/nuget.config
index b0fc73009da..388a65572dd 100644
--- a/src/Modules/nuget.config
+++ b/src/Modules/nuget.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="PSGallery" value="https://www.powershellgallery.com/api/v2/" />
+    <add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
index fb221cfe964..bb4e15351e5 100644
--- a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
+++ b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
@@ -121,6 +121,18 @@
               value="0x3002"
               version="1"
               />
+          <!--Telemetry events-->
+          <event
+              channel="C_OPERATIONAL"
+              level="win:Error"
+              message="$(string.PS_PROVIDER.event.E_O_TelemetrySettingError.message)"
+              opcode="Exception"
+              symbol="TelemetrySettingError"
+              task="Telemetry"
+              template="T_TelemetrySettingError"
+              value="0x3011"
+              version="1"
+              />
           <!--M3P events-->
           <event
               channel="C_ANALYTIC"
@@ -2208,17 +2220,41 @@
               value="0x6017"
               version="1"
               />
-            <event
-                channel="C_ANALYTIC"
-                keywords="AmsiState"
-                level="win:Verbose"
-                message="$(string.PS_PROVIDER.event.E_A_AmsiState.message)"
-                opcode="Method"
-                symbol="AmsiState"
-                task="Amsi"
-                template="T_AmsiState"
-                value="0x4001"
-                version="1"
+          <event
+              channel="C_ANALYTIC"
+              keywords="AmsiState"
+              level="win:Verbose"
+              message="$(string.PS_PROVIDER.event.E_A_AmsiState.message)"
+              opcode="Method"
+              symbol="AmsiState"
+              task="Amsi"
+              template="T_AmsiState"
+              value="0x4001"
+              version="1"
+              />
+          <event
+              channel="C_ANALYTIC"
+              keywords="WDACQuery"
+              level="win:Verbose"
+              message="$(string.PS_PROVIDER.event.E_A_WDACQuery.message)"
+              opcode="Method"
+              symbol="WDACQuery"
+              task="WDAC"
+              template="T_WDACQuery"
+              value="0x4002"
+              version="1"
+              />
+          <event
+              channel="C_ANALYTIC"
+              keywords="WDACAudit"
+              level="win:Verbose"
+              message = "$(string.PS_PROVIDER.event.E_A_WDACAudit.message)"
+              opcode="Method"
+              symbol="WDACAudit"
+              task="WDACAudit"
+              template="T_WDACAudit"
+              value="0x4003"
+              version="1"
               />
         </events>
         <channels>
@@ -2409,6 +2445,12 @@
               symbol="T_EXPERIMENTALFEATURE"
               value="107"
               />
+          <task
+              message="$(string.PS_PROVIDER.task.T_Telemetry.message)"
+              name="Telemetry"
+              symbol="T_TELEMETRY"
+              value="108"
+              />
           <task
               message="$(string.PS_PROVIDER.task.T_ScheduledJob.message)"
               name="ScheduledJob"
@@ -2427,11 +2469,23 @@
               symbol="T_ISEOperation"
               value="120"
               />
-            <task
-                message="$(string.PS_PROVIDER.task.T_AmsiState.message)"
-                name="Amsi"
-                symbol="T_Amsi"
-                value="130"
+          <task
+              message="$(string.PS_PROVIDER.task.T_AmsiState.message)"
+              name="Amsi"
+              symbol="T_Amsi"
+              value="130"
+              />
+          <task
+              message="$(string.PS_PROVIDER.task.T_WDACQuery.message)"
+              name="WDAC"
+              symbol="T_WDAC"
+              value="131"
+              />
+          <task
+              message="$(string.PS_PROVIDER.task.T_WDACAudit.message)"
+              name="WDACAudit"
+              symbol="T_WDACAudit"
+              value="132"
               />
         </tasks>
         <opcodes>
@@ -2593,11 +2647,23 @@
               name="PSWorkflow"
               symbol="K_PSWORKFLOW"
               />
-            <keyword
-                mask="0x400"
-                message="$(string.PS_PROVIDER.keyword.K_AmsiState.message)"
-                name="AmsiState"
-                symbol="K_AmsiState"
+          <keyword
+              mask="0x400"
+              message="$(string.PS_PROVIDER.keyword.K_AmsiState.message)"
+              name="AmsiState"
+              symbol="K_AmsiState"
+              />
+          <keyword
+              mask="0x800"
+              message="$(string.PS_PROVIDER.keyword.K_WDACQuery.message)"
+              name="WDACQuery"
+              symbol="K_WDACQuery"
+              />
+          <keyword
+              mask="0x1000"
+              message="$(string.PS_PROVIDER.keyword.K_WDACAudit.message)"
+              name="WDACAudit"
+              symbol="K_WDACAudit"
               />
         </keywords>
         <maps>
@@ -4004,6 +4070,20 @@
                 name="StackTrace"
                 />
           </template>
+          <template tid="T_TelemetrySettingError">
+            <data
+                inType="win:UnicodeString"
+                name="Name"
+                />
+            <data
+                inType="win:UnicodeString"
+                name="Message"
+                />
+            <data
+                inType="win:UnicodeString"
+                name="StackTrace"
+                />
+          </template>
           <template tid="T_TrackingGuid">
             <data
                 inType="win:GUID"
@@ -4080,16 +4160,48 @@
                 name="FileName"
                 />
           </template>
-            <template tid="T_AmsiState">
-                <data
-                    inType="win:UnicodeString"
-                    name="Action"
+          <template tid="T_AmsiState">
+            <data
+                inType="win:UnicodeString"
+                name="Action"
                 />
-                <data
-                    inType="win:UnicodeString"
-                    name="AmsiContext"
+            <data
+                inType="win:UnicodeString"
+                name="AmsiContext"
                 />
-            </template>
+          </template>
+          <template tid="T_WDACQuery">
+              <data
+                  inType="win:UnicodeString"
+                  name="QueryName"
+                  />
+              <data
+                  inType="win:UnicodeString"
+                  name="FileName"
+                  />
+              <data
+                  inType="win:Int32"
+                  name="QuerySuccess"
+                  />
+              <data
+                  inType="win:Int32"
+                  name="QuerySResult"
+                  />
+          </template>
+          <template tid="T_WDACAudit">
+              <data
+                  inType="win:UnicodeString"
+                  name="Title"
+                  />
+              <data
+                  inType="win:UnicodeString"
+                  name="Message"
+                  />
+              <data
+                  inType="win:UnicodeString"
+                  name="FullyQualifiedId"
+                  />
+          </template>
         </templates>
       </provider>
     </events>
@@ -5535,6 +5647,14 @@
             id="PS_PROVIDER.task.T_ExperimentalFeature.message"
             value="PowerShell Experimental Features"
             />
+        <string
+            id="PS_PROVIDER.event.E_O_TelemetrySettingError.message"
+            value="Failed to retrieve diagnostics and feedback setting from Windows.%n Exception: %1 %n Message: %2 %n StackTrace: %3 %n"
+            />
+        <string
+            id="PS_PROVIDER.task.T_Telemetry.message"
+            value="PowerShell Telemetry"
+            />
         <string
             id="PS_PROVIDER.task.T_NamedPipe.message"
             value="PowerShell Named Pipe IPC"
@@ -5719,6 +5839,30 @@
             id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_DISCONNECT.message"
             value="PowerShell IPC disconnect on process: %1 in AppDomain: %2 for User: %3."
             />
+        <string
+            id="PS_PROVIDER.event.E_A_WDACQuery.message"
+            value="WDAC Query. %n %t Query: %1 %n %t File: %2 %n %t SuccessCode: %3 %n %t ResultCode: %4"
+            />
+        <string
+            id="PS_PROVIDER.keyword.K_WDACQuery.message"
+            value="WDAC Query"
+            />
+        <string
+            id="PS_PROVIDER.task.T_WDACQuery.message"
+            value="WDAC Query"
+            />
+        <string
+            id="PS_PROVIDER.event.E_A_WDACAudit.message"
+            value="WDAC Audit. %n %t Title: %1 %n %t Message: %2 %n %t FullyQualifiedId: %3"
+            />
+        <string
+            id="PS_PROVIDER.keyword.K_WDACAudit.message"
+            value="WDAC Audit"
+            />
+        <string
+            id="PS_PROVIDER.task.T_WDACAudit.message"
+            value="WDAC Audit"
+            />
       </stringTable>
     </resources>
   </localization>
diff --git a/src/ResGen/Program.cs b/src/ResGen/Program.cs
index 3359226a99e..a69fd05e64f 100644
--- a/src/ResGen/Program.cs
+++ b/src/ResGen/Program.cs
@@ -52,7 +52,7 @@ public static void Main(string[] args)
                         if (className.StartsWith("public.", StringComparison.InvariantCultureIgnoreCase))
                         {
                             accessModifier = "public";
-                            className = className.Substring(className.IndexOf(".") + 1);
+                            className = className.Substring(className.IndexOf('.') + 1);
                         }
 
                         string sourceCode = GetStronglyTypeCsFileForResx(resxPath, moduleName, className, accessModifier);
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index 6fc2ebd22bf..954038cfa51 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>net8.0</TargetFramework>
+    <TargetFramework>net11.0</TargetFramework>
     <AssemblyName>resgen</AssemblyName>
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
diff --git a/src/System.Management.Automation/AssemblyInfo.cs b/src/System.Management.Automation/AssemblyInfo.cs
index 559d809fe72..e265bb453c8 100644
--- a/src/System.Management.Automation/AssemblyInfo.cs
+++ b/src/System.Management.Automation/AssemblyInfo.cs
@@ -7,6 +7,7 @@
 
 [assembly: InternalsVisibleTo("powershell-tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo("powershell-perf,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+[assembly: InternalsVisibleTo("powershell-fuzz-tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 
 [assembly: InternalsVisibleTo(@"Microsoft.PowerShell.Commands.Utility" + @",PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo(@"Microsoft.PowerShell.Commands.Management" + @",PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
index 0aba1eddfe4..5a15df53ca8 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -9,6 +9,7 @@
 using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Runtime.Loader;
+using Microsoft.PowerShell.Telemetry;
 
 namespace System.Management.Automation
 {
@@ -36,16 +37,19 @@ internal sealed partial class PowerShellAssemblyLoadContext
         /// <summary>
         /// Initialize a singleton of PowerShellAssemblyLoadContext.
         /// </summary>
-        internal static PowerShellAssemblyLoadContext InitializeSingleton(string basePaths)
+        internal static PowerShellAssemblyLoadContext InitializeSingleton(string basePaths, bool throwOnReentry)
         {
             lock (s_syncObj)
             {
-                if (Instance != null)
+                if (Instance is null)
+                {
+                    Instance = new PowerShellAssemblyLoadContext(basePaths);
+                }
+                else if (throwOnReentry)
                 {
                     throw new InvalidOperationException(SingletonAlreadyInitialized);
                 }
 
-                Instance = new PowerShellAssemblyLoadContext(basePaths);
                 return Instance;
             }
         }
@@ -581,7 +585,8 @@ public static void SetPowerShellAssemblyLoadContext([MarshalAs(UnmanagedType.LPW
         {
             ArgumentException.ThrowIfNullOrEmpty(basePaths);
 
-            PowerShellAssemblyLoadContext.InitializeSingleton(basePaths);
+            // Disallow calling this method from native code for more than once.
+            PowerShellAssemblyLoadContext.InitializeSingleton(basePaths, throwOnReentry: true);
         }
     }
 
@@ -603,16 +608,19 @@ public static unsafe class PowerShellUnsafeAssemblyLoad
         [UnmanagedCallersOnly]
         public static int LoadAssemblyFromNativeMemory(IntPtr data, int size)
         {
+            int result = 0;
             try
             {
                 using var stream = new UnmanagedMemoryStream((byte*)data, size);
                 AssemblyLoadContext.Default.LoadFromStream(stream);
-                return 0;
             }
             catch
             {
-                return -1;
+                result = -1;
             }
+
+            ApplicationInsightsTelemetry.SendUseTelemetry("PowerShellUnsafeAssemblyLoad", result == 0 ? "1" : "0");
+            return result;
         }
     }
 }
diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
index dc5db5f2c48..4cbb346fb14 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -167,16 +167,24 @@ public static bool IsStaSupported
         internal static readonly string ConfigDirectory = Platform.SelectProductNameForDirectory(Platform.XDG_Type.CONFIG);
 #else
         // 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";
+        internal static readonly string CacheDirectory = SafeDeriveFromSpecialFolder(
+            Environment.SpecialFolder.LocalApplicationData,
+            @"Microsoft\PowerShell");
+
+        internal static readonly string ConfigDirectory = SafeDeriveFromSpecialFolder(
+            Environment.SpecialFolder.Personal,
+            @"PowerShell");
 
         private static readonly Lazy<bool> _isStaSupported = new Lazy<bool>(() =>
         {
             int result = Interop.Windows.CoInitializeEx(IntPtr.Zero, Interop.Windows.COINIT_APARTMENTTHREADED);
 
-            // If 0 is returned the thread has been initialized for the first time
-            // as an STA and thus supported and needs to be uninitialized.
-            if (result > 0)
+            // Per COM documentation: Each successful call to CoInitializeEx (including S_FALSE)
+            // must be balanced by a corresponding call to CoUninitialize.
+            //  - S_OK (0) means we initialized for the first time.
+            //  - S_FALSE (1) means already initialized, but still increments the reference count.
+            // Both require CoUninitialize to decrement the reference count.
+            if (result >= 0)
             {
                 Interop.Windows.CoUninitialize();
             }
@@ -189,6 +197,30 @@ public static bool IsStaSupported
         private static bool? _isWindowsDesktop = null;
 #endif
 
+        internal static bool TryDeriveFromCache(string path1, out string result)
+        {
+            if (CacheDirectory is null or [])
+            {
+                result = null;
+                return false;
+            }
+
+            result = Path.Combine(CacheDirectory, path1);
+            return true;
+        }
+
+        internal static bool TryDeriveFromCache(string path1, string path2, out string result)
+        {
+            if (CacheDirectory is null or [])
+            {
+                result = null;
+                return false;
+            }
+
+            result = Path.Combine(CacheDirectory, path1, path2);
+            return true;
+        }
+
         // format files
         internal static readonly string[] FormatFileNames = new string[]
         {
@@ -218,6 +250,17 @@ internal static class CommonEnvVariableNames
 #endif
         }
 
+        private static string SafeDeriveFromSpecialFolder(Environment.SpecialFolder specialFolder, string subPath)
+        {
+            string basePath = Environment.GetFolderPath(specialFolder, Environment.SpecialFolderOption.DoNotVerify);
+            if (string.IsNullOrWhiteSpace(basePath))
+            {
+                return string.Empty;
+            }
+
+            return Path.Join(basePath, subPath);
+        }
+
 #if UNIX
         private static string s_tempHome = null;
 
@@ -360,7 +403,7 @@ internal static string GetFolderPath(Environment.SpecialFolder folder)
                 _ => throw new NotSupportedException()
             };
 #else
-            return Environment.GetFolderPath(folder);
+            return Environment.GetFolderPath(folder, Environment.SpecialFolderOption.DoNotVerify);
 #endif
         }
 
@@ -637,25 +680,29 @@ public string GetModeString()
                         return DirectoryOwnerFullGroupReadExecOtherReadExec;
                     }
 
-                    Span<char> modeCharacters = stackalloc char[10];
-                    modeCharacters[0] = itemTypeTable[ItemType];
-                    bool isExecutable;
-
                     UnixFileMode modeInfo = (UnixFileMode)Mode;
-                    modeCharacters[1] = modeInfo.HasFlag(UnixFileMode.UserRead) ? CanRead : NoPerm;
-                    modeCharacters[2] = modeInfo.HasFlag(UnixFileMode.UserWrite) ? CanWrite : NoPerm;
-                    isExecutable = modeInfo.HasFlag(UnixFileMode.UserExecute);
-                    modeCharacters[3] = modeInfo.HasFlag(UnixFileMode.SetUser) ? (isExecutable ? SetAndExec : SetAndNotExec) : (isExecutable ? CanExecute : NoPerm);
-
-                    modeCharacters[4] = modeInfo.HasFlag(UnixFileMode.GroupRead) ? CanRead : NoPerm;
-                    modeCharacters[5] = modeInfo.HasFlag(UnixFileMode.GroupWrite) ? CanWrite : NoPerm;
-                    isExecutable = modeInfo.HasFlag(UnixFileMode.GroupExecute);
-                    modeCharacters[6] = modeInfo.HasFlag(UnixFileMode.SetGroup) ? (isExecutable ? SetAndExec : SetAndNotExec) : (isExecutable ? CanExecute : NoPerm);
-
-                    modeCharacters[7] = modeInfo.HasFlag(UnixFileMode.OtherRead) ? CanRead : NoPerm;
-                    modeCharacters[8] = modeInfo.HasFlag(UnixFileMode.OtherWrite) ? CanWrite : NoPerm;
-                    isExecutable = modeInfo.HasFlag(UnixFileMode.OtherExecute);
-                    modeCharacters[9] = modeInfo.HasFlag(UnixFileMode.StickyBit) ? (isExecutable ? StickyAndExec : StickyAndNotExec) : (isExecutable ? CanExecute : NoPerm);
+
+                    Span<char> modeCharacters = [
+                        itemTypeTable[ItemType],
+
+                        modeInfo.HasFlag(UnixFileMode.UserRead) ? CanRead : NoPerm,
+                        modeInfo.HasFlag(UnixFileMode.UserWrite) ? CanWrite : NoPerm,
+                        modeInfo.HasFlag(UnixFileMode.SetUser) ?
+                            (modeInfo.HasFlag(UnixFileMode.UserExecute) ? SetAndExec : SetAndNotExec) :
+                            (modeInfo.HasFlag(UnixFileMode.UserExecute) ? CanExecute : NoPerm),
+
+                        modeInfo.HasFlag(UnixFileMode.GroupRead) ? CanRead : NoPerm,
+                        modeInfo.HasFlag(UnixFileMode.GroupWrite) ? CanWrite : NoPerm,
+                        modeInfo.HasFlag(UnixFileMode.SetGroup) ?
+                            (modeInfo.HasFlag(UnixFileMode.GroupExecute) ? SetAndExec : SetAndNotExec) :
+                            (modeInfo.HasFlag(UnixFileMode.GroupExecute) ? CanExecute : NoPerm),
+
+                        modeInfo.HasFlag(UnixFileMode.OtherRead) ? CanRead : NoPerm,
+                        modeInfo.HasFlag(UnixFileMode.OtherWrite) ? CanWrite : NoPerm,
+                        modeInfo.HasFlag(UnixFileMode.StickyBit) ?
+                            (modeInfo.HasFlag(UnixFileMode.OtherExecute) ? StickyAndExec : StickyAndNotExec) :
+                            (modeInfo.HasFlag(UnixFileMode.OtherExecute) ? CanExecute : NoPerm),
+                    ];
 
                     return new string(modeCharacters);
                 }
diff --git a/src/System.Management.Automation/CoreCLR/CorePsStub.cs b/src/System.Management.Automation/CoreCLR/CorePsStub.cs
index 6f94acbc389..e439cc30ff2 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsStub.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsStub.cs
@@ -431,7 +431,7 @@ namespace System.Management.Automation.Security
     /// <summary>
     /// Application white listing security policies only affect Windows OSs.
     /// </summary>
-    internal sealed class SystemPolicy
+    public sealed class SystemPolicy
     {
         private SystemPolicy() { }
 
@@ -455,7 +455,7 @@ internal static void LogWDACAuditMessage(
         /// <summary>
         /// Gets the system lockdown policy.
         /// </summary>
-        /// <remarks>Always return SystemEnforcementMode.None in CSS (trusted)</remarks>
+        /// <remarks>Always return SystemEnforcementMode.None on non-Windows platforms.</remarks>
         public static SystemEnforcementMode GetSystemLockdownPolicy()
         {
             return SystemEnforcementMode.None;
@@ -464,7 +464,7 @@ public static SystemEnforcementMode GetSystemLockdownPolicy()
         /// <summary>
         /// Gets lockdown policy as applied to a file.
         /// </summary>
-        /// <remarks>Always return SystemEnforcementMode.None in CSS (trusted)</remarks>
+        /// <remarks>Always return SystemEnforcementMode.None on non-Windows platforms.</remarks>
         public static SystemEnforcementMode GetLockdownPolicy(string path, System.Runtime.InteropServices.SafeHandle handle)
         {
             return SystemEnforcementMode.None;
@@ -493,7 +493,7 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement(
     /// <summary>
     /// How the policy is being enforced.
     /// </summary>
-    internal enum SystemEnforcementMode
+    public enum SystemEnforcementMode
     {
         /// Not enforced at all
         None = 0,
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
index 6160577beb2..283ec1bcad8 100644
--- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs
+++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -525,9 +525,6 @@ public DscClassCacheEntry(DSCResourceRunAsCredential aDSCResourceRunAsCredential
     public static class DscClassCache
     {
         private const string InboxDscResourceModulePath = "WindowsPowershell\\v1.0\\Modules\\PsDesiredStateConfiguration";
-        private const string reservedDynamicKeywords = "^(Synchronization|Certificate|IIS|SQL)$";
-
-        private const string reservedProperties = "^(Require|Trigger|Notify|Before|After|Subscribe)$";
 
         private static readonly PSTraceSource s_tracer = PSTraceSource.GetTracer("DSC", "DSC Class Cache");
 
@@ -1264,13 +1261,6 @@ public static void ValidateInstanceText(string instanceText)
             parser.ValidateInstanceText(instanceText);
         }
 
-        private static bool IsMagicProperty(string propertyName)
-        {
-            return System.Text.RegularExpressions.Regex.Match(propertyName,
-                "^(ResourceId|SourceInfo|ModuleName|ModuleVersion|ConfigurationName)$",
-                System.Text.RegularExpressions.RegexOptions.IgnoreCase).Success;
-        }
-
         private static string GetFriendlyName(CimClass cimClass)
         {
             try
@@ -1367,7 +1357,8 @@ private static DynamicKeyword CreateKeywordFromCimClass(string moduleName, Versi
             //
             // Skip all of the base, meta, registration and other classes that are not intended to be used directly by a script author
             //
-            if (System.Text.RegularExpressions.Regex.Match(keywordString, "^OMI_Base|^OMI_.*Registration", System.Text.RegularExpressions.RegexOptions.IgnoreCase).Success)
+            if (keywordString.StartsWith("OMI_Base", StringComparison.OrdinalIgnoreCase) ||
+                (keywordString.StartsWith("OMI_", StringComparison.OrdinalIgnoreCase) && keywordString.IndexOf("Registration", 4, StringComparison.OrdinalIgnoreCase) >= 0))
             {
                 return null;
             }
@@ -1383,7 +1374,7 @@ private static DynamicKeyword CreateKeywordFromCimClass(string moduleName, Versi
             };
 
             // If it's one of reserved dynamic keyword, mark it
-            if (System.Text.RegularExpressions.Regex.Match(keywordString, reservedDynamicKeywords, System.Text.RegularExpressions.RegexOptions.IgnoreCase).Success)
+            if (IsReservedDynamicKeyword(keywordString))
             {
                 keyword.IsReservedKeyword = true;
             }
@@ -1441,7 +1432,7 @@ private static DynamicKeyword CreateKeywordFromCimClass(string moduleName, Versi
                     }
                 }
                 // If it's one of our reserved properties, save it for error reporting
-                if (System.Text.RegularExpressions.Regex.Match(prop.Name, reservedProperties, System.Text.RegularExpressions.RegexOptions.IgnoreCase).Success)
+                if (IsReservedProperty(prop.Name))
                 {
                     keyword.HasReservedProperties = true;
                     continue;
@@ -1540,6 +1531,27 @@ private static DynamicKeyword CreateKeywordFromCimClass(string moduleName, Versi
             UpdateKnownRestriction(keyword);
 
             return keyword;
+
+            static bool IsMagicProperty(string propertyName) =>
+                string.Equals(propertyName, "ResourceId", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(propertyName, "SourceInfo", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(propertyName, "ModuleName", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(propertyName, "ModuleVersion", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(propertyName, "ConfigurationName", StringComparison.OrdinalIgnoreCase);
+
+            static bool IsReservedDynamicKeyword(string keyword) =>
+                string.Equals(keyword, "Synchronization", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(keyword, "Certificate", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(keyword, "IIS", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(keyword, "SQL", StringComparison.OrdinalIgnoreCase);
+
+            static bool IsReservedProperty(string name) =>
+                string.Equals(name, "Require", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(name, "Trigger", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(name, "Notify", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(name, "Before", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(name, "After", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(name, "Subscribe", StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>
@@ -3252,7 +3264,7 @@ public static bool ImportCimKeywordsFromModule(PSModuleInfo module, string resou
                         string tempSchemaFilepath = schemaFiles.FirstOrDefault();
 
                         Debug.Assert(schemaFiles.Count() == 1, "A valid DSCResource module can have only one schema mof file");
-                        
+
                         if (tempSchemaFilepath is not null)
                         {
                             var classes = GetCachedClassByFileName(tempSchemaFilepath) ?? ImportClasses(tempSchemaFilepath, new Tuple<string, Version>(module.Name, module.Version), errors);
diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/FileSystem_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/FileSystem_format_ps1xml.cs
index 0400f99b899..4c8d23971af 100644
--- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/FileSystem_format_ps1xml.cs
+++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/FileSystem_format_ps1xml.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace System.Management.Automation.Runspaces
 {
@@ -48,7 +49,10 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_FileSystemTypes(CustomC
                     .AddHeader(Alignment.Left, label: "UnixMode", width: 10)
                     .AddHeader(Alignment.Right, label: "User", width: 10)
                     .AddHeader(Alignment.Left, label: "Group", width: 10)
-                    .AddHeader(Alignment.Right, label: "LastWriteTime", width: 16)
+                    .AddHeader(
+                        Alignment.Right,
+                        label: "LastWriteTime",
+                        width: String.Format(CultureInfo.CurrentCulture, "{0:d} {0:HH}:{0:mm}", CultureInfo.CurrentCulture.Calendar.MaxSupportedDateTime).Length)
                     .AddHeader(Alignment.Right, label: "Size", width: 12)
                     .AddHeader(Alignment.Left, label: "Name")
                     .StartRowDefinition(wrap: true)
diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Help_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Help_format_ps1xml.cs
index d18de013397..6825ec14e6c 100644
--- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Help_format_ps1xml.cs
+++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Help_format_ps1xml.cs
@@ -350,7 +350,7 @@ internal static IEnumerable<ExtendedTypeDefinition> GetFormatData()
                             .AddNewline()
                             .AddText(HelpDisplayStrings.ParameterPosition)
                             .AddScriptBlockExpressionBinding(@" ", selectedByScript: @"($_.position -eq  $()) -or ($_.position -eq '')", customControl: control7)
-                            .AddScriptBlockExpressionBinding(@"$_.position", selectedByScript: "$_.position  -ne  $()")
+                            .AddScriptBlockExpressionBinding(@"$_.position", selectedByScript: "$_.position -ne $()")
                             .AddNewline()
                             .AddText(HelpDisplayStrings.ParameterDefaultValue)
                             .AddPropertyExpressionBinding(@"defaultValue")
@@ -358,6 +358,9 @@ internal static IEnumerable<ExtendedTypeDefinition> GetFormatData()
                             .AddText(HelpDisplayStrings.AcceptsPipelineInput)
                             .AddPropertyExpressionBinding(@"pipelineInput")
                             .AddNewline()
+                            .AddText(HelpDisplayStrings.ParameterAliases)
+                            .AddPropertyExpressionBinding(@"aliases")
+                            .AddNewline()
                             .AddText(HelpDisplayStrings.AcceptsWildCardCharacters)
                             .AddPropertyExpressionBinding(@"globbing", customControl: MamlTrueFalseShortControl)
                             .AddNewline()
@@ -677,10 +680,7 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_MamlCommandHelpInfo_Ful
                         .StartFrame(leftIndent: 4)
                             .AddPropertyExpressionBinding(@"title")
                             .AddNewline()
-                            .AddNewline()
-                            .StartFrame(leftIndent: 4)
-                                .AddPropertyExpressionBinding(@"alert", enumerateCollection: true, customControl: sharedControls[11])
-                            .EndFrame()
+                            .AddPropertyExpressionBinding(@"alert", enumerateCollection: true, customControl: sharedControls[11])
                             .AddNewline()
                         .EndFrame()
                     .EndEntry()
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 182af55d641..24d99d4dd4b 100644
--- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
+++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
@@ -918,9 +918,9 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
                                             $null = $output.Append($prop.Value)
                                         }
                                         # Dictionary and Hashtable we want to show as Key/Value pairs, we don't do the extra whitespace alignment here
-                                        elseif ($prop.Value.GetType().Name.StartsWith('Dictionary') -or $prop.Value.GetType().Name -eq 'Hashtable') {
+                                        elseif ($prop.Value -is [System.Collections.IDictionary]) {
                                             $isFirstElement = $true
-                                            foreach ($key in $prop.Value.Keys) {
+                                            foreach ($key in ($prop.Value.Keys | Sort-Object)) {
                                                 if ($isFirstElement) {
                                                     $null = $output.Append($newline)
                                                 }
@@ -946,14 +946,29 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
                                                 $isFirstElement = $true
                                                 foreach ($value in $prop.Value) {
                                                     $null = $output.Append($newline)
-                                                    if (!$isFirstElement) {
-                                                        $null = $output.Append($newline)
+                                                    $valueIndent = ' ' * ($newIndent + 2)
+
+                                                    if ($value -is [Type]) {
+                                                        # Just show the typename instead of it as an object
+                                                        $null = $output.Append(""${prefix}${valueIndent}[$($value.ToString())]"")
+                                                    }
+                                                    elseif ($value -is [string] -or $value.GetType().IsPrimitive) {
+                                                        $null = $output.Append(""${prefix}${valueIndent}${value}"")
+                                                    }
+                                                    else {
+                                                        if (!$isFirstElement) {
+                                                            $null = $output.Append($newline)
+                                                        }
+                                                        $null = $output.Append((Show-ErrorRecord $value $newIndent ($depth + 1)))
                                                     }
-                                                    $null = $output.Append((Show-ErrorRecord $value $newIndent ($depth + 1)))
                                                     $isFirstElement = $false
                                                 }
                                             }
                                         }
+                                        elseif ($prop.Value -is [Type]) {
+                                            # Just show the typename instead of it as an object
+                                            $null = $output.Append(""[$($prop.Value.ToString())]"")
+                                        }
                                         # Anything else, we convert to string.
                                         # ToString() can throw so we use LanguagePrimitives.TryConvertTo() to hide a convert error
                                         else {
@@ -1019,7 +1034,8 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
             yield return new FormatViewDefinition("ErrorInstance",
                 CustomControl.Create(outOfBand: true)
                     .StartEntry()
-                        .AddScriptBlockExpressionBinding(@"
+                        .AddScriptBlockExpressionBinding(
+                            """
                                     $errorColor = ''
                                     $commandPrefix = ''
                                     if (@('NativeCommandErrorMessage','NativeCommandError') -notcontains $_.FullyQualifiedErrorId -and @('CategoryView','ConciseView','DetailedView') -notcontains $ErrorView)
@@ -1076,8 +1092,9 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
                                     }
 
                                     $errorColor + $commandPrefix
-                                ")
-                        .AddScriptBlockExpressionBinding(@"
+                                """)
+                        .AddScriptBlockExpressionBinding(
+                            """
                                     Set-StrictMode -Off
                                     $ErrorActionPreference = 'Stop'
                                     trap { 'Error found in error view definition: ' + $_.Exception.Message }
@@ -1111,34 +1128,47 @@ function Get-ConciseViewPositionMessage {
                                         $message = ''
                                         $prefix = ''
 
+                                        # Handle case where there is a TargetObject from a Pester `Should` assertion failure and we can show the error at the target rather than the script source
+                                        # Note that in some versions, this is a Dictionary<,> and in others it's a hashtable. So we explicitly cast to a shared interface in the method invocation
+                                        # to force using `IDictionary.Contains`. Hashtable does have it's own `ContainKeys` as well, but if they ever opt to use a custom `IDictionary`, that may not.
+                                        $useTargetObject = $null -ne $err.TargetObject -and
+                                            $err.TargetObject -is [System.Collections.IDictionary] -and
+                                            ([System.Collections.IDictionary]$err.TargetObject).Contains('Line') -and
+                                            ([System.Collections.IDictionary]$err.TargetObject).Contains('LineText')
+
                                         # The checks here determine if we show line detailed error information:
                                         # - check if `ParserError` and comes from PowerShell which eventually results in a ParseException, but during this execution it's an ErrorRecord
+                                        $isParseError = $err.CategoryInfo.Category -eq 'ParserError' -and
+                                            $err.Exception -is [System.Management.Automation.ParentContainsErrorRecordException]
+
                                         # - check if invocation is a script or multiple lines in the console
+                                        $isMultiLineOrExternal = $myinv.ScriptName -or $myinv.ScriptLineNumber -gt 1
+
                                         # - check that it's not a script module as expectation is that users don't want to see the line of error within a module
-                                        if ((($err.CategoryInfo.Category -eq 'ParserError' -and $err.Exception -is 'System.Management.Automation.ParentContainsErrorRecordException') -or $myinv.ScriptName -or $myinv.ScriptLineNumber -gt 1) -and $myinv.ScriptName -notmatch '\.psm1$') {
-                                            $useTargetObject = $false
+                                        $shouldShowLineDetail = ($isParseError -or $isMultiLineOrExternal) -and
+                                            $myinv.ScriptName -notmatch '\.psm1$'
 
-                                            # Handle case where there is a TargetObject and we can show the error at the target rather than the script source
-                                            if ($_.TargetObject.Line -and $_.TargetObject.LineText) {
-                                                $posmsg = ""${resetcolor}$($_.TargetObject.File)${newline}""
-                                                $useTargetObject = $true
+                                        if ($useTargetObject -or $shouldShowLineDetail) {
+
+                                            if ($useTargetObject) {
+                                                $posmsg = "${resetcolor}$($err.TargetObject.File)${newline}"
                                             }
                                             elseif ($myinv.ScriptName) {
                                                 if ($env:TERM_PROGRAM -eq 'vscode') {
                                                     # If we are running in vscode, we know the file:line:col links are clickable so we use this format
-                                                    $posmsg = ""${resetcolor}$($myinv.ScriptName):$($myinv.ScriptLineNumber):$($myinv.OffsetInLine)${newline}""
+                                                    $posmsg = "${resetcolor}$($myinv.ScriptName):$($myinv.ScriptLineNumber):$($myinv.OffsetInLine)${newline}"
                                                 }
                                                 else {
-                                                    $posmsg = ""${resetcolor}$($myinv.ScriptName):$($myinv.ScriptLineNumber)${newline}""
+                                                    $posmsg = "${resetcolor}$($myinv.ScriptName):$($myinv.ScriptLineNumber)${newline}"
                                                 }
                                             }
                                             else {
-                                                $posmsg = ""${newline}""
+                                                $posmsg = "${newline}"
                                             }
 
                                             if ($useTargetObject) {
-                                                $scriptLineNumber = $_.TargetObject.Line
-                                                $scriptLineNumberLength = $_.TargetObject.Line.ToString().Length
+                                                $scriptLineNumber = $err.TargetObject.Line
+                                                $scriptLineNumberLength = $err.TargetObject.Line.ToString().Length
                                             }
                                             else {
                                                 $scriptLineNumber = $myinv.ScriptLineNumber
@@ -1155,13 +1185,42 @@ function Get-ConciseViewPositionMessage {
                                             }
 
                                             $verticalBar = '|'
-                                            $posmsg += ""${accentColor}${headerWhitespace}Line ${verticalBar}${newline}""
+                                            $posmsg += "${accentColor}${headerWhitespace}Line ${verticalBar}${newline}"
 
                                             $highlightLine = ''
                                             if ($useTargetObject) {
                                                 $line = $_.TargetObject.LineText.Trim()
+
                                                 $offsetLength = 0
                                                 $offsetInLine = 0
+                                                $startColumn = 0
+                                                if (
+                                                    ([System.Collections.IDictionary]$_.TargetObject).Contains('StartColumn') -and
+                                                    [System.Management.Automation.LanguagePrimitives]::TryConvertTo[int]($_.TargetObject.StartColumn, [ref]$startColumn) -and
+                                                    $null -ne $startColumn -and
+                                                    $startColumn -gt 0 -and
+                                                    $startColumn -le $line.Length
+                                                ) {
+                                                    $endColumn = 0
+                                                    if (-not (
+                                                        ([System.Collections.IDictionary]$_.TargetObject).Contains('EndColumn') -and
+                                                        [System.Management.Automation.LanguagePrimitives]::TryConvertTo[int]($_.TargetObject.EndColumn, [ref]$endColumn) -and
+                                                        $null -ne $endColumn -and
+                                                        $endColumn -gt $startColumn -and
+                                                        $endColumn -le ($line.Length + 1)
+                                                    )) {
+                                                        $endColumn = $line.Length + 1
+                                                    }
+
+                                                    # Input is expected to be 1-based index to match the extent positioning
+                                                    # but we use 0-based indexing below.
+                                                    $startColumn -= 1
+                                                    $endColumn -= 1
+
+                                                    $highlightLine = "$(" " * $startColumn)$("~" * ($endColumn - $startColumn))"
+                                                    $offsetLength = $endColumn - $startColumn
+                                                    $offsetInLine = $startColumn
+                                                }
                                             }
                                             else {
                                                 $positionMessage = $myinv.PositionMessage.Split($newline)
@@ -1180,19 +1239,19 @@ function Get-ConciseViewPositionMessage {
                                                 $line = $line.Insert($offsetInLine + $offsetLength, $resetColor).Insert($offsetInLine, $accentColor)
                                             }
 
-                                            $posmsg += ""${accentColor}${lineWhitespace}${ScriptLineNumber} ${verticalBar} ${resetcolor}${line}""
+                                            $posmsg += "${accentColor}${lineWhitespace}${ScriptLineNumber} ${verticalBar} ${resetcolor}${line}"
                                             $offsetWhitespace = ' ' * $offsetInLine
-                                            $prefix = ""${accentColor}${headerWhitespace}     ${verticalBar} ${errorColor}""
+                                            $prefix = "${accentColor}${headerWhitespace}     ${verticalBar} ${errorColor}"
                                             if ($highlightLine -ne '') {
-                                                $posMsg += ""${prefix}${highlightLine}${newline}""
+                                                $posMsg += "${prefix}${highlightLine}${newline}"
                                             }
-                                            $message = ""${prefix}""
+                                            $message = "${prefix}"
                                         }
 
                                         if (! $err.ErrorDetails -or ! $err.ErrorDetails.Message) {
-                                            if ($err.CategoryInfo.Category -eq 'ParserError' -and $err.Exception.Message.Contains(""~$newline"")) {
+                                            if ($err.CategoryInfo.Category -eq 'ParserError' -and $err.Exception.Message.Contains("~$newline")) {
                                                 # need to parse out the relevant part of the pre-rendered positionmessage
-                                                $message += $err.Exception.Message.split(""~$newline"")[1].split(""${newline}${newline}"")[0]
+                                                $message += $err.Exception.Message.split("~$newline")[1].split("${newline}${newline}")[0]
                                             }
                                             elseif ($err.Exception) {
                                                 $message += $err.Exception.Message
@@ -1214,7 +1273,7 @@ function Get-ConciseViewPositionMessage {
                                             $prefixVtLength = $prefix.Length - $prefixLength
 
                                             # replace newlines in message so it lines up correct
-                                            $message = $message.Replace($newline, ' ').Replace(""`n"", ' ').Replace(""`t"", ' ')
+                                            $message = $message.Replace($newline, ' ').Replace("`n", ' ').Replace("`t", ' ')
 
                                             $windowWidth = 120
                                             if ($Host.UI.RawUI -ne $null) {
@@ -1249,7 +1308,7 @@ function Get-ConciseViewPositionMessage {
                                             $message += $newline
                                         }
 
-                                        $posmsg += ""${errorColor}"" + $message
+                                        $posmsg += "${errorColor}" + $message
 
                                         $reason = 'Error'
                                         if ($err.Exception -and $err.Exception.WasThrownFromThrowStatement) {
@@ -1261,8 +1320,8 @@ function Get-ConciseViewPositionMessage {
                                             $reason = $myinv.MyCommand
                                         }
                                         # If it's a scriptblock, better to show the command in the scriptblock that had the error
-                                        elseif ($_.CategoryInfo.Activity) {
-                                            $reason = $_.CategoryInfo.Activity
+                                        elseif ($err.CategoryInfo.Activity) {
+                                            $reason = $err.CategoryInfo.Activity
                                         }
                                         elseif ($myinv.MyCommand) {
                                             $reason = $myinv.MyCommand
@@ -1279,7 +1338,7 @@ function Get-ConciseViewPositionMessage {
 
                                         $errorMsg = 'Error'
 
-                                        ""${errorColor}${reason}: ${posmsg}${resetcolor}""
+                                        "${errorColor}${reason}: ${posmsg}${resetcolor}"
                                     }
 
                                     $myinv = $_.InvocationInfo
@@ -1290,17 +1349,17 @@ function Get-ConciseViewPositionMessage {
                                     }
 
                                     if ($err.FullyQualifiedErrorId -eq 'NativeCommandErrorMessage' -or $err.FullyQualifiedErrorId -eq 'NativeCommandError') {
-                                        return ""${errorColor}$($err.Exception.Message)${resetcolor}""
+                                        return "${errorColor}$($err.Exception.Message)${resetcolor}"
                                     }
 
                                     if ($ErrorView -eq 'DetailedView') {
                                         $message = Get-Error | Out-String
-                                        return ""${errorColor}${message}${resetcolor}""
+                                        return "${errorColor}${message}${resetcolor}"
                                     }
 
                                     if ($ErrorView -eq 'CategoryView') {
                                         $message = $err.CategoryInfo.GetMessage()
-                                        return ""${errorColor}${message}${resetcolor}""
+                                        return "${errorColor}${message}${resetcolor}"
                                     }
 
                                     $posmsg = ''
@@ -1319,10 +1378,19 @@ function Get-ConciseViewPositionMessage {
                                     }
 
                                     if ($ErrorView -eq 'ConciseView') {
+                                        $recommendedAction = $_.ErrorDetails.RecommendedAction
+                                        if (-not [String]::IsNullOrWhiteSpace($recommendedAction)) {
+                                            $recommendedAction = $newline +
+                                                ${errorColor} +
+                                                '  Recommendation: ' +
+                                                $recommendedAction +
+                                                ${resetcolor}
+                                        }
+
                                         if ($err.PSMessageDetails) {
-                                            $posmsg = ""${errorColor}${posmsg}""
+                                            $posmsg = "${errorColor}${posmsg}"
                                         }
-                                        return $posmsg
+                                        return $posmsg + $recommendedAction
                                     }
 
                                     $indent = 4
@@ -1340,14 +1408,14 @@ function Get-ConciseViewPositionMessage {
 
                                     $posmsg += $newline + $indentString
 
-                                    $indentString = ""+ FullyQualifiedErrorId : "" + $err.FullyQualifiedErrorId
+                                    $indentString = "+ FullyQualifiedErrorId : " + $err.FullyQualifiedErrorId
                                     $posmsg += $newline + $indentString
 
                                     $originInfo = $err.OriginInfo
 
                                     if (($null -ne $originInfo) -and ($null -ne $originInfo.PSComputerName))
                                     {
-                                        $indentString = ""+ PSComputerName        : "" + $originInfo.PSComputerName
+                                        $indentString = "+ PSComputerName        : " + $originInfo.PSComputerName
                                         $posmsg += $newline + $indentString
                                     }
 
@@ -1357,8 +1425,8 @@ function Get-ConciseViewPositionMessage {
                                         $err.Exception.Message + $posmsg
                                     }
 
-                                    ""${errorColor}${finalMsg}${resetcolor}""
-                                ")
+                                    "${errorColor}${finalMsg}${resetcolor}"
+                                """)
                     .EndEntry()
                 .EndControl());
         }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs
index 18b74cbcfe1..be31a1db9a8 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs
@@ -9,6 +9,7 @@
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 using System.Management.Automation.Runspaces;
+using Microsoft.PowerShell.Commands;
 
 namespace Microsoft.PowerShell.Commands.Internal.Format
 {
@@ -727,8 +728,15 @@ public class OuterFormatTableAndListBase : OuterFormatShapeCommandBase
         /// will be determined using property sets, etc.
         /// </summary>
         [Parameter(Position = 0)]
+        [ValidateNotNullOrEmpty]
         public object[] Property { get; set; }
 
+        /// <summary>
+        /// Optional parameter for excluding properties from formatting.
+        /// </summary>
+        [Parameter]
+        public string[] ExcludeProperty { get; set; }
+
         #endregion
 
         internal override FormattingCommandLineParameters GetCommandLineParameters()
@@ -751,6 +759,18 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
 
         internal void GetCommandLineProperties(FormattingCommandLineParameters parameters, bool isTable)
         {
+            // Check View conflicts first (before any auto-expansion)
+            if (!string.IsNullOrEmpty(this.View))
+            {
+                // View cannot be used with Property or ExcludeProperty
+                if ((Property is not null && Property.Length != 0) || (ExcludeProperty is not null && ExcludeProperty.Length != 0))
+                {
+                    ReportCannotSpecifyViewAndProperty();
+                }
+
+                parameters.viewName = this.View;
+            }
+
             if (Property != null)
             {
                 CommandParameterDefinition def;
@@ -765,15 +785,21 @@ internal void GetCommandLineProperties(FormattingCommandLineParameters parameter
                 parameters.mshParameterList = processor.ProcessParameters(Property, invocationContext);
             }
 
-            if (!string.IsNullOrEmpty(this.View))
+            if (ExcludeProperty is not null)
             {
-                // we have a view command line switch
-                if (parameters.mshParameterList.Count != 0)
+                parameters.excludePropertyFilter = new PSPropertyExpressionFilter(ExcludeProperty);
+
+                // ExcludeProperty implies -Property * for better UX
+                if (Property is null || Property.Length == 0)
                 {
-                    ReportCannotSpecifyViewAndProperty();
-                }
+                    CommandParameterDefinition def = isTable
+                        ? new FormatTableParameterDefinition()
+                        : new FormatListParameterDefinition();
+                    ParameterProcessor processor = new ParameterProcessor(def);
+                    TerminatingErrorContext invocationContext = new TerminatingErrorContext(this);
 
-                parameters.viewName = this.View;
+                    parameters.mshParameterList = processor.ProcessParameters(new object[] { "*" }, invocationContext);
+                }
             }
         }
     }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommandParameters.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommandParameters.cs
index 7f88727ace7..498f6098a24 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommandParameters.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommandParameters.cs
@@ -70,6 +70,11 @@ internal sealed class FormattingCommandLineParameters
         /// Extension mechanism for shape specific parameters.
         /// </summary>
         internal ShapeSpecificParameters shapeParameters = null;
+
+        /// <summary>
+        /// Filter for excluding properties from formatting.
+        /// </summary>
+        internal PSPropertyExpressionFilter excludePropertyFilter = null;
     }
 
     /// <summary>
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
index 61a3f962daf..a69ad41c965 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
@@ -9,7 +9,6 @@
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 using System.Text;
-using System.Text.RegularExpressions;
 
 namespace Microsoft.PowerShell.Commands.Internal.Format
 {
@@ -317,6 +316,7 @@ internal struct GetWordsResult
     {
         internal string Word;
         internal string Delim;
+        internal bool VtResetAdded;
     }
 
     /// <summary>
@@ -367,9 +367,19 @@ private static IEnumerable<GetWordsResult> GetWords(string s)
                 {
                     var vtSpan = s.AsSpan(i, len);
                     sb.Append(vtSpan);
-                    vtSeqs.Append(vtSpan);
 
-                    wordHasVtSeqs = true;
+                    if (vtSpan.SequenceEqual(PSStyle.Instance.Reset))
+                    {
+                        // The Reset sequence will void all previous VT sequences.
+                        vtSeqs.Clear();
+                        wordHasVtSeqs = false;
+                    }
+                    else
+                    {
+                        vtSeqs.Append(vtSpan);
+                        wordHasVtSeqs = true;
+                    }
+
                     i += len - 1;
                     continue;
                 }
@@ -390,15 +400,18 @@ private static IEnumerable<GetWordsResult> GetWords(string s)
 
                 if (delimiter is not null)
                 {
+                    bool vtResetAdded = false;
                     if (wordHasVtSeqs && !sb.EndsWith(PSStyle.Instance.Reset))
                     {
+                        vtResetAdded = true;
                         sb.Append(PSStyle.Instance.Reset);
                     }
 
                     var result = new GetWordsResult()
                     {
                         Word = sb.ToString(),
-                        Delim = delimiter
+                        Delim = delimiter,
+                        VtResetAdded = vtResetAdded
                     };
 
                     sb.Clear().Append(vtSeqs);
@@ -611,7 +624,7 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
 
                     if (suffix is not null)
                     {
-                        wordToAdd = wordToAdd.EndsWith(resetStr)
+                        wordToAdd = word.VtResetAdded
                             ? wordToAdd.Insert(wordToAdd.Length - resetStr.Length, suffix)
                             : wordToAdd + suffix;
                     }
@@ -760,9 +773,19 @@ internal static List<string> SplitLines(string s)
                 {
                     var vtSpan = s.AsSpan(i, len);
                     sb.Append(vtSpan);
-                    vtSeqs.Append(vtSpan);
 
-                    hasVtSeqs = true;
+                    if (vtSpan.SequenceEqual(PSStyle.Instance.Reset))
+                    {
+                        // The Reset sequence will void all previous VT sequences.
+                        vtSeqs.Clear();
+                        hasVtSeqs = false;
+                    }
+                    else
+                    {
+                        vtSeqs.Append(vtSpan);
+                        hasVtSeqs = true;
+                    }
+
                     i += len - 1;
                     continue;
                 }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs
index a1e34424950..2ae4ac2626e 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs
@@ -20,7 +20,7 @@ namespace System.Management.Automation.Runspaces
     /// <summary>
     /// This exception is used by Formattable constructor to indicate errors
     /// occurred during construction time.
-    /// </summary>    
+    /// </summary>
     [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "FormatTable")]
     public class FormatTableLoadException : RuntimeException
     {
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs
index f40bb557c31..822703fde21 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs
@@ -223,9 +223,9 @@ internal static CustomItemBase Create(FormatToken token)
                     cie.Expression = new DisplayEntry(cpt.expression);
                 }
 
-                if (cpt.control != null)
+                if (cpt.control is ComplexControlBody complexControlBody)
                 {
-                    cie.CustomControl = new CustomControl((ComplexControlBody)cpt.control, null);
+                    cie.CustomControl = new CustomControl(complexControlBody, null);
                 }
 
                 return cie;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
index c9ecd0042dd..de6df333951 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
@@ -601,13 +601,12 @@ internal static AppliesTo GetAllApplicableTypes(TypeInfoDataBase db, AppliesTo a
                 // if it is a type reference, just add the type name
                 if (r is TypeReference tr)
                 {
-                    if (!allTypes.Contains(tr.name))
-                        allTypes.Add(tr.name);
+                    allTypes.Add(tr.name);
                 }
                 else
                 {
                     // check if we have a type group reference
-                    if (!(r is TypeGroupReference tgr))
+                    if (r is not TypeGroupReference tgr)
                         continue;
 
                     // find the type group definition the reference points to
@@ -619,8 +618,7 @@ internal static AppliesTo GetAllApplicableTypes(TypeInfoDataBase db, AppliesTo a
                     // we found the group, go over it
                     foreach (TypeReference x in tgd.typeReferenceList)
                     {
-                        if (!allTypes.Contains(x.name))
-                            allTypes.Add(x.name);
+                        allTypes.Add(x.name);
                     }
                 }
             }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator.cs
index db1bc0704aa..963b5a0f88b 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Collections.ObjectModel;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
@@ -347,8 +348,50 @@ protected class DataBaseInfo
 
         protected DataBaseInfo dataBaseInfo = new DataBaseInfo();
 
-        protected List<MshResolvedExpressionParameterAssociation> activeAssociationList = null;
-        protected FormattingCommandLineParameters inputParameters = null;
+        /// <summary>
+        /// Builds the raw association list for the given object.
+        /// Subclasses override this to provide cmdlet-specific property expansion logic.
+        /// </summary>
+        /// <param name="so">The object to build the association list for.</param>
+        /// <param name="propertyList">The list of properties specified by the user, or null if not specified.</param>
+        /// <returns>The raw association list, or null if not applicable.</returns>
+        protected virtual List<MshResolvedExpressionParameterAssociation> BuildRawAssociationList(PSObject so, List<MshParameter> propertyList)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Builds the active association list for the given object, with ExcludeProperty filter applied.
+        /// </summary>
+        /// <param name="so">The object to build the association list for.</param>
+        /// <returns>The filtered association list.</returns>
+        protected List<MshResolvedExpressionParameterAssociation> BuildActiveAssociationList(PSObject so)
+        {
+            var propertyList = parameters?.mshParameterList;
+            var excludeFilter = parameters?.excludePropertyFilter;
+            var rawList = BuildRawAssociationList(so, propertyList);
+            return ApplyExcludeFilter(rawList, excludeFilter);
+        }
+
+        /// <summary>
+        /// Applies the ExcludeProperty filter to the given association list.
+        /// </summary>
+        /// <param name="associationList">The list to filter.</param>
+        /// <param name="excludeFilter">The exclude filter to apply.</param>
+        /// <returns>The filtered list, or the original list if no filter is specified.</returns>
+        internal static List<MshResolvedExpressionParameterAssociation> ApplyExcludeFilter(
+            List<MshResolvedExpressionParameterAssociation> associationList,
+            PSPropertyExpressionFilter excludeFilter)
+        {
+            if (associationList is null || excludeFilter is null)
+            {
+                return associationList;
+            }
+
+            return associationList
+                .Where(item => !excludeFilter.IsMatch(item.ResolvedExpression))
+                .ToList();
+        }
 
         protected string GetExpressionDisplayValue(PSObject so, int enumerationLimit, PSPropertyExpression ex,
                     FieldFormattingDirective directive)
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs
index b2bbd27c2b9..b81c0c0f860 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs
@@ -16,7 +16,6 @@ internal override void Initialize(TerminatingErrorContext errorContext, PSProper
             PSObject so, TypeInfoDataBase db, FormattingCommandLineParameters parameters)
         {
             base.Initialize(errorContext, expressionFactory, so, db, parameters);
-            this.inputParameters = parameters;
         }
 
         internal override FormatStartData GenerateStartData(PSObject so)
@@ -40,7 +39,7 @@ internal override FormatEntryData GeneratePayload(PSObject so, int enumerationLi
         private ComplexViewEntry GenerateComplexViewEntryFromProperties(PSObject so, int enumerationLimit)
         {
             ComplexViewObjectBrowser browser = new ComplexViewObjectBrowser(this.ErrorManager, this.expressionFactory, enumerationLimit);
-            return browser.GenerateView(so, this.inputParameters);
+            return browser.GenerateView(so, this.parameters);
         }
 
         private ComplexViewEntry GenerateComplexViewEntryFromDataBaseInfo(PSObject so, int enumerationLimit)
@@ -425,17 +424,18 @@ internal ComplexViewObjectBrowser(FormatErrorManager resultErrorManager, PSPrope
         /// of the object.
         /// </summary>
         /// <param name="so">Object to process.</param>
-        /// <param name="inputParameters">Parameters from the command line.</param>
+        /// <param name="parameters">Parameters from the command line.</param>
         /// <returns>Complex view entry to send to the output command.</returns>
-        internal ComplexViewEntry GenerateView(PSObject so, FormattingCommandLineParameters inputParameters)
+        internal ComplexViewEntry GenerateView(PSObject so, FormattingCommandLineParameters parameters)
         {
-            _complexSpecificParameters = (ComplexSpecificParameters)inputParameters.shapeParameters;
+            _parameters = parameters;
+            _complexSpecificParameters = (ComplexSpecificParameters)parameters.shapeParameters;
 
             int maxDepth = _complexSpecificParameters.maxDepth;
             TraversalInfo level = new TraversalInfo(0, maxDepth);
 
             List<MshParameter> mshParameterList = null;
-            mshParameterList = inputParameters.mshParameterList;
+            mshParameterList = parameters.mshParameterList;
 
             // create a top level entry as root of the tree
             ComplexViewEntry cve = new ComplexViewEntry();
@@ -513,6 +513,9 @@ private void DisplayObject(PSObject so, TraversalInfo currentLevel, List<MshPara
             List<MshResolvedExpressionParameterAssociation> activeAssociationList =
                         AssociationManager.SetupActiveProperties(parameterList, so, _expressionFactory);
 
+            // Apply ExcludeProperty filter using the centralized method
+            activeAssociationList = ViewGenerator.ApplyExcludeFilter(activeAssociationList, _parameters?.excludePropertyFilter);
+
             // create a format entry
             FormatEntry fe = new FormatEntry();
             formatValueList.Add(fe);
@@ -758,6 +761,7 @@ private List<FormatValue> AddIndentationLevel(List<FormatValue> formatValueList)
             return feFrame.formatValueList;
         }
 
+        private FormattingCommandLineParameters _parameters;
         private ComplexSpecificParameters _complexSpecificParameters;
 
         /// <summary>
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_List.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_List.cs
index f7acd9ed226..35287d7c2e4 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_List.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_List.cs
@@ -30,9 +30,14 @@ internal override void Initialize(TerminatingErrorContext errorContext, PSProper
             {
                 _listBody = (ListControlBody)this.dataBaseInfo.view.mainControl;
             }
+        }
 
-            this.inputParameters = parameters;
-            SetUpActiveProperties(so);
+        /// <summary>
+        /// Builds the raw association list for list formatting.
+        /// </summary>
+        protected override List<MshResolvedExpressionParameterAssociation> BuildRawAssociationList(PSObject so, List<MshParameter> propertyList)
+        {
+            return AssociationManager.SetupActiveProperties(propertyList, so, this.expressionFactory);
         }
 
         /// <summary>
@@ -178,17 +183,14 @@ private ListControlEntryDefinition GetActiveListControlEntryDefinition(ListContr
 
         private ListViewEntry GenerateListViewEntryFromProperties(PSObject so, int enumerationLimit)
         {
-            // compute active properties every time
-            if (this.activeAssociationList == null)
-            {
-                SetUpActiveProperties(so);
-            }
+            // Build active association list (with ExcludeProperty filter applied)
+            var associationList = BuildActiveAssociationList(so);
 
             ListViewEntry lve = new ListViewEntry();
 
-            for (int k = 0; k < this.activeAssociationList.Count; k++)
+            for (int k = 0; k < associationList.Count; k++)
             {
-                MshResolvedExpressionParameterAssociation a = this.activeAssociationList[k];
+                MshResolvedExpressionParameterAssociation a = associationList[k];
                 ListViewField lvf = new ListViewField();
 
                 if (a.OriginatingParameter != null)
@@ -218,19 +220,7 @@ private ListViewEntry GenerateListViewEntryFromProperties(PSObject so, int enume
                 lvf.formatPropertyField.propertyValue = this.GetExpressionDisplayValue(so, enumerationLimit, a.ResolvedExpression, directive);
                 lve.listViewFieldList.Add(lvf);
             }
-
-            this.activeAssociationList = null;
             return lve;
         }
-
-        private void SetUpActiveProperties(PSObject so)
-        {
-            List<MshParameter> mshParameterList = null;
-
-            if (this.inputParameters != null)
-                mshParameterList = this.inputParameters.mshParameterList;
-
-            this.activeAssociationList = AssociationManager.SetupActiveProperties(mshParameterList, so, this.expressionFactory);
-        }
     }
 }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
index 64ed5bad6cf..3b14c0754ba 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
@@ -14,6 +14,8 @@ internal sealed class TableViewGenerator : ViewGenerator
         // tableBody to use for this instance of the ViewGenerator;
         private TableControlBody _tableBody;
 
+        private List<MshResolvedExpressionParameterAssociation> _activeAssociationList;
+
         internal override void Initialize(TerminatingErrorContext terminatingErrorContext, PSPropertyExpressionFactory mshExpressionFactory, TypeInfoDataBase db, ViewDefinition view, FormattingCommandLineParameters formatParameters)
         {
             base.Initialize(terminatingErrorContext, mshExpressionFactory, db, view, formatParameters);
@@ -34,46 +36,48 @@ internal override void Initialize(TerminatingErrorContext errorContext, PSProper
                 _tableBody = (TableControlBody)this.dataBaseInfo.view.mainControl;
             }
 
-            List<MshParameter> rawMshParameterList = null;
-
-            if (parameters != null)
-                rawMshParameterList = parameters.mshParameterList;
+            // Build the active association list (with ExcludeProperty filter applied)
+            _activeAssociationList = BuildActiveAssociationList(so);
+        }
 
+        /// <summary>
+        /// Builds the raw association list for table formatting.
+        /// </summary>
+        protected override List<MshResolvedExpressionParameterAssociation> BuildRawAssociationList(PSObject so, List<MshParameter> propertyList)
+        {
             // check if we received properties from the command line
-            if (rawMshParameterList != null && rawMshParameterList.Count > 0)
+            if (propertyList is not null && propertyList.Count > 0)
             {
-                this.activeAssociationList = AssociationManager.ExpandTableParameters(rawMshParameterList, so);
-                return;
+                return AssociationManager.ExpandTableParameters(propertyList, so);
             }
 
             // we did not get any properties:
             // try to get properties from the default property set of the object
-            this.activeAssociationList = AssociationManager.ExpandDefaultPropertySet(so, this.expressionFactory);
-            if (this.activeAssociationList.Count > 0)
+            var list = AssociationManager.ExpandDefaultPropertySet(so, this.expressionFactory);
+            if (list.Count > 0)
             {
                 // we got a valid set of properties from the default property set..add computername for
                 // remoteobjects (if available)
                 if (PSObjectHelper.ShouldShowComputerNameProperty(so))
                 {
-                    activeAssociationList.Add(new MshResolvedExpressionParameterAssociation(null,
+                    list.Add(new MshResolvedExpressionParameterAssociation(null,
                         new PSPropertyExpression(RemotingConstants.ComputerNameNoteProperty)));
                 }
 
-                return;
+                return list;
             }
 
             // we failed to get anything from the default property set
-            this.activeAssociationList = AssociationManager.ExpandAll(so);
-            if (this.activeAssociationList.Count > 0)
+            list = AssociationManager.ExpandAll(so);
+            if (list.Count > 0)
             {
                 // Remove PSComputerName and PSShowComputerName from the display as needed.
-                AssociationManager.HandleComputerNameProperties(so, activeAssociationList);
-                FilterActiveAssociationList();
-                return;
+                AssociationManager.HandleComputerNameProperties(so, list);
+                return LimitAssociationListSize(list);
             }
 
             // we were unable to retrieve any properties, so we leave an empty list
-            this.activeAssociationList = new List<MshResolvedExpressionParameterAssociation>();
+            return new List<MshResolvedExpressionParameterAssociation>();
         }
 
         /// <summary>
@@ -124,30 +128,29 @@ internal override FormatStartData GenerateStartData(PSObject so)
         }
 
         /// <summary>
-        /// Method to filter resolved expressions as per table view needs.
+        /// Limits the association list size for table view.
         /// For v1.0, table view supports only 10 properties.
-        ///
-        /// This method filters and updates "activeAssociationList" instance property.
         /// </summary>
-        /// <returns>None.</returns>
-        /// <remarks>This method updates "activeAssociationList" instance property.</remarks>
-        private void FilterActiveAssociationList()
+        /// <param name="list">The list to limit.</param>
+        /// <returns>The limited list.</returns>
+        private static List<MshResolvedExpressionParameterAssociation> LimitAssociationListSize(
+            List<MshResolvedExpressionParameterAssociation> list)
         {
-            // we got a valid set of properties from the default property set
-            // make sure we do not have too many properties
-
             // NOTE: this is an arbitrary number, chosen to be a sensitive default
-            const int nMax = 10;
+            const int maxCount = 10;
+
+            if (list.Count <= maxCount)
+            {
+                return list;
+            }
 
-            if (activeAssociationList.Count > nMax)
+            var result = new List<MshResolvedExpressionParameterAssociation>(maxCount);
+            for (int k = 0; k < maxCount; k++)
             {
-                List<MshResolvedExpressionParameterAssociation> tmp = this.activeAssociationList;
-                this.activeAssociationList = new List<MshResolvedExpressionParameterAssociation>();
-                for (int k = 0; k < nMax; k++)
-                    this.activeAssociationList.Add(tmp[k]);
+                result.Add(list[k]);
             }
 
-            return;
+            return result;
         }
 
         private TableHeaderInfo GenerateTableHeaderInfoFromDataBaseInfo(PSObject so)
@@ -173,7 +176,10 @@ private TableHeaderInfo GenerateTableHeaderInfoFromDataBaseInfo(PSObject so)
                     ci.alignment = colHeader.alignment;
                     if (colHeader.label != null)
                     {
-                        ci.HeaderMatchesProperty = so.Properties[colHeader.label.text] is not null;
+                        if (colHeader.label.text != string.Empty)
+                        {
+                            ci.HeaderMatchesProperty = so.Properties[colHeader.label.text] is not null;
+                        }
 
                         ci.label = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(colHeader.label);
                     }
@@ -220,9 +226,9 @@ private TableHeaderInfo GenerateTableHeaderInfoFromProperties(PSObject so)
             thi.hideHeader = this.HideHeaders;
             thi.repeatHeader = this.RepeatHeader;
 
-            for (int k = 0; k < this.activeAssociationList.Count; k++)
+            for (int k = 0; k < _activeAssociationList.Count; k++)
             {
-                MshResolvedExpressionParameterAssociation a = this.activeAssociationList[k];
+                MshResolvedExpressionParameterAssociation a = _activeAssociationList[k];
                 TableColumnInfo ci = new TableColumnInfo();
 
                 // set the label of the column
@@ -233,7 +239,7 @@ private TableHeaderInfo GenerateTableHeaderInfoFromProperties(PSObject so)
                         ci.propertyName = (string)key;
                 }
 
-                ci.propertyName ??= this.activeAssociationList[k].ResolvedExpression.ToString();
+                ci.propertyName ??= _activeAssociationList[k].ResolvedExpression.ToString();
 
                 // set the width of the table
                 if (a.OriginatingParameter != null)
@@ -465,13 +471,13 @@ private TableRowEntry GenerateTableRowEntryFromDataBaseInfo(PSObject so, int enu
         private TableRowEntry GenerateTableRowEntryFromFromProperties(PSObject so, int enumerationLimit)
         {
             TableRowEntry tre = new TableRowEntry();
-            for (int k = 0; k < this.activeAssociationList.Count; k++)
+            for (int k = 0; k < _activeAssociationList.Count; k++)
             {
                 FormatPropertyField fpf = new FormatPropertyField();
                 FieldFormattingDirective directive = null;
-                if (activeAssociationList[k].OriginatingParameter != null)
+                if (_activeAssociationList[k].OriginatingParameter != null)
                 {
-                    directive = activeAssociationList[k].OriginatingParameter.GetEntry(FormatParameterDefinitionKeys.FormatStringEntryKey) as FieldFormattingDirective;
+                    directive = _activeAssociationList[k].OriginatingParameter.GetEntry(FormatParameterDefinitionKeys.FormatStringEntryKey) as FieldFormattingDirective;
                 }
 
                 if (directive is null)
@@ -480,7 +486,7 @@ private TableRowEntry GenerateTableRowEntryFromFromProperties(PSObject so, int e
                     directive.isTable = true;
                 }
 
-                fpf.propertyValue = this.GetExpressionDisplayValue(so, enumerationLimit, this.activeAssociationList[k].ResolvedExpression, directive);
+                fpf.propertyValue = this.GetExpressionDisplayValue(so, enumerationLimit, _activeAssociationList[k].ResolvedExpression, directive);
                 tre.formatPropertyFieldList.Add(fpf);
             }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Wide.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Wide.cs
index 26c0af670c7..bfa364cc450 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Wide.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Wide.cs
@@ -13,7 +13,40 @@ internal override void Initialize(TerminatingErrorContext errorContext, PSProper
                                 PSObject so, TypeInfoDataBase db, FormattingCommandLineParameters parameters)
         {
             base.Initialize(errorContext, expressionFactory, so, db, parameters);
-            this.inputParameters = parameters;
+        }
+
+        /// <summary>
+        /// Builds the raw association list for wide formatting.
+        /// </summary>
+        protected override List<MshResolvedExpressionParameterAssociation> BuildRawAssociationList(PSObject so, List<MshParameter> propertyList)
+        {
+            // check if we received properties from the command line
+            if (propertyList is not null && propertyList.Count > 0)
+            {
+                return AssociationManager.ExpandParameters(propertyList, so);
+            }
+
+            // we did not get any properties:
+            // try to get the display property of the object
+            PSPropertyExpression displayNameExpression = PSObjectHelper.GetDisplayNameExpression(so, this.expressionFactory);
+            if (displayNameExpression is not null)
+            {
+                return new List<MshResolvedExpressionParameterAssociation>
+                {
+                    new MshResolvedExpressionParameterAssociation(null, displayNameExpression)
+                };
+            }
+
+            // try to get the default property set (we will use the first property)
+            var list = AssociationManager.ExpandDefaultPropertySet(so, this.expressionFactory);
+            if (list.Count == 0)
+            {
+                // we failed to get anything from the default property set
+                // just get all the properties
+                list = AssociationManager.ExpandAll(so);
+            }
+
+            return list;
         }
 
         internal override FormatStartData GenerateStartData(PSObject so)
@@ -130,20 +163,17 @@ private WideControlEntryDefinition GetActiveWideControlEntryDefinition(WideContr
 
         private WideViewEntry GenerateWideViewEntryFromProperties(PSObject so, int enumerationLimit)
         {
-            // compute active properties every time
-            if (this.activeAssociationList == null)
-            {
-                SetUpActiveProperty(so);
-            }
+            // Build active association list (with ExcludeProperty filter applied)
+            var associationList = BuildActiveAssociationList(so);
 
             WideViewEntry wve = new WideViewEntry();
             FormatPropertyField fpf = new FormatPropertyField();
 
             wve.formatPropertyField = fpf;
-            if (this.activeAssociationList.Count > 0)
+            if (associationList.Count > 0)
             {
                 // get the first one
-                MshResolvedExpressionParameterAssociation a = this.activeAssociationList[0];
+                MshResolvedExpressionParameterAssociation a = associationList[0];
                 FieldFormattingDirective directive = null;
                 if (a.OriginatingParameter != null)
                 {
@@ -152,46 +182,7 @@ private WideViewEntry GenerateWideViewEntryFromProperties(PSObject so, int enume
 
                 fpf.propertyValue = this.GetExpressionDisplayValue(so, enumerationLimit, a.ResolvedExpression, directive);
             }
-
-            this.activeAssociationList = null;
             return wve;
         }
-
-        private void SetUpActiveProperty(PSObject so)
-        {
-            List<MshParameter> rawMshParameterList = null;
-
-            if (this.inputParameters != null)
-                rawMshParameterList = this.inputParameters.mshParameterList;
-
-            // check if we received properties from the command line
-            if (rawMshParameterList != null && rawMshParameterList.Count > 0)
-            {
-                this.activeAssociationList = AssociationManager.ExpandParameters(rawMshParameterList, so);
-                return;
-            }
-
-            // we did not get any properties:
-            // try to get the display property of the object
-            PSPropertyExpression displayNameExpression = PSObjectHelper.GetDisplayNameExpression(so, this.expressionFactory);
-            if (displayNameExpression != null)
-            {
-                this.activeAssociationList = new List<MshResolvedExpressionParameterAssociation>();
-                this.activeAssociationList.Add(new MshResolvedExpressionParameterAssociation(null, displayNameExpression));
-                return;
-            }
-
-            // try to get the default property set (we will use the first property)
-            this.activeAssociationList = AssociationManager.ExpandDefaultPropertySet(so, this.expressionFactory);
-            if (this.activeAssociationList.Count > 0)
-            {
-                // we got a valid set of properties from the default property set
-                return;
-            }
-
-            // we failed to get anything from the default property set
-            // just get all the properties
-            this.activeAssociationList = AssociationManager.ExpandAll(so);
-        }
     }
 }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
index 00923a103ec..7ae144702ba 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
@@ -54,7 +54,7 @@ fid is GroupEndData ||
                 return false;
             }
 
-            if (!(GetProperty(so, FormatInfoData.classidProperty) is string classId))
+            if (GetProperty(so, FormatInfoData.classidProperty) is not string classId)
             {
                 // it's not one of the objects derived from FormatInfoData
                 return false;
@@ -109,7 +109,7 @@ fid is GroupEndData ||
                 return so;
             }
 
-            if (!(GetProperty(so, FormatInfoData.classidProperty) is string classId))
+            if (GetProperty(so, FormatInfoData.classidProperty) is not string classId)
             {
                 // it's not one of the objects derived from FormatInfoData,
                 // just return it as is
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
index 7598c6b2797..988b1133748 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
@@ -259,7 +259,7 @@ private void WriteSingleLineHelper(string prependString, string line, LineOutput
                     _cachedBuilder.Append(headPadding).Append(str);
                 }
 
-                if (str.Contains(ValueStringDecorated.ESC) && !str.EndsWith(reset))
+                if (str.Contains(ValueStringDecorated.ESC) && !str.AsSpan().TrimEnd().EndsWith(reset, StringComparison.Ordinal))
                 {
                     _cachedBuilder.Append(reset);
                 }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
index 3f927afd7d5..534f9541195 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
@@ -892,7 +892,7 @@ public static string MapColorPairToEscapeSequence(ConsoleColor foregroundColor,
                 throw new ArgumentOutOfRangeException(paramName: nameof(foregroundColor));
             }
 
-            if (backIndex < 0 || backIndex >= ForegroundColorMap.Length)
+            if (backIndex < 0 || backIndex >= BackgroundColorMap.Length)
             {
                 throw new ArgumentOutOfRangeException(paramName: nameof(backgroundColor));
             }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
index 552d511fd4e..55ee3c30ddb 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
@@ -375,5 +375,42 @@ private static PSObject IfHashtableWrapAsPSCustomObject(PSObject target, out boo
         private bool _isResolved = false;
 
         #endregion Private Members
+
+    }
+
+    /// <summary>
+    /// Helper class to do wildcard matching on PSPropertyExpressions.
+    /// </summary>
+    internal sealed class PSPropertyExpressionFilter
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PSPropertyExpressionFilter"/> class
+        /// with the specified array of patterns.
+        /// </summary>
+        /// <param name="wildcardPatternsStrings">Array of pattern strings to use.</param>
+        internal PSPropertyExpressionFilter(string[] wildcardPatternsStrings)
+        {
+            ArgumentNullException.ThrowIfNull(wildcardPatternsStrings);
+
+            _wildcardPatterns = new WildcardPattern[wildcardPatternsStrings.Length];
+            for (int k = 0; k < wildcardPatternsStrings.Length; k++)
+            {
+                _wildcardPatterns[k] = WildcardPattern.Get(wildcardPatternsStrings[k], WildcardOptions.IgnoreCase);
+            }
+        }
+
+        /// <summary>
+        /// Try to match the expression against the array of wildcard patterns.
+        /// The first match short-circuits the search.
+        /// </summary>
+        /// <param name="expression">PSPropertyExpression to test against.</param>
+        /// <returns>True if there is a match, else false.</returns>
+        internal bool IsMatch(PSPropertyExpression expression)
+        {
+            string expressionString = expression.ToString();
+            return _wildcardPatterns.Any(pattern => pattern.IsMatch(expressionString));
+        }
+
+        private readonly WildcardPattern[] _wildcardPatterns;
     }
 }
diff --git a/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs b/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs
index 60c5c2c0007..20fcf54e593 100644
--- a/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs
+++ b/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs
@@ -14,7 +14,7 @@ namespace Microsoft.PowerShell.Commands
     /// <summary>
     /// Null sink to absorb pipeline output.
     /// </summary>
-    [CmdletAttribute("Out", "Null", SupportsShouldProcess = false,
+    [Cmdlet("Out", "Null", SupportsShouldProcess = false,
         HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2096792", RemotingCapability = RemotingCapability.None)]
     public class OutNullCommand : PSCmdlet
     {
diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
index 6f5b47cca01..29325d27899 100644
--- a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -11,40 +11,70 @@ namespace SMA
     /// Source Code Generator to create partial PSVersionInfo class.
     /// </summary>
     [Generator]
-    public class PSVersionInfoGenerator : ISourceGenerator
+    public class PSVersionInfoGenerator : IIncrementalGenerator
     {
-        /// <summary>
-        /// Generate output PSVersionInfo.g.cs file.
-        /// This allows to directly get ProductVersion and others without reflection.
-        /// </summary>
-        /// <param name="context">Generator execution context.</param>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            var result = CreatePSVersionInfoPartialClass(context);
-
-            // We must use specific file name suffix (*.g.cs,*.g, *.i.cs, *.generated.cs, *.designer.cs)
-            // so that Roslyn analyzers skip the file.
-            context.AddSource("PSVersionInfo.g.cs", result);
-        }
-
         /// <summary>
         /// Not used.
         /// </summary>
         /// <param name="context">Generator initialization context.</param>
-        public void Initialize(GeneratorInitializationContext context)
+        public void Initialize(IncrementalGeneratorInitializationContext context)
         {
-            // No initialization required for this one.
+            IncrementalValueProvider<BuildOptions> buildOptionsProvider = context.AnalyzerConfigOptionsProvider
+                .Select(static (provider, _) =>
+                {
+                    provider.GlobalOptions.TryGetValue("build_property.ProductVersion", out var productVersion);
+                    provider.GlobalOptions.TryGetValue("build_property.PSCoreBuildVersion", out var mainVersion);
+                    provider.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var gitDescribe);
+                    provider.GlobalOptions.TryGetValue("build_property.ReleaseTag", out var releaseTag);
+
+                    BuildOptions options = new()
+                    {
+                        ProductVersion = productVersion ?? string.Empty,
+                        MainVersion = mainVersion ?? string.Empty,
+                        GitDescribe = gitDescribe ?? string.Empty,
+                        ReleaseTag = releaseTag ?? string.Empty
+                    };
+
+                    return options;
+                });
+
+            context.RegisterSourceOutput(
+                buildOptionsProvider,
+                static (context, buildOptions) =>
+                {
+                    string gitCommitId = string.IsNullOrEmpty(buildOptions.ReleaseTag) ? buildOptions.GitDescribe : buildOptions.ReleaseTag;
+                    if (gitCommitId.StartsWith("v"))
+                    {
+                        gitCommitId = gitCommitId.Substring(1);
+                    }
+
+                    var versions = ParsePSVersion(buildOptions.MainVersion);
+                    string result = string.Format(
+                        CultureInfo.InvariantCulture,
+                        SourceTemplate,
+                        buildOptions.ProductVersion,
+                        gitCommitId,
+                        versions.major,
+                        versions.minor,
+                        versions.patch,
+                        versions.preReleaseLabel);
+
+                    // We must use specific file name suffix (*.g.cs,*.g, *.i.cs, *.generated.cs, *.designer.cs)
+                    // so that Roslyn analyzers skip the file.
+                    context.AddSource("PSVersionInfo.g.cs", result);
+                });
         }
 
-        /// <summary>
-        /// Generate source code for the partial PSVersionInfo class.
-        /// </summary>
-        /// <param name="context">Generator execution context.</param>
-        /// <returns>A string with partial PSVersionInfo class.</returns>
-        private static string CreatePSVersionInfoPartialClass(GeneratorExecutionContext context)
+        private struct BuildOptions
         {
-            // We must put "<auto-generated" on first line so that Roslyng analyzers skip the file.
-            const string SourceTemplate = @"// <auto-generated>
+            public string ProductVersion;
+            public string MainVersion;
+            public string GitDescribe;
+            public string ReleaseTag;
+        }
+
+        // We must put "<auto-generated" on first line so that Roslyng analyzers skip the file.
+        private const string SourceTemplate = @"// <auto-generated>
 // This file is auto-generated by PSVersionInfoGenerator.
 // </auto-generated>
 
@@ -81,30 +111,6 @@ public static partial class PSVersionInfo
     }}
 }}";
 
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProductVersion", out var productVersion);
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PSCoreBuildVersion", out var mainVersion);
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var gitDescribe);
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ReleaseTag", out var releaseTag);
-
-            string gitCommitId = string.IsNullOrEmpty(releaseTag) ? gitDescribe : releaseTag;
-            if (gitCommitId.StartsWith("v"))
-            {
-                gitCommitId = gitCommitId.Substring(1);
-            }
-
-            var result = ParsePSVersion(mainVersion);
-
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                SourceTemplate,
-                productVersion,
-                gitCommitId,
-                result.major,
-                result.minor,
-                result.patch,
-                result.preReleaseLabel);
-        }
-
         private static (int major, int minor, int patch, string preReleaseLabel) ParsePSVersion(string mainVersion)
         {
             // We only handle the pre-defined PSVersion format here, e.g. 7.x.x or 7.x.x-preview.x
diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
index 4cc9ed73321..6ba483b5f6e 100644
--- a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
@@ -7,13 +7,14 @@
   <PropertyGroup>
     <!-- source generator project needs to target 'netstandard2.0' -->
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>preview</LangVersion>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-2.final" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 6a81d5053b8..beec0c4a495 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's System.Management.Automation project</Description>
-    <NoWarn>$(NoWarn);CS1570;CS1734;CA1416</NoWarn>
+    <NoWarn>$(NoWarn);CS1570;CS1734;CA1416;CA2022</NoWarn>
     <AssemblyName>System.Management.Automation</AssemblyName>
   </PropertyGroup>
 
@@ -19,9 +19,7 @@
     <CompilerVisibleProperty Include="PowerShellVersion" />
     <CompilerVisibleProperty Include="ReleaseTag" />
 
-    <ProjectReference Include="SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj"
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false" />
+    <ProjectReference Include="SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(IsWindows)' == 'true' ">
@@ -30,25 +28,21 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <!-- the Application Insights package -->
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.23.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.DirectoryServices" Version="8.0.0-rc.2.23479.6" />
-    <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Security.Permissions" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="System.DirectoryServices" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="System.Management" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="System.Security.Permissions" Version="11.0.0-preview.3.26207.106" />
     <!-- the following package(s) are from the powershell org -->
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
-    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.4.0" />
+    <PackageReference Include="Microsoft.PowerShell.Native" Version="700.0.0-rc.1" />
     <!-- Signing APIs -->
-    <PackageReference Include="Microsoft.Security.Extensions" Version="1.3.0" />
+  <PackageReference Include="Microsoft.Security.Extensions" Version="1.4.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs b/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs
index 36f781d98a0..e71e4c7c04f 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs
@@ -52,7 +52,7 @@ public abstract class QueryBuilder
         /// <param name="propertyName">Property name to query on.</param>
         /// <param name="allowedPropertyValues">Property values to accept in the query.</param>
         /// <param name="wildcardsEnabled">
-        /// <see langword="true"/> if <paramref name="allowedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
+        /// <see langword="true"/> if <paramref name="allowedPropertyValues"/> should be treated as a <see cref="string"/> containing a wildcard pattern;
         /// <see langword="false"/> otherwise.
         /// </param>
         /// <param name="behaviorOnNoMatch">
@@ -69,7 +69,7 @@ public virtual void FilterByProperty(string propertyName, IEnumerable allowedPro
         /// <param name="propertyName">Property name to query on.</param>
         /// <param name="excludedPropertyValues">Property values to reject in the query.</param>
         /// <param name="wildcardsEnabled">
-        /// <see langword="true"/> if <paramref name="excludedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
+        /// <see langword="true"/> if <paramref name="excludedPropertyValues"/> should be treated as a <see cref="string"/> containing a wildcard pattern;
         /// <see langword="false"/> otherwise.
         /// </param>
         /// <param name="behaviorOnNoMatch">
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/xml/CoreCLR/cmdlets-over-objects.objectModel.autogen.cs b/src/System.Management.Automation/cimSupport/cmdletization/xml/CoreCLR/cmdlets-over-objects.objectModel.autogen.cs
index 8614c6a3994..76b7a3c2c52 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/xml/CoreCLR/cmdlets-over-objects.objectModel.autogen.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/xml/CoreCLR/cmdlets-over-objects.objectModel.autogen.cs
@@ -23,8 +23,8 @@ namespace Microsoft.PowerShell.Cmdletization.Xml
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
-    [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11", IsNullable = false)]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11", IsNullable = false)]
     internal partial class PowerShellMetadata
     {
         private ClassMetadata _classField;
@@ -46,7 +46,7 @@ public ClassMetadata Class
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Enum", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("Enum", IsNullable = false)]
         public EnumMetadataEnum[] Enums
         {
             get
@@ -64,7 +64,7 @@ public EnumMetadataEnum[] Enums
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class ClassMetadata
     {
         private string _versionField;
@@ -126,7 +126,7 @@ public ClassMetadataInstanceCmdlets InstanceCmdlets
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Cmdlet", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("Cmdlet", IsNullable = false)]
         public StaticCmdletMetadata[] StaticCmdlets
         {
             get
@@ -141,7 +141,7 @@ public StaticCmdletMetadata[] StaticCmdlets
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Data", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("Data", IsNullable = false)]
         public ClassMetadataData[] CmdletAdapterPrivateData
         {
             get
@@ -156,7 +156,7 @@ public ClassMetadataData[] CmdletAdapterPrivateData
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string CmdletAdapter
         {
             get
@@ -171,7 +171,7 @@ public string CmdletAdapter
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string ClassName
         {
             get
@@ -186,7 +186,7 @@ public string ClassName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string ClassVersion
         {
             get
@@ -204,7 +204,7 @@ public string ClassVersion
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class ClassMetadataInstanceCmdlets
     {
         private GetCmdletParameters _getCmdletParametersField;
@@ -242,7 +242,7 @@ public GetCmdletMetadata GetCmdlet
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Cmdlet")]
+        [System.Xml.Serialization.XmlElement("Cmdlet")]
         public InstanceCmdletMetadata[] Cmdlet
         {
             get
@@ -260,7 +260,7 @@ public InstanceCmdletMetadata[] Cmdlet
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class GetCmdletParameters
     {
         private PropertyMetadata[] _queryablePropertiesField;
@@ -272,7 +272,7 @@ internal partial class GetCmdletParameters
         private string _defaultCmdletParameterSetField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Property", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("Property", IsNullable = false)]
         public PropertyMetadata[] QueryableProperties
         {
             get
@@ -287,7 +287,7 @@ public PropertyMetadata[] QueryableProperties
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem(IsNullable = false)]
         public Association[] QueryableAssociations
         {
             get
@@ -302,7 +302,7 @@ public Association[] QueryableAssociations
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Option", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("Option", IsNullable = false)]
         public QueryOption[] QueryOptions
         {
             get
@@ -317,7 +317,7 @@ public QueryOption[] QueryOptions
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string DefaultCmdletParameterSet
         {
             get
@@ -335,7 +335,7 @@ public string DefaultCmdletParameterSet
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class PropertyMetadata
     {
         private TypeMetadata _typeField;
@@ -361,11 +361,11 @@ public TypeMetadata Type
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ExcludeQuery", typeof(WildcardablePropertyQuery))]
-        [System.Xml.Serialization.XmlElementAttribute("MaxValueQuery", typeof(PropertyQuery))]
-        [System.Xml.Serialization.XmlElementAttribute("MinValueQuery", typeof(PropertyQuery))]
-        [System.Xml.Serialization.XmlElementAttribute("RegularQuery", typeof(WildcardablePropertyQuery))]
-        [System.Xml.Serialization.XmlChoiceIdentifierAttribute("ItemsElementName")]
+        [System.Xml.Serialization.XmlElement("ExcludeQuery", typeof(WildcardablePropertyQuery))]
+        [System.Xml.Serialization.XmlElement("MaxValueQuery", typeof(PropertyQuery))]
+        [System.Xml.Serialization.XmlElement("MinValueQuery", typeof(PropertyQuery))]
+        [System.Xml.Serialization.XmlElement("RegularQuery", typeof(WildcardablePropertyQuery))]
+        [System.Xml.Serialization.XmlChoiceIdentifier("ItemsElementName")]
         public PropertyQuery[] Items
         {
             get
@@ -380,8 +380,8 @@ public PropertyQuery[] Items
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ItemsElementName")]
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlElement("ItemsElementName")]
+        [System.Xml.Serialization.XmlIgnore()]
         public ItemsChoiceType[] ItemsElementName
         {
             get
@@ -396,7 +396,7 @@ public ItemsChoiceType[] ItemsElementName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string PropertyName
         {
             get
@@ -414,7 +414,7 @@ public string PropertyName
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class TypeMetadata
     {
         private string _pSTypeField;
@@ -422,7 +422,7 @@ internal partial class TypeMetadata
         private string _eTSTypeField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string PSType
         {
             get
@@ -437,7 +437,7 @@ public string PSType
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string ETSType
         {
             get
@@ -455,7 +455,7 @@ public string ETSType
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class Association
     {
         private AssociationAssociatedInstance _associatedInstanceField;
@@ -481,7 +481,7 @@ public AssociationAssociatedInstance AssociatedInstance
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("Association")]
+        [System.Xml.Serialization.XmlAttribute("Association")]
         public string Association1
         {
             get
@@ -496,7 +496,7 @@ public string Association1
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string SourceRole
         {
             get
@@ -511,7 +511,7 @@ public string SourceRole
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string ResultRole
         {
             get
@@ -529,7 +529,7 @@ public string ResultRole
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class AssociationAssociatedInstance
     {
         private TypeMetadata _typeField;
@@ -568,7 +568,7 @@ public CmdletParameterMetadataForGetCmdletFilteringParameter CmdletParameterMeta
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadataForGetCmdletFilteringParameter : CmdletParameterMetadataForGetCmdletParameter
     {
         private bool _errorOnNoMatchField;
@@ -576,7 +576,7 @@ internal partial class CmdletParameterMetadataForGetCmdletFilteringParameter : C
         private bool _errorOnNoMatchFieldSpecified;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool ErrorOnNoMatch
         {
             get
@@ -591,7 +591,7 @@ public bool ErrorOnNoMatch
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool ErrorOnNoMatchSpecified
         {
             get
@@ -607,10 +607,10 @@ public bool ErrorOnNoMatchSpecified
     }
 
     /// <remarks/>
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(CmdletParameterMetadataForGetCmdletFilteringParameter))]
+    [System.Xml.Serialization.XmlInclude(typeof(CmdletParameterMetadataForGetCmdletFilteringParameter))]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadataForGetCmdletParameter : CmdletParameterMetadata
     {
         private bool _valueFromPipelineField;
@@ -624,7 +624,7 @@ internal partial class CmdletParameterMetadataForGetCmdletParameter : CmdletPara
         private string[] _cmdletParameterSetsField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool ValueFromPipeline
         {
             get
@@ -639,7 +639,7 @@ public bool ValueFromPipeline
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool ValueFromPipelineSpecified
         {
             get
@@ -654,7 +654,7 @@ public bool ValueFromPipelineSpecified
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool ValueFromPipelineByPropertyName
         {
             get
@@ -669,7 +669,7 @@ public bool ValueFromPipelineByPropertyName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool ValueFromPipelineByPropertyNameSpecified
         {
             get
@@ -684,7 +684,7 @@ public bool ValueFromPipelineByPropertyNameSpecified
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string[] CmdletParameterSets
         {
             get
@@ -700,13 +700,13 @@ public string[] CmdletParameterSets
     }
 
     /// <remarks/>
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(CmdletParameterMetadataForGetCmdletParameter))]
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(CmdletParameterMetadataForGetCmdletFilteringParameter))]
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(CmdletParameterMetadataForInstanceMethodParameter))]
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(CmdletParameterMetadataForStaticMethodParameter))]
+    [System.Xml.Serialization.XmlInclude(typeof(CmdletParameterMetadataForGetCmdletParameter))]
+    [System.Xml.Serialization.XmlInclude(typeof(CmdletParameterMetadataForGetCmdletFilteringParameter))]
+    [System.Xml.Serialization.XmlInclude(typeof(CmdletParameterMetadataForInstanceMethodParameter))]
+    [System.Xml.Serialization.XmlInclude(typeof(CmdletParameterMetadataForStaticMethodParameter))]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadata
     {
         private object _allowEmptyCollectionField;
@@ -852,7 +852,7 @@ public CmdletParameterMetadataValidateRange ValidateRange
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("AllowedValue", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("AllowedValue", IsNullable = false)]
         public string[] ValidateSet
         {
             get
@@ -881,7 +881,7 @@ public ObsoleteAttributeMetadata Obsolete
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool IsMandatory
         {
             get
@@ -896,7 +896,7 @@ public bool IsMandatory
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool IsMandatorySpecified
         {
             get
@@ -911,7 +911,7 @@ public bool IsMandatorySpecified
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string[] Aliases
         {
             get
@@ -926,7 +926,7 @@ public string[] Aliases
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string PSName
         {
             get
@@ -941,7 +941,7 @@ public string PSName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "nonNegativeInteger")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "nonNegativeInteger")]
         public string Position
         {
             get
@@ -959,7 +959,7 @@ public string Position
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadataValidateCount
     {
         private string _minField;
@@ -967,7 +967,7 @@ internal partial class CmdletParameterMetadataValidateCount
         private string _maxField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "nonNegativeInteger")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "nonNegativeInteger")]
         public string Min
         {
             get
@@ -982,7 +982,7 @@ public string Min
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "nonNegativeInteger")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "nonNegativeInteger")]
         public string Max
         {
             get
@@ -1000,7 +1000,7 @@ public string Max
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadataValidateLength
     {
         private string _minField;
@@ -1008,7 +1008,7 @@ internal partial class CmdletParameterMetadataValidateLength
         private string _maxField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "nonNegativeInteger")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "nonNegativeInteger")]
         public string Min
         {
             get
@@ -1023,7 +1023,7 @@ public string Min
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "nonNegativeInteger")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "nonNegativeInteger")]
         public string Max
         {
             get
@@ -1041,7 +1041,7 @@ public string Max
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadataValidateRange
     {
         private string _minField;
@@ -1049,7 +1049,7 @@ internal partial class CmdletParameterMetadataValidateRange
         private string _maxField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "integer")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "integer")]
         public string Min
         {
             get
@@ -1064,7 +1064,7 @@ public string Min
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "integer")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "integer")]
         public string Max
         {
             get
@@ -1082,13 +1082,13 @@ public string Max
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class ObsoleteAttributeMetadata
     {
         private string _messageField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string Message
         {
             get
@@ -1106,7 +1106,7 @@ public string Message
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadataForInstanceMethodParameter : CmdletParameterMetadata
     {
         private bool _valueFromPipelineByPropertyNameField;
@@ -1114,7 +1114,7 @@ internal partial class CmdletParameterMetadataForInstanceMethodParameter : Cmdle
         private bool _valueFromPipelineByPropertyNameFieldSpecified;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool ValueFromPipelineByPropertyName
         {
             get
@@ -1129,7 +1129,7 @@ public bool ValueFromPipelineByPropertyName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool ValueFromPipelineByPropertyNameSpecified
         {
             get
@@ -1147,7 +1147,7 @@ public bool ValueFromPipelineByPropertyNameSpecified
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletParameterMetadataForStaticMethodParameter : CmdletParameterMetadata
     {
         private bool _valueFromPipelineField;
@@ -1159,7 +1159,7 @@ internal partial class CmdletParameterMetadataForStaticMethodParameter : CmdletP
         private bool _valueFromPipelineByPropertyNameFieldSpecified;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool ValueFromPipeline
         {
             get
@@ -1174,7 +1174,7 @@ public bool ValueFromPipeline
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool ValueFromPipelineSpecified
         {
             get
@@ -1189,7 +1189,7 @@ public bool ValueFromPipelineSpecified
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool ValueFromPipelineByPropertyName
         {
             get
@@ -1204,7 +1204,7 @@ public bool ValueFromPipelineByPropertyName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool ValueFromPipelineByPropertyNameSpecified
         {
             get
@@ -1222,7 +1222,7 @@ public bool ValueFromPipelineByPropertyNameSpecified
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class QueryOption
     {
         private TypeMetadata _typeField;
@@ -1260,7 +1260,7 @@ public CmdletParameterMetadataForGetCmdletParameter CmdletParameterMetadata
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string OptionName
         {
             get
@@ -1278,7 +1278,7 @@ public string OptionName
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class GetCmdletMetadata
     {
         private CommonCmdletMetadata _cmdletMetadataField;
@@ -1317,7 +1317,7 @@ public GetCmdletParameters GetCmdletParameters
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CommonCmdletMetadata
     {
         private ObsoleteAttributeMetadata _obsoleteField;
@@ -1349,7 +1349,7 @@ public ObsoleteAttributeMetadata Obsolete
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string Verb
         {
             get
@@ -1364,7 +1364,7 @@ public string Verb
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string Noun
         {
             get
@@ -1379,7 +1379,7 @@ public string Noun
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string[] Aliases
         {
             get
@@ -1394,7 +1394,7 @@ public string[] Aliases
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public ConfirmImpact ConfirmImpact
         {
             get
@@ -1409,7 +1409,7 @@ public ConfirmImpact ConfirmImpact
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool ConfirmImpactSpecified
         {
             get
@@ -1424,7 +1424,7 @@ public bool ConfirmImpactSpecified
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "anyURI")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "anyURI")]
         public string HelpUri
         {
             get
@@ -1441,7 +1441,7 @@ public string HelpUri
 
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     public enum ConfirmImpact
     {
         /// <remarks/>
@@ -1460,7 +1460,7 @@ public enum ConfirmImpact
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class StaticCmdletMetadata
     {
         private StaticCmdletMetadataCmdletMetadata _cmdletMetadataField;
@@ -1482,7 +1482,7 @@ public StaticCmdletMetadataCmdletMetadata CmdletMetadata
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Method")]
+        [System.Xml.Serialization.XmlElement("Method")]
         public StaticMethodMetadata[] Method
         {
             get
@@ -1500,13 +1500,13 @@ public StaticMethodMetadata[] Method
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class StaticCmdletMetadataCmdletMetadata : CommonCmdletMetadata
     {
         private string _defaultCmdletParameterSetField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string DefaultCmdletParameterSet
         {
             get
@@ -1524,7 +1524,7 @@ public string DefaultCmdletParameterSet
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class StaticMethodMetadata : CommonMethodMetadata
     {
         private StaticMethodParameterMetadata[] _parametersField;
@@ -1532,7 +1532,7 @@ internal partial class StaticMethodMetadata : CommonMethodMetadata
         private string _cmdletParameterSetField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Parameter", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("Parameter", IsNullable = false)]
         public StaticMethodParameterMetadata[] Parameters
         {
             get
@@ -1547,7 +1547,7 @@ public StaticMethodParameterMetadata[] Parameters
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string CmdletParameterSet
         {
             get
@@ -1565,7 +1565,7 @@ public string CmdletParameterSet
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class StaticMethodParameterMetadata : CommonMethodParameterMetadata
     {
         private CmdletParameterMetadataForStaticMethodParameter _cmdletParameterMetadataField;
@@ -1604,7 +1604,7 @@ public CmdletOutputMetadata CmdletOutputMetadata
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CmdletOutputMetadata
     {
         private object _errorCodeField;
@@ -1626,7 +1626,7 @@ public object ErrorCode
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string PSName
         {
             get
@@ -1642,11 +1642,11 @@ public string PSName
     }
 
     /// <remarks/>
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(InstanceMethodParameterMetadata))]
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(StaticMethodParameterMetadata))]
+    [System.Xml.Serialization.XmlInclude(typeof(InstanceMethodParameterMetadata))]
+    [System.Xml.Serialization.XmlInclude(typeof(StaticMethodParameterMetadata))]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CommonMethodParameterMetadata
     {
         private TypeMetadata _typeField;
@@ -1670,7 +1670,7 @@ public TypeMetadata Type
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string ParameterName
         {
             get
@@ -1685,7 +1685,7 @@ public string ParameterName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string DefaultValue
         {
             get
@@ -1703,7 +1703,7 @@ public string DefaultValue
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class InstanceMethodParameterMetadata : CommonMethodParameterMetadata
     {
         private CmdletParameterMetadataForInstanceMethodParameter _cmdletParameterMetadataField;
@@ -1740,11 +1740,11 @@ public CmdletOutputMetadata CmdletOutputMetadata
     }
 
     /// <remarks/>
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(InstanceMethodMetadata))]
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(StaticMethodMetadata))]
+    [System.Xml.Serialization.XmlInclude(typeof(InstanceMethodMetadata))]
+    [System.Xml.Serialization.XmlInclude(typeof(StaticMethodMetadata))]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CommonMethodMetadata
     {
         private CommonMethodMetadataReturnValue _returnValueField;
@@ -1766,7 +1766,7 @@ public CommonMethodMetadataReturnValue ReturnValue
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string MethodName
         {
             get
@@ -1784,7 +1784,7 @@ public string MethodName
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class CommonMethodMetadataReturnValue
     {
         private TypeMetadata _typeField;
@@ -1823,13 +1823,13 @@ public CmdletOutputMetadata CmdletOutputMetadata
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class InstanceMethodMetadata : CommonMethodMetadata
     {
         private InstanceMethodParameterMetadata[] _parametersField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Parameter", IsNullable = false)]
+        [System.Xml.Serialization.XmlArrayItem("Parameter", IsNullable = false)]
         public InstanceMethodParameterMetadata[] Parameters
         {
             get
@@ -1847,7 +1847,7 @@ public InstanceMethodParameterMetadata[] Parameters
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class InstanceCmdletMetadata
     {
         private CommonCmdletMetadata _cmdletMetadataField;
@@ -1900,10 +1900,10 @@ public GetCmdletParameters GetCmdletParameters
     }
 
     /// <remarks/>
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(WildcardablePropertyQuery))]
+    [System.Xml.Serialization.XmlInclude(typeof(WildcardablePropertyQuery))]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class PropertyQuery
     {
         private CmdletParameterMetadataForGetCmdletFilteringParameter _cmdletParameterMetadataField;
@@ -1926,7 +1926,7 @@ public CmdletParameterMetadataForGetCmdletFilteringParameter CmdletParameterMeta
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class WildcardablePropertyQuery : PropertyQuery
     {
         private bool _allowGlobbingField;
@@ -1934,7 +1934,7 @@ internal partial class WildcardablePropertyQuery : PropertyQuery
         private bool _allowGlobbingFieldSpecified;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool AllowGlobbing
         {
             get
@@ -1949,7 +1949,7 @@ public bool AllowGlobbing
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool AllowGlobbingSpecified
         {
             get
@@ -1966,7 +1966,7 @@ public bool AllowGlobbingSpecified
 
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11", IncludeInSchema = false)]
+    [System.Xml.Serialization.XmlType(Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11", IncludeInSchema = false)]
     public enum ItemsChoiceType
     {
         /// <remarks/>
@@ -1985,7 +1985,7 @@ public enum ItemsChoiceType
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class ClassMetadataData
     {
         private string _nameField;
@@ -1993,7 +1993,7 @@ internal partial class ClassMetadataData
         private string _valueField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string Name
         {
             get
@@ -2008,7 +2008,7 @@ public string Name
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlTextAttribute()]
+        [System.Xml.Serialization.XmlText()]
         public string Value
         {
             get
@@ -2026,7 +2026,7 @@ public string Value
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class EnumMetadataEnum
     {
         private EnumMetadataEnumValue[] _valueField;
@@ -2040,7 +2040,7 @@ internal partial class EnumMetadataEnum
         private bool _bitwiseFlagsFieldSpecified;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Value")]
+        [System.Xml.Serialization.XmlElement("Value")]
         public EnumMetadataEnumValue[] Value
         {
             get
@@ -2055,7 +2055,7 @@ public EnumMetadataEnumValue[] Value
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string EnumName
         {
             get
@@ -2070,7 +2070,7 @@ public string EnumName
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string UnderlyingType
         {
             get
@@ -2085,7 +2085,7 @@ public string UnderlyingType
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public bool BitwiseFlags
         {
             get
@@ -2100,7 +2100,7 @@ public bool BitwiseFlags
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [System.Xml.Serialization.XmlIgnore()]
         public bool BitwiseFlagsSpecified
         {
             get
@@ -2118,7 +2118,7 @@ public bool BitwiseFlagsSpecified
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.17929")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
+    [System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/cmdlets-over-objects/2009/11")]
     internal partial class EnumMetadataEnumValue
     {
         private string _nameField;
@@ -2126,7 +2126,7 @@ internal partial class EnumMetadataEnumValue
         private string _valueField;
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.Xml.Serialization.XmlAttribute()]
         public string Name
         {
             get
@@ -2141,7 +2141,7 @@ public string Name
         }
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute(DataType = "integer")]
+        [System.Xml.Serialization.XmlAttribute(DataType = "integer")]
         public string Value
         {
             get
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs b/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs
index e2b87d4adf9..7274c3bb954 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs
@@ -2237,4 +2237,3 @@ public string Value
         }
     }
 }
-
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xmlSerializer.autogen.cs b/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xmlSerializer.autogen.cs
index f463e5052bb..dd1c6023cdb 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xmlSerializer.autogen.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xmlSerializer.autogen.cs
@@ -760,7 +760,7 @@ private void Write12_Item(string n, string ns, global::Microsoft.PowerShell.Cmdl
             {
                 WriteXsiType(@"CmdletParameterMetadataForGetCmdletFilteringParameter", @"http://schemas.microsoft.com/cmdlets-over-objects/2009/11");
             }
-    
+
             if (o.@IsMandatorySpecified)
             {
                 WriteAttribute(@"IsMandatory", @"", System.Xml.XmlConvert.ToString((global::System.Boolean)((global::System.Boolean)o.@IsMandatory)));
@@ -10108,4 +10108,3 @@ public override System.Xml.Serialization.XmlSerializer GetSerializer(System.Type
         }
     }
 }
-
diff --git a/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs b/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
index 9a3e5f137ad..202c3e98e48 100644
--- a/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
+++ b/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
@@ -267,7 +267,7 @@ private static List<CimClass> GetInheritanceChain(CimInstance cimInstance)
         /// <returns></returns>
         public override Collection<string> GetTypeNameHierarchy(object baseObject)
         {
-            if (!(baseObject is CimInstance cimInstance))
+            if (baseObject is not CimInstance cimInstance)
             {
                 throw new ArgumentNullException(nameof(baseObject));
             }
@@ -343,7 +343,7 @@ public override bool IsSettable(PSAdaptedProperty adaptedProperty)
                 return false;
             }
 
-            if (!(adaptedProperty.Tag is CimProperty cimProperty))
+            if (adaptedProperty.Tag is not CimProperty cimProperty)
             {
                 return false;
             }
diff --git a/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs b/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs
index a2c2cd8321e..596a4142e93 100644
--- a/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs
+++ b/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs
@@ -65,7 +65,7 @@ internal object Transform(EngineIntrinsics engineIntrinsics, object inputData, b
                             else
                                 temp = result;
 
-                            if (!(temp is PSReference reference))
+                            if (temp is not PSReference reference)
                             {
                                 throw new PSInvalidCastException("InvalidCastExceptionReferenceTypeExpected", null,
                                                                    ExtendedTypeSystem.ReferenceTypeExpected);
diff --git a/src/System.Management.Automation/engine/Attributes.cs b/src/System.Management.Automation/engine/Attributes.cs
index 9e698c05174..dac3a2ac377 100644
--- a/src/System.Management.Automation/engine/Attributes.cs
+++ b/src/System.Management.Automation/engine/Attributes.cs
@@ -87,7 +87,7 @@ namespace System.Management.Automation
     /// <see cref="ValidateArgumentsAttribute"/> validates the argument as a whole. If the argument value may
     /// be an enumerable, you can derive from <see cref="ValidateEnumeratedArgumentsAttribute"/>
     /// which will take care of unrolling the enumerable and validate each element individually.
-    /// It is also recommended to override <see cref="System.Object.ToString"/> to return a readable string
+    /// It is also recommended to override <see cref="object.ToString"/> to return a readable string
     /// similar to the attribute declaration, for example "[ValidateRangeAttribute(5,10)]".
     /// If this attribute is applied to a string parameter, the string command argument will be validated.
     /// If this attribute is applied to a string[] parameter, the string[] command argument will be validated.
@@ -154,7 +154,7 @@ protected ValidateArgumentsAttribute()
     /// <seealso cref="ValidateEnumeratedArgumentsAttribute"/> and override the
     /// <seealso cref="ValidateEnumeratedArgumentsAttribute.ValidateElement"/>
     /// abstract method, after which they can apply the attribute to their parameters.
-    /// It is also recommended to override <see cref="System.Object.ToString"/> to return a readable string
+    /// It is also recommended to override <see cref="object.ToString"/> to return a readable string
     /// similar to the attribute declaration, for example "[ValidateRangeAttribute(5,10)]".
     /// If this attribute is applied to a string parameter, the string command argument will be validated.
     /// If this attribute is applied to a string[] parameter, each string command argument will be validated.
@@ -844,7 +844,7 @@ public sealed class ValidateLengthAttribute : ValidateEnumeratedArgumentsAttribu
         /// <exception cref="ArgumentException">For invalid arguments.</exception>
         protected override void ValidateElement(object element)
         {
-            if (!(element is string objectString))
+            if (element is not string objectString)
             {
                 throw new ValidationMetadataException(
                     "ValidateLengthNotString",
@@ -1877,7 +1877,7 @@ protected override void Validate(object arguments, EngineIntrinsics engineIntrin
     /// <summary>
     /// Allows a NULL as the argument to a mandatory parameter.
     /// </summary>
-    [AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
     public sealed class AllowNullAttribute : CmdletMetadataAttribute
     {
         /// <summary>
@@ -1889,7 +1889,7 @@ public AllowNullAttribute() { }
     /// <summary>
     /// Allows an empty string as the argument to a mandatory string parameter.
     /// </summary>
-    [AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
     public sealed class AllowEmptyStringAttribute : CmdletMetadataAttribute
     {
         /// <summary>
@@ -1901,7 +1901,7 @@ public AllowEmptyStringAttribute() { }
     /// <summary>
     /// Allows an empty collection as the argument to a mandatory collection parameter.
     /// </summary>
-    [AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
     public sealed class AllowEmptyCollectionAttribute : CmdletMetadataAttribute
     {
         /// <summary>
@@ -1956,7 +1956,7 @@ protected override void Validate(object arguments, EngineIntrinsics engineIntrin
                     Metadata.ValidateNotNullFailure);
             }
 
-            if (!(arguments is string path))
+            if (arguments is not string path)
             {
                 throw new ValidationMetadataException(
                     "PathArgumentIsNotValid",
@@ -2292,7 +2292,7 @@ public ValidateNotNullOrWhiteSpaceAttribute()
     /// <see cref="ArgumentTransformationAttribute"/> and override the
     /// <see cref="ArgumentTransformationAttribute.Transform"/> abstract method, after which they
     /// can apply the attribute to their parameters.
-    /// It is also recommended to override <see cref="System.Object.ToString"/> to return a readable
+    /// It is also recommended to override <see cref="object.ToString"/> to return a readable
     /// string similar to the attribute declaration, for example "[ValidateRangeAttribute(5,10)]".
     /// If multiple transformations are defined on a parameter, they will be invoked in series,
     /// each getting the output of the previous transformation.
diff --git a/src/System.Management.Automation/engine/AutomationEngine.cs b/src/System.Management.Automation/engine/AutomationEngine.cs
index cc1ca2f5ad0..592796d5bb0 100644
--- a/src/System.Management.Automation/engine/AutomationEngine.cs
+++ b/src/System.Management.Automation/engine/AutomationEngine.cs
@@ -86,7 +86,7 @@ internal string Expand(string s)
         /// Compile a piece of text into a parse tree for later execution.
         /// </summary>
         /// <param name="script">The text to parse.</param>
-        /// <param name="addToHistory">True iff the scriptblock will be added to history.</param>
+        /// <param name="addToHistory">True if-and-only-if the scriptblock will be added to history.</param>
         /// <returns>The parse text as a parsetree node.</returns>
         internal ScriptBlock ParseScriptBlock(string script, bool addToHistory)
         {
diff --git a/src/System.Management.Automation/engine/COM/ComInvoker.cs b/src/System.Management.Automation/engine/COM/ComInvoker.cs
index a1b4a4c1ba7..ea8b8b96d79 100644
--- a/src/System.Management.Automation/engine/COM/ComInvoker.cs
+++ b/src/System.Management.Automation/engine/COM/ComInvoker.cs
@@ -7,9 +7,6 @@
 
 using COM = System.Runtime.InteropServices.ComTypes;
 
-// Disable obsolete warnings about VarEnum and COM-marshaling APIs in CoreCLR
-#pragma warning disable 618
-
 namespace System.Management.Automation
 {
     internal static class ComInvoker
diff --git a/src/System.Management.Automation/engine/COM/ComUtil.cs b/src/System.Management.Automation/engine/COM/ComUtil.cs
index e244e4cdf3f..8cd5e73b835 100644
--- a/src/System.Management.Automation/engine/COM/ComUtil.cs
+++ b/src/System.Management.Automation/engine/COM/ComUtil.cs
@@ -141,9 +141,6 @@ private static string GetStringFromCustomType(COM.ITypeInfo typeinfo, IntPtr ref
             return "UnknownCustomtype";
         }
 
-        // Disable obsolete warning about VarEnum in CoreCLR
-#pragma warning disable 618
-
         /// <summary>
         /// This function gets a string representation of the Type Descriptor
         /// This is used in generating signature for Properties and Methods.
@@ -259,8 +256,6 @@ internal static Type GetTypeFromTypeDesc(COM.TYPEDESC typedesc)
             return VarEnumSelector.GetTypeForVarEnum(vt);
         }
 
-#pragma warning restore 618
-
         /// <summary>
         /// Converts a FuncDesc out of GetFuncDesc into a MethodInformation.
         /// </summary>
diff --git a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
index 88fadc3342d..b9cf67b29e6 100644
--- a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
+++ b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
@@ -622,7 +622,7 @@ private Dictionary<MergedCompiledCommandParameter, object> GetDefaultParameterVa
 
             foreach (DictionaryEntry entry in DefaultParameterValues)
             {
-                if (!(entry.Key is string key))
+                if (entry.Key is not string key)
                 {
                     continue;
                 }
@@ -4386,7 +4386,7 @@ public override bool ContainsKey(object key)
                 throw PSTraceSource.NewArgumentNullException(nameof(key));
             }
 
-            if (!(key is string strKey))
+            if (key is not string strKey)
             {
                 return false;
             }
@@ -4415,7 +4415,7 @@ private void AddImpl(object key, object value, bool isSelfIndexing)
                 throw PSTraceSource.NewArgumentNullException(nameof(key));
             }
 
-            if (!(key is string strKey))
+            if (key is not string strKey)
             {
                 throw PSTraceSource.NewArgumentException(nameof(key), ParameterBinderStrings.StringValueKeyExpected, key, key.GetType().FullName);
             }
@@ -4463,7 +4463,7 @@ public override object this[object key]
                     throw PSTraceSource.NewArgumentNullException(nameof(key));
                 }
 
-                if (!(key is string strKey))
+                if (key is not string strKey)
                 {
                     return null;
                 }
@@ -4489,7 +4489,7 @@ public override void Remove(object key)
                 throw PSTraceSource.NewArgumentNullException(nameof(key));
             }
 
-            if (!(key is string strKey))
+            if (key is not string strKey)
             {
                 return;
             }
diff --git a/src/System.Management.Automation/engine/CommandBase.cs b/src/System.Management.Automation/engine/CommandBase.cs
index 4d90a7c2490..3708611df07 100644
--- a/src/System.Management.Automation/engine/CommandBase.cs
+++ b/src/System.Management.Automation/engine/CommandBase.cs
@@ -8,8 +8,7 @@
 using System.Management.Automation.Internal.Host;
 using System.Management.Automation.Language;
 using System.Management.Automation.Runspaces;
-
-using Dbg = System.Management.Automation.Diagnostics;
+using System.Threading;
 
 namespace System.Management.Automation.Internal
 {
@@ -132,6 +131,13 @@ internal bool IsStopping
             }
         }
 
+        /// <summary>
+        /// Gets the CancellationToken that is signaled when the pipeline is stopping.
+        /// </summary>
+        internal CancellationToken StopToken => commandRuntime is MshCommandRuntime mcr
+            ? mcr.PipelineProcessor.PipelineStopToken
+            : default;
+
         /// <summary>
         /// The information about the command.
         /// </summary>
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index e98f577090c..a6b6f4170b3 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -251,8 +251,7 @@ private static bool CompleteAgainstSwitchFile(Ast lastAst, Token tokenBeforeCurs
         {
             Tuple<Token, Ast> fileConditionTuple;
 
-            var errorStatement = lastAst as ErrorStatementAst;
-            if (errorStatement != null && errorStatement.Flags != null && errorStatement.Kind != null && tokenBeforeCursor != null &&
+            if (lastAst is ErrorStatementAst errorStatement && errorStatement.Flags is not null && errorStatement.Kind is not null && tokenBeforeCursor is not null &&
                 errorStatement.Kind.Kind.Equals(TokenKind.Switch) && errorStatement.Flags.TryGetValue("file", out fileConditionTuple))
             {
                 // Handle "switch -file <tab>"
@@ -262,24 +261,239 @@ private static bool CompleteAgainstSwitchFile(Ast lastAst, Token tokenBeforeCurs
             if (lastAst.Parent is CommandExpressionAst)
             {
                 // Handle "switch -file m<tab>" or "switch -file *.ps1<tab>"
-                if (!(lastAst.Parent.Parent is PipelineAst pipeline))
+                if (lastAst.Parent.Parent is not PipelineAst pipeline)
                 {
                     return false;
                 }
 
-                errorStatement = pipeline.Parent as ErrorStatementAst;
-                if (errorStatement == null || errorStatement.Kind == null || errorStatement.Flags == null)
+                if (pipeline.Parent is not ErrorStatementAst parentErrorStatement || parentErrorStatement.Kind is null || parentErrorStatement.Flags is null)
                 {
                     return false;
                 }
 
-                return (errorStatement.Kind.Kind.Equals(TokenKind.Switch) &&
-                        errorStatement.Flags.TryGetValue("file", out fileConditionTuple) && fileConditionTuple.Item2 == pipeline);
+                return (parentErrorStatement.Kind.Kind.Equals(TokenKind.Switch) &&
+                        parentErrorStatement.Flags.TryGetValue("file", out fileConditionTuple) && fileConditionTuple.Item2 == pipeline);
             }
 
             return false;
         }
 
+        /// <summary>
+        /// Check if we should complete parameter names for switch cases on $PSBoundParameters.Keys
+        /// </summary>
+        private static List<CompletionResult> CompleteAgainstSwitchCaseCondition(CompletionContext completionContext)
+        {
+            var lastAst = completionContext.RelatedAsts.Last();
+
+            PipelineAst conditionPipeline = null;
+            Ast switchAst = null;
+
+            // Check if we're in a switch statement (complete) or error statement (incomplete switch)
+            if (lastAst.Parent is SwitchStatementAst switchStatementAst)
+            {
+                // Verify that the lastAst is one of the clause conditions (not in the body)
+                bool isClauseCondition = switchStatementAst.Clauses.Any(clause => clause.Item1 == lastAst);
+
+                if (!isClauseCondition)
+                {
+                    return null;
+                }
+
+                conditionPipeline = switchStatementAst.Condition as PipelineAst;
+                switchAst = switchStatementAst;
+            }
+            else
+            {
+                // Check for incomplete switch parsed as ErrorStatementAst
+                if (lastAst.Parent is not ErrorStatementAst errorStatementAst || errorStatementAst.Kind is null ||
+                    errorStatementAst.Kind.Kind != TokenKind.Switch)
+                {
+                    return null;
+                }
+
+                // For ErrorStatementAst, the case value is in Bodies, condition is in Conditions
+                bool isInBodies = errorStatementAst.Bodies != null && errorStatementAst.Bodies.Any(body => body == lastAst);
+
+                if (!isInBodies)
+                {
+                    return null;
+                }
+
+                // Get the condition from ErrorStatementAst.Conditions
+                if (errorStatementAst.Conditions != null && errorStatementAst.Conditions.Count > 0)
+                {
+                    conditionPipeline = errorStatementAst.Conditions[0] as PipelineAst;
+                }
+                switchAst = errorStatementAst;
+            }
+
+            if (conditionPipeline == null || conditionPipeline.PipelineElements.Count != 1)
+            {
+                return null;
+            }
+
+            if (conditionPipeline.PipelineElements[0] is not CommandExpressionAst commandExpressionAst)
+            {
+                return null;
+            }
+
+            // Check if the expression is a member access on $PSBoundParameters.Keys
+            if (commandExpressionAst.Expression is not MemberExpressionAst memberExpressionAst)
+            {
+                return null;
+            }
+
+            // Check if the target is $PSBoundParameters
+            if (memberExpressionAst.Expression is not VariableExpressionAst variableExpressionAst ||
+                !variableExpressionAst.VariablePath.UserPath.Equals("PSBoundParameters", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Check if the member is "Keys"
+            if (memberExpressionAst.Member is not StringConstantExpressionAst memberNameAst ||
+                !memberNameAst.Value.Equals("Keys", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Find the nearest param block by traversing up the AST
+            var paramBlockAst = FindNearestParamBlock(switchAst.Parent);
+
+            if (paramBlockAst == null || paramBlockAst.Parameters.Count == 0)
+            {
+                return null;
+            }
+
+            // Generate completion results from parameter names
+            var wordToComplete = completionContext.WordToComplete ?? string.Empty;
+            return CreateParameterCompletionResults(paramBlockAst, wordToComplete);
+        }
+
+        /// <summary>
+        /// Check if we should complete parameter names for $PSBoundParameters access patterns
+        /// Supports: $PSBoundParameters.ContainsKey('...'), $PSBoundParameters['...'], $PSBoundParameters.Remove('...')
+        /// </summary>
+        private static List<CompletionResult> CompleteAgainstPSBoundParametersAccess(CompletionContext completionContext)
+        {
+            var lastAst = completionContext.RelatedAsts.Last();
+
+            // Must be a string constant
+            if (lastAst is not StringConstantExpressionAst stringAst)
+            {
+                return null;
+            }
+
+            ExpressionAst targetAst = null;
+
+            // Check for method invocation: $PSBoundParameters.ContainsKey('...') or $PSBoundParameters.Remove('...')
+            if (lastAst.Parent is InvokeMemberExpressionAst invokeMemberAst)
+            {
+                if (invokeMemberAst.Member is StringConstantExpressionAst memberName &&
+                    (memberName.Value.Equals("ContainsKey", StringComparison.OrdinalIgnoreCase) ||
+                     memberName.Value.Equals("Remove", StringComparison.OrdinalIgnoreCase)))
+                {
+                    targetAst = invokeMemberAst.Expression;
+                }
+            }
+            // Check for indexer: $PSBoundParameters['...']
+            else if (lastAst.Parent is IndexExpressionAst indexAst)
+            {
+                targetAst = indexAst.Target;
+            }
+
+            if (targetAst is null)
+            {
+                return null;
+            }
+
+            // Check if target is $PSBoundParameters
+            if (targetAst is not VariableExpressionAst variableAst ||
+                !variableAst.VariablePath.UserPath.Equals("PSBoundParameters", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Find the nearest param block
+            var paramBlockAst = FindNearestParamBlock(lastAst.Parent);
+
+            if (paramBlockAst == null || paramBlockAst.Parameters.Count == 0)
+            {
+                return null;
+            }
+
+            // Generate completion results from parameter names
+            var wordToComplete = completionContext.WordToComplete ?? string.Empty;
+
+            // Determine quote style based on the string constant type
+            string quoteChar = string.Empty;
+            if (stringAst.StringConstantType == StringConstantType.SingleQuoted)
+            {
+                quoteChar = "'";
+            }
+            else if (stringAst.StringConstantType == StringConstantType.DoubleQuoted)
+            {
+                quoteChar = "\"";
+            }
+
+            return CreateParameterCompletionResults(paramBlockAst, wordToComplete, quoteChar);
+        }
+
+        /// <summary>
+        /// Finds the nearest ParamBlockAst by traversing up the AST hierarchy.
+        /// </summary>
+        /// <param name="startAst">The AST node to start searching from.</param>
+        /// <returns>The nearest ParamBlockAst if found; otherwise, null.</returns>
+        private static ParamBlockAst FindNearestParamBlock(Ast startAst)
+        {
+            Ast current = startAst;
+            while (current != null)
+            {
+                if (current is FunctionDefinitionAst functionDefinitionAst)
+                {
+                    return functionDefinitionAst.Body?.ParamBlock;
+                }
+                else if (current is ScriptBlockAst scriptBlockAst)
+                {
+                    var paramBlock = scriptBlockAst.ParamBlock;
+                    if (paramBlock != null)
+                    {
+                        return paramBlock;
+                    }
+                }
+
+                current = current.Parent;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Creates completion results from parameter names with optional quote wrapping.
+        /// </summary>
+        /// <param name="paramBlockAst">The parameter block containing parameters to complete.</param>
+        /// <param name="wordToComplete">The partial word to match against parameter names.</param>
+        /// <param name="quoteChar">Optional quote character to wrap completion text (empty string for no quotes).</param>
+        /// <returns>A list of completion results, or null if no matches found.</returns>
+        private static List<CompletionResult> CreateParameterCompletionResults(
+            ParamBlockAst paramBlockAst,
+            string wordToComplete,
+            string quoteChar = "")
+        {
+            var result = paramBlockAst.Parameters
+                .Select(parameter => parameter.Name.VariablePath.UserPath)
+                .Where(parameterName => parameterName.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase))
+                .Select(parameterName =>
+                    new CompletionResult(
+                        quoteChar + parameterName + quoteChar,
+                        parameterName,
+                        CompletionResultType.ParameterValue,
+                        parameterName))
+                .ToList();
+
+            return result.Count > 0 ? result : null;
+        }
+
         private static bool CompleteOperator(Token tokenAtCursor, Ast lastAst)
         {
             if (tokenAtCursor.Kind == TokenKind.Minus)
@@ -516,6 +730,13 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                         {
                             // Handles quoted string inside index expression like: $PSVersionTable["<Tab>"]
                             completionContext.WordToComplete = (tokenAtCursor as StringToken).Value;
+                            // Check for $PSBoundParameters indexer first
+                            var psBoundResult = CompleteAgainstPSBoundParametersAccess(completionContext);
+                            if (psBoundResult != null && psBoundResult.Count > 0)
+                            {
+                                return psBoundResult;
+                            }
+
                             return CompletionCompleters.CompleteIndexExpression(completionContext, indexExpressionAst.Target);
                         }
 
@@ -693,6 +914,19 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                     return completions;
                                 }
                             }
+                            else if (lastAst is VariableExpressionAst && lastAst.Parent is ParameterAst paramAst && paramAst.Attributes.Count > 0)
+                            {
+                                foreach (AttributeBaseAst attribute in paramAst.Attributes)
+                                {
+                                    if (IsCursorWithinOrJustAfterExtent(_cursorPosition, attribute.Extent))
+                                    {
+                                        completionContext.ReplacementIndex = replacementIndex += tokenAtCursor.Text.Length;
+                                        completionContext.ReplacementLength = replacementLength = 0;
+                                        result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                                        break;
+                                    }
+                                }
+                            }
                             else
                             {
                                 // Handle scenarios such as 'configuration foo { File ab { Attributes ='
@@ -928,6 +1162,18 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                     {
                                         result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
                                     }
+
+                                    if (lastAst is VariableExpressionAst && lastAst.Parent is ParameterAst paramAst && paramAst.Attributes.Count > 0)
+                                    {
+                                        foreach (AttributeBaseAst attribute in paramAst.Attributes)
+                                        {
+                                            if (IsCursorWithinOrJustAfterExtent(_cursorPosition, attribute.Extent))
+                                            {
+                                                result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                                                break;
+                                            }
+                                        }
+                                    }
                                     break;
 
                                 case TokenKind.Ieq:
@@ -1003,6 +1249,21 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                             break;
                                         }
 
+                                        if (lastAst is VariableExpressionAst && lastAst.Parent is ParameterAst paramAst && paramAst.Attributes.Count > 0)
+                                        {
+                                            foreach (AttributeBaseAst attribute in paramAst.Attributes)
+                                            {
+                                                if (IsCursorWithinOrJustAfterExtent(_cursorPosition, attribute.Extent))
+                                                {
+                                                    completionContext.ReplacementLength = replacementLength = 0;
+                                                    result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                                                    break;
+                                                }
+                                            }
+
+                                            break;
+                                        }
+
                                         result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out _);
                                         break;
                                     }
@@ -1421,18 +1682,115 @@ private static List<CompletionResult> CompletePropertyAssignment(MemberExpressio
         {
             if (SafeExprEvaluator.TrySafeEval(memberExpression, context.ExecutionContext, out var evalValue))
             {
-                if (evalValue is null)
+                if (evalValue is not null)
                 {
+                    Type type = evalValue.GetType();
+                    if (type.IsEnum)
+                    {
+                        return GetResultForEnum(type, context);
+                    }
+
                     return null;
                 }
+            }
 
-                Type type = evalValue.GetType();
-                if (type.IsEnum)
+            _ = TryGetInferredCompletionsForAssignment(memberExpression, context, out List<CompletionResult> result);
+            return result;
+        }
+
+        private static bool TryGetInferredCompletionsForAssignment(Ast expression, CompletionContext context, out List<CompletionResult> result)
+        {
+            result = null;
+            IList<PSTypeName> inferredTypes;
+            if (expression.Parent is ConvertExpressionAst convertExpression)
+            {
+                inferredTypes = new PSTypeName[] { new(convertExpression.Type.TypeName) };
+            }
+            else if (expression is MemberExpressionAst)
+            {
+                inferredTypes = AstTypeInference.InferTypeOf(expression);
+            }
+            else if (expression is VariableExpressionAst varExpression)
+            {
+                PSTypeName typeConstraint = CompletionCompleters.GetLastDeclaredTypeConstraint(varExpression, context.TypeInferenceContext);
+                if (typeConstraint is null)
                 {
-                    return GetResultForEnum(type, context);
+                    return false;
                 }
+
+                inferredTypes = new PSTypeName[] { typeConstraint };
             }
-            return null;
+            else
+            {
+                return false;
+            }
+
+            if (inferredTypes.Count == 0)
+            {
+                return false;
+            }
+
+            var values = new SortedSet<string>();
+            foreach (PSTypeName type in inferredTypes)
+            {
+                Type loadedType = type.Type;
+                if (loadedType is not null)
+                {
+                    if (loadedType.IsEnum)
+                    {
+                        foreach (string value in Enum.GetNames(loadedType))
+                        {
+                            _ = values.Add(value);
+                        }
+                    }
+                }
+                else if (type is not null && type.TypeDefinitionAst.IsEnum)
+                {
+                    foreach (MemberAst member in type.TypeDefinitionAst.Members)
+                    {
+                        if (member is PropertyMemberAst property)
+                        {
+                            _ = values.Add(property.Name);
+                        }
+                    }
+                }
+            }
+
+            string wordToComplete;
+            if (string.IsNullOrEmpty(context.WordToComplete))
+            {
+                if (context.TokenAtCursor is not null && context.TokenAtCursor.Kind != TokenKind.Equals)
+                {
+                    wordToComplete = context.TokenAtCursor.Text + "*";
+                }
+                else
+                {
+                    wordToComplete = "*";
+                }
+            }
+            else
+            {
+                wordToComplete = context.WordToComplete + "*";
+            }
+
+            result = new List<CompletionResult>();
+            var pattern = new WildcardPattern(wordToComplete, WildcardOptions.IgnoreCase);
+            foreach (string name in values)
+            {
+                string quotedName = GetQuotedString(name, context);
+                if (pattern.IsMatch(quotedName))
+                {
+                    result.Add(new CompletionResult(quotedName, name, CompletionResultType.Property, name));
+                }
+            }
+
+            if (result.Count == 0)
+            {
+                result = null;
+                return false;
+            }
+
+            return true;
         }
 
         private static bool TryGetCompletionsForVariableAssignment(
@@ -1501,7 +1859,7 @@ bool TryGetResultForSet(Type typeConstraint, ValidateSetAttribute setConstraint,
             // If the assignment itself was unconstrained, the variable still might be
             if (!TryGetTypeConstraintOnVariable(completionContext, variableAst.VariablePath.UserPath, out typeConstraint, out setConstraint))
             {
-                return false;
+                return TryGetInferredCompletionsForAssignment(variableAst, completionContext, out completions);
             }
 
             // Again try the [ValidateSet()] constraint first
@@ -1778,6 +2136,21 @@ private static List<CompletionResult> GetResultForString(CompletionContext compl
 
             string strValue = constantString != null ? constantString.Value : expandableString.Value;
 
+            // Check for switch case completion on $PSBoundParameters.Keys
+            completionContext.WordToComplete = strValue;
+            var switchCaseResult = CompleteAgainstSwitchCaseCondition(completionContext);
+            if (switchCaseResult != null && switchCaseResult.Count > 0)
+            {
+                return switchCaseResult;
+            }
+
+            // Check for $PSBoundParameters access patterns (ContainsKey, indexer, Remove)
+            var psBoundResult = CompleteAgainstPSBoundParametersAccess(completionContext);
+            if (psBoundResult != null && psBoundResult.Count > 0)
+            {
+                return psBoundResult;
+            }
+
             bool shouldContinue;
             List<CompletionResult> result = GetResultForEnumPropertyValueOfDSCResource(completionContext, strValue, ref replacementIndex, ref replacementLength, out shouldContinue);
             if (!shouldContinue || (result != null && result.Count > 0))
@@ -1939,6 +2312,20 @@ private static List<CompletionResult> GetResultForIdentifier(CompletionContext c
             var tokenAtCursorText = tokenAtCursor.Text;
             completionContext.WordToComplete = tokenAtCursorText;
 
+            // Check for switch case completion on $PSBoundParameters.Keys
+            var switchCaseResult = CompleteAgainstSwitchCaseCondition(completionContext);
+            if (switchCaseResult != null && switchCaseResult.Count > 0)
+            {
+                return switchCaseResult;
+            }
+
+            // Check for $PSBoundParameters access patterns (ContainsKey, indexer, Remove)
+            var psBoundResult = CompleteAgainstPSBoundParametersAccess(completionContext);
+            if (psBoundResult != null && psBoundResult.Count > 0)
+            {
+                return psBoundResult;
+            }
+
             if (lastAst.Parent is BreakStatementAst || lastAst.Parent is ContinueStatementAst)
             {
                 return CompleteLoopLabel(completionContext);
@@ -1963,7 +2350,12 @@ private static List<CompletionResult> GetResultForIdentifier(CompletionContext c
                         switch (usingState.UsingStatementKind)
                         {
                             case UsingStatementKind.Assembly:
-                                break;
+                                HashSet<string> assemblyExtensions = new(StringComparer.OrdinalIgnoreCase)
+                                {
+                                    StringLiterals.PowerShellILAssemblyExtension
+                                };
+                                return CompletionCompleters.CompleteFilename(completionContext, containerOnly: false, assemblyExtensions).ToList();
+
                             case UsingStatementKind.Command:
                                 break;
                             case UsingStatementKind.Module:
@@ -1998,9 +2390,25 @@ private static List<CompletionResult> GetResultForIdentifier(CompletionContext c
                     }
                 }
             }
-            if (completionContext.TokenAtCursor.TokenFlags == TokenFlags.MemberName && (lastAst is NamedAttributeArgumentAst || lastAst.Parent is NamedAttributeArgumentAst))
+
+            if (completionContext.TokenAtCursor.TokenFlags == TokenFlags.MemberName)
             {
-                result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                if (lastAst is NamedAttributeArgumentAst || lastAst.Parent is NamedAttributeArgumentAst)
+                {
+                    result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                }
+                else if (lastAst is VariableExpressionAst && lastAst.Parent is ParameterAst paramAst && paramAst.Attributes.Count > 0)
+                {
+                    foreach (AttributeBaseAst attribute in paramAst.Attributes)
+                    {
+                        if (IsCursorWithinOrJustAfterExtent(completionContext.CursorPosition, attribute.Extent))
+                        {
+                            result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                            break;
+                        }
+                    }
+                }
+
                 if (result is not null)
                 {
                     return result;
@@ -2455,7 +2863,7 @@ private static List<CompletionResult> CompleteLoopLabel(CompletionContext comple
 
             return result;
         }
-      
+
         private static List<CompletionResult> CompleteUsingKeywords(int cursorOffset, Token[] tokens, ref int replacementIndex, ref int replacementLength)
         {
             var result = new List<CompletionResult>();
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 357ce126ab5..73406e449bf 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Buffers;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -63,7 +64,6 @@ public static IEnumerable<CompletionResult> CompleteCommand(string commandName)
         /// <param name="moduleName"></param>
         /// <param name="commandTypes"></param>
         /// <returns></returns>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public static IEnumerable<CompletionResult> CompleteCommand(string commandName, string moduleName, CommandTypes commandTypes = CommandTypes.All)
         {
             var runspace = Runspace.DefaultRunspace;
@@ -88,7 +88,7 @@ private static List<CompletionResult> CompleteCommand(CompletionContext context,
             var addAmpersandIfNecessary = IsAmpersandNeeded(context, false);
 
             string commandName = context.WordToComplete;
-            string quote = HandleDoubleAndSingleQuote(ref commandName);
+            string quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref commandName);
 
             List<CompletionResult> commandResults = null;
 
@@ -233,7 +233,7 @@ internal static CompletionResult GetCommandNameCompletionResult(string name, obj
             syntax = string.IsNullOrEmpty(syntax) ? name : syntax;
             bool needAmpersand;
 
-            if (CompletionRequiresQuotes(name, false))
+            if (CompletionHelpers.CompletionRequiresQuotes(name))
             {
                 needAmpersand = quote == string.Empty && addAmpersandIfNecessary;
                 string quoteInUse = quote == string.Empty ? "'" : quote;
@@ -328,50 +328,72 @@ internal static List<CompletionResult> MakeCommandsUnique(IEnumerable<PSObject>
                 }
             }
 
-            List<CompletionResult> endResults = null;
             foreach (var keyValuePair in commandTable)
             {
-                var commandList = keyValuePair.Value as List<object>;
-                if (commandList != null)
+                if (keyValuePair.Value is List<object> commandList)
                 {
-                    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
-                    // 'Get-Foo' directly doesn't work
-                    string completionName = keyValuePair.Key;
-                    if (!includeModulePrefix)
+                    var modulesWithCommand = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                    var importedModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                    var commandInfoList = new List<CommandInfo>(commandList.Count);
+                    for (int i = 0; i < commandList.Count; i++)
                     {
-                        var commandInfo = commandList[0] as CommandInfo;
-                        if (commandInfo != null && !string.IsNullOrEmpty(commandInfo.Prefix))
+                        if (commandList[i] is not CommandInfo commandInfo)
                         {
-                            Diagnostics.Assert(!string.IsNullOrEmpty(commandInfo.ModuleName), "the module name should exist if commandInfo.Prefix is not an empty string");
-                            if (!ModuleCmdletBase.IsPrefixedCommand(commandInfo))
-                            {
-                                completionName = commandInfo.ModuleName + "\\" + completionName;
-                            }
+                            continue;
+                        }
+
+                        commandInfoList.Add(commandInfo);
+                        if (commandInfo.CommandType == CommandTypes.Application)
+                        {
+                            continue;
+                        }
+
+                        modulesWithCommand.Add(commandInfo.ModuleName);
+                        if ((commandInfo.CommandType == CommandTypes.Cmdlet && commandInfo.CommandMetadata.CommandType is not null)
+                            || (commandInfo.CommandType is CommandTypes.Function or CommandTypes.Filter && commandInfo.Definition != string.Empty)
+                            || (commandInfo.CommandType == CommandTypes.Alias && commandInfo.Definition is not null))
+                        {
+                            // Checks if the command or source module has been imported.
+                            _ = importedModules.Add(commandInfo.ModuleName);
                         }
                     }
 
-                    results.Add(GetCommandNameCompletionResult(completionName, commandList[0], addAmpersandIfNecessary, quote));
+                    if (commandInfoList.Count == 0)
+                    {
+                        continue;
+                    }
 
-                    // For the other commands that are hidden, we need to disambiguate,
-                    // but put these at the end as it's less likely any of the hidden
-                    // commands are desired.  If we can't add anything to disambiguate,
-                    // then we'll skip adding a completion result.
-                    for (int index = 1; index < commandList.Count; index++)
+                    int moduleCount = modulesWithCommand.Count;
+                    modulesWithCommand.Clear();
+                    int index;
+                    if (commandInfoList[0].CommandType == CommandTypes.Application
+                        || importedModules.Count == 1
+                        || moduleCount < 2)
                     {
-                        var commandInfo = commandList[index] as CommandInfo;
-                        Diagnostics.Assert(commandInfo != null, "Elements should always be CommandInfo");
+                        // We can use the short name for this command because there's no ambiguity about which command it resolves to.
+                        // If the first element is an application then we know there's no conflicting commands/aliases (because of the command precedence).
+                        // If there's just 1 module imported then the short name refers to that module (and it will be the first element in the list)
+                        // If there's less than 2 unique modules exporting that command then we can use the short name because it can only refer to that module.
+                        index = 1;
+                        results.Add(GetCommandNameCompletionResult(keyValuePair.Key, commandInfoList[0], addAmpersandIfNecessary, quote));
+                        modulesWithCommand.Add(commandInfoList[0].ModuleName);
+                    }
+                    else
+                    {
+                        index = 0;
+                    }
 
+                    for (; index < commandInfoList.Count; index++)
+                    {
+                        CommandInfo commandInfo = commandInfoList[index];
                         if (commandInfo.CommandType == CommandTypes.Application)
                         {
-                            endResults.Add(GetCommandNameCompletionResult(commandInfo.Definition, commandInfo, addAmpersandIfNecessary, quote));
+                            results.Add(GetCommandNameCompletionResult(commandInfo.Definition, commandInfo, addAmpersandIfNecessary, quote));
                         }
-                        else if (!string.IsNullOrEmpty(commandInfo.ModuleName))
+                        else if (!string.IsNullOrEmpty(commandInfo.ModuleName) && modulesWithCommand.Add(commandInfo.ModuleName))
                         {
                             var name = commandInfo.ModuleName + "\\" + commandInfo.Name;
-                            endResults.Add(GetCommandNameCompletionResult(name, commandInfo, addAmpersandIfNecessary, quote));
+                            results.Add(GetCommandNameCompletionResult(name, commandInfo, addAmpersandIfNecessary, quote));
                         }
                     }
                 }
@@ -398,11 +420,6 @@ internal static List<CompletionResult> MakeCommandsUnique(IEnumerable<PSObject>
                 }
             }
 
-            if (endResults != null && endResults.Count > 0)
-            {
-                results.AddRange(endResults);
-            }
-
             return results;
         }
 
@@ -423,16 +440,34 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
 
         internal static List<CompletionResult> CompleteModuleName(CompletionContext context, bool loadedModulesOnly, bool skipEditionCheck = false)
         {
-            var moduleName = context.WordToComplete ?? string.Empty;
+            var wordToComplete = context.WordToComplete ?? string.Empty;
             var result = new List<CompletionResult>();
-            var quote = HandleDoubleAndSingleQuote(ref moduleName);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
+
+            // Indicates if we should search for modules where the last part of the name matches the input text
+            // eg: Host<Tab> finds Microsoft.PowerShell.Host
+            // If the user has entered a manual wildcard, or a module name that contains a "." we assume they only want results that matches the input exactly.
+            bool shortNameSearch = wordToComplete.Length > 0 && !WildcardPattern.ContainsWildcardCharacters(wordToComplete) && !wordToComplete.Contains('.');
+
+            if (!wordToComplete.EndsWith('*'))
+            {
+                wordToComplete += "*";
+            }
 
-            if (!moduleName.EndsWith('*'))
+            string[] moduleNames;
+            WildcardPattern shortNamePattern;
+            if (shortNameSearch)
+            {
+                moduleNames = new string[] { wordToComplete, "*." + wordToComplete };
+                shortNamePattern = new WildcardPattern(wordToComplete, WildcardOptions.IgnoreCase);
+            }
+            else
             {
-                moduleName += "*";
+                moduleNames = new string[] { wordToComplete };
+                shortNamePattern = null;
             }
 
-            var powershell = context.Helper.AddCommandWithPreferenceSetting("Get-Module", typeof(GetModuleCommand)).AddParameter("Name", moduleName);
+            var powershell = context.Helper.AddCommandWithPreferenceSetting("Get-Module", typeof(GetModuleCommand)).AddParameter("Name", moduleNames);
             if (!loadedModulesOnly)
             {
                 powershell.AddParameter("ListAvailable", true);
@@ -444,32 +479,58 @@ internal static List<CompletionResult> CompleteModuleName(CompletionContext cont
                 }
             }
 
-            Exception exceptionThrown;
-            var psObjects = context.Helper.ExecuteCurrentPowerShell(out exceptionThrown);
+            Collection<PSObject> psObjects = context.Helper.ExecuteCurrentPowerShell(out _);
 
             if (psObjects != null)
             {
-                foreach (dynamic moduleInfo in psObjects)
+                // When PowerShell is used interactively, completion is usually triggered by PSReadLine, with PSReadLine's SessionState
+                // as the engine session state. In that case, results from the module search may contain a nested module of PSReadLine,
+                // which should be filtered out below.
+                // When the completion is triggered from global session state, such as when running 'TabExpansion2' from command line,
+                // the module associated with engine session state will be null.
+                //
+                // Note that, it's intentional to not hard code the name 'PSReadLine' in the change, so that in case the tab completion
+                // is triggered from within a different module, its nested modules can also be filtered out.
+                HashSet<PSModuleInfo> nestedModulesToFilterOut = null;
+                PSModuleInfo currentModule = context.ExecutionContext.EngineSessionState.Module;
+                if (loadedModulesOnly && currentModule?.NestedModules.Count > 0)
                 {
-                    var completionText = moduleInfo.Name.ToString();
-                    var listItemText = completionText;
-                    var toolTip = "Description: " + moduleInfo.Description.ToString() + "\r\nModuleType: "
-                                  + moduleInfo.ModuleType.ToString() + "\r\nPath: "
-                                  + moduleInfo.Path.ToString();
+                    nestedModulesToFilterOut = new(currentModule.NestedModules);
+                }
 
-                    if (CompletionRequiresQuotes(completionText, false))
+                var completedModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                foreach (PSObject item in psObjects)
+                {
+                    var moduleInfo = (PSModuleInfo)item.BaseObject;
+                    var completionText = moduleInfo.Name;
+                    if (!completedModules.Add(completionText))
                     {
-                        var quoteInUse = quote == string.Empty ? "'" : quote;
-                        if (quoteInUse == "'")
-                            completionText = completionText.Replace("'", "''");
-                        completionText = quoteInUse + completionText + quoteInUse;
+                        continue;
                     }
-                    else
+
+                    if (shortNameSearch
+                        && completionText.Contains('.')
+                        && !shortNamePattern.IsMatch(completionText.Substring(completionText.LastIndexOf('.') + 1))
+                        && !shortNamePattern.IsMatch(completionText))
                     {
-                        completionText = quote + completionText + quote;
+                        // This check is to make sure we don't return a module whose name only matches the user specified word in the middle.
+                        // For example, when user completes with 'gmo power', we should not return 'Microsoft.PowerShell.Utility'.
+                        continue;
+                    }
+
+                    if (nestedModulesToFilterOut is not null
+                        && nestedModulesToFilterOut.Contains(moduleInfo))
+                    {
+                        continue;
                     }
 
-                    result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, toolTip));
+                    var toolTip = "Description: " + moduleInfo.Description + "\r\nModuleType: "
+                                  + moduleInfo.ModuleType.ToString() + "\r\nPath: "
+                                  + moduleInfo.Path;
+
+                    completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
+
+                    result.Add(new CompletionResult(completionText, listItemText: moduleInfo.Name, CompletionResultType.ParameterValue, toolTip));
                 }
             }
 
@@ -541,7 +602,7 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
             else
             {
                 // No CommandParameterAst is found. It could be a StringConstantExpressionAst "-"
-                if (!(context.RelatedAsts[context.RelatedAsts.Count - 1] is StringConstantExpressionAst dashAst))
+                if (context.RelatedAsts[context.RelatedAsts.Count - 1] is not StringConstantExpressionAst dashAst)
                     return result;
                 if (!dashAst.Value.Trim().Equals("-", StringComparison.OrdinalIgnoreCase))
                     return result;
@@ -608,6 +669,11 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
         {
             Diagnostics.Assert(bindingInfo.InfoType.Equals(PseudoBindingInfoType.PseudoBindingSucceed), "The pseudo binding should succeed");
             List<CompletionResult> result = new List<CompletionResult>();
+            Assembly commandAssembly = null;
+            if (bindingInfo.CommandInfo is CmdletInfo cmdletInfo)
+            {
+                commandAssembly = cmdletInfo.CommandMetadata.CommandType.Assembly;
+            }
 
             if (parameterName == string.Empty)
             {
@@ -615,7 +681,8 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
                     parameterName,
                     bindingInfo.ValidParameterSetsFlags,
                     bindingInfo.UnboundParameters,
-                    withColon);
+                    withColon,
+                    commandAssembly);
                 return result;
             }
 
@@ -637,7 +704,8 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
                         parameterName,
                         bindingInfo.ValidParameterSetsFlags,
                         bindingInfo.UnboundParameters,
-                        withColon);
+                        withColon,
+                        commandAssembly);
                 }
 
                 return result;
@@ -652,7 +720,8 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
                         parameterName,
                         bindingInfo.ValidParameterSetsFlags,
                         bindingInfo.BoundParameters.Values,
-                        withColon);
+                        withColon,
+                        commandAssembly);
                 }
 
                 return result;
@@ -716,7 +785,8 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
                     parameterName,
                     bindingInfo.ValidParameterSetsFlags,
                     bindingInfo.UnboundParameters,
-                    withColon);
+                    withColon,
+                    commandAssembly);
                 return result;
             }
 
@@ -724,11 +794,25 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
 
             WildcardPattern pattern = WildcardPattern.Get(parameterName + "*", WildcardOptions.IgnoreCase);
             string parameterType = "[" + ToStringCodeMethods.Type(param.Parameter.Type, dropNamespaces: true) + "] ";
+
+            string helpMessage = string.Empty;
+            if (param.Parameter.CompiledAttributes is not null)
+            {
+                foreach (Attribute attr in param.Parameter.CompiledAttributes)
+                {
+                    if (attr is ParameterAttribute pattr && TryGetParameterHelpMessage(pattr, commandAssembly, out string attrHelpMessage))
+                    {
+                        helpMessage = $" - {attrHelpMessage}";
+                        break;
+                    }
+                }
+            }
+
             string colonSuffix = withColon ? ":" : string.Empty;
             if (pattern.IsMatch(matchedParameterName))
             {
-                string completionText = "-" + matchedParameterName + colonSuffix;
-                string tooltip = parameterType + matchedParameterName;
+                string completionText = $"-{matchedParameterName}{colonSuffix}";
+                string tooltip = $"{parameterType}{matchedParameterName}{helpMessage}";
                 result.Add(new CompletionResult(completionText, matchedParameterName, CompletionResultType.ParameterName, tooltip));
             }
             else
@@ -742,7 +826,7 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
                             $"-{alias}{colonSuffix}",
                             alias,
                             CompletionResultType.ParameterName,
-                            parameterType + alias));
+                            $"{parameterType}{alias}{helpMessage}"));
                     }
                 }
             }
@@ -750,6 +834,44 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
             return result;
         }
 
+#nullable enable
+        /// <summary>
+        /// Try and get the help message text for the parameter attribute.
+        /// </summary>
+        /// <param name="attr">The attribute to check for the help message.</param>
+        /// <param name="assembly">The assembly to lookup resources messages, this should be the assembly the cmdlet is defined in.</param>
+        /// <param name="message">The help message if it was found otherwise null.</param>
+        /// <returns>True if the help message was set or false if not.></returns>
+        private static bool TryGetParameterHelpMessage(
+            ParameterAttribute attr,
+            Assembly? assembly,
+            [NotNullWhen(true)] out string? message)
+        {
+            message = null;
+
+            if (attr.HelpMessage is not null)
+            {
+                message = attr.HelpMessage;
+                return true;
+            }
+
+            if (assembly is null || attr.HelpMessageBaseName is null || attr.HelpMessageResourceId is null)
+            {
+                return false;
+            }
+
+            try
+            {
+                message = ResourceManagerCache.GetResourceString(assembly, attr.HelpMessageBaseName, attr.HelpMessageResourceId);
+                return message is not null;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+#nullable disable
+
         /// <summary>
         /// Get the parameter completion results by using the given valid parameter sets and available parameters.
         /// </summary>
@@ -757,12 +879,14 @@ private static List<CompletionResult> GetParameterCompletionResults(string param
         /// <param name="validParameterSetFlags"></param>
         /// <param name="parameters"></param>
         /// <param name="withColon"></param>
+        /// <param name="commandAssembly">Optional assembly used to lookup parameter help messages.</param>
         /// <returns></returns>
         private static List<CompletionResult> GetParameterCompletionResults(
             string parameterName,
             uint validParameterSetFlags,
             IEnumerable<MergedCompiledCommandParameter> parameters,
-            bool withColon)
+            bool withColon,
+            Assembly commandAssembly = null)
         {
             var result = new List<CompletionResult>();
             var commonParamResult = new List<CompletionResult>();
@@ -778,6 +902,7 @@ private static List<CompletionResult> GetParameterCompletionResults(
 
                 string name = param.Parameter.Name;
                 string type = "[" + ToStringCodeMethods.Type(param.Parameter.Type, dropNamespaces: true) + "] ";
+                string helpMessage = null;
                 bool isCommonParameter = Cmdlet.CommonParameters.Contains(name, StringComparer.OrdinalIgnoreCase);
                 List<CompletionResult> listInUse = isCommonParameter ? commonParamResult : result;
 
@@ -793,20 +918,27 @@ private static List<CompletionResult> GetParameterCompletionResults(
                     {
                         foreach (var attr in compiledAttributes)
                         {
-                            var pattr = attr as ParameterAttribute;
-                            if (pattr != null && pattr.DontShow)
+                            if (attr is ParameterAttribute pattr)
                             {
-                                showToUser = false;
-                                addCommonParameters = false;
-                                break;
+                                if (pattr.DontShow)
+                                {
+                                    showToUser = false;
+                                    addCommonParameters = false;
+                                    break;
+                                }
+
+                                if (helpMessage is null && TryGetParameterHelpMessage(pattr, commandAssembly, out string attrHelpMessage))
+                                {
+                                    helpMessage = $" - {attrHelpMessage}";
+                                }
                             }
                         }
                     }
 
                     if (showToUser)
                     {
-                        string completionText = "-" + name + colonSuffix;
-                        string tooltip = type + name;
+                        string completionText = $"-{name}{colonSuffix}";
+                        string tooltip = $"{type}{name}{helpMessage}";
                         listInUse.Add(new CompletionResult(completionText, name, CompletionResultType.ParameterName,
                                                            tooltip));
                     }
@@ -1742,7 +1874,7 @@ private static void ProcessParameter(
                     RemoveLastNullCompletionResult(result);
 
                     string wordToComplete = context.WordToComplete ?? string.Empty;
-                    string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+                    string quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
                     var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
                     var setList = new List<string>();
@@ -1777,23 +1909,8 @@ private static void ProcessParameter(
                     {
                         string realEntry = entry;
                         string completionText = entry;
-                        if (quote == string.Empty)
-                        {
-                            if (CompletionRequiresQuotes(entry, false))
-                            {
-                                realEntry = CodeGeneration.EscapeSingleQuotedStringContent(entry);
-                                completionText = "'" + realEntry + "'";
-                            }
-                        }
-                        else
-                        {
-                            if (quote.Equals("'", StringComparison.OrdinalIgnoreCase))
-                            {
-                                realEntry = CodeGeneration.EscapeSingleQuotedStringContent(entry);
-                            }
 
-                            completionText = quote + realEntry + quote;
-                        }
+                        completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                         result.Add(new CompletionResult(completionText, entry, CompletionResultType.ParameterValue, entry));
                     }
@@ -1819,7 +1936,7 @@ private static void ProcessParameter(
                 }
 
                 string wordToComplete = context.WordToComplete ?? string.Empty;
-                string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+                string quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
                 var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
                 var enumList = new List<string>();
@@ -2147,6 +2264,12 @@ private static void NativeCommandArgumentCompletion(
                             break;
                         }
 
+                        if (parameterName.Equals("ExcludeModule", StringComparison.OrdinalIgnoreCase))
+                        {
+                            NativeCompletionGetCommand(context, moduleName: null, parameterName, result);
+                            break;
+                        }
+
                         if (parameterName.Equals("Name", StringComparison.OrdinalIgnoreCase))
                         {
                             var moduleNames = NativeCommandArgumentCompletion_ExtractSecondaryArgument(boundArguments, "Module");
@@ -2185,6 +2308,22 @@ private static void NativeCommandArgumentCompletion(
                         NativeCompletionGetHelpCommand(context, parameterName, /* isHelpRelated: */ true, result);
                         break;
                     }
+                case "Save-Help":
+                    {
+                        if (parameterName.Equals("Module", StringComparison.OrdinalIgnoreCase))
+                        {
+                            CompleteModule(context, result);
+                        }
+                        break;
+                    }
+                case "Update-Help":
+                    {
+                        if (parameterName.Equals("Module", StringComparison.OrdinalIgnoreCase))
+                        {
+                            CompleteModule(context, result);
+                        }
+                        break;
+                    }
                 case "Invoke-Expression":
                     {
                         if (parameterName.Equals("Command", StringComparison.OrdinalIgnoreCase))
@@ -2365,7 +2504,8 @@ private static void NativeCommandArgumentCompletion(
                 case "Format-Table":
                 case "Format-Wide":
                     {
-                        if (parameterName.Equals("Property", StringComparison.OrdinalIgnoreCase))
+                        if (parameterName.Equals("Property", StringComparison.OrdinalIgnoreCase)
+                         || parameterName.Equals("ExcludeProperty", StringComparison.OrdinalIgnoreCase))
                         {
                             NativeCompletionMemberName(context, result, commandAst, boundArguments?[parameterName]);
                         }
@@ -2498,9 +2638,8 @@ private static ScriptBlock GetCustomArgumentCompleter(
                 }
             }
 
-            var registeredCompleters = optionKey.Equals("NativeArgumentCompleters", StringComparison.OrdinalIgnoreCase)
-                ? context.NativeArgumentCompleters
-                : context.CustomArgumentCompleters;
+            bool isNative = optionKey.Equals("NativeArgumentCompleters", StringComparison.OrdinalIgnoreCase);
+            var registeredCompleters = isNative ? context.NativeArgumentCompleters : context.CustomArgumentCompleters;
 
             if (registeredCompleters != null)
             {
@@ -2511,6 +2650,13 @@ private static ScriptBlock GetCustomArgumentCompleter(
                         return scriptBlock;
                     }
                 }
+
+                // For a native command, if a fallback completer is registered, then return it.
+                // For example, the 'Microsoft.PowerShell.UnixTabCompletion' module.
+                if (isNative && registeredCompleters.TryGetValue(RegisterArgumentCompleterCommand.FallbackCompleterKey, out scriptBlock))
+                {
+                    return scriptBlock;
+                }
             }
 
             return null;
@@ -2985,7 +3131,7 @@ private static void NativeCompletionCimNamespace(
                             continue;
                         }
 
-                        if (!(namespaceNameProperty.Value is string childNamespace))
+                        if (namespaceNameProperty.Value is not string childNamespace)
                         {
                             continue;
                         }
@@ -3030,39 +3176,46 @@ private static void NativeCompletionGetCommand(CompletionContext context, string
 
                 result.Add(CompletionResult.Null);
             }
-            else if (!string.IsNullOrEmpty(paramName) && paramName.Equals("Module", StringComparison.OrdinalIgnoreCase))
+            else if (!string.IsNullOrEmpty(paramName)
+                && (paramName.Equals("Module", StringComparison.OrdinalIgnoreCase)
+                || paramName.Equals("ExcludeModule", StringComparison.OrdinalIgnoreCase)))
             {
-                RemoveLastNullCompletionResult(result);
+                CompleteModule(context, result);
+            }
+        }
 
-                var modules = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                var moduleResults = CompleteModuleName(context, loadedModulesOnly: true);
-                if (moduleResults != null)
+        private static void CompleteModule(CompletionContext context, List<CompletionResult> result)
+        {
+            RemoveLastNullCompletionResult(result);
+
+            var modules = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            var moduleResults = CompleteModuleName(context, loadedModulesOnly: true);
+            if (moduleResults != null)
+            {
+                foreach (CompletionResult moduleResult in moduleResults)
                 {
-                    foreach (CompletionResult moduleResult in moduleResults)
+                    if (!modules.Contains(moduleResult.ToolTip))
                     {
-                        if (!modules.Contains(moduleResult.ToolTip))
-                        {
-                            modules.Add(moduleResult.ToolTip);
-                            result.Add(moduleResult);
-                        }
+                        modules.Add(moduleResult.ToolTip);
+                        result.Add(moduleResult);
                     }
                 }
+            }
 
-                moduleResults = CompleteModuleName(context, loadedModulesOnly: false);
-                if (moduleResults != null)
+            moduleResults = CompleteModuleName(context, loadedModulesOnly: false);
+            if (moduleResults != null)
+            {
+                foreach (CompletionResult moduleResult in moduleResults)
                 {
-                    foreach (CompletionResult moduleResult in moduleResults)
+                    if (!modules.Contains(moduleResult.ToolTip))
                     {
-                        if (!modules.Contains(moduleResult.ToolTip))
-                        {
-                            modules.Add(moduleResult.ToolTip);
-                            result.Add(moduleResult);
-                        }
+                        modules.Add(moduleResult.ToolTip);
+                        result.Add(moduleResult);
                     }
                 }
-
-                result.Add(CompletionResult.Null);
             }
+
+            result.Add(CompletionResult.Null);
         }
 
         private static void NativeCompletionGetHelpCommand(CompletionContext context, string paramName, bool isHelpRelated, List<CompletionResult> result)
@@ -3102,7 +3255,7 @@ private static void NativeCompletionEventLogCommands(CompletionContext context,
                 RemoveLastNullCompletionResult(result);
 
                 var logName = context.WordToComplete ?? string.Empty;
-                var quote = HandleDoubleAndSingleQuote(ref logName);
+                var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref logName);
 
                 if (!logName.EndsWith('*'))
                 {
@@ -3124,17 +3277,7 @@ private static void NativeCompletionEventLogCommands(CompletionContext context,
                         var completionText = eventLog.Log.ToString();
                         var listItemText = completionText;
 
-                        if (CompletionRequiresQuotes(completionText, false))
-                        {
-                            var quoteInUse = quote == string.Empty ? "'" : quote;
-                            if (quoteInUse == "'")
-                                completionText = completionText.Replace("'", "''");
-                            completionText = quoteInUse + completionText + quoteInUse;
-                        }
-                        else
-                        {
-                            completionText = quote + completionText + quote;
-                        }
+                        completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                         if (pattern.IsMatch(listItemText))
                         {
@@ -3153,7 +3296,7 @@ private static void NativeCompletionJobCommands(CompletionContext context, strin
                 return;
 
             var wordToComplete = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
             if (!wordToComplete.EndsWith('*'))
             {
@@ -3215,17 +3358,7 @@ private static void NativeCompletionJobCommands(CompletionContext context, strin
                     var completionText = psJob.Name;
                     var listItemText = completionText;
 
-                    if (CompletionRequiresQuotes(completionText, false))
-                    {
-                        var quoteInUse = quote == string.Empty ? "'" : quote;
-                        if (quoteInUse == "'")
-                            completionText = completionText.Replace("'", "''");
-                        completionText = quoteInUse + completionText + quoteInUse;
-                    }
-                    else
-                    {
-                        completionText = quote + completionText + quote;
-                    }
+                    completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                     result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
                 }
@@ -3240,7 +3373,7 @@ private static void NativeCompletionScheduledJobCommands(CompletionContext conte
                 return;
 
             var wordToComplete = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
             if (!wordToComplete.EndsWith('*'))
             {
@@ -3290,17 +3423,7 @@ private static void NativeCompletionScheduledJobCommands(CompletionContext conte
                     var completionText = psJob.Name;
                     var listItemText = completionText;
 
-                    if (CompletionRequiresQuotes(completionText, false))
-                    {
-                        var quoteInUse = quote == string.Empty ? "'" : quote;
-                        if (quoteInUse == "'")
-                            completionText = completionText.Replace("'", "''");
-                        completionText = quoteInUse + completionText + quoteInUse;
-                    }
-                    else
-                    {
-                        completionText = quote + completionText + quote;
-                    }
+                    completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                     result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
                 }
@@ -3374,7 +3497,7 @@ private static void NativeCompletionProcessCommands(CompletionContext context, s
                 return;
 
             var wordToComplete = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
             if (!wordToComplete.EndsWith('*'))
             {
@@ -3430,17 +3553,7 @@ private static void NativeCompletionProcessCommands(CompletionContext context, s
                         continue;
 
                     uniqueSet.Add(completionText);
-                    if (CompletionRequiresQuotes(completionText, false))
-                    {
-                        var quoteInUse = quote == string.Empty ? "'" : quote;
-                        if (quoteInUse == "'")
-                            completionText = completionText.Replace("'", "''");
-                        completionText = quoteInUse + completionText + quoteInUse;
-                    }
-                    else
-                    {
-                        completionText = quote + completionText + quote;
-                    }
+                    completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                     // on macOS, system processes names will be empty if PowerShell isn't run as `sudo`
                     if (string.IsNullOrEmpty(listItemText))
@@ -3465,7 +3578,7 @@ private static void NativeCompletionProviderCommands(CompletionContext context,
             RemoveLastNullCompletionResult(result);
 
             var providerName = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref providerName);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref providerName);
 
             if (!providerName.EndsWith('*'))
             {
@@ -3483,17 +3596,7 @@ private static void NativeCompletionProviderCommands(CompletionContext context,
                 var completionText = providerInfo.Name;
                 var listItemText = completionText;
 
-                if (CompletionRequiresQuotes(completionText, false))
-                {
-                    var quoteInUse = quote == string.Empty ? "'" : quote;
-                    if (quoteInUse == "'")
-                        completionText = completionText.Replace("'", "''");
-                    completionText = quoteInUse + completionText + quoteInUse;
-                }
-                else
-                {
-                    completionText = quote + completionText + quote;
-                }
+                completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                 result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
             }
@@ -3509,7 +3612,7 @@ private static void NativeCompletionDriveCommands(CompletionContext context, str
             RemoveLastNullCompletionResult(result);
 
             var wordToComplete = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
             if (!wordToComplete.EndsWith('*'))
             {
@@ -3531,17 +3634,7 @@ private static void NativeCompletionDriveCommands(CompletionContext context, str
                     var completionText = driveInfo.Name;
                     var listItemText = completionText;
 
-                    if (CompletionRequiresQuotes(completionText, false))
-                    {
-                        var quoteInUse = quote == string.Empty ? "'" : quote;
-                        if (quoteInUse == "'")
-                            completionText = completionText.Replace("'", "''");
-                        completionText = quoteInUse + completionText + quoteInUse;
-                    }
-                    else
-                    {
-                        completionText = quote + completionText + quote;
-                    }
+                    completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                     result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
                 }
@@ -3556,7 +3649,7 @@ private static void NativeCompletionServiceCommands(CompletionContext context, s
                 return;
 
             var wordToComplete = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
             if (!wordToComplete.EndsWith('*'))
             {
@@ -3582,17 +3675,7 @@ private static void NativeCompletionServiceCommands(CompletionContext context, s
                         var completionText = serviceInfo.DisplayName;
                         var listItemText = completionText;
 
-                        if (CompletionRequiresQuotes(completionText, false))
-                        {
-                            var quoteInUse = quote == string.Empty ? "'" : quote;
-                            if (quoteInUse == "'")
-                                completionText = completionText.Replace("'", "''");
-                            completionText = quoteInUse + completionText + quoteInUse;
-                        }
-                        else
-                        {
-                            completionText = quote + completionText + quote;
-                        }
+                        completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                         result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
                     }
@@ -3613,17 +3696,7 @@ private static void NativeCompletionServiceCommands(CompletionContext context, s
                         var completionText = serviceInfo.Name;
                         var listItemText = completionText;
 
-                        if (CompletionRequiresQuotes(completionText, false))
-                        {
-                            var quoteInUse = quote == string.Empty ? "'" : quote;
-                            if (quoteInUse == "'")
-                                completionText = completionText.Replace("'", "''");
-                            completionText = quoteInUse + completionText + quoteInUse;
-                        }
-                        else
-                        {
-                            completionText = quote + completionText + quote;
-                        }
+                        completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                         result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
                     }
@@ -3643,7 +3716,7 @@ private static void NativeCompletionVariableCommands(CompletionContext context,
             RemoveLastNullCompletionResult(result);
 
             var variableName = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref variableName);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref variableName);
             if (!variableName.EndsWith('*'))
             {
                 variableName += "*";
@@ -3669,7 +3742,7 @@ private static void NativeCompletionVariableCommands(CompletionContext context,
                     completionText = completionText.Replace("*", "`*");
                 }
 
-                if (!completionText.Equals("$", StringComparison.Ordinal) && CompletionRequiresQuotes(completionText, false))
+                if (!completionText.Equals("$", StringComparison.Ordinal) && CompletionHelpers.CompletionRequiresQuotes(completionText))
                 {
                     var quoteInUse = effectiveQuote == string.Empty ? "'" : effectiveQuote;
                     if (quoteInUse == "'")
@@ -3702,7 +3775,7 @@ private static void NativeCompletionAliasCommands(CompletionContext context, str
             if (paramName.Equals("Name", StringComparison.OrdinalIgnoreCase))
             {
                 var commandName = context.WordToComplete ?? string.Empty;
-                var quote = HandleDoubleAndSingleQuote(ref commandName);
+                var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref commandName);
 
                 if (!commandName.EndsWith('*'))
                 {
@@ -3719,17 +3792,7 @@ private static void NativeCompletionAliasCommands(CompletionContext context, str
                         var completionText = aliasInfo.Name;
                         var listItemText = completionText;
 
-                        if (CompletionRequiresQuotes(completionText, false))
-                        {
-                            var quoteInUse = quote == string.Empty ? "'" : quote;
-                            if (quoteInUse == "'")
-                                completionText = completionText.Replace("'", "''");
-                            completionText = quoteInUse + completionText + quoteInUse;
-                        }
-                        else
-                        {
-                            completionText = quote + completionText + quote;
-                        }
+                        completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                         result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
                     }
@@ -3763,7 +3826,7 @@ private static void NativeCompletionTraceSourceCommands(CompletionContext contex
             RemoveLastNullCompletionResult(result);
 
             var traceSourceName = context.WordToComplete ?? string.Empty;
-            var quote = HandleDoubleAndSingleQuote(ref traceSourceName);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref traceSourceName);
 
             if (!traceSourceName.EndsWith('*'))
             {
@@ -3782,17 +3845,7 @@ private static void NativeCompletionTraceSourceCommands(CompletionContext contex
                 var completionText = trace.Name;
                 var listItemText = completionText;
 
-                if (CompletionRequiresQuotes(completionText, false))
-                {
-                    var quoteInUse = quote == string.Empty ? "'" : quote;
-                    if (quoteInUse == "'")
-                        completionText = completionText.Replace("'", "''");
-                    completionText = quoteInUse + completionText + quoteInUse;
-                }
-                else
-                {
-                    completionText = quote + completionText + quote;
-                }
+                completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);
 
                 result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, listItemText));
             }
@@ -4397,16 +4450,17 @@ internal static IEnumerable<CompletionResult> CompleteFilename(CompletionContext
         internal static IEnumerable<CompletionResult> CompleteFilename(CompletionContext context, bool containerOnly, HashSet<string> extension)
         {
             var wordToComplete = context.WordToComplete;
-            var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
 
-            // First, try to match \\server\share
-            // support both / and \ when entering UNC paths for typing convenience (#17111)
-            var shareMatch = Regex.Match(wordToComplete, @"^(?:\\\\|//)([^\\/]+)(?:\\|/)([^\\/]*)$");
+            // Matches file shares with and without the provider name and with either slash direction.
+            // Avoids matching Windows device paths like \\.\CDROM0 and \\?\Volume{b8f3fc1c-5cd6-4553-91e2-d6814c4cd375}\
+            var shareMatch = s_shareMatch.Match(wordToComplete);
             if (shareMatch.Success)
             {
                 // Only match share names, no filenames.
-                var server = shareMatch.Groups[1].Value;
-                var sharePattern = WildcardPattern.Get(shareMatch.Groups[2].Value + "*", WildcardOptions.IgnoreCase);
+                var provider = shareMatch.Groups[1].Value;
+                var server = shareMatch.Groups[2].Value;
+                var sharePattern = WildcardPattern.Get(shareMatch.Groups[3].Value + "*", WildcardOptions.IgnoreCase);
                 var ignoreHidden = context.GetOption("IgnoreHiddenShares", @default: false);
                 var shares = GetFileShares(server, ignoreHidden);
                 if (shares.Count == 0)
@@ -4419,13 +4473,20 @@ internal static IEnumerable<CompletionResult> CompleteFilename(CompletionContext
                 {
                     if (sharePattern.IsMatch(share))
                     {
-                        string shareFullPath = "\\\\" + server + "\\" + share;
-                        if (quote != string.Empty)
+                        string sharePath = $"\\\\{server}\\{share}";
+                        string completionText;
+                        if (quote == string.Empty)
+                        {
+                            completionText = share.Contains(' ')
+                                ? $"'{provider}{sharePath}'"
+                                : $"{provider}{sharePath}";
+                        }
+                        else
                         {
-                            shareFullPath = quote + shareFullPath + quote;
+                            completionText = $"{quote}{provider}{sharePath}{quote}";
                         }
 
-                        shareResults.Add(new CompletionResult(shareFullPath, shareFullPath, CompletionResultType.ProviderContainer, shareFullPath));
+                        shareResults.Add(new CompletionResult(completionText, share, CompletionResultType.ProviderContainer, sharePath));
                     }
                 }
 
@@ -4506,20 +4567,41 @@ internal static IEnumerable<CompletionResult> CompleteFilename(CompletionContext
                 basePath = EscapePath(basePath, stringType, useLiteralPath, out _);
             }
 
-            _ = context.Helper
+            PowerShell currentPS = context.Helper
                 .AddCommandWithPreferenceSetting("Microsoft.PowerShell.Management\\Resolve-Path")
                 .AddParameter("Path", basePath);
 
-            var resolvedPaths = context.Helper.ExecuteCurrentPowerShell(out _);
-            if (resolvedPaths is null || resolvedPaths.Count == 0)
+            string relativeBasePath;
+            var useRelativePath = context.GetOption("RelativePaths", @default: defaultRelativePath);
+            if (useRelativePath)
             {
-                return CommandCompletion.EmptyCompletionResult;
+                if (providerSeparatorIndex != -1)
+                {
+                    // User must have requested relative paths but that's not valid with provider paths.
+                    return CommandCompletion.EmptyCompletionResult;
+                }
+
+                var lastAst = context.RelatedAsts?[^1];
+                if (lastAst?.Parent is UsingStatementAst usingStatement
+                    && usingStatement.UsingStatementKind is UsingStatementKind.Module or UsingStatementKind.Assembly
+                    && lastAst.Extent.File is not null)
+                {
+                    relativeBasePath = Directory.GetParent(lastAst.Extent.File).FullName;
+                    _ = currentPS.AddParameter("RelativeBasePath", relativeBasePath);
+                }
+                else
+                {
+                    relativeBasePath = context.ExecutionContext.SessionState.Internal.CurrentLocation.ProviderPath;
+                }
+            }
+            else
+            {
+                relativeBasePath = string.Empty;
             }
 
-            var useRelativePath = context.GetOption("RelativePaths", @default: defaultRelativePath);
-            if (useRelativePath && providerSeparatorIndex != -1)
+            var resolvedPaths = context.Helper.ExecuteCurrentPowerShell(out _);
+            if (resolvedPaths is null || resolvedPaths.Count == 0)
             {
-                // User must have requested relative paths but that's not valid with provider paths.
                 return CommandCompletion.EmptyCompletionResult;
             }
 
@@ -4553,7 +4635,8 @@ internal static IEnumerable<CompletionResult> CompleteFilename(CompletionContext
                         useLiteralPath,
                         inputUsedHomeChar,
                         providerPrefix,
-                        stringType);
+                        stringType,
+                        relativeBasePath);
                     break;
 
                 default:
@@ -4588,6 +4671,7 @@ internal static IEnumerable<CompletionResult> CompleteFilename(CompletionContext
         /// <param name="inputUsedHome"></param>
         /// <param name="providerPrefix"></param>
         /// <param name="stringType"></param>
+        /// <param name="relativeBasePath"></param>
         /// <returns></returns>
         private static List<CompletionResult> GetFileSystemProviderResults(
             CompletionContext context,
@@ -4600,7 +4684,8 @@ private static List<CompletionResult> GetFileSystemProviderResults(
             bool literalPaths,
             bool inputUsedHome,
             string providerPrefix,
-            StringConstantType stringType)
+            StringConstantType stringType,
+            string relativeBasePath)
         {
 #if DEBUG
             Diagnostics.Assert(provider.Name.Equals(FileSystemProvider.ProviderName), "Provider should be filesystem provider.");
@@ -4675,7 +4760,7 @@ private static List<CompletionResult> GetFileSystemProviderResults(
                     {
                         basePath = context.ExecutionContext.EngineSessionState.NormalizeRelativePath(
                             entry.FullName,
-                            context.ExecutionContext.SessionState.Internal.CurrentLocation.ProviderPath);
+                            relativeBasePath);
                         if (!basePath.StartsWith($"..{provider.ItemSeparator}", StringComparison.Ordinal))
                         {
                             basePath = $".{provider.ItemSeparator}{basePath}";
@@ -4688,7 +4773,7 @@ private static List<CompletionResult> GetFileSystemProviderResults(
                     var resultType = isContainer
                         ? CompletionResultType.ProviderContainer
                         : CompletionResultType.ProviderItem;
-                    
+
                     bool leafQuotesNeeded;
                     var completionText = NewPathCompletionText(
                         basePath,
@@ -4755,6 +4840,13 @@ private static List<CompletionResult> GetDefaultProviderResults(
                 bool hadErrors;
                 var childItemOutput = context.Helper.ExecuteCurrentPowerShell(out _, out hadErrors);
 
+                if (childItemOutput.Count == 1 &&
+                    (pathInfo.Provider.FullName + "::" + pathInfo.ProviderPath).EqualsOrdinalIgnoreCase(childItemOutput[0].Properties["PSPath"].Value as string))
+                {
+                    // Get-ChildItem returned the item itself instead of the children so there must be no child items to complete.
+                    continue;
+                }
+
                 var childrenInfoTable = new Dictionary<string, bool>(childItemOutput.Count);
                 var childNameList = new List<string>(childItemOutput.Count);
 
@@ -4790,7 +4882,7 @@ private static List<CompletionResult> GetDefaultProviderResults(
 
                 if (childNameList.Count == 0)
                 {
-                    return results;
+                    continue;
                 }
 
                 string basePath = providerPrefix.Length > 0
@@ -4857,10 +4949,22 @@ private static List<CompletionResult> GetDefaultProviderResults(
 
         private static string GetChildNameFromPsObject(dynamic psObject, char separator)
         {
-            // The obvious solution would be to use the "PSChildName" property
-            // but some providers don't have it (like the Variable provider)
-            // So we use a substring of "PSPath" instead.
-            string childName = psObject.PSPath ?? string.Empty;
+            if (((PSObject)psObject).BaseObject is string result)
+            {
+                // The "Get-ChildItem" call for this provider returned a string that we assume is the child name.
+                // This is what the SCCM provider returns.
+                return result;
+            }
+
+            string childName = psObject.PSChildName;
+            if (childName is not null)
+            {
+                return childName;
+            }
+
+            // Some providers (Like the variable provider) don't include a PSChildName property
+            // so we get the child name from the path instead.
+            childName = psObject.PSPath ?? string.Empty;
             int ProviderSeparatorIndex = childName.IndexOf("::", StringComparison.Ordinal);
             childName = childName.Substring(ProviderSeparatorIndex + 2);
             int indexOfName = childName.LastIndexOf(separator);
@@ -4871,7 +4975,7 @@ private static string GetChildNameFromPsObject(dynamic psObject, char separator)
 
             return childName.Substring(indexOfName + 1);
         }
-        
+
         /// <summary>
         /// Takes a path and rebuilds it with the specified variable replacements.
         /// Also escapes special characters as needed.
@@ -4892,12 +4996,15 @@ private static string RebuildPathWithVars(
 
             for (int i = 0; i < path.Length; i++)
             {
+                // on Windows, we need to preserve the expanded home path as native commands don't understand it
+#if UNIX
                 if (i == homeIndex)
                 {
                     _ = sb.Append('~');
                     i += homePath.Length - 1;
                     continue;
                 }
+#endif
 
                 EscapeCharIfNeeded(sb, path, i, stringType, literalPath, useSingleQuoteEscapeRules, ref quotesAreNeeded);
                 _ = sb.Append(path[i]);
@@ -5013,14 +5120,24 @@ private static void EscapeCharIfNeeded(
                     break;
 
                 default:
-                    // Handle all the different quote types
-                    if (useSingleQuoteEscapeRules && path[index].IsSingleQuote())
+                    if (useSingleQuoteEscapeRules)
                     {
-                        _ = sb.Append('\'');
-                        quotesAreNeeded = true;
+                        // Bareword or singlequoted input string.
+                        if (path[index].IsSingleQuote())
+                        {
+                            // SingleQuotes are escaped with more single quotes. quotesAreNeeded is set so bareword strings can quoted.
+                            _ = sb.Append('\'');
+                            quotesAreNeeded = true;
+                        }
+                        else if (!quotesAreNeeded && stringType == StringConstantType.BareWord && path[index].IsDoubleQuote())
+                        {
+                            // Bareword string with double quote inside. Make sure to quote it so we don't need to escape it.
+                            quotesAreNeeded = true;
+                        }
                     }
-                    else if (!useSingleQuoteEscapeRules && path[index].IsDoubleQuote())
+                    else if (path[index].IsDoubleQuote())
                     {
+                        // Double quoted or bareword with variables input string. Need to escape double quotes.
                         _ = sb.Append('`');
                         quotesAreNeeded = true;
                     }
@@ -5061,6 +5178,10 @@ private static string NewPathCompletionText(string parent, string leaf, StringCo
             return result;
         }
 
+        private static readonly Regex s_shareMatch = new(
+            @"(^Microsoft\.PowerShell\.Core\\FileSystem::|^FileSystem::|^)(?:\\\\|//)(?![.|?])([^\\/]+)(?:\\|/)([^\\/]*)$",
+            RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         private struct SHARE_INFO_1
         {
@@ -5084,38 +5205,48 @@ internal static List<string> GetFileShares(string machine, bool ignoreHidden)
             uint numEntries = 0;
             uint totalEntries;
             uint resumeHandle = 0;
-            int result = Interop.Windows.NetShareEnum(
-                machine,
-                level: 1,
-                out shBuf,
-                Interop.Windows.MAX_PREFERRED_LENGTH,
-                out numEntries,
-                out totalEntries,
-                ref resumeHandle);
-
-            var shares = new List<string>();
-            if (result == Interop.Windows.ERROR_SUCCESS || result == Interop.Windows.ERROR_MORE_DATA)
+            try
             {
-                for (int i = 0; i < numEntries; ++i)
-                {
-                    nint curInfoPtr = shBuf + (Marshal.SizeOf<SHARE_INFO_1>() * i);
-                    SHARE_INFO_1 shareInfo = Marshal.PtrToStructure<SHARE_INFO_1>(curInfoPtr);
+                int result = Interop.Windows.NetShareEnum(
+                    machine,
+                    level: 1,
+                    out shBuf,
+                    Interop.Windows.MAX_PREFERRED_LENGTH,
+                    out numEntries,
+                    out totalEntries,
+                    ref resumeHandle);
 
-                    if ((shareInfo.type & Interop.Windows.STYPE_MASK) != Interop.Windows.STYPE_DISKTREE)
+                var shares = new List<string>();
+                if (result == Interop.Windows.ERROR_SUCCESS || result == Interop.Windows.ERROR_MORE_DATA)
+                {
+                    for (int i = 0; i < numEntries; ++i)
                     {
-                        continue;
-                    }
+                        nint curInfoPtr = shBuf + (Marshal.SizeOf<SHARE_INFO_1>() * i);
+                        SHARE_INFO_1 shareInfo = Marshal.PtrToStructure<SHARE_INFO_1>(curInfoPtr);
 
-                    if (ignoreHidden && shareInfo.netname.EndsWith('$'))
-                    {
-                        continue;
+                        if ((shareInfo.type & Interop.Windows.STYPE_MASK) != Interop.Windows.STYPE_DISKTREE)
+                        {
+                            continue;
+                        }
+
+                        if (ignoreHidden && shareInfo.netname.EndsWith('$'))
+                        {
+                            continue;
+                        }
+
+                        shares.Add(shareInfo.netname);
                     }
+                }
 
-                    shares.Add(shareInfo.netname);
+                return shares;
+            }
+            finally
+            {
+                if (shBuf != nint.Zero)
+                {
+                    Interop.Windows.NetApiBufferFree(shBuf);
                 }
             }
-
-            return shares;
 #endif
         }
 
@@ -5150,11 +5281,12 @@ public static IEnumerable<CompletionResult> CompleteVariable(string variableName
             return CompleteVariable(new CompletionContext { WordToComplete = variableName, Helper = helper, ExecutionContext = executionContext });
         }
 
-        private static readonly string[] s_variableScopes = new string[] { "Global:", "Local:", "Script:", "Private:" };
+        private static readonly string[] s_variableScopes = new string[] { "Global:", "Local:", "Script:", "Private:", "Using:" };
 
-        private static readonly char[] s_charactersRequiringQuotes = new char[] {
-            '-', '`', '&', '@', '\'', '"', '#', '{', '}', '(', ')', '$', ',', ';', '|', '<', '>', ' ', '.', '\\', '/', '\t', '^',
-        };
+        private static readonly SearchValues<char> s_charactersRequiringQuotes = SearchValues.Create("-`&@'\"#{}()$,;|<> .\\/ \t^");
+
+        private static bool ContainsCharactersRequiringQuotes(ReadOnlySpan<char> text)
+            => text.ContainsAny(s_charactersRequiringQuotes);
 
         internal static List<CompletionResult> CompleteVariable(CompletionContext context)
         {
@@ -5163,10 +5295,22 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
             List<CompletionResult> tempResults = new();
 
             var wordToComplete = context.WordToComplete;
+            string scopePrefix = string.Empty;
             var colon = wordToComplete.IndexOf(':');
+            if (colon >= 0)
+            {
+                scopePrefix = wordToComplete.Remove(colon + 1);
+                wordToComplete = wordToComplete.Substring(colon + 1);
+            }
 
             var lastAst = context.RelatedAsts?[^1];
             var variableAst = lastAst as VariableExpressionAst;
+            if (lastAst is PropertyMemberAst ||
+                (lastAst is not null && lastAst.Parent is ParameterAst parameter && parameter.DefaultValue != lastAst))
+            {
+                // User is adding a new parameter or a class member, variable tab completion is not useful.
+                return results;
+            }
             var prefix = variableAst != null && variableAst.Splatted ? "@" : "$";
             bool tokenAtCursorUsedBraces = context.TokenAtCursor is not null && context.TokenAtCursor.Text.StartsWith("${");
 
@@ -5200,15 +5344,23 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                         continue;
                     }
 
-                    var varInfo = findVariablesVisitor.VariableInfoTable[varName];
-                    var varType = varInfo.LastDeclaredConstraint ?? varInfo.LastAssignedType;
-                    var toolTip = varType is null
-                        ? varName
-                        : StringUtil.Format("[{0}]${1}", ToStringCodeMethods.Type(varType, dropNamespaces: true), varName);
+                    VariableInfo varInfo = findVariablesVisitor.VariableInfoTable[varName];
+                    PSTypeName varType = varInfo.LastDeclaredConstraint ?? varInfo.LastAssignedType;
+                    string toolTip;
+                    if (varType is null)
+                    {
+                        toolTip = varName;
+                    }
+                    else
+                    {
+                        toolTip = varType.Type is not null
+                            ? StringUtil.Format("[{0}]${1}", ToStringCodeMethods.Type(varType.Type, dropNamespaces: true), varName)
+                            : varType.Name;
+                    }
 
-                    var completionText = !tokenAtCursorUsedBraces && varName.IndexOfAny(s_charactersRequiringQuotes) == -1
-                        ? prefix + varName
-                        : prefix + "{" + varName + "}";
+                    var completionText = !tokenAtCursorUsedBraces && !ContainsCharactersRequiringQuotes(varName)
+                        ? prefix + scopePrefix + varName
+                        : prefix + "{" + scopePrefix + varName + "}";
                     AddUniqueVariable(hashedResults, results, completionText, varName, toolTip);
                 }
             }
@@ -5226,10 +5378,15 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                         var toolTip = value is null
                             ? key
                             : StringUtil.Format("[{0}]${1}", ToStringCodeMethods.Type(value.GetType(), dropNamespaces: true), key);
-                        var completionText = !tokenAtCursorUsedBraces && name.IndexOfAny(s_charactersRequiringQuotes) == -1
+                        if (!string.IsNullOrEmpty(variable.Description))
+                        {
+                            toolTip += $" - {variable.Description}";
+                        }
+
+                        var completionText = !tokenAtCursorUsedBraces && !ContainsCharactersRequiringQuotes(name)
                             ? prefix + name
                             : prefix + "{" + name + "}";
-                        AddUniqueVariable(hashedResults, tempResults, completionText, key, key);
+                        AddUniqueVariable(hashedResults, tempResults, completionText, key, toolTip);
                     }
                 }
 
@@ -5241,15 +5398,14 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
             }
             else
             {
-                string provider = wordToComplete.Substring(0, colon + 1);
                 string pattern;
-                if (s_variableScopes.Contains(provider, StringComparer.OrdinalIgnoreCase))
+                if (s_variableScopes.Contains(scopePrefix, StringComparer.OrdinalIgnoreCase))
                 {
-                    pattern = string.Concat("variable:", wordToComplete.AsSpan(colon + 1), "*");
+                    pattern = string.Concat("variable:", wordToComplete, "*");
                 }
                 else
                 {
-                    pattern = wordToComplete + "*";
+                    pattern = scopePrefix + wordToComplete + "*";
                 }
 
                 var powerShellExecutionHelper = context.Helper;
@@ -5277,11 +5433,16 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                                                                 ToStringCodeMethods.Type(value.GetType(),
                                                                                          dropNamespaces: true), name);
                                 }
+
+                                if (!string.IsNullOrEmpty(variable.Description))
+                                {
+                                    tooltip += $" - {variable.Description}";
+                                }
                             }
 
-                            var completedName = !tokenAtCursorUsedBraces && name.IndexOfAny(s_charactersRequiringQuotes) == -1
-                                                    ? prefix + provider + name
-                                                    : prefix + "{" + provider + name + "}";
+                            var completedName = !tokenAtCursorUsedBraces && !ContainsCharactersRequiringQuotes(name)
+                                                    ? prefix + scopePrefix + name
+                                                    : prefix + "{" + scopePrefix + name + "}";
                             AddUniqueVariable(hashedResults, results, completedName, name, tooltip);
                         }
                     }
@@ -5294,7 +5455,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                 foreach (var key in envVars.Keys)
                 {
                     var name = "env:" + key;
-                    var completedName = !tokenAtCursorUsedBraces && name.IndexOfAny(s_charactersRequiringQuotes) == -1
+                    var completedName = !tokenAtCursorUsedBraces && !ContainsCharactersRequiringQuotes(name)
                         ? prefix + name
                         : prefix + "{" + name + "}";
                     AddUniqueVariable(hashedResults, tempResults, completedName, name, "[string]" + name);
@@ -5304,22 +5465,22 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                 tempResults.Clear();
             }
 
-            // Return variables already in session state first, because we can sometimes give better information,
-            // like the variables type.
-            foreach (var specialVariable in s_specialVariablesCache.Value)
+            if (colon == -1)
             {
-                if (wildcardPattern.IsMatch(specialVariable))
+                // Return variables already in session state first, because we can sometimes give better information,
+                // like the variables type.
+                foreach (var specialVariable in s_specialVariablesCache.Value)
                 {
-                    var completedName = !tokenAtCursorUsedBraces && specialVariable.IndexOfAny(s_charactersRequiringQuotes) == -1
-                                            ? prefix + specialVariable
-                                            : prefix + "{" + specialVariable + "}";
+                    if (wildcardPattern.IsMatch(specialVariable))
+                    {
+                        var completedName = !tokenAtCursorUsedBraces && !ContainsCharactersRequiringQuotes(specialVariable)
+                                                ? prefix + specialVariable
+                                                : prefix + "{" + specialVariable + "}";
 
-                    AddUniqueVariable(hashedResults, results, completedName, specialVariable, specialVariable);
+                        AddUniqueVariable(hashedResults, results, completedName, specialVariable, specialVariable);
+                    }
                 }
-            }
 
-            if (colon == -1)
-            {
                 var allDrives = context.ExecutionContext.SessionState.Drive.GetAll();
                 foreach (var drive in allDrives)
                 {
@@ -5330,7 +5491,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                         continue;
                     }
 
-                    var completedName = !tokenAtCursorUsedBraces && drive.Name.IndexOfAny(s_charactersRequiringQuotes) == -1
+                    var completedName = !tokenAtCursorUsedBraces && !ContainsCharactersRequiringQuotes(drive.Name)
                         ? prefix + drive.Name + ":"
                         : prefix + "{" + drive.Name + ":}";
                     var tooltip = string.IsNullOrEmpty(drive.Description)
@@ -5348,7 +5509,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                 {
                     if (wildcardPattern.IsMatch(scope))
                     {
-                        var completedName = !tokenAtCursorUsedBraces && scope.IndexOfAny(s_charactersRequiringQuotes) == -1
+                        var completedName = !tokenAtCursorUsedBraces && !ContainsCharactersRequiringQuotes(scope)
                             ? prefix + scope
                             : prefix + "{" + scope + "}";
                         AddUniqueVariable(hashedResults, results, completedName, scope, scope);
@@ -5367,7 +5528,7 @@ private static void AddUniqueVariable(HashSet<string> hashedResults, List<Comple
             }
         }
 
-        private static readonly HashSet<string> s_varModificationCommands = new(StringComparer.OrdinalIgnoreCase)
+        internal static readonly HashSet<string> s_varModificationCommands = new(StringComparer.OrdinalIgnoreCase)
         {
             "New-Variable",
             "nv",
@@ -5376,13 +5537,13 @@ private static void AddUniqueVariable(HashSet<string> hashedResults, List<Comple
             "sv"
         };
 
-        private static readonly string[] s_varModificationParameters = new string[]
+        internal static readonly string[] s_varModificationParameters = new string[]
         {
             "Name",
             "Value"
         };
 
-        private static readonly string[] s_outVarParameters = new string[]
+        internal static readonly string[] s_outVarParameters = new string[]
         {
             "ErrorVariable",
             "ev",
@@ -5395,13 +5556,13 @@ private static void AddUniqueVariable(HashSet<string> hashedResults, List<Comple
 
         };
 
-        private static readonly string[] s_pipelineVariableParameters = new string[]
+        internal static readonly string[] s_pipelineVariableParameters = new string[]
         {
             "PipelineVariable",
             "pv"
         };
 
-        private static readonly HashSet<string> s_localScopeCommandNames = new(StringComparer.OrdinalIgnoreCase)
+        internal static readonly HashSet<string> s_localScopeCommandNames = new(StringComparer.OrdinalIgnoreCase)
         {
             "Microsoft.PowerShell.Core\\ForEach-Object",
             "ForEach-Object",
@@ -5417,11 +5578,11 @@ private static void AddUniqueVariable(HashSet<string> hashedResults, List<Comple
 
         private sealed class VariableInfo
         {
-            internal Type LastDeclaredConstraint;
-            internal Type LastAssignedType;
+            internal PSTypeName LastDeclaredConstraint;
+            internal PSTypeName LastAssignedType;
         }
 
-        private sealed class FindVariablesVisitor : AstVisitor
+        private sealed class FindVariablesVisitor : AstVisitor2
         {
             internal Ast Top;
             internal Ast CompletionVariableAst;
@@ -5430,34 +5591,34 @@ private sealed class FindVariablesVisitor : AstVisitor
             internal int StopSearchOffset;
             internal TypeInferenceContext Context;
 
-            private static Type GetInferredVarTypeFromAst(Ast ast)
+            private static PSTypeName GetInferredVarTypeFromAst(Ast ast)
             {
-                Type type;
+                PSTypeName type;
                 switch (ast)
                 {
                     case ConstantExpressionAst constant:
-                        type = constant.StaticType;
+                        type = new PSTypeName(constant.StaticType);
                         break;
 
                     case ExpandableStringExpressionAst:
-                        type = typeof(string);
+                        type = new PSTypeName(typeof(string));
                         break;
 
                     case ConvertExpressionAst convertExpression:
-                        type = convertExpression.StaticType;
+                        type = new PSTypeName(convertExpression.Type.TypeName);
                         break;
 
                     case HashtableAst:
-                        type = typeof(Hashtable);
+                        type = new PSTypeName(typeof(Hashtable));
                         break;
 
                     case ArrayExpressionAst:
                     case ArrayLiteralAst:
-                        type = typeof(object[]);
+                        type = new PSTypeName(typeof(object[]));
                         break;
 
                     case ScriptBlockExpressionAst:
-                        type = typeof(ScriptBlock);
+                        type = new PSTypeName(typeof(ScriptBlock));
                         break;
 
                     default:
@@ -5468,10 +5629,9 @@ private static Type GetInferredVarTypeFromAst(Ast ast)
                 return type;
             }
 
-            private void SaveVariableInfo(string variableName, Type variableType, bool isConstraint)
+            private void SaveVariableInfo(string variableName, PSTypeName variableType, bool isConstraint)
             {
-                VariableInfo varInfo;
-                if (VariableInfoTable.TryGetValue(variableName, out varInfo))
+                if (VariableInfoTable.TryGetValue(variableName, out VariableInfo varInfo))
                 {
                     if (isConstraint)
                     {
@@ -5496,7 +5656,11 @@ public override AstVisitAction DefaultVisit(Ast ast)
             {
                 if (ast.Extent.StartOffset > StopSearchOffset)
                 {
-                    return AstVisitAction.StopVisit;
+                    // When visiting do while/until statements, the condition will be visited before the statement block.
+                    // The condition itself may not be interesting if it's after the cursor, but the statement block could be.
+                    return ast is PipelineBaseAst && ast.Parent is DoUntilStatementAst or DoWhileStatementAst
+                        ? AstVisitAction.SkipChildren
+                        : AstVisitAction.StopVisit;
                 }
 
                 return AstVisitAction.Continue;
@@ -5506,30 +5670,62 @@ public override AstVisitAction VisitAssignmentStatement(AssignmentStatementAst a
             {
                 if (assignmentStatementAst.Extent.StartOffset > StopSearchOffset)
                 {
-                    return AstVisitAction.StopVisit;
+                    return assignmentStatementAst.Parent is DoUntilStatementAst or DoWhileStatementAst ?
+                        AstVisitAction.SkipChildren
+                        : AstVisitAction.StopVisit;
                 }
 
-                if (assignmentStatementAst.Left is ConvertExpressionAst convertExpression)
+                ProcessAssignmentLeftSide(assignmentStatementAst.Left, assignmentStatementAst.Right);
+                return AstVisitAction.Continue;
+            }
+
+            private void ProcessAssignmentLeftSide(ExpressionAst left, StatementAst right)
+            {
+                if (left is AttributedExpressionAst attributedExpression)
                 {
-                    if (convertExpression.Child is VariableExpressionAst variableExpression)
+                    var firstConvertExpression = attributedExpression as ConvertExpressionAst;
+                    ExpressionAst child = attributedExpression.Child;
+                    while (child is AttributedExpressionAst attributeChild)
+                    {
+                        if (firstConvertExpression is null && attributeChild is ConvertExpressionAst convertExpression)
+                        {
+                            // Multiple type constraint can be set on a variable like this: [int] [string] $Var1 = 1
+                            // But it's the left most type constraint that determines the final type.
+                            firstConvertExpression = convertExpression;
+                        }
+
+                        child = attributeChild.Child;
+                    }
+
+                    if (child is VariableExpressionAst variableExpression)
                     {
                         if (variableExpression == CompletionVariableAst || s_specialVariablesCache.Value.Contains(variableExpression.VariablePath.UserPath))
                         {
-                            return AstVisitAction.Continue;
+                            return;
                         }
 
-                        SaveVariableInfo(variableExpression.VariablePath.UserPath, convertExpression.StaticType, isConstraint: true);
+                        if (firstConvertExpression is not null)
+                        {
+                            SaveVariableInfo(variableExpression.VariablePath.UnqualifiedPath, new PSTypeName(firstConvertExpression.Type.TypeName), isConstraint: true);
+                        }
+                        else
+                        {
+                            PSTypeName lastAssignedType = right is CommandExpressionAst commandExpression
+                                ? GetInferredVarTypeFromAst(commandExpression.Expression)
+                                : null;
+                            SaveVariableInfo(variableExpression.VariablePath.UnqualifiedPath, lastAssignedType, isConstraint: false);
+                        }
                     }
                 }
-                else if (assignmentStatementAst.Left is VariableExpressionAst variableExpression)
+                else if (left is VariableExpressionAst variableExpression)
                 {
                     if (variableExpression == CompletionVariableAst || s_specialVariablesCache.Value.Contains(variableExpression.VariablePath.UserPath))
                     {
-                        return AstVisitAction.Continue;
+                        return;
                     }
 
-                    Type lastAssignedType;
-                    if (assignmentStatementAst.Right is CommandExpressionAst commandExpression)
+                    PSTypeName lastAssignedType;
+                    if (right is CommandExpressionAst commandExpression)
                     {
                         lastAssignedType = GetInferredVarTypeFromAst(commandExpression.Expression);
                     }
@@ -5538,10 +5734,23 @@ public override AstVisitAction VisitAssignmentStatement(AssignmentStatementAst a
                         lastAssignedType = null;
                     }
 
-                    SaveVariableInfo(variableExpression.VariablePath.UserPath, lastAssignedType, isConstraint: false);
+                    SaveVariableInfo(variableExpression.VariablePath.UnqualifiedPath, lastAssignedType, isConstraint: false);
+                }
+                else if (left is ArrayLiteralAst array)
+                {
+                    foreach (ExpressionAst expression in array.Elements)
+                    {
+                        ProcessAssignmentLeftSide(expression, right);
+                    }
+                }
+                else if (left is ParenExpressionAst parenExpression)
+                {
+                    ExpressionAst pureExpression = parenExpression.Pipeline.GetPureExpression();
+                    if (pureExpression is not null)
+                    {
+                        ProcessAssignmentLeftSide(pureExpression, right);
+                    }
                 }
-
-                return AstVisitAction.Continue;
             }
 
             public override AstVisitAction VisitCommand(CommandAst commandAst)
@@ -5561,7 +5770,7 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
                         var nameValue = variableName.ConstantValue as string;
                         if (nameValue is not null)
                         {
-                            Type variableType;
+                            PSTypeName variableType;
                             if (bindingResult.BoundParameters.TryGetValue("Value", out ParameterBindingResult variableValue))
                             {
                                 variableType = GetInferredVarTypeFromAst(variableValue.Value);
@@ -5586,7 +5795,7 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
                             var varName = outVarBind.ConstantValue as string;
                             if (varName is not null)
                             {
-                                SaveVariableInfo(varName, typeof(ArrayList), isConstraint: false);
+                                SaveVariableInfo(varName, new PSTypeName(typeof(ArrayList)), isConstraint: false);
                             }
                         }
                     }
@@ -5601,9 +5810,9 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
                                 if (varName is not null)
                                 {
                                     var inferredTypes = AstTypeInference.InferTypeOf(commandAst, Context, TypeInferenceRuntimePermissions.AllowSafeEval);
-                                    Type varType = inferredTypes.Count == 0
+                                    PSTypeName varType = inferredTypes.Count == 0
                                         ? null
-                                        : inferredTypes[0].Type;
+                                        : inferredTypes[0];
                                     SaveVariableInfo(varName, varType, isConstraint: false);
                                 }
                             }
@@ -5611,6 +5820,46 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
                     }
                 }
 
+                foreach (RedirectionAst redirection in commandAst.Redirections)
+                {
+                    if (redirection is FileRedirectionAst fileRedirection
+                        && fileRedirection.Location is StringConstantExpressionAst redirectTarget
+                        && redirectTarget.Value.StartsWith("variable:", StringComparison.OrdinalIgnoreCase)
+                        && redirectTarget.Value.Length > "variable:".Length)
+                    {
+                        string varName = redirectTarget.Value.Substring("variable:".Length);
+                        PSTypeName varType;
+                        switch (fileRedirection.FromStream)
+                        {
+                            case RedirectionStream.Error:
+                                varType = new PSTypeName(typeof(ErrorRecord));
+                                break;
+
+                            case RedirectionStream.Warning:
+                                varType = new PSTypeName(typeof(WarningRecord));
+                                break;
+
+                            case RedirectionStream.Verbose:
+                                varType = new PSTypeName(typeof(VerboseRecord));
+                                break;
+
+                            case RedirectionStream.Debug:
+                                varType = new PSTypeName(typeof(DebugRecord));
+                                break;
+
+                            case RedirectionStream.Information:
+                                varType = new PSTypeName(typeof(InformationRecord));
+                                break;
+
+                            default:
+                                varType = null;
+                                break;
+                        }
+
+                        SaveVariableInfo(varName, varType, isConstraint: false);
+                    }
+                }
+
                 return AstVisitAction.Continue;
             }
 
@@ -5627,7 +5876,7 @@ public override AstVisitAction VisitParameter(ParameterAst parameterAst)
                     return AstVisitAction.Continue;
                 }
 
-                SaveVariableInfo(variableExpression.VariablePath.UserPath, parameterAst.StaticType, isConstraint: true);
+                SaveVariableInfo(variableExpression.VariablePath.UnqualifiedPath, new PSTypeName(parameterAst.StaticType), isConstraint: true);
 
                 return AstVisitAction.Continue;
             }
@@ -5639,7 +5888,7 @@ public override AstVisitAction VisitForEachStatement(ForEachStatementAst forEach
                     return AstVisitAction.StopVisit;
                 }
 
-                SaveVariableInfo(forEachStatementAst.Variable.VariablePath.UserPath, variableType: null, isConstraint: false);
+                SaveVariableInfo(forEachStatementAst.Variable.VariablePath.UnqualifiedPath, variableType: null, isConstraint: false);
                 return AstVisitAction.Continue;
             }
 
@@ -5699,7 +5948,7 @@ public override AstVisitAction VisitDataStatement(DataStatementAst dataStatement
             }
         }
 
-        private static readonly Lazy<SortedSet<string>> s_specialVariablesCache = new Lazy<SortedSet<string>>(BuildSpecialVariablesCache);
+        private static readonly Lazy<SortedSet<string>> s_specialVariablesCache = new(BuildSpecialVariablesCache);
 
         private static SortedSet<string> BuildSpecialVariablesCache()
         {
@@ -5715,6 +5964,35 @@ private static SortedSet<string> BuildSpecialVariablesCache()
             return result;
         }
 
+        internal static PSTypeName GetLastDeclaredTypeConstraint(VariableExpressionAst variableAst, TypeInferenceContext typeInferenceContext)
+        {
+            Ast parent = variableAst.Parent;
+            var findVariablesVisitor = new FindVariablesVisitor()
+            {
+                CompletionVariableAst = variableAst,
+                StopSearchOffset = variableAst.Extent.StartOffset,
+                Context = typeInferenceContext
+            };
+            while (parent != null)
+            {
+                if (parent is IParameterMetadataProvider)
+                {
+                    findVariablesVisitor.Top = parent;
+                    parent.Visit(findVariablesVisitor);
+                }
+
+                if (findVariablesVisitor.VariableInfoTable.TryGetValue(variableAst.VariablePath.UserPath, out VariableInfo varInfo)
+                    && varInfo.LastDeclaredConstraint is not null)
+                {
+                    return varInfo.LastDeclaredConstraint;
+                }
+
+                parent = parent.Parent;
+            }
+
+            return null;
+        }
+
         #endregion Variables
 
         #region Comments
@@ -5782,7 +6060,7 @@ internal static List<CompletionResult> CompleteComment(CompletionContext context
                 for (int index = psobjs.Count - 1; index >= 0; index--)
                 {
                     var psobj = psobjs[index];
-                    if (!(PSObject.Base(psobj) is HistoryInfo historyInfo)) continue;
+                    if (PSObject.Base(psobj) is not HistoryInfo historyInfo) continue;
 
                     var commandLine = historyInfo.CommandLine;
                     if (!string.IsNullOrEmpty(commandLine) && pattern.IsMatch(commandLine))
@@ -5832,12 +6110,13 @@ private static List<CompletionResult> CompleteRequires(CompletionContext context
 
                 // Produce completions for all parameters that begin with the prefix we've found,
                 // but which haven't already been specified in the line we need to complete
-                foreach (KeyValuePair<string, string> parameter in s_requiresParameters)
+                foreach (string parameter in s_requiresParameters)
                 {
-                    if (parameter.Key.StartsWith(currentParameterPrefix, StringComparison.OrdinalIgnoreCase)
-                        && !context.CursorPosition.Line.Contains($" -{parameter.Key}", StringComparison.OrdinalIgnoreCase))
+                    if (parameter.StartsWith(currentParameterPrefix, StringComparison.OrdinalIgnoreCase)
+                        && !context.CursorPosition.Line.Contains($" -{parameter}", StringComparison.OrdinalIgnoreCase))
                     {
-                        results.Add(new CompletionResult(parameter.Key, parameter.Key, CompletionResultType.ParameterName, parameter.Value));
+                        string toolTip = GetRequiresParametersToolTip(parameter);
+                        results.Add(new CompletionResult(parameter, parameter, CompletionResultType.ParameterName, toolTip));
                     }
                 }
 
@@ -5862,11 +6141,12 @@ private static List<CompletionResult> CompleteRequires(CompletionContext context
             // Complete PSEdition parameter values
             if (currentParameterMatch.Value.Equals("PSEdition", StringComparison.OrdinalIgnoreCase))
             {
-                foreach (KeyValuePair<string, string> psEditionEntry in s_requiresPSEditions)
+                foreach (string psEditionEntry in s_requiresPSEditions)
                 {
-                    if (psEditionEntry.Key.StartsWith(currentValue, StringComparison.OrdinalIgnoreCase))
+                    if (psEditionEntry.StartsWith(currentValue, StringComparison.OrdinalIgnoreCase))
                     {
-                        results.Add(new CompletionResult(psEditionEntry.Key, psEditionEntry.Key, CompletionResultType.ParameterValue, psEditionEntry.Value));
+                        string toolTip = GetRequiresPsEditionsToolTip(psEditionEntry);
+                        results.Add(new CompletionResult(psEditionEntry, psEditionEntry, CompletionResultType.ParameterValue, toolTip));
                     }
                 }
 
@@ -5894,7 +6174,7 @@ private static List<CompletionResult> CompleteRequires(CompletionContext context
                 hashtableKeyMatches = Regex.Matches(hashtableString, @"(@{|;)\s*(?:'|\""|\w*)\w*");
 
                 // Build the list of keys we might want to complete, based on what's already been provided
-                var moduleSpecKeysToComplete = new HashSet<string>(s_requiresModuleSpecKeys.Keys);
+                var moduleSpecKeysToComplete = new HashSet<string>(s_requiresModuleSpecKeys);
                 bool sawModuleNameLast = false;
                 foreach (Match existingHashtableKeyMatch in hashtableKeyMatches)
                 {
@@ -5950,7 +6230,8 @@ private static List<CompletionResult> CompleteRequires(CompletionContext context
                 {
                     if (moduleSpecKey.StartsWith(currentValue, StringComparison.OrdinalIgnoreCase))
                     {
-                        results.Add(new CompletionResult(moduleSpecKey, moduleSpecKey, CompletionResultType.ParameterValue, s_requiresModuleSpecKeys[moduleSpecKey]));
+                        string toolTip = GetRequiresModuleSpecKeysToolTip(moduleSpecKey);
+                        results.Add(new CompletionResult(moduleSpecKey, moduleSpecKey, CompletionResultType.ParameterValue, toolTip));
                     }
                 }
             }
@@ -5958,27 +6239,53 @@ private static List<CompletionResult> CompleteRequires(CompletionContext context
             return results;
         }
 
-        private static readonly IReadOnlyDictionary<string, string> s_requiresParameters = new SortedList<string, string>(StringComparer.OrdinalIgnoreCase)
+        private static readonly string[] s_requiresParameters = new string[]
         {
-            { "Modules", "Specifies PowerShell modules that the script requires." },
-            { "PSEdition", "Specifies a PowerShell edition that the script requires." },
-            { "RunAsAdministrator", "Specifies that PowerShell must be running as administrator on Windows." },
-            { "Version", "Specifies the minimum version of PowerShell that the script requires." },
+            "Modules",
+            "PSEdition",
+            "RunAsAdministrator",
+            "Version"
         };
 
-        private static readonly IReadOnlyDictionary<string, string> s_requiresPSEditions = new SortedList<string, string>(StringComparer.OrdinalIgnoreCase)
+        private static string GetRequiresParametersToolTip(string name) => name switch
         {
-            { "Core", "Specifies that the script requires PowerShell Core to run." },
-            { "Desktop", "Specifies that the script requires Windows PowerShell to run." },
+            "Modules" => TabCompletionStrings.RequiresModulesParameterDescription,
+            "PSEdition" => TabCompletionStrings.RequiresPSEditionParameterDescription,
+            "RunAsAdministrator" => TabCompletionStrings.RequiresRunAsAdministratorParameterDescription,
+            "Version" => TabCompletionStrings.RequiresVersionParameterDescription,
+            _ => string.Empty
         };
 
-        private static readonly IReadOnlyDictionary<string, string> s_requiresModuleSpecKeys = new SortedList<string, string>(StringComparer.OrdinalIgnoreCase)
+        private static readonly string[] s_requiresPSEditions = new string[]
         {
-            { "ModuleName", "Required. Specifies the module name." },
-            { "GUID", "Optional. Specifies the GUID of the module." },
-            { "ModuleVersion", "Specifies a minimum acceptable version of the module." },
-            { "RequiredVersion", "Specifies an exact, required version of the module." },
-            { "MaximumVersion", "Specifies the maximum acceptable version of the module." },
+            "Core",
+            "Desktop"
+        };
+
+        private static string GetRequiresPsEditionsToolTip(string name) => name switch
+        {
+            "Core" => TabCompletionStrings.RequiresPsEditionCoreDescription,
+            "Desktop" => TabCompletionStrings.RequiresPsEditionDesktopDescription,
+            _ => string.Empty
+        };
+
+        private static readonly string[] s_requiresModuleSpecKeys = new string[]
+        {
+            "GUID",
+            "MaximumVersion",
+            "ModuleName",
+            "ModuleVersion",
+            "RequiredVersion"
+        };
+
+        private static string GetRequiresModuleSpecKeysToolTip(string name) => name switch
+        {
+            "GUID" => TabCompletionStrings.RequiresModuleSpecGUIDDescription,
+            "MaximumVersion" => TabCompletionStrings.RequiresModuleSpecMaximumVersionDescription,
+            "ModuleName" => TabCompletionStrings.RequiresModuleSpecModuleNameDescription,
+            "ModuleVersion" => TabCompletionStrings.RequiresModuleSpecModuleVersionDescription,
+            "RequiredVersion" => TabCompletionStrings.RequiresModuleSpecRequiredVersionDescription,
+            _ => string.Empty
         };
 
         private static readonly char[] s_hashtableKeyPrefixes = new[]
@@ -6023,7 +6330,7 @@ private static List<CompletionResult> CompleteCommentHelp(CompletionContext cont
                 replacementIndex = context.TokenAtCursor.Extent.StartOffset + lineKeyword.Index;
                 replacementLength = lineKeyword.Value.Length;
 
-                var validKeywords = new HashSet<String>(s_commentHelpKeywords.Keys, StringComparer.OrdinalIgnoreCase);
+                var validKeywords = new HashSet<string>(s_commentHelpKeywords, StringComparer.OrdinalIgnoreCase);
                 foreach (Match keyword in usedKeywords)
                 {
                     if (keyword == lineKeyword || s_commentHelpAllowedDuplicateKeywords.Contains(keyword.Value))
@@ -6039,7 +6346,8 @@ private static List<CompletionResult> CompleteCommentHelp(CompletionContext cont
                 {
                     if (keyword.StartsWith(lineKeyword.Value, StringComparison.OrdinalIgnoreCase))
                     {
-                        result.Add(new CompletionResult(keyword, keyword, CompletionResultType.Keyword, s_commentHelpKeywords[keyword]));
+                        string toolTip = GetCommentHelpKeywordsToolTip(keyword);
+                        result.Add(new CompletionResult(keyword, keyword, CompletionResultType.Keyword, toolTip));
                     }
                 }
 
@@ -6099,46 +6407,66 @@ private static List<CompletionResult> CompleteCommentHelp(CompletionContext cont
             return null;
         }
 
-        private static readonly IReadOnlyDictionary<string, string> s_commentHelpKeywords = new SortedList<string, string>(StringComparer.OrdinalIgnoreCase)
-        {
-            { "SYNOPSIS", "A brief description of the function or script. This keyword can be used only once in each topic." },
-            { "DESCRIPTION", "A detailed description of the function or script. This keyword can be used only once in each topic." },
-            { "PARAMETER", ".PARAMETER  <Parameter-Name>\nThe description of a parameter. Add a .PARAMETER keyword for each parameter in the function or script syntax." },
-            { "EXAMPLE", "A sample command that uses the function or script, optionally followed by sample output and a description. Repeat this keyword for each example." },
-            { "INPUTS", "The .NET types of objects that can be piped to the function or script. You can also include a description of the input objects." },
-            { "OUTPUTS", "The .NET type of the objects that the cmdlet returns. You can also include a description of the returned objects." },
-            { "NOTES", "Additional information about the function or script." },
-            { "LINK", "The name of a related topic. Repeat the .LINK keyword for each related topic. The .Link keyword content can also include a URI to an online version of the same help topic." },
-            { "COMPONENT", "The name of the technology or feature that the function or script uses, or to which it is related." },
-            { "ROLE", "The name of the user role for the help topic." },
-            { "FUNCTIONALITY", "The keywords that describe the intended use of the function." },
-            { "FORWARDHELPTARGETNAME", ".FORWARDHELPTARGETNAME <Command-Name>\nRedirects to the help topic for the specified command." },
-            { "FORWARDHELPCATEGORY", ".FORWARDHELPCATEGORY <Category>\nSpecifies the help category of the item in .ForwardHelpTargetName" },
-            { "REMOTEHELPRUNSPACE", ".REMOTEHELPRUNSPACE <PSSession-variable>\nSpecifies a session that contains the help topic. Enter a variable that contains a PSSession object." },
-            { "EXTERNALHELP", ".EXTERNALHELP <XML Help File>\nThe .ExternalHelp keyword is required when a function or script is documented in XML files." }
+        private static readonly string[] s_commentHelpKeywords = new string[]
+        {
+            "COMPONENT",
+            "DESCRIPTION",
+            "EXAMPLE",
+            "EXTERNALHELP",
+            "FORWARDHELPCATEGORY",
+            "FORWARDHELPTARGETNAME",
+            "FUNCTIONALITY",
+            "INPUTS",
+            "LINK",
+            "NOTES",
+            "OUTPUTS",
+            "PARAMETER",
+            "REMOTEHELPRUNSPACE",
+            "ROLE",
+            "SYNOPSIS"
+        };
+
+        private static string GetCommentHelpKeywordsToolTip(string name) => name switch
+        {
+            "COMPONENT" => TabCompletionStrings.CommentHelpCOMPONENTKeywordDescription,
+            "DESCRIPTION" => TabCompletionStrings.CommentHelpDESCRIPTIONKeywordDescription,
+            "EXAMPLE" => TabCompletionStrings.CommentHelpEXAMPLEKeywordDescription,
+            "EXTERNALHELP" => TabCompletionStrings.CommentHelpEXTERNALHELPKeywordDescription,
+            "FORWARDHELPCATEGORY" => TabCompletionStrings.CommentHelpFORWARDHELPCATEGORYKeywordDescription,
+            "FORWARDHELPTARGETNAME" => TabCompletionStrings.CommentHelpFORWARDHELPTARGETNAMEKeywordDescription,
+            "FUNCTIONALITY" => TabCompletionStrings.CommentHelpFUNCTIONALITYKeywordDescription,
+            "INPUTS" => TabCompletionStrings.CommentHelpINPUTSKeywordDescription,
+            "LINK" => TabCompletionStrings.CommentHelpLINKKeywordDescription,
+            "NOTES" => TabCompletionStrings.CommentHelpNOTESKeywordDescription,
+            "OUTPUTS" => TabCompletionStrings.CommentHelpOUTPUTSKeywordDescription,
+            "PARAMETER" => TabCompletionStrings.CommentHelpPARAMETERKeywordDescription,
+            "REMOTEHELPRUNSPACE" => TabCompletionStrings.CommentHelpREMOTEHELPRUNSPACEKeywordDescription,
+            "ROLE" => TabCompletionStrings.CommentHelpROLEKeywordDescription,
+            "SYNOPSIS" => TabCompletionStrings.CommentHelpSYNOPSISKeywordDescription,
+            _ => string.Empty
         };
 
         private static readonly HashSet<string> s_commentHelpAllowedDuplicateKeywords = new(StringComparer.OrdinalIgnoreCase)
         {
-            "PARAMETER",
             "EXAMPLE",
-            "LINK"
+            "LINK",
+            "PARAMETER"
         };
 
         private static readonly string[] s_commentHelpForwardCategories = new string[]
         {
             "Alias",
+            "All",
             "Cmdlet",
-            "HelpFile",
+            "ExternalScript",
+            "FAQ",
+            "Filter",
             "Function",
-            "Provider",
             "General",
-            "FAQ",
             "Glossary",
-            "ScriptCommand",
-            "ExternalScript",
-            "Filter",
-            "All"
+            "HelpFile",
+            "Provider",
+            "ScriptCommand"
         };
 
         private static FunctionDefinitionAst GetCommentHelpFunctionTarget(CompletionContext context)
@@ -6248,7 +6576,9 @@ private static List<CompletionResult> CompleteCommentParameterValue(CompletionCo
             new List<Tuple<string, string>>
                 {
                     new Tuple<string, string>("Where", "Where({ expression } [, mode [, numberToReturn]])"),
-                    new Tuple<string, string>("ForEach", "ForEach(expression [, arguments...])")
+                    new Tuple<string, string>("ForEach", "ForEach(expression [, arguments...])"),
+                    new Tuple<string, string>("PSWhere", "PSWhere({ expression } [, mode [, numberToReturn]])"),
+                    new Tuple<string, string>("PSForEach", "PSForEach(expression [, arguments...])"),
                 };
 
         // List of DSC collection-value variables
@@ -6654,7 +6984,7 @@ private static void CompleteFormatViewByInferredType(CompletionContext context,
             Diagnostics.Assert(controlBodyType is not null, "This should never happen unless a new Format-* cmdlet is added");
 
             var wordToComplete = context.WordToComplete;
-            var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            var quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
             WildcardPattern viewPattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
 
             var uniqueNames = new HashSet<string>();
@@ -6673,7 +7003,7 @@ private static void CompleteFormatViewByInferredType(CompletionContext context,
                             {
                                 string completionText = viewDefinition.name;
                                 // If the string is quoted or if it contains characters that need quoting, quote it in single quotes
-                                if (quote != string.Empty || viewDefinition.name.IndexOfAny(s_charactersRequiringQuotes) != -1)
+                                if (quote != string.Empty || ContainsCharactersRequiringQuotes(viewDefinition.name))
                                 {
                                     completionText = "'" + completionText.Replace("'", "''") + "'";
                                 }
@@ -6835,7 +7165,7 @@ private static void AddInferredMember(object member, WildcardPattern memberNameP
             {
                 completionText = $"{memberName}(";
             }
-            else if (memberName.IndexOfAny(s_charactersRequiringQuotes) != -1)
+            else if (ContainsCharactersRequiringQuotes(memberName))
             {
                 completionText = $"'{memberName}'";
             }
@@ -7573,44 +7903,34 @@ private static string GetNamespaceToRemove(CompletionContext context, TypeComple
 
         internal static List<CompletionResult> CompleteHelpTopics(CompletionContext context)
         {
-            var results = new List<CompletionResult>();
-            string userHelpDir = HelpUtils.GetUserHomeHelpSearchPath();
-            string appHelpDir = Utils.GetApplicationBase(Utils.DefaultPowerShellShellID);
-            string currentCulture = CultureInfo.CurrentCulture.Name;
-
-            //search for help files for the current culture + en-US as fallback
-            var searchPaths = new string[]
+            ArrayList helpProviders = context.ExecutionContext.HelpSystem.HelpProviders;
+            HelpFileHelpProvider helpFileProvider = null;
+            for (int i = helpProviders.Count - 1; i >= 0; i--)
             {
-                Path.Combine(userHelpDir, currentCulture),
-                Path.Combine(appHelpDir, currentCulture),
-                Path.Combine(userHelpDir, "en-US"),
-                Path.Combine(appHelpDir, "en-US")
-            }.Distinct();
+                if (helpProviders[i] is HelpFileHelpProvider provider)
+                {
+                    helpFileProvider = provider;
+                    break;
+                }
+            }
 
-            string wordToComplete = context.WordToComplete + "*";
-            try
+            if (helpFileProvider is null)
             {
-                var wildcardPattern = WildcardPattern.Get(wordToComplete, WildcardOptions.IgnoreCase);
+                return null;
+            }
 
-                foreach (var dir in searchPaths)
+            List<CompletionResult> results = new();
+            Collection<string> filesMatched = MUIFileSearcher.SearchFiles($"{context.WordToComplete}*.help.txt", helpFileProvider.GetExtendedSearchPaths());
+            foreach (string path in filesMatched)
+            {
+                string fileName = Path.GetFileName(path);
+                if (fileName.StartsWith("about_", StringComparison.OrdinalIgnoreCase))
                 {
-                    var currentDir = new DirectoryInfo(dir);
-                    if (currentDir.Exists)
-                    {
-                        foreach (var file in currentDir.EnumerateFiles("about_*.help.txt"))
-                        {
-                            if (wildcardPattern.IsMatch(file.Name))
-                            {
-                                string topicName = file.Name.Substring(0, file.Name.LastIndexOf(".help.txt"));
-                                results.Add(new CompletionResult(topicName));
-                            }
-                        }
-                    }
+                    string topicName = fileName.Substring(0, fileName.Length - ".help.txt".Length);
+                    results.Add(new CompletionResult(topicName, topicName, CompletionResultType.ParameterValue, topicName));
                 }
             }
-            catch (Exception)
-            {
-            }
+
             return results;
         }
 
@@ -7629,9 +7949,7 @@ internal static List<CompletionResult> CompleteStatementFlags(TokenKind kind, st
                     bool withColon = wordToComplete.EndsWith(':');
                     wordToComplete = withColon ? wordToComplete.Remove(wordToComplete.Length - 1) : wordToComplete;
 
-                    string enumString = LanguagePrimitives.EnumSingleTypeConverter.EnumValues(typeof(SwitchFlags));
-                    string separator = CultureInfo.CurrentUICulture.TextInfo.ListSeparator;
-                    string[] enumArray = enumString.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+                    string[] enumArray = LanguagePrimitives.EnumSingleTypeConverter.GetEnumNames(typeof(SwitchFlags));
 
                     var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
                     var enumList = new List<string>();
@@ -7921,7 +8239,7 @@ internal static List<CompletionResult> CompleteHashtableKey(CompletionContext co
                 }
 
                 var result = new List<CompletionResult>();
-                foreach (var key in s_requiresModuleSpecKeys.Keys)
+                foreach (string key in s_requiresModuleSpecKeys)
                 {
                     if (excludedKeys.Contains(key)
                         || (wordToComplete is not null && !key.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase))
@@ -7930,7 +8248,10 @@ internal static List<CompletionResult> CompleteHashtableKey(CompletionContext co
                     {
                         continue;
                     }
-                    result.Add(new CompletionResult(key, key, CompletionResultType.Property, s_requiresModuleSpecKeys[key]));
+
+                    string toolTip = GetRequiresModuleSpecKeysToolTip(key);
+
+                    result.Add(new CompletionResult(key, key, CompletionResultType.Property, toolTip));
                 }
 
                 return result;
@@ -8182,7 +8503,9 @@ private static List<CompletionResult> GetSpecialHashTableKeyMembers(HashSet<stri
             {
                 if ((string.IsNullOrEmpty(wordToComplete) || key.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase)) && !excludedKeys.Contains(key))
                 {
-                    result.Add(new CompletionResult(key, key, CompletionResultType.Property, key));
+                    string toolTip = GetHashtableKeyDescriptionToolTip(key);
+
+                    result.Add(new CompletionResult(key, key, CompletionResultType.Property, toolTip));
                 }
             }
 
@@ -8194,6 +8517,31 @@ private static List<CompletionResult> GetSpecialHashTableKeyMembers(HashSet<stri
             return result;
         }
 
+        private static string GetHashtableKeyDescriptionToolTip(string name) => name switch
+        {
+            "Alignment" => TabCompletionStrings.AlignmentHashtableKeyDescription,
+            "Ascending" => TabCompletionStrings.AscendingHashtableKeyDescription,
+            "Data" => TabCompletionStrings.DataHashtableKeyDescription,
+            "Depth" => TabCompletionStrings.DepthHashtableKeyDescription,
+            "Descending" => TabCompletionStrings.DescendingHashtableKeyDescription,
+            "EndTime" => TabCompletionStrings.EndTimeHashtableKeyDescription,
+            "Expression" => TabCompletionStrings.ExpressionHashtableKeyDescription,
+            "FormatString" => TabCompletionStrings.FormatStringHashtableKeyDescription,
+            "ID" => TabCompletionStrings.IDHashtableKeyDescription,
+            "Keywords" => TabCompletionStrings.KeywordsHashtableKeyDescription,
+            "Label" => TabCompletionStrings.LabelHashtableKeyDescription,
+            "Level" => TabCompletionStrings.LevelHashtableKeyDescription,
+            "LogName" => TabCompletionStrings.LogNameHashtableKeyDescription,
+            "Name" => TabCompletionStrings.NameHashtableKeyDescription,
+            "Path" => TabCompletionStrings.PathHashtableKeyDescription,
+            "ProviderName" => TabCompletionStrings.ProviderNameHashtableKeyDescription,
+            "StartTime" => TabCompletionStrings.StartTimeHashtableKeyDescription,
+            "SuppressHashFilter" => TabCompletionStrings.SuppressHashFilterHashtableKeyDescription,
+            "UserID" => TabCompletionStrings.UserIDHashtableKeyDescription,
+            "Width" => TabCompletionStrings.WidthHashtableKeyDescription,
+            _ => string.Empty
+        };
+
         #endregion Hashtable Keys
 
         #region Helpers
@@ -8213,7 +8561,7 @@ internal static bool IsPathSafelyExpandable(ExpandableStringExpressionAst expand
             var varValues = new List<string>();
             foreach (ExpressionAst nestedAst in expandableStringAst.NestedExpressions)
             {
-                if (!(nestedAst is VariableExpressionAst variableAst)) { return false; }
+                if (nestedAst is not VariableExpressionAst variableAst) { return false; }
 
                 string strValue = CombineVariableWithPartialPath(variableAst, null, executionContext);
                 if (strValue != null)
@@ -8274,36 +8622,31 @@ internal static string CombineVariableWithPartialPath(VariableExpressionAst vari
             return null;
         }
 
-        internal static string HandleDoubleAndSingleQuote(ref string wordToComplete)
+        /// <summary>
+        /// Calls Get-Command to get command info objects.
+        /// </summary>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <param name="parametersToAdd">The parameters to add.</param>
+        /// <returns>Collection of command info objects.</returns>
+        internal static Collection<CommandInfo> GetCommandInfo(
+            IDictionary fakeBoundParameters,
+            params string[] parametersToAdd)
         {
-            string quote = string.Empty;
+            using var ps = PowerShell.Create(RunspaceMode.CurrentRunspace);
 
-            if (!string.IsNullOrEmpty(wordToComplete) && (wordToComplete[0].IsSingleQuote() || wordToComplete[0].IsDoubleQuote()))
-            {
-                char frontQuote = wordToComplete[0];
-                int length = wordToComplete.Length;
+            ps.AddCommand("Get-Command");
 
-                if (length == 1)
+            foreach (string parameter in parametersToAdd)
+            {
+                if (fakeBoundParameters.Contains(parameter))
                 {
-                    wordToComplete = string.Empty;
-                    quote = frontQuote.IsSingleQuote() ? "'" : "\"";
-                }
-                else if (length > 1)
-                {
-                    if ((wordToComplete[length - 1].IsDoubleQuote() && frontQuote.IsDoubleQuote()) || (wordToComplete[length - 1].IsSingleQuote() && frontQuote.IsSingleQuote()))
-                    {
-                        wordToComplete = wordToComplete.Substring(1, length - 2);
-                        quote = frontQuote.IsSingleQuote() ? "'" : "\"";
-                    }
-                    else if (!wordToComplete[length - 1].IsDoubleQuote() && !wordToComplete[length - 1].IsSingleQuote())
-                    {
-                        wordToComplete = wordToComplete.Substring(1);
-                        quote = frontQuote.IsSingleQuote() ? "'" : "\"";
-                    }
+                    ps.AddParameter(parameter, fakeBoundParameters[parameter]);
                 }
             }
 
-            return quote;
+            Collection<CommandInfo> commands = ps.Invoke<CommandInfo>();
+
+            return commands;
         }
 
         internal static bool IsSplattedVariable(Ast targetExpr)
@@ -8346,7 +8689,7 @@ internal static void CompleteMemberHelper(
                 IEnumerable members;
                 if (@static)
                 {
-                    if (!(PSObject.Base(value) is Type type))
+                    if (PSObject.Base(value) is not Type type)
                     {
                         return;
                     }
@@ -8371,7 +8714,7 @@ internal static void CompleteMemberHelper(
                     var completionText = memberInfo.Name;
 
                     // Handle scenarios like this: $aa | add-member 'a b' 23; $aa.a<tab>
-                    if (completionText.IndexOfAny(s_charactersRequiringQuotes) != -1)
+                    if (ContainsCharactersRequiringQuotes(completionText))
                     {
                         completionText = completionText.Replace("'", "''");
                         completionText = "'" + completionText + "'";
@@ -8412,13 +8755,13 @@ internal static void CompleteMemberHelper(
                     var pattern = WildcardPattern.Get(memberName, WildcardOptions.IgnoreCase);
                     foreach (DictionaryEntry entry in dictionary)
                     {
-                        if (!(entry.Key is string key))
+                        if (entry.Key is not string key)
                             continue;
 
                         if (pattern.IsMatch(key))
                         {
                             // Handle scenarios like this: $hashtable["abc#d"] = 100; $hashtable.ab<tab>
-                            if (key.IndexOfAny(s_charactersRequiringQuotes) != -1)
+                            if (ContainsCharactersRequiringQuotes(key))
                             {
                                 key = key.Replace("'", "''");
                                 key = "'" + key + "'";
@@ -8476,32 +8819,6 @@ private static bool IsStaticTypeEnumerable(Type type)
             return false;
         }
 
-        private static bool CompletionRequiresQuotes(string completion, bool escape)
-        {
-            // If the tokenizer sees the completion as more than two tokens, or if there is some error, then
-            // some form of quoting is necessary (if it's a variable, we'd need ${}, filenames would need [], etc.)
-
-            Language.Token[] tokens;
-            ParseError[] errors;
-            Language.Parser.ParseInput(completion, out tokens, out errors);
-
-            char[] charToCheck = escape ? new[] { '$', '[', ']', '`' } : new[] { '$', '`' };
-
-            // Expect no errors and 2 tokens (1 is for our completion, the other is eof)
-            // Or if the completion is a keyword, we ignore the errors
-            bool requireQuote = !(errors.Length == 0 && tokens.Length == 2);
-            if ((!requireQuote && tokens[0] is StringToken) ||
-                (tokens.Length == 2 && (tokens[0].TokenFlags & TokenFlags.Keyword) != 0))
-            {
-                requireQuote = false;
-                var value = tokens[0].Text;
-                if (value.IndexOfAny(charToCheck) != -1)
-                    requireQuote = true;
-            }
-
-            return requireQuote;
-        }
-
         private static bool ProviderSpecified(string path)
         {
             var index = path.IndexOf(':');
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionHelpers.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionHelpers.cs
new file mode 100644
index 00000000000..edf31e8e97a
--- /dev/null
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionHelpers.cs
@@ -0,0 +1,322 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Buffers;
+using System.Collections.Generic;
+using System.Management.Automation.Language;
+
+namespace System.Management.Automation
+{
+    /// <summary>
+    /// Shared helper class for common completion helper methods.
+    /// </summary>
+    internal static class CompletionHelpers
+    {
+        private static readonly SearchValues<char> s_defaultCharsToCheck = SearchValues.Create("$`");
+
+        private const string SingleQuote = "'";
+        private const string DoubleQuote = "\"";
+
+        /// <summary>
+        /// Get matching completions from word to complete.
+        /// This makes it easier to handle different variations of completions with consideration of quotes.
+        /// </summary>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="possibleCompletionValues">The possible completion values to iterate.</param>
+        /// <param name="displayInfoMapper">The optional completion display info mapper delegate for tool tip and list item text.</param>
+        /// <param name="resultType">The optional completion result type. Default is Text.</param>
+        /// <param name="matchStrategy">The optional match strategy delegate.</param>
+        /// <returns>List of matching completion results.</returns>
+        internal static IEnumerable<CompletionResult> GetMatchingResults(
+            string wordToComplete,
+            IEnumerable<string> possibleCompletionValues,
+            CompletionDisplayInfoMapper displayInfoMapper = null,
+            CompletionResultType resultType = CompletionResultType.Text,
+            MatchStrategy matchStrategy = null)
+        {
+            displayInfoMapper ??= DefaultDisplayInfoMapper;
+            matchStrategy ??= DefaultMatch;
+
+            string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+            if (quote != SingleQuote)
+            {
+                wordToComplete = NormalizeToExpandableString(wordToComplete);
+            }
+
+            foreach (string value in possibleCompletionValues)
+            {
+                if (matchStrategy(value, wordToComplete))
+                {
+                    string completionText = QuoteCompletionText(value, quote);
+
+                    (string toolTip, string listItemText) = displayInfoMapper(value);
+
+                    yield return new CompletionResult(completionText, listItemText, resultType, toolTip);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Provides the display information for a completion result.
+        /// This delegate is used to map a string value to its corresponding display information.
+        /// </summary>
+        /// <param name="value">The input value to be mapped</param>
+        /// <returns>Completion display info containing tool tip and list item text.</returns>
+        internal delegate (string ToolTip, string ListItemText) CompletionDisplayInfoMapper(string value);
+
+        /// <summary>
+        /// Provides the default display information for a completion result.
+        /// Defaults to using the input value for both the tool tip and list item text.
+        /// </summary>
+        /// <returns>Completion display info containing tool tip and list item text.</returns>
+        internal static readonly CompletionDisplayInfoMapper DefaultDisplayInfoMapper = value
+            => (value, value);
+
+        /// <summary>
+        /// Normalizes the input string to an expandable string format for PowerShell.
+        /// </summary>
+        /// <param name="value">The input string to be normalized.</param>
+        /// <returns>The normalized string with special characters replaced by their PowerShell escape sequences.</returns>
+        /// <remarks>
+        /// This method replaces special characters in the input string with their PowerShell equivalent escape sequences:
+        /// <list type="bullet">
+        ///     <item><description>Replaces "\r" (carriage return) with "`r".</description></item>
+        ///     <item><description>Replaces "\n" (newline) with "`n".</description></item>
+        ///     <item><description>Replaces "\t" (tab) with "`t".</description></item>
+        ///     <item><description>Replaces "\0" (null) with "`0".</description></item>
+        ///     <item><description>Replaces "\a" (bell) with "`a".</description></item>
+        ///     <item><description>Replaces "\b" (backspace) with "`b".</description></item>
+        ///     <item><description>Replaces "\u001b" (escape character) with "`e".</description></item>
+        ///     <item><description>Replaces "\f" (form feed) with "`f".</description></item>
+        ///     <item><description>Replaces "\v" (vertical tab) with "`v".</description></item>
+        /// </list>
+        /// </remarks>
+        internal static string NormalizeToExpandableString(string value)
+            => value
+                .Replace("\r", "`r")
+                .Replace("\n", "`n")
+                .Replace("\t", "`t")
+                .Replace("\0", "`0")
+                .Replace("\a", "`a")
+                .Replace("\b", "`b")
+                .Replace("\u001b", "`e")
+                .Replace("\f", "`f")
+                .Replace("\v", "`v");
+
+        /// <summary>
+        /// Defines a strategy for determining if a value matches a word or pattern.
+        /// </summary>
+        /// <param name="value">The input string to check for a match.</param>
+        /// <param name="wordToComplete">The word or pattern to match against.</param>
+        /// <returns>
+        /// <c>true</c> if the value matches the specified word or pattern; otherwise, <c>false</c>.
+        /// </returns>
+        internal delegate bool MatchStrategy(string value, string wordToComplete);
+
+        /// <summary>
+        /// Determines if the given value matches the specified word using a literal, case-insensitive prefix match.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if the value starts with the word (case-insensitively); otherwise, <c>false</c>.
+        /// </returns>
+        internal static readonly MatchStrategy LiteralMatchOrdinalIgnoreCase = (value, wordToComplete)
+            => value.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Determines if the given value matches the specified word using wildcard pattern matching.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if the value matches the word as a wildcard pattern; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks>
+        /// Wildcard pattern matching allows for flexible matching, where wilcards can represent
+        /// multiple characters in the input. This strategy is case-insensitive.
+        /// </remarks>
+        internal static readonly MatchStrategy WildcardPatternMatchIgnoreCase = (value, wordToComplete)
+            => WildcardPattern
+                .Get(wordToComplete + "*", WildcardOptions.IgnoreCase)
+                .IsMatch(value);
+
+        /// <summary>
+        /// Determines if the given value matches the specified word considering wildcard characters literally.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if the value matches either the literal normalized word or the wildcard pattern with escaping;
+        /// otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks>
+        /// This strategy first attempts a literal prefix match for performance and, if unsuccessful, escapes the word to complete to
+        /// handle any problematic wildcard characters before performing a wildcard match.
+        /// </remarks>
+        internal static readonly MatchStrategy WildcardPatternEscapeMatch = (value, wordToComplete)
+            => LiteralMatchOrdinalIgnoreCase(value, wordToComplete) ||
+               WildcardPatternMatchIgnoreCase(value, WildcardPattern.Escape(wordToComplete));
+
+        /// <summary>
+        /// Determines if the given value matches the specified word taking into account wildcard characters.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if the value matches either the literal normalized word or the wildcard pattern; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks>
+        /// This strategy attempts a literal match first for performance and, if unsuccessful, evaluates the word against a wildcard pattern.
+        /// </remarks>
+        internal static readonly MatchStrategy DefaultMatch = (value, wordToComplete)
+            => LiteralMatchOrdinalIgnoreCase(value, wordToComplete) ||
+               WildcardPatternMatchIgnoreCase(value, wordToComplete);
+
+        /// <summary>
+        /// Removes wrapping quotes from a string and returns the quote used, if present.
+        /// </summary>
+        /// <param name="wordToComplete">
+        /// The string to process, potentially surrounded by single or double quotes.
+        /// This parameter is updated in-place to exclude the removed quotes.
+        /// </param>
+        /// <returns>
+        /// The type of quote detected (single or double), or an empty string if no quote is found.
+        /// </returns>
+        /// <remarks>
+        /// This method checks for single or double quotes at the start and end of the string.
+        /// If wrapping quotes are detected and match, both are removed; otherwise, only the front quote is removed.
+        /// The string is updated in-place, and only matching front-and-back quotes are stripped.
+        /// If no quotes are detected or the input is empty, the original string remains unchanged.
+        /// </remarks>
+        internal static string HandleDoubleAndSingleQuote(ref string wordToComplete)
+        {
+            if (string.IsNullOrEmpty(wordToComplete))
+            {
+                return string.Empty;
+            }
+
+            char frontQuote = wordToComplete[0];
+            bool hasFrontSingleQuote = frontQuote.IsSingleQuote();
+            bool hasFrontDoubleQuote = frontQuote.IsDoubleQuote();
+
+            if (!hasFrontSingleQuote && !hasFrontDoubleQuote)
+            {
+                return string.Empty;
+            }
+
+            string quoteInUse = hasFrontSingleQuote ? SingleQuote : DoubleQuote;
+
+            int length = wordToComplete.Length;
+            if (length == 1)
+            {
+                wordToComplete = string.Empty;
+                return quoteInUse;
+            }
+
+            char backQuote = wordToComplete[length - 1];
+            bool hasBackSingleQuote = backQuote.IsSingleQuote();
+            bool hasBackDoubleQuote = backQuote.IsDoubleQuote();
+
+            bool hasBothFrontAndBackQuotes =
+                (hasFrontSingleQuote && hasBackSingleQuote) || (hasFrontDoubleQuote && hasBackDoubleQuote);
+
+            if (hasBothFrontAndBackQuotes)
+            {
+                wordToComplete = wordToComplete.Substring(1, length - 2);
+                return quoteInUse;
+            }
+
+            bool hasFrontQuoteAndNoBackQuote =
+                (hasFrontSingleQuote || hasFrontDoubleQuote) && !hasBackSingleQuote && !hasBackDoubleQuote;
+
+            if (hasFrontQuoteAndNoBackQuote)
+            {
+                wordToComplete = wordToComplete.Substring(1);
+                return quoteInUse;
+            }
+
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Determines whether the specified completion string requires quotes.
+        /// Quoting is required if:
+        /// <list type="bullet">
+        ///   <item><description>There are parsing errors in the input string.</description></item>
+        ///   <item><description>The parsed token count is not exactly two (the input token + EOF).</description></item>
+        ///   <item><description>The first token is a string or a PowerShell keyword containing special characters.</description></item>
+        ///   <item><description>The first token is a semi colon or comma token.</description></item>
+        /// </list>
+        /// </summary>
+        /// <param name="completion">The input string to analyze for quoting requirements.</param>
+        /// <returns><c>true</c> if the string requires quotes, <c>false</c> otherwise.</returns>
+        internal static bool CompletionRequiresQuotes(string completion)
+        {
+            Parser.ParseInput(completion, out Token[] tokens, out ParseError[] errors);
+
+            bool isExpectedTokenCount = tokens.Length == 2;
+
+            bool requireQuote = errors.Length > 0 || !isExpectedTokenCount;
+
+            Token firstToken = tokens[0];
+            bool isStringToken = firstToken is StringToken;
+            bool isKeywordToken = (firstToken.TokenFlags & TokenFlags.Keyword) != 0;
+            bool isSemiToken = firstToken.Kind == TokenKind.Semi;
+            bool isCommaToken = firstToken.Kind == TokenKind.Comma;
+
+            if ((!requireQuote && isStringToken) || (isExpectedTokenCount && isKeywordToken))
+            {
+                requireQuote = ContainsCharsToCheck(firstToken.Text);
+            }
+
+            else if (isExpectedTokenCount && (isSemiToken || isCommaToken))
+            {
+                requireQuote = true;
+            }
+
+            return requireQuote;
+        }
+
+        /// <summary>
+        /// Determines whether the given text contains an escaped newline string.
+        /// </summary>
+        /// <param name="text">The input string to check for escaped newlines.</param>
+        /// <returns>
+        /// <c>true</c> if the text contains the escaped Unix-style newline string ("`n") or
+        /// the Windows-style newline string ("`r`n"); otherwise, <c>false</c>.
+        /// </returns>
+        private static bool ContainsEscapedNewlineString(string text)
+            => text.Contains("`n", StringComparison.Ordinal);
+
+        private static bool ContainsCharsToCheck(ReadOnlySpan<char> text)
+            => text.ContainsAny(s_defaultCharsToCheck);
+
+        /// <summary>
+        /// Quotes a given completion text.
+        /// </summary>
+        /// <param name="completionText">
+        /// The text to be quoted.
+        /// </param>
+        /// <param name="quote">
+        /// The quote character to use for enclosing the text. Defaults to a single quote if not provided.
+        /// </param>
+        /// <returns>
+        /// The quoted <paramref name="completionText"/>.
+        /// </returns>
+        internal static string QuoteCompletionText(string completionText, string quote)
+        {
+            // Escaped newlines e.g. `r`n need be surrounded with double quotes
+            if (ContainsEscapedNewlineString(completionText))
+            {
+                return DoubleQuote + completionText + DoubleQuote;
+            }
+
+            if (!CompletionRequiresQuotes(completionText))
+            {
+                return quote + completionText + quote;
+            }
+
+            string quoteInUse = string.IsNullOrEmpty(quote) ? SingleQuote : quote;
+
+            if (quoteInUse == SingleQuote)
+            {
+                completionText = CodeGeneration.EscapeSingleQuotedStringContent(completionText);
+            }
+
+            return quoteInUse + completionText + quoteInUse;
+        }
+    }
+}
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs
index ffb09e2a50d..0554a52ba17 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs
@@ -168,26 +168,15 @@ internal static CompletionResult Null
         /// <param name="toolTip">The text for the tooltip with details to be displayed about the object.</param>
         public CompletionResult(string completionText, string listItemText, CompletionResultType resultType, string toolTip)
         {
-            if (string.IsNullOrEmpty(completionText))
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(completionText));
-            }
-
-            if (string.IsNullOrEmpty(listItemText))
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(listItemText));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(completionText);
+            ArgumentException.ThrowIfNullOrEmpty(listItemText);
+            ArgumentException.ThrowIfNullOrEmpty(toolTip);
 
             if (resultType < CompletionResultType.Text || resultType > CompletionResultType.DynamicKeyword)
             {
                 throw PSTraceSource.NewArgumentOutOfRangeException(nameof(resultType), resultType);
             }
 
-            if (string.IsNullOrEmpty(toolTip))
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(toolTip));
-            }
-
             _completionText = completionText;
             _listItemText = listItemText;
             _toolTip = toolTip;
diff --git a/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs b/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs
index 2b5281a8f26..c63a8e7f92d 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs
@@ -172,66 +172,110 @@ public abstract class ArgumentCompleterFactoryAttribute : ArgumentCompleterAttri
     [Cmdlet(VerbsLifecycle.Register, "ArgumentCompleter", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=528576")]
     public class RegisterArgumentCompleterCommand : PSCmdlet
     {
+        private const string PowerShellSetName = "PowerShellSet";
+        private const string NativeCommandSetName = "NativeCommandSet";
+        private const string NativeFallbackSetName = "NativeFallbackSet";
+
+        // Use a key that is unlikely to be a file name or path to indicate the fallback completer for native commands.
+        internal const string FallbackCompleterKey = "___ps::<native_fallback_key>@@___";
+
         /// <summary>
+        /// Gets or sets the command names for which the argument completer is registered.
         /// </summary>
-        [Parameter(ParameterSetName = "NativeSet", Mandatory = true)]
-        [Parameter(ParameterSetName = "PowerShellSet")]
+        [Parameter(ParameterSetName = NativeCommandSetName, Mandatory = true)]
+        [Parameter(ParameterSetName = PowerShellSetName)]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] CommandName { get; set; }
 
         /// <summary>
+        /// Gets or sets the name of the parameter for which the argument completer is registered.
         /// </summary>
-        [Parameter(ParameterSetName = "PowerShellSet", Mandatory = true)]
+        [Parameter(ParameterSetName = PowerShellSetName, Mandatory = true)]
         public string ParameterName { get; set; }
 
         /// <summary>
+        /// Gets or sets the script block that will be executed to provide argument completions.
         /// </summary>
         [Parameter(Mandatory = true)]
         [AllowNull()]
         public ScriptBlock ScriptBlock { get; set; }
 
         /// <summary>
+        /// Indicates the argument completer is for native commands.
         /// </summary>
-        [Parameter(ParameterSetName = "NativeSet")]
+        [Parameter(ParameterSetName = NativeCommandSetName)]
         public SwitchParameter Native { get; set; }
 
+        /// <summary>
+        /// Indicates the argument completer is a fallback for any native commands that don't have a completer registered.
+        /// </summary>
+        [Parameter(ParameterSetName = NativeFallbackSetName)]
+        public SwitchParameter NativeFallback { get; set; }
+
         /// <summary>
         /// </summary>
         protected override void EndProcessing()
         {
             Dictionary<string, ScriptBlock> completerDictionary;
-            if (ParameterName != null)
+
+            if (ParameterSetName is NativeFallbackSetName)
             {
-                completerDictionary = Context.CustomArgumentCompleters ??
-                                      (Context.CustomArgumentCompleters = new Dictionary<string, ScriptBlock>(StringComparer.OrdinalIgnoreCase));
+                completerDictionary = Context.NativeArgumentCompleters ??= new(StringComparer.OrdinalIgnoreCase);
+
+                SetKeyValue(completerDictionary, FallbackCompleterKey, ScriptBlock);
             }
-            else
+            else if (ParameterSetName is NativeCommandSetName)
             {
-                completerDictionary = Context.NativeArgumentCompleters ??
-                                      (Context.NativeArgumentCompleters = new Dictionary<string, ScriptBlock>(StringComparer.OrdinalIgnoreCase));
-            }
+                completerDictionary = Context.NativeArgumentCompleters ??= new(StringComparer.OrdinalIgnoreCase);
 
-            if (CommandName == null || CommandName.Length == 0)
+                foreach (string command in CommandName)
+                {
+                    var key = command?.Trim();
+                    if (string.IsNullOrEmpty(key))
+                    {
+                        continue;
+                    }
+
+                    SetKeyValue(completerDictionary, key, ScriptBlock);
+                }
+            }
+            else if (ParameterSetName is PowerShellSetName)
             {
-                CommandName = new[] { string.Empty };
+                completerDictionary = Context.CustomArgumentCompleters ??= new(StringComparer.OrdinalIgnoreCase);
+
+                string paramName = ParameterName.Trim();
+                if (paramName.Length is 0)
+                {
+                    return;
+                }
+
+                if (CommandName is null || CommandName.Length is 0)
+                {
+                    SetKeyValue(completerDictionary, paramName, ScriptBlock);
+                    return;
+                }
+
+                foreach (string command in CommandName)
+                {
+                    var key = command?.Trim();
+                    key = string.IsNullOrEmpty(key)
+                        ? paramName
+                        : $"{key}:{paramName}";
+
+                    SetKeyValue(completerDictionary, key, ScriptBlock);
+                }
             }
 
-            for (int i = 0; i < CommandName.Length; i++)
+            static void SetKeyValue(Dictionary<string, ScriptBlock> table, string key, ScriptBlock value)
             {
-                var key = CommandName[i];
-                if (!string.IsNullOrWhiteSpace(ParameterName))
+                if (value is null)
                 {
-                    if (!string.IsNullOrWhiteSpace(key))
-                    {
-                        key = key + ":" + ParameterName;
-                    }
-                    else
-                    {
-                        key = ParameterName;
-                    }
+                    table.Remove(key);
+                }
+                else
+                {
+                    table[key] = value;
                 }
-
-                completerDictionary[key] = ScriptBlock;
             }
         }
     }
diff --git a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
index 4201be16f93..2e7457cd812 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
@@ -1198,7 +1198,7 @@ private bool PrepareCommandElements(ExecutionContext context, CommandParameterAs
             string commandName = null;
             try
             {
-                processor = PrepareFromAst(context, out commandName) ?? context.CreateCommand(commandName, dotSource);
+                processor = PrepareFromAst(context, out commandName) ?? context.CreateCommand(commandName, dotSource, forCompletion:true);
             }
             catch (RuntimeException)
             {
@@ -1406,7 +1406,6 @@ private CommandProcessorBase PrepareFromAst(ExecutionContext context, out string
             }
 
             ast.Visit(exportVisitor);
-
             CommandProcessorBase commandProcessor = null;
 
             resolvedCommandName = _commandAst.GetCommandName();
diff --git a/src/System.Management.Automation/engine/CommandCompletion/ScopeArgumentCompleter.cs b/src/System.Management.Automation/engine/CommandCompletion/ScopeArgumentCompleter.cs
new file mode 100644
index 00000000000..444ccf79adb
--- /dev/null
+++ b/src/System.Management.Automation/engine/CommandCompletion/ScopeArgumentCompleter.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Management.Automation.Language;
+
+namespace System.Management.Automation
+{
+    /// <summary>
+    /// Provides argument completion for Scope parameter.
+    /// </summary>
+    public class ScopeArgumentCompleter : IArgumentCompleter
+    {
+        private static readonly string[] s_Scopes = new string[] { "Global", "Local", "Script" };
+
+        /// <summary>
+        /// Returns completion results for scope parameter.
+        /// </summary>
+        /// <param name="commandName">The command name.</param>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="commandAst">The command AST.</param>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>List of completion results.</returns>
+        public IEnumerable<CompletionResult> CompleteArgument(
+            string commandName,
+            string parameterName,
+            string wordToComplete,
+            CommandAst commandAst,
+            IDictionary fakeBoundParameters)
+                => CompletionHelpers.GetMatchingResults(
+                    wordToComplete,
+                    possibleCompletionValues: s_Scopes);
+    }
+}
diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
index c656f23fc3d..9ca87f4c834 100644
--- a/src/System.Management.Automation/engine/CommandDiscovery.cs
+++ b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -262,6 +262,9 @@ internal void AddSessionStateCmdletEntryToCache(SessionStateCmdletEntry entry, b
         /// False if not.  Null if command discovery should default to something reasonable
         /// for the command discovered.
         /// </param>
+        /// <param name="forCompletion">
+        /// True if this for parameter completion and script requirements should be ignored.
+        /// </param>
         /// <returns>
         /// </returns>
         /// <exception cref="CommandNotFoundException">
@@ -271,14 +274,15 @@ internal void AddSessionStateCmdletEntryToCache(SessionStateCmdletEntry entry, b
         /// If the security manager is preventing the command from running.
         /// </exception>
         internal CommandProcessorBase LookupCommandProcessor(string commandName,
-            CommandOrigin commandOrigin, bool? useLocalScope)
+            CommandOrigin commandOrigin, bool? useLocalScope, bool forCompletion = false)
         {
             CommandProcessorBase processor = null;
             CommandInfo commandInfo = LookupCommandInfo(commandName, commandOrigin);
 
             if (commandInfo != null)
             {
-                processor = LookupCommandProcessor(commandInfo, commandOrigin, useLocalScope, null);
+                processor = LookupCommandProcessor(commandInfo, commandOrigin, useLocalScope, null, forCompletion);
+
                 // commandInfo.Name might be different than commandName - restore the original invocation name
                 processor.Command.MyInvocation.InvocationName = commandName;
             }
@@ -286,7 +290,7 @@ internal CommandProcessorBase LookupCommandProcessor(string commandName,
             return processor;
         }
 
-        internal static void VerifyRequiredModules(ExternalScriptInfo scriptInfo, ExecutionContext context)
+        internal static void VerifyRequiredModules(ExternalScriptInfo scriptInfo, ExecutionContext context, bool forCompletion = false)
         {
             // Check Required Modules
             if (scriptInfo.RequiresModules != null)
@@ -301,7 +305,7 @@ internal static void VerifyRequiredModules(ExternalScriptInfo scriptInfo, Execut
                         moduleManifestPath: null,
                         manifestProcessingFlags: ModuleCmdletBase.ManifestProcessingFlags.LoadElements | ModuleCmdletBase.ManifestProcessingFlags.WriteErrors,
                         error: out error);
-                    if (error != null)
+                    if (!forCompletion && error is not null)
                     {
                         ScriptRequiresException scriptRequiresException =
                             new ScriptRequiresException(
@@ -316,9 +320,9 @@ internal static void VerifyRequiredModules(ExternalScriptInfo scriptInfo, Execut
             }
         }
 
-        private CommandProcessorBase CreateScriptProcessorForSingleShell(ExternalScriptInfo scriptInfo, ExecutionContext context, bool useLocalScope, SessionStateInternal sessionState)
+        private CommandProcessorBase CreateScriptProcessorForSingleShell(ExternalScriptInfo scriptInfo, ExecutionContext context, bool useLocalScope, SessionStateInternal sessionState, bool forCompletion = false)
         {
-            VerifyScriptRequirements(scriptInfo, Context);
+            VerifyScriptRequirements(scriptInfo, Context, forCompletion);
 
             if (!string.IsNullOrEmpty(scriptInfo.RequiresApplicationID))
             {
@@ -340,12 +344,18 @@ private CommandProcessorBase CreateScriptProcessorForSingleShell(ExternalScriptI
         // #Requires -PSVersion
         // #Requires -PSEdition
         // #Requires -Module
-        internal static void VerifyScriptRequirements(ExternalScriptInfo scriptInfo, ExecutionContext context)
+        internal static void VerifyScriptRequirements(ExternalScriptInfo scriptInfo, ExecutionContext context, bool forCompletion = false)
         {
-            VerifyElevatedPrivileges(scriptInfo);
-            VerifyPSVersion(scriptInfo);
-            VerifyPSEdition(scriptInfo);
-            VerifyRequiredModules(scriptInfo, context);
+            // When completing script parameters we don't care if these requirements are met.
+            // VerifyRequiredModules will attempt to load the required modules which is useful for completion (so the correct types are loaded).
+            if (!forCompletion)
+            {
+                VerifyElevatedPrivileges(scriptInfo);
+                VerifyPSVersion(scriptInfo);
+                VerifyPSEdition(scriptInfo);
+            }
+
+            VerifyRequiredModules(scriptInfo, context, forCompletion);
         }
 
         internal static void VerifyPSVersion(ExternalScriptInfo scriptInfo)
@@ -426,6 +436,9 @@ internal static void VerifyElevatedPrivileges(ExternalScriptInfo scriptInfo)
         /// False if not.  Null if command discovery should default to something reasonable
         /// for the command discovered.
         /// </param>
+        /// <param name="forCompletion">
+        /// True if this for parameter completion and script requirements should be ignored.
+        /// </param>
         /// <param name="sessionState">The session state the commandInfo should be run in.</param>
         /// <returns>
         /// </returns>
@@ -436,7 +449,7 @@ internal static void VerifyElevatedPrivileges(ExternalScriptInfo scriptInfo)
         /// If the security manager is preventing the command from running.
         /// </exception>
         internal CommandProcessorBase LookupCommandProcessor(CommandInfo commandInfo,
-            CommandOrigin commandOrigin, bool? useLocalScope, SessionStateInternal sessionState)
+            CommandOrigin commandOrigin, bool? useLocalScope, SessionStateInternal sessionState, bool forCompletion = false)
         {
             CommandProcessorBase processor = null;
 
@@ -482,7 +495,7 @@ internal CommandProcessorBase LookupCommandProcessor(CommandInfo commandInfo,
                     scriptInfo.SignatureChecked = true;
                     try
                     {
-                        processor = CreateScriptProcessorForSingleShell(scriptInfo, Context, useLocalScope ?? true, sessionState);
+                        processor = CreateScriptProcessorForSingleShell(scriptInfo, Context, useLocalScope ?? true, sessionState, forCompletion);
                     }
                     catch (ScriptRequiresSyntaxException reqSyntaxException)
                     {
@@ -1151,10 +1164,8 @@ internal void RegisterLookupCommandInfoAction(string currentAction, string comma
                 case "ActivePostCommand": currentActionSet = _activePostCommand; break;
             }
 
-            if (currentActionSet.Contains(command))
+            if (!currentActionSet.Add(command))
                 throw new InvalidOperationException();
-            else
-                currentActionSet.Add(command);
         }
 
         internal void UnregisterLookupCommandInfoAction(string currentAction, string command)
@@ -1168,8 +1179,7 @@ internal void UnregisterLookupCommandInfoAction(string currentAction, string com
                 case "ActivePostCommand": currentActionSet = _activePostCommand; break;
             }
 
-            if (currentActionSet.Contains(command))
-                currentActionSet.Remove(command);
+            currentActionSet.Remove(command);
         }
 
         private readonly HashSet<string> _activePreLookup = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
@@ -1221,11 +1231,17 @@ internal LookupPathCollection GetLookupDirectoryPaths()
                         string tempDir = directory.TrimStart();
                         if (tempDir.EqualsOrdinalIgnoreCase("~"))
                         {
-                            tempDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+                            tempDir = Environment.GetFolderPath(
+                                Environment.SpecialFolder.UserProfile,
+                                Environment.SpecialFolderOption.DoNotVerify);
                         }
                         else if (tempDir.StartsWith("~" + Path.DirectorySeparatorChar))
                         {
-                            tempDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + Path.DirectorySeparatorChar + tempDir.Substring(2);
+                            tempDir = Environment.GetFolderPath(
+                                Environment.SpecialFolder.UserProfile,
+                                Environment.SpecialFolderOption.DoNotVerify)
+                                + Path.DirectorySeparatorChar
+                                + tempDir.Substring(2);
                         }
 
                         _cachedPath.Add(tempDir);
diff --git a/src/System.Management.Automation/engine/CommandPathSearch.cs b/src/System.Management.Automation/engine/CommandPathSearch.cs
index 92a533e6ec0..12c494ad8ea 100644
--- a/src/System.Management.Automation/engine/CommandPathSearch.cs
+++ b/src/System.Management.Automation/engine/CommandPathSearch.cs
@@ -111,7 +111,7 @@ private void ResolveCurrentDirectoryInLookupPaths()
                 sessionState.IsProviderLoaded(fileSystemProviderName);
 
             string? environmentCurrentDirectory = null;
-            
+
             try
             {
                 environmentCurrentDirectory = Directory.GetCurrentDirectory();
diff --git a/src/System.Management.Automation/engine/CommandProcessor.cs b/src/System.Management.Automation/engine/CommandProcessor.cs
index d9758cea2fa..d1ef250d717 100644
--- a/src/System.Management.Automation/engine/CommandProcessor.cs
+++ b/src/System.Management.Automation/engine/CommandProcessor.cs
@@ -101,7 +101,7 @@ internal CommandProcessor(IScriptCommandInfo scriptCommandInfo, ExecutionContext
         /// </exception>
         internal ParameterBinderController NewParameterBinderController(InternalCommand command)
         {
-            if (!(command is Cmdlet cmdlet))
+            if (command is not Cmdlet cmdlet)
             {
                 throw PSTraceSource.NewArgumentException(nameof(command));
             }
diff --git a/src/System.Management.Automation/engine/CommandSearcher.cs b/src/System.Management.Automation/engine/CommandSearcher.cs
index 9acbae68ad0..638ccd4ac79 100644
--- a/src/System.Management.Automation/engine/CommandSearcher.cs
+++ b/src/System.Management.Automation/engine/CommandSearcher.cs
@@ -951,24 +951,13 @@ private static bool ShouldSkipCommandResolutionForConstrainedLanguage(CommandInf
 
             if (result != null)
             {
-                if (result is FilterInfo)
+                var formatString = result switch
                 {
-                    CommandDiscovery.discoveryTracer.WriteLine(
-                        "Filter found: {0}",
-                        function);
-                }
-                else if (result is ConfigurationInfo)
-                {
-                    CommandDiscovery.discoveryTracer.WriteLine(
-                        "Configuration found: {0}",
-                        function);
-                }
-                else
-                {
-                    CommandDiscovery.discoveryTracer.WriteLine(
-                        "Function found: {0}  {1}",
-                        function);
-                }
+                    FilterInfo => "Filter found: {0}",
+                    ConfigurationInfo => "Configuration found: {0}",
+                    _ => "Function found: {0}",
+                };
+                CommandDiscovery.discoveryTracer.WriteLine(formatString, function);
             }
             else
             {
@@ -1459,7 +1448,7 @@ private static CanDoPathLookupResult CanDoPathLookup(string possiblePath)
                 // If the command contains any invalid path characters, we can't
                 // do the path lookup
 
-                if (possiblePath.IndexOfAny(Path.GetInvalidPathChars()) != -1)
+                if (PathUtils.ContainsInvalidPathChars(possiblePath))
                 {
                     result = CanDoPathLookupResult.IllegalCharacters;
                     break;
diff --git a/src/System.Management.Automation/engine/CommonCommandParameters.cs b/src/System.Management.Automation/engine/CommonCommandParameters.cs
index ea636dc5838..9dc92d817aa 100644
--- a/src/System.Management.Automation/engine/CommonCommandParameters.cs
+++ b/src/System.Management.Automation/engine/CommonCommandParameters.cs
@@ -225,7 +225,7 @@ public string OutVariable
         /// This parameter configures the number of objects to buffer before calling the downstream Cmdlet
         /// </remarks>
         [Parameter]
-        [ValidateRangeAttribute(0, Int32.MaxValue)]
+        [ValidateRange(0, Int32.MaxValue)]
         [Alias("ob")]
         public int OutBuffer
         {
diff --git a/src/System.Management.Automation/engine/CoreAdapter.cs b/src/System.Management.Automation/engine/CoreAdapter.cs
index 55486c674ab..136083d04d7 100644
--- a/src/System.Management.Automation/engine/CoreAdapter.cs
+++ b/src/System.Management.Automation/engine/CoreAdapter.cs
@@ -1723,7 +1723,7 @@ internal static void SetReferences(object[] arguments, MethodInformation methodI
                     // It still might be an PSObject wrapping an PSReference
                     if (originalArgumentReference == null)
                     {
-                        if (!(originalArgument is PSObject originalArgumentObj))
+                        if (originalArgument is not PSObject originalArgumentObj)
                         {
                             continue;
                         }
@@ -2835,7 +2835,7 @@ internal PropertyCacheEntry(PropertyInfo property)
 
                 // Get the public or protected getter
                 MethodInfo propertyGetter = property.GetGetMethod(true);
-                if (propertyGetter != null && (propertyGetter.IsPublic || propertyGetter.IsFamily))
+                if (propertyGetter != null && (propertyGetter.IsPublic || propertyGetter.IsFamily || propertyGetter.IsFamilyOrAssembly))
                 {
                     this.isStatic = propertyGetter.IsStatic;
                     // Delegate is initialized later to avoid jit if it's not called
@@ -2847,7 +2847,7 @@ internal PropertyCacheEntry(PropertyInfo property)
 
                 // Get the public or protected setter
                 MethodInfo propertySetter = property.GetSetMethod(true);
-                if (propertySetter != null && (propertySetter.IsPublic || propertySetter.IsFamily))
+                if (propertySetter != null && (propertySetter.IsPublic || propertySetter.IsFamily || propertySetter.IsFamilyOrAssembly))
                 {
                     this.isStatic = propertySetter.IsStatic;
                 }
@@ -3860,7 +3860,7 @@ internal void AddAllDynamicMembers<T>(object obj, PSMemberInfoInternalCollection
 
         private static bool PropertyIsStatic(PSProperty property)
         {
-            if (!(property.adapterData is PropertyCacheEntry entry))
+            if (property.adapterData is not PropertyCacheEntry entry)
             {
                 return false;
             }
@@ -4365,7 +4365,7 @@ private static object InvokeResolvedConstructor(MethodInformation bestMethod, ob
 
         /// <summary>
         /// This is a flavor of MethodInvokeDotNet to deal with a peculiarity of property setters:
-        /// Tthe setValue is always the last parameter. This enables a parameter after a varargs or optional
+        /// The setValue is always the last parameter. This enables a parameter after a varargs or optional
         /// parameters and GetBestMethodAndArguments is not prepared for that.
         /// This method disregards the last parameter in its call to GetBestMethodAndArguments used in this case
         /// more for its "Arguments" side than for its "BestMethod" side, since there is only one method.
@@ -4441,7 +4441,7 @@ internal static string GetMethodInfoOverloadDefinition(string memberName, Method
             }
 
             builder.Append(memberName ?? methodEntry.Name);
-            if (methodEntry.IsGenericMethodDefinition)
+            if (methodEntry.IsGenericMethodDefinition || methodEntry.IsGenericMethod)
             {
                 builder.Append('[');
 
@@ -5440,7 +5440,7 @@ private static object GetNodeObject(XmlNode node)
             }
 
             XmlNodeList nodeChildren = node.ChildNodes;
-            // nodeChildren will not be null as we already verified iff the node has children.
+            // nodeChildren will not be null as we already verified that the node has children.
             if ((nodeChildren.Count == 1) && (nodeChildren[0].NodeType == XmlNodeType.Text))
             {
                 return node.InnerText;
diff --git a/src/System.Management.Automation/engine/Credential.cs b/src/System.Management.Automation/engine/Credential.cs
index b2be0dbfd2e..c921b9a084d 100644
--- a/src/System.Management.Automation/engine/Credential.cs
+++ b/src/System.Management.Automation/engine/Credential.cs
@@ -10,9 +10,6 @@
 using System.Security.Cryptography;
 using Microsoft.PowerShell;
 
-// FxCop suppressions for resource strings:
-[module: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", Scope = "resource", Target = "Credential.resources", MessageId = "Cred")]
-
 namespace System.Management.Automation
 {
     /// <summary>
diff --git a/src/System.Management.Automation/engine/DataStoreAdapter.cs b/src/System.Management.Automation/engine/DataStoreAdapter.cs
index 4cbe6f15f5a..07c7cef4d01 100644
--- a/src/System.Management.Automation/engine/DataStoreAdapter.cs
+++ b/src/System.Management.Automation/engine/DataStoreAdapter.cs
@@ -26,7 +26,7 @@ public class PSDriveInfo : IComparable
         /// using "SessionState" as the category.
         /// This is the same category as the SessionState tracer class.
         /// </summary>
-        [Dbg.TraceSourceAttribute(
+        [Dbg.TraceSource(
              "PSDriveInfo",
              "The namespace navigation tracer")]
         private static readonly Dbg.PSTraceSource s_tracer =
diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index 8eeec501031..6dfaf34fbec 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -562,7 +562,7 @@ public ErrorDetails(string message)
         /// <see cref="System.Resources.ResourceManager"/>
         /// </param>
         /// <param name="args">
-        /// <see cref="System.String.Format(IFormatProvider,string,object[])"/>
+        /// <see cref="string.Format(IFormatProvider,string,object[])"/>
         /// insertion parameters
         /// </param>
         /// <remarks>
@@ -584,7 +584,7 @@ public ErrorDetails(string message)
         /// by overriding virtual method
         /// <see cref="Cmdlet.GetResourceString"/>.
         /// This constructor then inserts the specified args using
-        /// <see cref="System.String.Format(IFormatProvider,string,object[])"/>.
+        /// <see cref="string.Format(IFormatProvider,string,object[])"/>.
         /// </remarks>
         public ErrorDetails(
             Cmdlet cmdlet,
@@ -610,7 +610,7 @@ public ErrorDetails(
         /// <see cref="System.Resources.ResourceManager"/>
         /// </param>
         /// <param name="args">
-        /// <see cref="System.String.Format(IFormatProvider,string,object[])"/>
+        /// <see cref="string.Format(IFormatProvider,string,object[])"/>
         /// insertion parameters
         /// </param>
         /// <remarks>
@@ -637,7 +637,7 @@ public ErrorDetails(
         /// will implement
         /// <see cref="IResourceSupplier"/>.
         /// The constructor then inserts the specified args using
-        /// <see cref="System.String.Format(IFormatProvider,string,object[])"/>.
+        /// <see cref="string.Format(IFormatProvider,string,object[])"/>.
         /// </remarks>
         public ErrorDetails(
             IResourceSupplier resourceSupplier,
@@ -663,7 +663,7 @@ public ErrorDetails(
         /// <see cref="System.Resources.ResourceManager"/>
         /// </param>
         /// <param name="args">
-        /// <see cref="System.String.Format(IFormatProvider,string,object[])"/>
+        /// <see cref="string.Format(IFormatProvider,string,object[])"/>
         /// insertion parameters
         /// </param>
         /// <remarks>
@@ -678,7 +678,7 @@ public ErrorDetails(
         /// This constructor first loads a template string from the assembly using
         /// <see cref="System.Resources.ResourceManager.GetString(string)"/>.
         /// The constructor then inserts the specified args using
-        /// <see cref="System.String.Format(IFormatProvider,string,object[])"/>.
+        /// <see cref="string.Format(IFormatProvider,string,object[])"/>.
         /// </remarks>
         public ErrorDetails(
             System.Reflection.Assembly assembly,
@@ -796,7 +796,7 @@ internal Exception TextLookupError
 
         #region ToString
         /// <summary>
-        /// As <see cref="System.Object.ToString()"/>
+        /// As <see cref="object.ToString()"/>
         /// </summary>
         /// <returns>Developer-readable identifier.</returns>
         public override string ToString()
@@ -1665,7 +1665,7 @@ private string GetInvocationTypeName()
                 return commandInfo.Name;
             }
 
-            if (!(commandInfo is CmdletInfo cmdletInfo))
+            if (commandInfo is not CmdletInfo cmdletInfo)
             {
                 return string.Empty;
             }
@@ -1677,7 +1677,7 @@ private string GetInvocationTypeName()
 
         #region ToString
         /// <summary>
-        /// As <see cref="System.Object.ToString()"/>
+        /// As <see cref="object.ToString()"/>
         /// </summary>
         /// <returns>Developer-readable identifier.</returns>
         public override string ToString()
@@ -1689,12 +1689,7 @@ public override string ToString()
 
             if (Exception != null)
             {
-                if (!string.IsNullOrEmpty(Exception.Message))
-                {
-                    return Exception.Message;
-                }
-
-                return Exception.ToString();
+                return Exception.Message ?? Exception.ToString();
             }
 
             return base.ToString();
@@ -1828,7 +1823,7 @@ public interface IResourceSupplier
         /// if you want more complex behavior.
         ///
         /// Insertions will be inserted into the string with
-        /// <see cref="System.String.Format(IFormatProvider,string,object[])"/>
+        /// <see cref="string.Format(IFormatProvider,string,object[])"/>
         /// to generate the final error message in
         /// <see cref="ErrorDetails.Message"/>.
         /// </remarks>
diff --git a/src/System.Management.Automation/engine/EventManager.cs b/src/System.Management.Automation/engine/EventManager.cs
index 75538135b92..1c5de607321 100644
--- a/src/System.Management.Automation/engine/EventManager.cs
+++ b/src/System.Management.Automation/engine/EventManager.cs
@@ -1830,6 +1830,11 @@ private PSEngineEvent() { }
         /// </summary>
         public const string OnIdle = "PowerShell.OnIdle";
 
+        /// <summary>
+        /// Called when <c>Debug-Runspace</c> has attached a debugger to the current runspace.
+        /// </summary>
+        public const string OnDebugAttach = "PowerShell.OnDebugAttach";
+
         /// <summary>
         /// Called during scriptblock invocation.
         /// </summary>
@@ -1843,7 +1848,7 @@ private PSEngineEvent() { }
         /// <summary>
         /// A HashSet that contains all engine event names.
         /// </summary>
-        internal static readonly HashSet<string> EngineEvents = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { Exiting, OnIdle, OnScriptBlockInvoke };
+        internal static readonly HashSet<string> EngineEvents = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { Exiting, OnIdle, OnDebugAttach, OnScriptBlockInvoke };
     }
 
     /// <summary>
@@ -2045,7 +2050,7 @@ public override bool Equals(object obj)
         {
             return obj is PSEventSubscriber es && Equals(es);
         }
-        
+
         /// <summary>
         /// Determines if two PSEventSubscriber instances are equal
         /// </summary>
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index 56f64c1a5c2..ac39eade17b 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -477,7 +477,6 @@ internal LocationGlobber LocationGlobber
         /// The assemblies that have been loaded for this runspace.
         /// </summary>
         internal Dictionary<string, Assembly> AssemblyCache { get; private set; }
-
         #endregion Properties
 
         #region Engine State
@@ -634,12 +633,13 @@ internal HelpSystem HelpSystem
         /// </summary>
         /// <param name="command">The name of the command to lookup.</param>
         /// <param name="dotSource"></param>
+        /// <param name="forCompletion"></param>
         /// <returns>The command processor object.</returns>
-        internal CommandProcessorBase CreateCommand(string command, bool dotSource)
+        internal CommandProcessorBase CreateCommand(string command, bool dotSource, bool forCompletion = false)
         {
             CommandOrigin commandOrigin = this.EngineSessionState.CurrentScope.ScopeOrigin;
             CommandProcessorBase commandProcessor =
-                CommandDiscovery.LookupCommandProcessor(command, commandOrigin, !dotSource);
+                CommandDiscovery.LookupCommandProcessor(command, commandOrigin, !dotSource, forCompletion);
             // Reset the command origin for script commands... // BUGBUG - dotting can get around command origin checks???
             if (commandProcessor != null && commandProcessor is ScriptCommandProcessorBase)
             {
@@ -1385,6 +1385,7 @@ private static Assembly LoadAssembly(string name, string filePath, out Exception
             {
                 try
                 {
+                    // codeql[cs/dll-injection-remote] - The dll is loaded during the initial state setup, which is expected behavior. This allows users hosting PowerShell to load additional C# types to enable their specific scenarios.
                     loadedAssembly = Assembly.LoadFrom(filePath);
                     return loadedAssembly;
                 }
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/EnableDisableExperimentalFeatureCommand.cs b/src/System.Management.Automation/engine/ExperimentalFeature/EnableDisableExperimentalFeatureCommand.cs
index 2cdb266571d..af09f427253 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/EnableDisableExperimentalFeatureCommand.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/EnableDisableExperimentalFeatureCommand.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation;
@@ -112,26 +113,28 @@ public class ExperimentalFeatureNameCompleter : IArgumentCompleter
         /// <param name="commandAst">The command AST.</param>
         /// <param name="fakeBoundParameters">The fake bound parameters.</param>
         /// <returns>List of Completion Results.</returns>
-        public IEnumerable<CompletionResult> CompleteArgument(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
+        public IEnumerable<CompletionResult> CompleteArgument(
+            string commandName,
+            string parameterName,
+            string wordToComplete,
+            CommandAst commandAst,
+            IDictionary fakeBoundParameters)
         {
-            if (fakeBoundParameters == null)
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(fakeBoundParameters));
-            }
-
-            var commandInfo = new CmdletInfo("Get-ExperimentalFeature", typeof(GetExperimentalFeatureCommand));
-            var ps = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace)
-                .AddCommand(commandInfo)
-                .AddParameter("Name", wordToComplete + "*");
+            SortedSet<string> expirmentalFeatures = new(StringComparer.OrdinalIgnoreCase);
 
-            HashSet<string> names = new HashSet<string>();
-            var results = ps.Invoke<ExperimentalFeature>();
-            foreach (var result in results)
+            foreach (ExperimentalFeature feature in GetExperimentalFeatures())
             {
-                names.Add(result.Name);
+                expirmentalFeatures.Add(feature.Name);
             }
 
-            return names.Order().Select(static name => new CompletionResult(name, name, CompletionResultType.Text, name));
+            return CompletionHelpers.GetMatchingResults(wordToComplete, expirmentalFeatures);
+        }
+
+        private static Collection<ExperimentalFeature> GetExperimentalFeatures()
+        {
+            using var ps = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);
+            ps.AddCommand("Get-ExperimentalFeature");
+            return ps.Invoke<ExperimentalFeature>();
         }
     }
 }
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 25d9b6e2743..7e17ec43137 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -21,9 +20,8 @@ public class ExperimentalFeature
         #region Const Members
 
         internal const string EngineSource = "PSEngine";
-        internal const string PSModuleAutoLoadSkipOfflineFilesFeatureName = "PSModuleAutoLoadSkipOfflineFiles";
-        internal const string PSFeedbackProvider = "PSFeedbackProvider";
-        internal const string PSCommandWithArgs = "PSCommandWithArgs";
+        internal const string PSSerializeJSONLongEnumAsNumber = nameof(PSSerializeJSONLongEnumAsNumber);
+        internal const string PSProfileDSCResource = "PSProfileDSCResource";
 
         #endregion
 
@@ -106,24 +104,17 @@ static ExperimentalFeature()
                     name: "PSFileSystemProviderV2",
                     description: "Replace the old FileSystemProvider with cleaner design and faster code"),
                 */
-                new ExperimentalFeature(
-                    name: "PSCommandNotFoundSuggestion",
-                    description: "Recommend potential commands based on fuzzy search on a CommandNotFoundException"),
-                new ExperimentalFeature(
-                    name: "PSSubsystemPluginModel",
-                    description: "A plugin model for registering and un-registering PowerShell subsystems"),
                 new ExperimentalFeature(
                     name: "PSLoadAssemblyFromNativeCode",
                     description: "Expose an API to allow assembly loading from native code"),
                 new ExperimentalFeature(
-                    name: PSModuleAutoLoadSkipOfflineFilesFeatureName,
-                    description: "Module discovery will skip over files that are marked by cloud providers as not fully on disk."),
-                new ExperimentalFeature(
-                    name: PSFeedbackProvider,
-                    description: "Replace the hard-coded suggestion framework with the extensible feedback provider"),
+                    name: PSSerializeJSONLongEnumAsNumber,
+                    description: "Serialize enums based on long or ulong as an numeric value rather than the string representation when using ConvertTo-Json."
+                ),
                 new ExperimentalFeature(
-                    name: PSCommandWithArgs,
-                    description: "Enable `-CommandWithArgs` parameter for pwsh"),
+                    name: PSProfileDSCResource,
+                    description: "DSC v3 resources for managing PowerShell profile."
+                )
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/GetCommandCommand.cs b/src/System.Management.Automation/engine/GetCommandCommand.cs
index 9784cdc9ea8..10e8334021b 100644
--- a/src/System.Management.Automation/engine/GetCommandCommand.cs
+++ b/src/System.Management.Automation/engine/GetCommandCommand.cs
@@ -12,6 +12,7 @@
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 using System.Management.Automation.Language;
+using static System.Management.Automation.Verbs;
 using Dbg = System.Management.Automation.Diagnostics;
 
 namespace Microsoft.PowerShell.Commands
@@ -71,6 +72,7 @@ public string[] Name
         /// Gets or sets the verb parameter to the cmdlet.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = "CmdletSet")]
+        [ArgumentCompleter(typeof(VerbArgumentCompleter))]
         public string[] Verb
         {
             get
@@ -138,6 +140,28 @@ public string[] Module
         private string[] _modules = Array.Empty<string>();
         private bool _isModuleSpecified = false;
 
+        /// <summary>
+        /// Gets or sets the ExcludeModule parameter to the cmdlet.
+        /// </summary>
+        [Parameter()]
+        public string[] ExcludeModule
+        {
+            get
+            {
+                return _excludedModules;
+            }
+
+            set
+            {
+                value ??= Array.Empty<string>();
+
+                _excludedModules = value;
+                _excludedModulePatterns = null;
+            }
+        }
+
+        private string[] _excludedModules = Array.Empty<string>();
+
         /// <summary>
         /// Gets or sets the FullyQualifiedModule parameter to the cmdlet.
         /// </summary>
@@ -402,6 +426,7 @@ protected override void ProcessRecord()
 
             // Initialize the module patterns
             _modulePatterns ??= SessionStateUtilities.CreateWildcardsFromStrings(Module, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
+            _excludedModulePatterns ??= SessionStateUtilities.CreateWildcardsFromStrings(ExcludeModule, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
 
             switch (ParameterSetName)
             {
@@ -700,6 +725,13 @@ private bool IsNounVerbMatch(CommandInfo command)
 
                 if (!string.IsNullOrEmpty(command.ModuleName))
                 {
+                    if (_excludedModulePatterns is not null
+                        && _excludedModulePatterns.Count > 0
+                        && SessionStateUtilities.MatchesAnyWildcardPattern(command.ModuleName, _excludedModulePatterns, true))
+                    {
+                        break;
+                    }
+
                     if (_isFullyQualifiedModuleSpecified)
                     {
                         if (!_moduleSpecifications.Any(
@@ -1269,6 +1301,13 @@ private bool IsCommandMatch(ref CommandInfo current, out bool isDuplicate)
                 }
                 else
                 {
+                    if (_excludedModulePatterns is not null
+                        && _excludedModulePatterns.Count > 0
+                        && SessionStateUtilities.MatchesAnyWildcardPattern(current.ModuleName, _excludedModulePatterns, true))
+                    {
+                        return false;
+                    }
+
                     if (_isFullyQualifiedModuleSpecified)
                     {
                         bool foundModuleMatch = false;
@@ -1528,6 +1567,7 @@ private bool IsCommandInResult(CommandInfo command)
         private Collection<WildcardPattern> _verbPatterns;
         private Collection<WildcardPattern> _nounPatterns;
         private Collection<WildcardPattern> _modulePatterns;
+        private Collection<WildcardPattern> _excludedModulePatterns;
 
 #if LEGACYTELEMETRY
         private Stopwatch _timer = new Stopwatch();
@@ -1654,40 +1694,50 @@ private static PSObject GetParameterType(Type parameterType)
     }
 
     /// <summary>
+    /// Provides argument completion for Noun parameter.
     /// </summary>
     public class NounArgumentCompleter : IArgumentCompleter
     {
+        /// </summary>
+        /// Returns completion results for Noun parameter.
+        /// </summary>
+        /// <param name="commandName">The command name.</param>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="commandAst">The command AST.</param>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>List of completion results.</returns>
+        public IEnumerable<CompletionResult> CompleteArgument(
+            string commandName,
+            string parameterName,
+            string wordToComplete,
+            CommandAst commandAst,
+            IDictionary fakeBoundParameters) => CompletionHelpers.GetMatchingResults(
+                wordToComplete,
+                possibleCompletionValues: GetCommandNouns(fakeBoundParameters));
+
         /// <summary>
+        /// Get sorted set of command nouns using Get-Command.
         /// </summary>
-        public IEnumerable<CompletionResult> CompleteArgument(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>Sorted set of command nouns.</returns>
+        private static SortedSet<string> GetCommandNouns(IDictionary fakeBoundParameters)
         {
-            if (fakeBoundParameters == null)
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(fakeBoundParameters));
-            }
-
-            var commandInfo = new CmdletInfo("Get-Command", typeof(GetCommandCommand));
-            var ps = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace)
-                .AddCommand(commandInfo)
-                .AddParameter("Noun", wordToComplete + "*");
-
-            if (fakeBoundParameters.Contains("Module"))
-            {
-                ps.AddParameter("Module", fakeBoundParameters["Module"]);
-            }
+            Collection<CommandInfo> commands = CompletionCompleters.GetCommandInfo(fakeBoundParameters, "Module", "Verb");
+            SortedSet<string> nouns = new(StringComparer.OrdinalIgnoreCase);
 
-            HashSet<string> nouns = new HashSet<string>();
-            var results = ps.Invoke<CommandInfo>();
-            foreach (var result in results)
+            foreach (CommandInfo command in commands)
             {
-                var dash = result.Name.IndexOf('-');
-                if (dash != -1)
+                string commandName = command.Name;
+                int dashIndex = commandName.IndexOf('-');
+                if (dashIndex != -1)
                 {
-                    nouns.Add(result.Name.Substring(dash + 1));
+                    string noun = commandName.Substring(dashIndex + 1);
+                    nouns.Add(noun);
                 }
             }
 
-            return nouns.Order().Select(static noun => new CompletionResult(noun, noun, CompletionResultType.Text, noun));
+            return nouns;
         }
     }
 }
diff --git a/src/System.Management.Automation/engine/ICommandRuntime.cs b/src/System.Management.Automation/engine/ICommandRuntime.cs
index 4fd0c0061b1..49b1104e047 100644
--- a/src/System.Management.Automation/engine/ICommandRuntime.cs
+++ b/src/System.Management.Automation/engine/ICommandRuntime.cs
@@ -457,11 +457,11 @@ public interface ICommandRuntime
         /// It may be displayed by some hosts, but not all.
         /// </param>
         /// <param name="yesToAll">
-        /// true iff user selects YesToAll.  If this is already true,
+        /// true if-and-only-if user selects YesToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return true.
         /// </param>
         /// <param name="noToAll">
-        /// true iff user selects NoToAll.  If this is already true,
+        /// true if-and-only-if user selects NoToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return false.
         /// </param>
         /// <returns>
@@ -592,11 +592,11 @@ public interface ICommandRuntime2 : ICommandRuntime
         /// the default option selected in the selection menu is 'No'.
         /// </param>
         /// <param name="yesToAll">
-        /// true iff user selects YesToAll.  If this is already true,
+        /// true if-and-only-if user selects YesToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return true.
         /// </param>
         /// <param name="noToAll">
-        /// true iff user selects NoToAll.  If this is already true,
+        /// true if-and-only-if user selects NoToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return false.
         /// </param>
         /// <exception cref="System.Management.Automation.PipelineStoppedException">
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 0a2d3fa74df..62308282d17 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -1569,14 +1569,10 @@ public static InitialSessionState CreateDefault()
                 string assembly = ss.Assemblies[i].FileName;
                 if (!string.IsNullOrEmpty(assembly))
                 {
-                    if (assemblyList.Contains(assembly))
+                    if (!assemblyList.Add(assembly))
                     {
                         ss.Assemblies.RemoveItem(i);
                     }
-                    else
-                    {
-                        assemblyList.Add(assembly);
-                    }
                 }
             }
 
@@ -2864,7 +2860,7 @@ private string MakeUserNamePath()
             // Ensure that user name contains no invalid path characters.
             // MSDN indicates that logon names cannot contain any of these invalid characters,
             // but this check will ensure safety.
-            if (userName.IndexOfAny(System.IO.Path.GetInvalidPathChars()) > -1)
+            if (PathUtils.ContainsInvalidPathChars(userName))
             {
                 throw new PSInvalidOperationException(RemotingErrorIdStrings.InvalidUserDriveName);
             }
@@ -4531,6 +4527,14 @@ static InitialSessionState()
                     ScopedItemOptions.None,
                     new ArgumentTypeConverterAttribute(typeof(System.Text.Encoding))),
 
+                // Variable which controls the encoding for decoding data from a NativeCommand
+                new SessionStateVariableEntry(
+                    SpecialVariables.PSApplicationOutputEncoding,
+                    null,
+                    RunspaceInit.PSApplicationOutputEncodingDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(Encoding))),
+
                 // Preferences
                 //
                 // NTRAID#Windows Out Of Band Releases-931461-2006/03/13
@@ -5474,6 +5478,7 @@ private static void InitializeCoreCmdletsAndProviders(
                 { "Get-Module",                        new SessionStateCmdletEntry("Get-Module", typeof(GetModuleCommand), helpFile) },
                 { "Get-PSHostProcessInfo",             new SessionStateCmdletEntry("Get-PSHostProcessInfo", typeof(GetPSHostProcessInfoCommand), helpFile) },
                 { "Get-PSSession",                     new SessionStateCmdletEntry("Get-PSSession", typeof(GetPSSessionCommand), helpFile) },
+                { "Get-PSSubsystem",                   new SessionStateCmdletEntry("Get-PSSubsystem", typeof(Subsystem.GetPSSubsystemCommand), helpFile) },
                 { "Import-Module",                     new SessionStateCmdletEntry("Import-Module", typeof(ImportModuleCommand), helpFile) },
                 { "Invoke-Command",                    new SessionStateCmdletEntry("Invoke-Command", typeof(InvokeCommandCommand), helpFile) },
                 { "Invoke-History",                    new SessionStateCmdletEntry("Invoke-History", typeof(InvokeHistoryCommand), helpFile) },
@@ -5514,11 +5519,6 @@ private static void InitializeCoreCmdletsAndProviders(
                 { "Format-Default",                    new SessionStateCmdletEntry("Format-Default", typeof(FormatDefaultCommand), helpFile) },
             };
 
-            if (ExperimentalFeature.IsEnabled("PSSubsystemPluginModel"))
-            {
-                cmdlets.Add("Get-PSSubsystem", new SessionStateCmdletEntry("Get-PSSubsystem", typeof(Subsystem.GetPSSubsystemCommand), helpFile));
-            }
-
 #if UNIX
             cmdlets.Add("Switch-Process", new SessionStateCmdletEntry("Switch-Process", typeof(SwitchProcessCommand), helpFile));
 #endif
diff --git a/src/System.Management.Automation/engine/InternalCommands.cs b/src/System.Management.Automation/engine/InternalCommands.cs
index 86502861bfa..4e50e2d130f 100644
--- a/src/System.Management.Automation/engine/InternalCommands.cs
+++ b/src/System.Management.Automation/engine/InternalCommands.cs
@@ -1441,8 +1441,11 @@ public SwitchParameter EQ
 
             set
             {
-                _binaryOperator = TokenKind.Ieq;
-                _forceBooleanEvaluation = false;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ieq;
+                    _forceBooleanEvaluation = false;
+                }
             }
         }
 
@@ -1459,7 +1462,10 @@ public SwitchParameter CEQ
 
             set
             {
-                _binaryOperator = TokenKind.Ceq;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ceq;
+                }
             }
         }
 
@@ -1477,7 +1483,10 @@ public SwitchParameter NE
 
             set
             {
-                _binaryOperator = TokenKind.Ine;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ine;
+                }
             }
         }
 
@@ -1494,7 +1503,10 @@ public SwitchParameter CNE
 
             set
             {
-                _binaryOperator = TokenKind.Cne;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cne;
+                }
             }
         }
 
@@ -1512,7 +1524,10 @@ public SwitchParameter GT
 
             set
             {
-                _binaryOperator = TokenKind.Igt;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Igt;
+                }
             }
         }
 
@@ -1529,7 +1544,10 @@ public SwitchParameter CGT
 
             set
             {
-                _binaryOperator = TokenKind.Cgt;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cgt;
+                }
             }
         }
 
@@ -1547,7 +1565,10 @@ public SwitchParameter LT
 
             set
             {
-                _binaryOperator = TokenKind.Ilt;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ilt;
+                }
             }
         }
 
@@ -1564,7 +1585,10 @@ public SwitchParameter CLT
 
             set
             {
-                _binaryOperator = TokenKind.Clt;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Clt;
+                }
             }
         }
 
@@ -1582,7 +1606,10 @@ public SwitchParameter GE
 
             set
             {
-                _binaryOperator = TokenKind.Ige;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ige;
+                }
             }
         }
 
@@ -1599,7 +1626,10 @@ public SwitchParameter CGE
 
             set
             {
-                _binaryOperator = TokenKind.Cge;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cge;
+                }
             }
         }
 
@@ -1617,7 +1647,10 @@ public SwitchParameter LE
 
             set
             {
-                _binaryOperator = TokenKind.Ile;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ile;
+                }
             }
         }
 
@@ -1634,7 +1667,10 @@ public SwitchParameter CLE
 
             set
             {
-                _binaryOperator = TokenKind.Cle;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cle;
+                }
             }
         }
 
@@ -1652,7 +1688,10 @@ public SwitchParameter Like
 
             set
             {
-                _binaryOperator = TokenKind.Ilike;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ilike;
+                }
             }
         }
 
@@ -1669,7 +1708,10 @@ public SwitchParameter CLike
 
             set
             {
-                _binaryOperator = TokenKind.Clike;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Clike;
+                }
             }
         }
 
@@ -1687,7 +1729,10 @@ public SwitchParameter NotLike
 
             set
             {
-                _binaryOperator = TokenKind.Inotlike;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Inotlike;
+                }
             }
         }
 
@@ -1704,7 +1749,10 @@ public SwitchParameter CNotLike
 
             set
             {
-                _binaryOperator = TokenKind.Cnotlike;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cnotlike;
+                }
             }
         }
 
@@ -1722,7 +1770,10 @@ public SwitchParameter Match
 
             set
             {
-                _binaryOperator = TokenKind.Imatch;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Imatch;
+                }
             }
         }
 
@@ -1739,7 +1790,10 @@ public SwitchParameter CMatch
 
             set
             {
-                _binaryOperator = TokenKind.Cmatch;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cmatch;
+                }
             }
         }
 
@@ -1757,7 +1811,10 @@ public SwitchParameter NotMatch
 
             set
             {
-                _binaryOperator = TokenKind.Inotmatch;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Inotmatch;
+                }
             }
         }
 
@@ -1774,7 +1831,10 @@ public SwitchParameter CNotMatch
 
             set
             {
-                _binaryOperator = TokenKind.Cnotmatch;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cnotmatch;
+                }
             }
         }
 
@@ -1792,7 +1852,10 @@ public SwitchParameter Contains
 
             set
             {
-                _binaryOperator = TokenKind.Icontains;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Icontains;
+                }
             }
         }
 
@@ -1809,7 +1872,10 @@ public SwitchParameter CContains
 
             set
             {
-                _binaryOperator = TokenKind.Ccontains;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Ccontains;
+                }
             }
         }
 
@@ -1827,7 +1893,10 @@ public SwitchParameter NotContains
 
             set
             {
-                _binaryOperator = TokenKind.Inotcontains;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Inotcontains;
+                }
             }
         }
 
@@ -1844,7 +1913,10 @@ public SwitchParameter CNotContains
 
             set
             {
-                _binaryOperator = TokenKind.Cnotcontains;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cnotcontains;
+                }
             }
         }
 
@@ -1862,7 +1934,10 @@ public SwitchParameter In
 
             set
             {
-                _binaryOperator = TokenKind.In;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.In;
+                }
             }
         }
 
@@ -1879,7 +1954,10 @@ public SwitchParameter CIn
 
             set
             {
-                _binaryOperator = TokenKind.Cin;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cin;
+                }
             }
         }
 
@@ -1897,7 +1975,10 @@ public SwitchParameter NotIn
 
             set
             {
-                _binaryOperator = TokenKind.Inotin;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Inotin;
+                }
             }
         }
 
@@ -1914,7 +1995,10 @@ public SwitchParameter CNotIn
 
             set
             {
-                _binaryOperator = TokenKind.Cnotin;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Cnotin;
+                }
             }
         }
 
@@ -1931,7 +2015,10 @@ public SwitchParameter Is
 
             set
             {
-                _binaryOperator = TokenKind.Is;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Is;
+                }
             }
         }
 
@@ -1948,7 +2035,10 @@ public SwitchParameter IsNot
 
             set
             {
-                _binaryOperator = TokenKind.IsNot;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.IsNot;
+                }
             }
         }
 
@@ -1965,7 +2055,10 @@ public SwitchParameter Not
 
             set
             {
-                _binaryOperator = TokenKind.Not;
+                if (value)
+                {
+                    _binaryOperator = TokenKind.Not;
+                }
             }
         }
 
@@ -2018,7 +2111,7 @@ private void CheckLanguageMode()
 
         private object GetLikeRHSOperand(object operand)
         {
-            if (!(operand is string val))
+            if (operand is not string val)
             {
                 return operand;
             }
@@ -2741,17 +2834,9 @@ public IEnumerable<CompletionResult> CompleteArgument(
             string wordToComplete,
             CommandAst commandAst,
             IDictionary fakeBoundParameters)
-        {
-            var strictModeVersionPattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
-
-            foreach (string version in s_strictModeVersions)
-            {
-                if (strictModeVersionPattern.IsMatch(version))
-                {
-                    yield return new CompletionResult(version);
-                }
-            }
-        }
+                => CompletionHelpers.GetMatchingResults(
+                    wordToComplete,
+                    possibleCompletionValues: s_strictModeVersions);
     }
 
     #endregion Set-StrictMode
diff --git a/src/System.Management.Automation/engine/Interop/Windows/AssignProcessToJobObject.cs b/src/System.Management.Automation/engine/Interop/Windows/AssignProcessToJobObject.cs
index 1a924fb51dc..7605420dab4 100644
--- a/src/System.Management.Automation/engine/Interop/Windows/AssignProcessToJobObject.cs
+++ b/src/System.Management.Automation/engine/Interop/Windows/AssignProcessToJobObject.cs
@@ -4,13 +4,16 @@
 #nullable enable
 
 using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
 
 internal static partial class Interop
 {
     internal static partial class Windows
     {
-        [LibraryImport("Kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool AssignProcessToJobObject(nint hJob, nint hProcess);
+        internal static partial bool AssignProcessToJobObject(
+            SafeJobHandle hJob,
+            SafeProcessHandle hProcess);
     }
 }
diff --git a/src/System.Management.Automation/engine/Interop/Windows/CreateIoCompletionPort.cs b/src/System.Management.Automation/engine/Interop/Windows/CreateIoCompletionPort.cs
new file mode 100644
index 00000000000..0b877fcdaea
--- /dev/null
+++ b/src/System.Management.Automation/engine/Interop/Windows/CreateIoCompletionPort.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class Windows
+    {
+        internal sealed class SafeIoCompletionPort : SafeHandle
+        {
+            public SafeIoCompletionPort() : base(invalidHandleValue: nint.Zero, ownsHandle: true) { }
+
+            public override bool IsInvalid => handle == nint.Zero;
+
+            protected override bool ReleaseHandle()
+                => Windows.CloseHandle(handle);
+        }
+
+        [LibraryImport("kernel32.dll", SetLastError = true)]
+        private static partial SafeIoCompletionPort CreateIoCompletionPort(
+            nint FileHandle,
+            nint ExistingCompletionPort,
+            nint CompletionKey,
+            int NumberOfConcurrentThreads);
+
+        internal static SafeIoCompletionPort CreateIoCompletionPort()
+        {
+            return CreateIoCompletionPort(
+                FileHandle: -1,
+                ExistingCompletionPort: nint.Zero,
+                CompletionKey: nint.Zero,
+                NumberOfConcurrentThreads: 1);
+        }
+    }
+}
diff --git a/src/System.Management.Automation/engine/Interop/Windows/CreateJobObject.cs b/src/System.Management.Automation/engine/Interop/Windows/CreateJobObject.cs
new file mode 100644
index 00000000000..fee16b813aa
--- /dev/null
+++ b/src/System.Management.Automation/engine/Interop/Windows/CreateJobObject.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Windows
+    {
+        internal sealed class SafeJobHandle : SafeHandle
+        {
+            public SafeJobHandle() : base(invalidHandleValue: nint.Zero, ownsHandle: true) { }
+
+            public override bool IsInvalid => handle == nint.Zero;
+
+            protected override bool ReleaseHandle()
+                => Windows.CloseHandle(handle);
+        }
+
+        [LibraryImport("kernel32.dll", EntryPoint = "CreateJobObjectW", SetLastError = true)]
+        private static partial SafeJobHandle CreateJobObject(
+            nint lpJobAttributes,
+            nint lpName);
+
+        internal static SafeJobHandle CreateJobObject()
+            => CreateJobObject(nint.Zero, nint.Zero);
+    }
+}
diff --git a/src/System.Management.Automation/engine/Interop/Windows/GetQueuedCompletionStatus.cs b/src/System.Management.Automation/engine/Interop/Windows/GetQueuedCompletionStatus.cs
new file mode 100644
index 00000000000..d23234e850b
--- /dev/null
+++ b/src/System.Management.Automation/engine/Interop/Windows/GetQueuedCompletionStatus.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class Windows
+    {
+        public const int INFINITE = -1;
+
+        [LibraryImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool GetQueuedCompletionStatus(
+            SafeIoCompletionPort CompletionPort,
+            out int lpNumberOfBytesTransferred,
+            out nint lpCompletionKey,
+            out nint lpOverlapped,
+            int dwMilliseconds);
+
+        internal static bool GetQueuedCompletionStatus(
+            SafeIoCompletionPort completionPort,
+            int timeoutMilliseconds,
+            out int status)
+        {
+            return GetQueuedCompletionStatus(
+                completionPort,
+                out status,
+                lpCompletionKey: out _,
+                lpOverlapped: out _,
+                timeoutMilliseconds);
+        }
+    }
+}
diff --git a/src/System.Management.Automation/engine/Interop/Windows/NetApiBufferFree.cs b/src/System.Management.Automation/engine/Interop/Windows/NetApiBufferFree.cs
new file mode 100644
index 00000000000..4f7d0541872
--- /dev/null
+++ b/src/System.Management.Automation/engine/Interop/Windows/NetApiBufferFree.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class Windows
+    {
+
+        [LibraryImport("Netapi32.dll")]
+        internal static partial uint NetApiBufferFree(nint Buffer);
+    }
+}
diff --git a/src/System.Management.Automation/engine/Interop/Windows/PostQueuedCompletionStatus.cs b/src/System.Management.Automation/engine/Interop/Windows/PostQueuedCompletionStatus.cs
new file mode 100644
index 00000000000..714eedcc3e5
--- /dev/null
+++ b/src/System.Management.Automation/engine/Interop/Windows/PostQueuedCompletionStatus.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class Windows
+    {
+        [LibraryImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool PostQueuedCompletionStatus(
+            SafeIoCompletionPort CompletionPort,
+            int lpNumberOfBytesTransferred,
+            nint lpCompletionKey,
+            nint lpOverlapped);
+
+        internal static bool PostQueuedCompletionStatus(
+            SafeIoCompletionPort completionPort,
+            int status)
+        {
+            return PostQueuedCompletionStatus(completionPort, status, nint.Zero, nint.Zero);
+        }
+    }
+}
diff --git a/src/System.Management.Automation/engine/Interop/Windows/QueryDosDevice.cs b/src/System.Management.Automation/engine/Interop/Windows/QueryDosDevice.cs
index 27907bd0135..d23899e8ef7 100644
--- a/src/System.Management.Automation/engine/Interop/Windows/QueryDosDevice.cs
+++ b/src/System.Management.Automation/engine/Interop/Windows/QueryDosDevice.cs
@@ -28,7 +28,7 @@ internal static string GetDosDeviceForNetworkPath(char deviceName)
 #endif
 
             Span<char> buffer = stackalloc char[StartLength + 1];
-            Span<char> fullDeviceName = stackalloc char[3] { deviceName, ':', '\0' };
+            Span<char> fullDeviceName = [deviceName, ':', '\0'];
             char[]? rentedArray = null;
 
             try
diff --git a/src/System.Management.Automation/engine/Interop/Windows/SetInformationJobObject.cs b/src/System.Management.Automation/engine/Interop/Windows/SetInformationJobObject.cs
new file mode 100644
index 00000000000..37d0e74f1f8
--- /dev/null
+++ b/src/System.Management.Automation/engine/Interop/Windows/SetInformationJobObject.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class Windows
+    {
+        internal const int JobObjectAssociateCompletionPortInformation = 7;
+        internal const int JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO = 4;
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct JOBOBJECT_ASSOCIATE_COMPLETION_PORT
+        {
+            public nint CompletionKey;
+            public nint CompletionPort;
+        }
+
+        [LibraryImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool SetInformationJobObject(
+            SafeJobHandle hJob,
+            int JobObjectInformationClass,
+            ref JOBOBJECT_ASSOCIATE_COMPLETION_PORT lpJobObjectInformation,
+            int cbJobObjectInformationLength);
+
+        internal static bool SetInformationJobObject(
+            SafeJobHandle jobHandle,
+            SafeIoCompletionPort completionPort)
+        {
+            JOBOBJECT_ASSOCIATE_COMPLETION_PORT objectInfo = new()
+            {
+                CompletionKey = jobHandle.DangerousGetHandle(),
+                CompletionPort = completionPort.DangerousGetHandle(),
+            };
+            return SetInformationJobObject(
+                jobHandle,
+                JobObjectAssociateCompletionPortInformation,
+                ref objectInfo,
+                Marshal.SizeOf<JOBOBJECT_ASSOCIATE_COMPLETION_PORT>());
+        }
+    }
+}
diff --git a/src/System.Management.Automation/engine/Interop/Windows/WNetGetConnection.cs b/src/System.Management.Automation/engine/Interop/Windows/WNetGetConnection.cs
index bf7742526f1..01667fb4274 100644
--- a/src/System.Management.Automation/engine/Interop/Windows/WNetGetConnection.cs
+++ b/src/System.Management.Automation/engine/Interop/Windows/WNetGetConnection.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Buffers;
 using System.Runtime.InteropServices;
+using System.Management.Automation.Internal;
 
 internal static partial class Interop
 {
@@ -13,8 +14,8 @@ internal static unsafe partial class Windows
     {
         private static bool s_WNetApiNotAvailable;
 
-        [LibraryImport("mpr.dll", EntryPoint = "WNetGetConnectionW")]
-        internal static partial int WNetGetConnection(ReadOnlySpan<ushort> localName, Span<ushort> remoteName, ref uint remoteNameLength);
+        [LibraryImport("mpr.dll", EntryPoint = "WNetGetConnectionW", StringMarshalling = StringMarshalling.Utf16)]
+        internal static partial int WNetGetConnection(ReadOnlySpan<char> localName, Span<char> remoteName, ref int remoteNameLength);
 
         internal static int GetUNCForNetworkDrive(char drive, out string? uncPath)
         {
@@ -24,59 +25,62 @@ internal static int GetUNCForNetworkDrive(char drive, out string? uncPath)
                 return ERROR_NOT_SUPPORTED;
             }
 
-            uint bufferSize = MAX_PATH;
-
-#if DEBUG
-            // In Debug mode buffer size is initially set to 3 and if additional buffer is required, the
-            // required buffer size is allocated and the WNetGetConnection API is executed with the newly
-            // allocated buffer size.
-            bufferSize = 3;
-#endif
-
-            // TODO: change ushort with char after LibraryImport will support 'ref char'
-            // without applying the 'System.Runtime.CompilerServices.DisableRuntimeMarshallingAttribute'
-            // to the assembly.
-            ReadOnlySpan<ushort> driveName = stackalloc ushort[] { drive, ':', '\0' };
-            Span<ushort> uncBuffer = stackalloc ushort[(int)bufferSize];
-            int errorCode = ERROR_NO_NETWORK;
-
-            try
+            ReadOnlySpan<char> driveName = [drive, ':', '\0'];
+            int bufferSize = MAX_PATH;
+            Span<char> uncBuffer = stackalloc char[MAX_PATH];
+            if (InternalTestHooks.WNetGetConnectionBufferSize > 0 && InternalTestHooks.WNetGetConnectionBufferSize <= MAX_PATH)
             {
-                errorCode = WNetGetConnection(driveName, uncBuffer, ref bufferSize);
-            }
-            catch (System.DllNotFoundException)
-            {
-                s_WNetApiNotAvailable = true;
-                return ERROR_NOT_SUPPORTED;
+                bufferSize = InternalTestHooks.WNetGetConnectionBufferSize;
+                uncBuffer = uncBuffer.Slice(0, bufferSize);
             }
 
-            if (errorCode == ERROR_SUCCESS)
-            {
-                uncPath = uncBuffer.Slice((int)bufferSize).ToString();
-            }
-            else if (errorCode == ERROR_MORE_DATA)
+            char[]? rentedArray = null;
+            while (true)
             {
-                ushort[]? rentedArray = null;
+                int errorCode;
                 try
                 {
-                    uncBuffer = rentedArray = ArrayPool<ushort>.Shared.Rent((int)bufferSize);
-                    errorCode = WNetGetConnection(driveName, uncBuffer, ref bufferSize);
+                    try
+                    {
+                        errorCode = WNetGetConnection(driveName, uncBuffer, ref bufferSize);
+                    }
+                    catch (DllNotFoundException)
+                    {
+                        s_WNetApiNotAvailable = true;
+                        return ERROR_NOT_SUPPORTED;
+                    }
 
                     if (errorCode == ERROR_SUCCESS)
                     {
-                        uncPath = uncBuffer.Slice((int)bufferSize).ToString();
+                        // Cannot rely on bufferSize as it's only set if
+                        // the first call ended with ERROR_MORE_DATA,
+                        // instead slice at the null terminator.
+                        unsafe
+                        {
+                            fixed (char* uncBufferPtr = uncBuffer)
+                            {
+                                uncPath = new string(uncBufferPtr);
+                            }
+                        }
                     }
                 }
                 finally
                 {
                     if (rentedArray is not null)
                     {
-                        ArrayPool<ushort>.Shared.Return(rentedArray);
+                        ArrayPool<char>.Shared.Return(rentedArray);
                     }
                 }
-            }
 
-            return errorCode;
+                if (errorCode == ERROR_MORE_DATA)
+                {
+                    uncBuffer = rentedArray = ArrayPool<char>.Shared.Rent(bufferSize);
+                }
+                else
+                {
+                    return errorCode;
+                }
+            }
         }
     }
 }
diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
index ac78e5e80d5..13d8f66e5e9 100644
--- a/src/System.Management.Automation/engine/LanguagePrimitives.cs
+++ b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -202,7 +202,6 @@ public override object ConvertFrom(object sourceValue, Type destinationType, IFo
             string sourceAsString = (string)LanguagePrimitives.ConvertTo(sourceValue, typeof(string), formatProvider);
             return LanguagePrimitives.ConvertTo(sourceAsString, destinationType, formatProvider);
         }
-
         /// <summary>
         /// Returns false, since this converter is not designed to be used to
         /// convert from the type associated with the converted to other types.
@@ -637,7 +636,7 @@ public static bool Equals(object first, object second, bool ignoreCase, IFormatP
 
             formatProvider ??= CultureInfo.InvariantCulture;
 
-            if (!(formatProvider is CultureInfo culture))
+            if (formatProvider is not CultureInfo culture)
             {
                 throw PSTraceSource.NewArgumentException(nameof(formatProvider));
             }
@@ -781,7 +780,7 @@ public static int Compare(object first, object second, bool ignoreCase, IFormatP
         {
             formatProvider ??= CultureInfo.InvariantCulture;
 
-            if (!(formatProvider is CultureInfo culture))
+            if (formatProvider is not CultureInfo culture)
             {
                 throw PSTraceSource.NewArgumentException(nameof(formatProvider));
             }
@@ -1037,7 +1036,7 @@ internal static bool IsTrue(IList objectArray)
                     // but since we don't want this to recurse indefinitely
                     // we explicitly check the case where it would recurse
                     // and deal with it.
-                    if (!(PSObject.Base(objectArray[0]) is IList firstElement))
+                    if (PSObject.Base(objectArray[0]) is not IList firstElement)
                     {
                         return IsTrue(objectArray[0]);
                     }
@@ -2077,6 +2076,14 @@ internal static string EnumValues(Type enumType)
                 return string.Join(CultureInfo.CurrentUICulture.TextInfo.ListSeparator, enumHashEntry.names);
             }
 
+            /// <summary>
+            /// Returns all names for the provided enum type.
+            /// </summary>
+            /// <param name="enumType">The enum type to retrieve names from.</param>
+            /// <returns>Array of enum names for the specified type.</returns>
+            internal static string[] GetEnumNames(Type enumType)
+                => EnumSingleTypeConverter.GetEnumHashEntry(enumType).names;
+
             /// <summary>
             /// Returns all values for the provided enum type.
             /// </summary>
@@ -2093,7 +2100,7 @@ public override object ConvertFrom(object sourceValue, Type destinationType, IFo
             protected static object BaseConvertFrom(object sourceValue, Type destinationType, IFormatProvider formatProvider, bool ignoreCase, bool multipleValues)
             {
                 Diagnostics.Assert(sourceValue != null, "the type converter has a special case for null source values");
-                if (!(sourceValue is string sourceValueString))
+                if (sourceValue is not string sourceValueString)
                 {
                     throw new PSInvalidCastException("InvalidCastEnumFromTypeNotAString", null,
                         ExtendedTypeSystem.InvalidCastException,
@@ -2935,17 +2942,12 @@ private static object ConvertStringToInteger(
                     return result;
                 }
 
-                if (resultType == typeof(BigInteger))
-                {
-                    // Fallback for BigInteger: manual parsing using any common format.
-                    NumberStyles style = NumberStyles.AllowLeadingSign
-                        | NumberStyles.AllowDecimalPoint
-                        | NumberStyles.AllowExponent
-                        | NumberStyles.AllowHexSpecifier;
+               if (resultType == typeof(BigInteger))
+               {
+                    NumberStyles style = NumberStyles.Integer | NumberStyles.AllowThousands;
 
                     return BigInteger.Parse(strToConvert, style, NumberFormatInfo.InvariantInfo);
                 }
-
                 // Fallback conversion for regular numeric types.
                 return GetIntegerSystemConverter(resultType).ConvertFrom(strToConvert);
             }
@@ -3986,44 +3988,46 @@ internal object Convert(object valueToConvert,
                     //  - It's in FullLanguage but not because it's part of a parameter binding that is transitioning from ConstrainedLanguage to FullLanguage
                     // When this is invoked from a parameter binding in transition from ConstrainedLanguage environment to FullLanguage command, we disallow
                     // the property conversion because it's dangerous.
-                    if (ecFromTLS == null || (ecFromTLS.LanguageMode == PSLanguageMode.FullLanguage && !ecFromTLS.LanguageModeTransitionInParameterBinding))
+                    bool canProceedWithConversion = ecFromTLS == null || (ecFromTLS.LanguageMode == PSLanguageMode.FullLanguage && !ecFromTLS.LanguageModeTransitionInParameterBinding);
+                    if (!canProceedWithConversion)
                     {
-                        result = _constructor();
-                        var psobject = valueToConvert as PSObject;
-                        if (psobject != null)
-                        {
-                            // Use PSObject properties to perform conversion.
-                            SetObjectProperties(result, psobject, resultType, CreateMemberNotFoundError, CreateMemberSetValueError, formatProvider, recursion, ignoreUnknownMembers);
-                        }
-                        else
+                        if (SystemPolicy.GetSystemLockdownPolicy() != SystemEnforcementMode.Audit)
                         {
-                            // Use provided property dictionary to perform conversion.
-                            // The method invocation is disabled for "Hashtable to Object conversion" (Win8:649519), but we need to keep it enabled for New-Object for compatibility to PSv2
-                            IDictionary properties = valueToConvert as IDictionary;
-                            SetObjectProperties(result, properties, resultType, CreateMemberNotFoundError, CreateMemberSetValueError, enableMethodCall: false);
+                            throw InterpreterError.NewInterpreterException(
+                                valueToConvert,
+                                typeof(RuntimeException),
+                                errorPosition: null,
+                                "HashtableToObjectConversionNotSupportedInDataSection",
+                                ParserStrings.HashtableToObjectConversionNotSupportedInDataSection,
+                                resultType.ToString());
                         }
 
-                        typeConversion.WriteLine("Constructor result: \"{0}\".", result);
-                    }
-                    else
-                    {
-                        if (SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Audit)
-                        {
-                            SystemPolicy.LogWDACAuditMessage(
+                        // When in audit mode, we report but don't enforce, so we will proceed with the conversion.
+                        SystemPolicy.LogWDACAuditMessage(
                                 context: ecFromTLS,
                                 title: ExtendedTypeSystem.WDACHashTypeLogTitle,
                                 message: StringUtil.Format(ExtendedTypeSystem.WDACHashTypeLogMessage, resultType.FullName),
                                 fqid: "LanguageHashtableConversionNotAllowed",
                                 dropIntoDebugger: true);
-                        }
-                        else
-                        {
-                            RuntimeException rte = InterpreterError.NewInterpreterException(valueToConvert, typeof(RuntimeException), null,
-                                "HashtableToObjectConversionNotSupportedInDataSection", ParserStrings.HashtableToObjectConversionNotSupportedInDataSection, resultType.ToString());
-                            throw rte;
-                        }
                     }
 
+                    result = _constructor();
+                    var psobject = valueToConvert as PSObject;
+                    if (psobject != null)
+                    {
+                        // Use PSObject properties to perform conversion.
+                        SetObjectProperties(result, psobject, resultType, CreateMemberNotFoundError, CreateMemberSetValueError, formatProvider, recursion, ignoreUnknownMembers);
+                    }
+                    else
+                    {
+                        // Use provided property dictionary to perform conversion.
+                        // The method invocation is disabled for "Hashtable to Object conversion" (Win8:649519), but we need to keep it enabled for New-Object for compatibility to PSv2
+                        IDictionary properties = valueToConvert as IDictionary;
+                        SetObjectProperties(result, properties, resultType, CreateMemberNotFoundError, CreateMemberSetValueError, enableMethodCall: false);
+                    }
+
+                    typeConversion.WriteLine("Constructor result: \"{0}\".", result);
+
                     return result;
                 }
                 catch (TargetInvocationException ex)
diff --git a/src/System.Management.Automation/engine/ManagementObjectAdapter.cs b/src/System.Management.Automation/engine/ManagementObjectAdapter.cs
index aa1c151e0e3..9b69ee168d7 100644
--- a/src/System.Management.Automation/engine/ManagementObjectAdapter.cs
+++ b/src/System.Management.Automation/engine/ManagementObjectAdapter.cs
@@ -172,7 +172,7 @@ protected override T GetMember<T>(object obj, string memberName)
         {
             tracer.WriteLine("Getting member with name {0}", memberName);
 
-            if (!(obj is ManagementBaseObject mgmtObject))
+            if (obj is not ManagementBaseObject mgmtObject)
             {
                 return null;
             }
@@ -364,7 +364,7 @@ protected override object PropertyGet(PSProperty property)
         /// <param name="convertIfPossible">Instructs the adapter to convert before setting, if the adapter supports conversion.</param>
         protected override void PropertySet(PSProperty property, object setValue, bool convertIfPossible)
         {
-            if (!(property.baseObject is ManagementBaseObject mObj))
+            if (property.baseObject is not ManagementBaseObject mObj)
             {
                 throw new SetValueInvocationException("CannotSetNonManagementObjectMsg",
                     null,
diff --git a/src/System.Management.Automation/engine/Modules/AnalysisCache.cs b/src/System.Management.Automation/engine/Modules/AnalysisCache.cs
index a701b0745c8..8a5f29e2b16 100644
--- a/src/System.Management.Automation/engine/Modules/AnalysisCache.cs
+++ b/src/System.Management.Automation/engine/Modules/AnalysisCache.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Buffers;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -35,11 +36,10 @@ internal static class AnalysisCache
         private static readonly ConcurrentDictionary<string, string> s_modulesBeingAnalyzed =
             new(concurrencyLevel: 1, capacity: 2, StringComparer.OrdinalIgnoreCase);
 
-        internal static readonly char[] InvalidCommandNameCharacters = new[]
-        {
-            '#', ',', '(', ')', '{', '}', '[', ']', '&', '/', '\\', '$', '^', ';', ':',
-            '"', '\'', '<', '>', '|', '?', '@', '`', '*', '%', '+', '=', '~'
-        };
+        internal static readonly SearchValues<char> InvalidCommandNameCharacters = SearchValues.Create("#,(){}[]&/\\$^;:\"'<>|?@`*%+=~");
+
+        internal static bool ContainsInvalidCommandNameCharacters(ReadOnlySpan<char> text)
+            => text.ContainsAny(InvalidCommandNameCharacters);
 
         internal static ConcurrentDictionary<string, CommandTypes> GetExportedCommands(string modulePath, bool testOnly, ExecutionContext context)
         {
@@ -194,7 +194,7 @@ internal static bool ModuleIsEditionIncompatible(string modulePath, Hashtable mo
 
         internal static bool ModuleAnalysisViaGetModuleRequired(object modulePathObj, bool hadCmdlets, bool hadFunctions, bool hadAliases)
         {
-            if (!(modulePathObj is string modulePath))
+            if (modulePathObj is not string modulePath)
                 return true;
 
             if (modulePath.EndsWith(StringLiterals.PowerShellModuleFileExtension, StringComparison.OrdinalIgnoreCase))
@@ -256,7 +256,7 @@ private static bool CheckModulesTypesInManifestAgainstExportedCommands(Hashtable
                     return ModuleAnalysisViaGetModuleRequired(nestedModule, hadCmdlets, hadFunctions, hadAliases);
                 }
 
-                if (!(nestedModules is object[] nestedModuleArray))
+                if (nestedModules is not object[] nestedModuleArray)
                     return true;
 
                 foreach (var element in nestedModuleArray)
@@ -345,7 +345,7 @@ private static ConcurrentDictionary<string, CommandTypes> AnalyzeScriptModule(st
             {
                 if (SessionStateUtilities.MatchesAnyWildcardPattern(command, scriptAnalysisPatterns, true))
                 {
-                    if (command.IndexOfAny(InvalidCommandNameCharacters) < 0)
+                    if (!ContainsInvalidCommandNameCharacters(command))
                     {
                         result[command] = CommandTypes.Function;
                     }
@@ -357,7 +357,7 @@ private static ConcurrentDictionary<string, CommandTypes> AnalyzeScriptModule(st
             {
                 var commandName = pair.Key;
                 // These are already filtered
-                if (commandName.IndexOfAny(InvalidCommandNameCharacters) < 0)
+                if (!ContainsInvalidCommandNameCharacters(commandName))
                 {
                     result.AddOrUpdate(commandName, CommandTypes.Alias,
                         static (_, existingCommandType) => existingCommandType | CommandTypes.Alias);
@@ -664,6 +664,11 @@ private static byte[] GetHeader()
 
         public void QueueSerialization()
         {
+            if (string.IsNullOrEmpty(s_cacheStoreLocation))
+            {
+                return;
+            }
+
             // We expect many modules to rapidly call for serialization.
             // Instead of doing it right away, we'll queue a task that starts writing
             // after it seems like we've stopped adding stuff to write out.  This is
@@ -1121,7 +1126,7 @@ static AnalysisCacheData()
                 cacheFileName = string.Create(CultureInfo.InvariantCulture, $"{cacheFileName}-{hashString}");
             }
 
-            s_cacheStoreLocation = Path.Combine(Platform.CacheDirectory, cacheFileName);
+            Platform.TryDeriveFromCache(cacheFileName, out s_cacheStoreLocation);
         }
     }
 
diff --git a/src/System.Management.Automation/engine/Modules/GetModuleCommand.cs b/src/System.Management.Automation/engine/Modules/GetModuleCommand.cs
index 743b64a1b0e..caf7527d73e 100644
--- a/src/System.Management.Automation/engine/Modules/GetModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/GetModuleCommand.cs
@@ -297,29 +297,17 @@ protected override void StopProcessing()
         #region IDisposable Members
 
         /// <summary>
-        /// Releases resources associated with this object.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases resources associated with this object.
-        /// </summary>
-        private void Dispose(bool disposing)
         {
             if (_disposed)
             {
                 return;
             }
 
-            if (disposing)
-            {
-                _cancellationTokenSource.Dispose();
-            }
-
+            _cancellationTokenSource.Dispose();
+            
             _disposed = true;
         }
 
@@ -586,24 +574,25 @@ private static IEnumerable<ModuleSpecification> GetCandidateModuleSpecs(
     }
 
     /// <summary>
-    /// PSEditionArgumentCompleter for PowerShell Edition names.
+    /// Provides argument completion for PSEdition parameter.
     /// </summary>
     public class PSEditionArgumentCompleter : IArgumentCompleter
     {
         /// <summary>
-        /// CompleteArgument.
+        /// Returns completion results for PSEdition parameter.
         /// </summary>
-        public IEnumerable<CompletionResult> CompleteArgument(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
-        {
-            var wordToCompletePattern = WildcardPattern.Get(string.IsNullOrWhiteSpace(wordToComplete) ? "*" : wordToComplete + "*", WildcardOptions.IgnoreCase);
-
-            foreach (var edition in Utils.AllowedEditionValues)
-            {
-                if (wordToCompletePattern.IsMatch(edition))
-                {
-                    yield return new CompletionResult(edition, edition, CompletionResultType.Text, edition);
-                }
-            }
-        }
+        /// <param name="commandName">The command name.</param>
+        /// <param name="parameterName">The parameter name.</param>
+        /// <param name="wordToComplete">The word to complete.</param>
+        /// <param name="commandAst">The command AST.</param>
+        /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+        /// <returns>List of completion results.</returns>
+        public IEnumerable<CompletionResult> CompleteArgument(
+            string commandName,
+            string parameterName,
+            string wordToComplete,
+            CommandAst commandAst,
+            IDictionary fakeBoundParameters)
+                => CompletionHelpers.GetMatchingResults(wordToComplete, possibleCompletionValues: Utils.AllowedEditionValues);
     }
 }
diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 15e8bfe6a9a..532079d1a77 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -1371,7 +1371,7 @@ private void ImportModule_RemotelyViaCimSession(
             }
         }
 
-        private bool IsPs1xmlFileHelper_IsPresentInEntries(RemoteDiscoveryHelper.CimModuleFile cimModuleFile, IEnumerable<string> manifestEntries)
+        private bool IsPs1xmlFileHelper_IsPresentInEntries(RemoteDiscoveryHelper.CimModuleFile cimModuleFile, List<string> manifestEntries)
         {
             const string ps1xmlExt = ".ps1xml";
             string fileName = cimModuleFile.FileName;
@@ -1780,28 +1780,16 @@ protected override void StopProcessing()
         #region IDisposable Members
 
         /// <summary>
-        /// Releases resources associated with this object.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases resources associated with this object.
-        /// </summary>
-        private void Dispose(bool disposing)
         {
             if (_disposed)
             {
                 return;
             }
 
-            if (disposing)
-            {
-                _cancellationTokenSource.Dispose();
-            }
+            _cancellationTokenSource.Dispose();
 
             _disposed = true;
         }
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 48b68574f54..0a1d0bfc04f 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -16,6 +16,7 @@
 using System.Management.Automation.Runspaces;
 using System.Management.Automation.Security;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Xml;
 using System.Diagnostics;
@@ -1047,9 +1048,8 @@ private IEnumerable<PSModuleInfo> GetModuleForRootedPaths(List<string> modulePat
                             PSModuleInfo module = CreateModuleInfoForGetModule(resolvedModulePath, refresh);
                             if (module != null)
                             {
-                                if (!modules.Contains(resolvedModulePath))
+                                if (modules.Add(resolvedModulePath))
                                 {
-                                    modules.Add(resolvedModulePath);
                                     yield return module;
                                 }
                             }
@@ -1078,9 +1078,8 @@ private IEnumerable<PSModuleInfo> GetModuleForRootedPaths(List<string> modulePat
                                         foundModule = true;
                                         // We need to list all versions of the module.
                                         string subModulePath = Path.GetDirectoryName(file);
-                                        if (!modules.Contains(subModulePath))
+                                        if (modules.Add(subModulePath))
                                         {
-                                            modules.Add(subModulePath);
                                             yield return module;
                                         }
                                     }
@@ -1922,11 +1921,12 @@ 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
+                Architecture currentArchitecture = RuntimeInformation.ProcessArchitecture;
 
-                if (currentArchitecture != requiredProcessorArchitecture)
+                if ((requiredProcessorArchitecture == ProcessorArchitecture.X86 && currentArchitecture != Architecture.X86) ||
+                    (requiredProcessorArchitecture == ProcessorArchitecture.Amd64 && currentArchitecture != Architecture.X64) ||
+                    (requiredProcessorArchitecture == ProcessorArchitecture.Arm && (currentArchitecture != Architecture.Arm && currentArchitecture != Architecture.Arm64)) ||
+                    requiredProcessorArchitecture == ProcessorArchitecture.IA64)
                 {
                     containedErrors = true;
                     if (writingErrors)
@@ -6168,7 +6168,7 @@ private void CheckForDisallowedDotSourcing(
                 }
             }
         }
-        
+
         private static void RemoveNestedModuleFunctions(
             ExecutionContext context,
             PSModuleInfo module,
@@ -6405,7 +6405,7 @@ private PSModuleInfo AnalyzeScriptFile(string filename, bool force, ExecutionCon
 
                 // If this has an extension, and it's a relative path,
                 // then we need to ensure it's a fully-qualified path
-                if ((moduleToProcess.IndexOfAny(Path.GetInvalidPathChars()) == -1) &&
+                if ((!PathUtils.ContainsInvalidPathChars(moduleToProcess)) &&
                     Path.HasExtension(moduleToProcess) &&
                     (!Path.IsPathRooted(moduleToProcess)))
                 {
@@ -7276,7 +7276,7 @@ private static void ImportFunctions(FunctionInfo func, SessionStateInternal targ
                     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 
+                // 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/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index b687e502763..538c4775f0a 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -10,9 +10,7 @@
 using System.Management.Automation.Language;
 using System.Text;
 using System.Threading;
-
 using Microsoft.PowerShell.Commands;
-using Microsoft.Win32;
 
 using Dbg = System.Management.Automation.Diagnostics;
 
@@ -39,18 +37,22 @@ public class ModuleIntrinsics
         private static readonly string s_windowsPowerShellPSHomeModulePath =
             Path.Combine(System.Environment.SystemDirectory, "WindowsPowerShell", "v1.0", "Modules");
 
+        static ModuleIntrinsics()
+        {
+            // Initialize the module path.
+            SetModulePath();
+        }
+
         internal ModuleIntrinsics(ExecutionContext context)
         {
             _context = context;
-
-            // And initialize the module path...
-            SetModulePath();
+            ModuleTable = new Dictionary<string, PSModuleInfo>(StringComparer.OrdinalIgnoreCase);
         }
 
         private readonly ExecutionContext _context;
 
         // Holds the module collection...
-        internal Dictionary<string, PSModuleInfo> ModuleTable { get; } = new Dictionary<string, PSModuleInfo>(StringComparer.OrdinalIgnoreCase);
+        internal Dictionary<string, PSModuleInfo> ModuleTable { get; }
 
         private const int MaxModuleNestingDepth = 10;
 
@@ -176,11 +178,9 @@ private PSModuleInfo CreateModuleImplementation(string name, string path, object
 
                         sb.SessionState = ss;
                     }
-                    else
+                    else if (moduleCode is string sbText)
                     {
-                        var sbText = moduleCode as string;
-                        if (sbText != null)
-                            sb = ScriptBlock.Create(_context, sbText);
+                        sb = ScriptBlock.Create(_context, sbText);
                     }
                 }
 
@@ -967,7 +967,9 @@ internal static string GetPersonalModulePath()
 #if UNIX
             return Platform.SelectProductNameForDirectory(Platform.XDG_Type.USER_MODULES);
 #else
-            string myDocumentsPath = InternalTestHooks.SetMyDocumentsSpecialFolderToBlank ? string.Empty : Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            string myDocumentsPath = InternalTestHooks.SetMyDocumentsSpecialFolderToBlank
+                ? string.Empty
+                : Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments, Environment.SpecialFolderOption.DoNotVerify);
             return string.IsNullOrEmpty(myDocumentsPath) ? null : Path.Combine(myDocumentsPath, Utils.ModuleDirectory);
 #endif
         }
@@ -1082,91 +1084,80 @@ internal static string GetExpandedEnvironmentVariable(string name, EnvironmentVa
             return result;
         }
 
-        /// <summary>
-        /// Checks if a particular string (path) is a member of 'combined path' string (like %Path% or %PSModulePath%)
-        /// </summary>
-        /// <param name="pathToScan">'Combined path' string to analyze; can not be null.</param>
-        /// <param name="pathToLookFor">Path to search for; can not be another 'combined path' (semicolon-separated); can not be null.</param>
-        /// <returns>Index of pathToLookFor in pathToScan; -1 if not found.</returns>
-        private static int PathContainsSubstring(string pathToScan, string pathToLookFor)
-        {
-            // we don't support if any of the args are null - parent function should ensure this; empty values are ok
-            Diagnostics.Assert(pathToScan != null, "pathToScan should not be null according to contract of the function");
-            Diagnostics.Assert(pathToLookFor != null, "pathToLookFor should not be null according to contract of the function");
-
-            int pos = 0; // position of the current substring in pathToScan
-            string[] substrings = pathToScan.Split(Path.PathSeparator, StringSplitOptions.None); // we want to process empty entries
-            string goodPathToLookFor = pathToLookFor.Trim().TrimEnd(Path.DirectorySeparatorChar); // trailing backslashes and white-spaces will mess up equality comparison
-            foreach (string substring in substrings)
-            {
-                string goodSubstring = substring.Trim().TrimEnd(Path.DirectorySeparatorChar);  // trailing backslashes and white-spaces will mess up equality comparison
-
-                // We have to use equality comparison on individual substrings (as opposed to simple 'string.IndexOf' or 'string.Contains')
-                // because of cases like { pathToScan="C:\Temp\MyDir\MyModuleDir", pathToLookFor="C:\Temp" }
-
-                if (string.Equals(goodSubstring, goodPathToLookFor, StringComparison.OrdinalIgnoreCase))
-                {
-                    return pos; // match found - return index of it in the 'pathToScan' string
-                }
-                else
-                {
-                    pos += substring.Length + 1; // '1' is for trailing semicolon
-                }
-            }
-            // if we are here, that means a match was not found
-            return -1;
-        }
-
         /// <summary>
         /// Adds paths to a 'combined path' string (like %Path% or %PSModulePath%) if they are not already there.
         /// </summary>
         /// <param name="basePath">Path string (like %Path% or %PSModulePath%).</param>
-        /// <param name="pathToAdd">Collection of individual paths to add.</param>
+        /// <param name="pathToAdd">An individual path to add, or multiple paths separated by the path separator character.</param>
         /// <param name="insertPosition">-1 to append to the end; 0 to insert in the beginning of the string; etc...</param>
         /// <returns>Result string.</returns>
-        private static string AddToPath(string basePath, string pathToAdd, int insertPosition)
+        private static string UpdatePath(string basePath, string pathToAdd, ref int insertPosition)
         {
             // we don't support if any of the args are null - parent function should ensure this; empty values are ok
-            Diagnostics.Assert(basePath != null, "basePath should not be null according to contract of the function");
-            Diagnostics.Assert(pathToAdd != null, "pathToAdd should not be null according to contract of the function");
+            Dbg.Assert(basePath != null, "basePath should not be null according to contract of the function");
+            Dbg.Assert(pathToAdd != null, "pathToAdd should not be null according to contract of the function");
+
+            // The 'pathToAdd' could be a 'combined path' (path-separator-separated).
+            string[] newPaths = pathToAdd.Split(
+                Path.PathSeparator,
+                StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 
-            StringBuilder result = new StringBuilder(basePath);
+            if (newPaths.Length is 0)
+            {
+                // The 'pathToAdd' doesn't really contain any paths to add.
+                return basePath;
+            }
+
+            var result = new StringBuilder(basePath, capacity: basePath.Length + pathToAdd.Length + newPaths.Length);
+            var addedPaths = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            string[] initialPaths = basePath.Split(
+                Path.PathSeparator,
+                StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+
+            foreach (string p in initialPaths)
+            {
+                // Remove the trailing directory separators.
+                // Trailing white spaces were already removed by 'StringSplitOptions.TrimEntries'.
+                addedPaths.Add(Path.TrimEndingDirectorySeparator(p));
+            }
 
-            if (!string.IsNullOrEmpty(pathToAdd)) // we don't want to append empty paths
+            foreach (string subPathToAdd in newPaths)
             {
-                foreach (string subPathToAdd in pathToAdd.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries)) // in case pathToAdd is a 'combined path' (semicolon-separated)
+                // Remove the trailing directory separators.
+                // Trailing white spaces were already removed by 'StringSplitOptions.TrimEntries'.
+                string normalizedPath = Path.TrimEndingDirectorySeparator(subPathToAdd);
+                if (addedPaths.Contains(normalizedPath))
                 {
-                    int position = PathContainsSubstring(result.ToString(), subPathToAdd); // searching in effective 'result' value ensures that possible duplicates in pathsToAdd are handled correctly
-                    if (position == -1) // subPathToAdd not found - add it
-                    {
-                        if (insertPosition == -1 || insertPosition > basePath.Length) // append subPathToAdd to the end
-                        {
-                            bool endsWithPathSeparator = false;
-                            if (result.Length > 0)
-                            {
-                                endsWithPathSeparator = (result[result.Length - 1] == Path.PathSeparator);
-                            }
+                    // The normalized sub path was already added - skip it.
+                    continue;
+                }
 
-                            if (endsWithPathSeparator)
-                            {
-                                result.Append(subPathToAdd);
-                            }
-                            else
-                            {
-                                result.Append(Path.PathSeparator + subPathToAdd);
-                            }
-                        }
-                        else if (insertPosition > result.Length)
-                        {
-                            // handle case where path is a singleton with no path separator already
-                            result.Append(Path.PathSeparator).Append(subPathToAdd);
-                        }
-                        else // insert at the requested location (this is used by DSC (<Program Files> location) and by 'user-specific location' (SpecialFolder.MyDocuments or EVT.User))
-                        {
-                            result.Insert(insertPosition, subPathToAdd + Path.PathSeparator);
-                        }
+                // The normalized sub path was not found - add it.
+                if (insertPosition is -1 || insertPosition >= result.Length)
+                {
+                    // Append the normalized sub path to the end.
+                    if (result.Length > 0 && result[^1] != Path.PathSeparator)
+                    {
+                        result.Append(Path.PathSeparator);
                     }
+
+                    result.Append(normalizedPath);
+                    // Next insertion should happen at the end.
+                    insertPosition = result.Length;
+                }
+                else
+                {
+                    // Insert at the requested location.
+                    // This is used by the user-specific module path, the shared module path (<Program Files> location), and the PSHome module path.
+                    string strToInsert = normalizedPath + Path.PathSeparator;
+                    result.Insert(insertPosition, strToInsert);
+
+                    // Next insertion should happen after the just inserted string.
+                    insertPosition += strToInsert.Length;
                 }
+
+                // Add it to the set.
+                addedPaths.Add(normalizedPath);
             }
 
             return result.ToString();
@@ -1218,7 +1209,7 @@ public static string GetModulePath(string currentProcessModulePath, string hklmM
             string psHomeModulePath = GetPSHomeModulePath(); // $PSHome\Modules location
 
             // If the variable isn't set, then set it to the default value
-            if (currentProcessModulePath == null)  // EVT.Process does Not exist - really corner case
+            if (string.IsNullOrEmpty(currentProcessModulePath))  // EVT.Process does Not exist - really corner case
             {
                 // Handle the default case...
                 if (string.IsNullOrEmpty(hkcuUserModulePath)) // EVT.User does Not exist -> set to <SpecialFolder.MyDocuments> location
@@ -1270,21 +1261,6 @@ public static string GetModulePath(string currentProcessModulePath, string hklmM
             return currentProcessModulePath;
         }
 
-        private static string UpdatePath(string path, string pathToAdd, ref int insertIndex)
-        {
-            if (!string.IsNullOrEmpty(pathToAdd))
-            {
-                path = AddToPath(path, pathToAdd, insertIndex);
-                insertIndex = path.IndexOf(Path.PathSeparator, PathContainsSubstring(path, pathToAdd));
-                if (insertIndex != -1)
-                {
-                    // advance past the path separator
-                    insertIndex++;
-                }
-            }
-            return path;
-        }
-
         /// <summary>
         /// Checks if $env:PSModulePath is not set and sets it as appropriate. Note - because these
         /// strings go through the provider, we need to escape any wildcards before passing them
@@ -1358,11 +1334,16 @@ private static string SetModulePath()
         {
             string currentModulePath = GetExpandedEnvironmentVariable(Constants.PSModulePathEnvVar, EnvironmentVariableTarget.Process);
 #if !UNIX
-            // if the current process and user env vars are the same, it means we need to append the machine one as it's incomplete
-            // otherwise, the user modified it and we should use the process one
+            // if the current process and user env vars are the same, it means we need to append the machine one as it's incomplete.
+            // Otherwise, the user modified it and we should use the process one.
             if (string.CompareOrdinal(GetExpandedEnvironmentVariable(Constants.PSModulePathEnvVar, EnvironmentVariableTarget.User), currentModulePath) == 0)
             {
-                currentModulePath = currentModulePath + Path.PathSeparator + GetExpandedEnvironmentVariable(Constants.PSModulePathEnvVar, EnvironmentVariableTarget.Machine);
+                string machineScopeValue = GetExpandedEnvironmentVariable(Constants.PSModulePathEnvVar, EnvironmentVariableTarget.Machine);
+                currentModulePath = string.IsNullOrEmpty(currentModulePath)
+                    ? machineScopeValue
+                    : string.IsNullOrEmpty(machineScopeValue)
+                        ? currentModulePath
+                        : string.Concat(currentModulePath, Path.PathSeparator, machineScopeValue);
             }
 #endif
             string allUsersModulePath = PowerShellConfig.Instance.GetModulePath(ConfigScope.AllUsers);
diff --git a/src/System.Management.Automation/engine/Modules/ModuleUtils.cs b/src/System.Management.Automation/engine/Modules/ModuleUtils.cs
index d8e2b24e016..41bf4ac3521 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleUtils.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleUtils.cs
@@ -39,18 +39,11 @@ internal static class ModuleUtils
 
         static ModuleUtils()
         {
-            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSModuleAutoLoadSkipOfflineFilesFeatureName))
-            {
-                FileAttributesToSkip = FileAttributes.Hidden
-                    // Skip OneDrive files/directories that are not fully on disk.
-                    | FileAttributes.Offline
-                    | (FileAttributes)FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS
-                    | (FileAttributes)FILE_ATTRIBUTE_RECALL_ON_OPEN;
-
-                return;
-            }
-
-            FileAttributesToSkip = FileAttributes.Hidden;
+            FileAttributesToSkip = FileAttributes.Hidden
+                // Skip OneDrive files/directories that are not fully on disk.
+                | FileAttributes.Offline
+                | (FileAttributes)FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS
+                | (FileAttributes)FILE_ATTRIBUTE_RECALL_ON_OPEN;
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs b/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
index 9644829a02a..892d7375387 100644
--- a/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
+++ b/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
@@ -40,7 +40,7 @@ internal static ScriptAnalysis Analyze(string path, ExecutionContext context)
                 // So eat the invalid operation
             }
 
-            string scriptContent = ReadScript(path);
+            string scriptContent = File.ReadAllText(path, Encoding.Default);
 
             ParseError[] errors;
             var moduleAst = (new Parser()).Parse(path, scriptContent, null, out errors, ParseMode.ModuleAnalysis);
@@ -89,19 +89,6 @@ internal static ScriptAnalysis Analyze(string path, ExecutionContext context)
             return result;
         }
 
-        internal static string ReadScript(string path)
-        {
-            using (FileStream readerStream = new FileStream(path, FileMode.Open, FileAccess.Read))
-            {
-                Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = readerStream.SafeFileHandle;
-
-                using (StreamReader scriptReader = new StreamReader(readerStream, Encoding.Default))
-                {
-                    return scriptReader.ReadToEnd();
-                }
-            }
-        }
-
         internal List<string> DiscoveredExports { get; set; }
 
         internal Dictionary<string, string> DiscoveredAliases { get; set; }
@@ -277,10 +264,22 @@ public override AstVisitAction VisitAssignmentStatement(AssignmentStatementAst a
         //  - Exporting module members
         public override AstVisitAction VisitCommand(CommandAst commandAst)
         {
-            string commandName =
-                commandAst.GetCommandName() ??
-                GetSafeValueVisitor.GetSafeValue(commandAst.CommandElements[0], null, GetSafeValueVisitor.SafeValueContext.ModuleAnalysis) as string;
+            string commandName = commandAst.GetCommandName();
+            if (commandName is null)
+            {
+                // GetCommandName only works if the name is a string constant. GetSafeValueVistor can evaluate some safe dynamic expressions
+                try
+                {
+                    commandName = GetSafeValueVisitor.GetSafeValue(commandAst.CommandElements[0], null, GetSafeValueVisitor.SafeValueContext.ModuleAnalysis) as string;
+                }
+                catch (ParseException)
+                {
+                    // The script is invalid so we can't use GetSafeValue to get the name either.
+                }
+            }
 
+            // We couldn't get the name of the command. Either it's an anonymous scriptblock: & {"Some script"}
+            // Or it's a dynamic expression we couldn't safely resolve.
             if (commandName == null)
                 return AstVisitAction.SkipChildren;
 
diff --git a/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs b/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
index 566262e3db9..650588c32e4 100644
--- a/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
@@ -374,7 +374,9 @@ private bool IsValidFilePath(string path, PSModuleInfo module, bool verifyPathSc
                     ThrowTerminatingError(er);
                 }
 
-                path = pathInfos[0].Path;
+                // `Path` returns the PSProviderPath which is fully qualified to the provider and the filesystem APIs
+                // don't understand this.  Instead `ProviderPath` returns the path that the FileSystemProvider understands.
+                path = pathInfos[0].ProviderPath;
 
                 // First, we validate if the path does exist.
                 if (!File.Exists(path) && !Directory.Exists(path))
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index 427929c3e8b..e674cb1c5eb 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -390,6 +390,9 @@ public void WriteProgress(
             WriteProgress(sourceId, progressRecord, false);
         }
 
+        internal bool IsWriteProgressEnabled()
+            => WriteHelper_ShouldWrite(ProgressPreference, lastProgressContinueStatus);
+
         internal void WriteProgress(
                 Int64 sourceId,
                 ProgressRecord progressRecord,
@@ -472,6 +475,9 @@ public void WriteDebug(string text)
             WriteDebug(new DebugRecord(text));
         }
 
+        internal bool IsWriteDebugEnabled()
+            => WriteHelper_ShouldWrite(DebugPreference, lastDebugContinueStatus);
+
         /// <summary>
         /// Display debug information.
         /// </summary>
@@ -566,6 +572,9 @@ public void WriteVerbose(string text)
             WriteVerbose(new VerboseRecord(text));
         }
 
+        internal bool IsWriteVerboseEnabled()
+            => WriteHelper_ShouldWrite(VerbosePreference, lastVerboseContinueStatus);
+
         /// <summary>
         /// Display verbose information.
         /// </summary>
@@ -660,6 +669,9 @@ public void WriteWarning(string text)
             WriteWarning(new WarningRecord(text));
         }
 
+        internal bool IsWriteWarningEnabled()
+            => WriteHelper_ShouldWrite(WarningPreference, lastWarningContinueStatus);
+
         /// <summary>
         /// Display warning information.
         /// </summary>
@@ -733,6 +745,9 @@ public void WriteInformation(InformationRecord informationRecord)
             WriteInformation(informationRecord, false);
         }
 
+        internal bool IsWriteInformationEnabled()
+            => WriteHelper_ShouldWrite(InformationPreference, lastInformationContinueStatus);
+
         /// <summary>
         /// Display tagged object information.
         /// </summary>
@@ -1483,7 +1498,7 @@ private bool CanShouldProcessAutoConfirm()
         /// <see cref="System.Management.Automation.ShouldProcessReason"/>
         /// are returned.
         /// </param>
-        /// <remarks>true iff the action should be performed</remarks>
+        /// <remarks>true if-and-only-if the action should be performed</remarks>
         /// <exception cref="System.Management.Automation.PipelineStoppedException">
         /// The pipeline has already been terminated, or was terminated
         /// during the execution of this method.
@@ -1783,11 +1798,11 @@ public bool ShouldContinue(string query, string caption)
         /// the default option selected in the selection menu is 'No'.
         /// </param>
         /// <param name="yesToAll">
-        /// true iff user selects YesToAll.  If this is already true,
+        /// true if-and-only-if user selects YesToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return true.
         /// </param>
         /// <param name="noToAll">
-        /// true iff user selects NoToAll.  If this is already true,
+        /// true if-and-only-if user selects NoToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return false.
         /// </param>
         /// <exception cref="System.Management.Automation.PipelineStoppedException">
@@ -1830,11 +1845,11 @@ public bool ShouldContinue(
         /// It may be displayed by some hosts, but not all.
         /// </param>
         /// <param name="yesToAll">
-        /// true iff user selects YesToAll.  If this is already true,
+        /// true if-and-only-if user selects YesToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return true.
         /// </param>
         /// <param name="noToAll">
-        /// true iff user selects NoToAll.  If this is already true,
+        /// true if-and-only-if user selects NoToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return false.
         /// </param>
         /// <exception cref="System.Management.Automation.PipelineStoppedException">
@@ -2345,7 +2360,7 @@ internal AllowWrite(InternalCommand permittedToWrite, bool permittedToWriteToPip
             {
                 if (permittedToWrite == null)
                     throw PSTraceSource.NewArgumentNullException(nameof(permittedToWrite));
-                if (!(permittedToWrite.commandRuntime is MshCommandRuntime mcr))
+                if (permittedToWrite.commandRuntime is not MshCommandRuntime mcr)
                     throw PSTraceSource.NewArgumentNullException("permittedToWrite.CommandRuntime");
                 _pp = mcr.PipelineProcessor;
                 if (_pp == null)
@@ -2357,19 +2372,18 @@ internal AllowWrite(InternalCommand permittedToWrite, bool permittedToWriteToPip
                 _pp._permittedToWriteToPipeline = permittedToWriteToPipeline;
                 _pp._permittedToWriteThread = Thread.CurrentThread;
             }
+            
             /// <summary>
-            /// End the scope where WriteObject/WriteError is permitted.
+            /// Release all resources.
             /// </summary>
-            /// <!--
-            /// Not a true public, since the class is internal.
-            /// This is public only due to C# interface rules.
-            /// -->
+            /// <remarks>
+            /// End the scope where WriteObject/WriteError is permitted.
+            /// </remarks>
             public void Dispose()
             {
                 _pp._permittedToWrite = _wasPermittedToWrite;
                 _pp._permittedToWriteToPipeline = _wasPermittedToWriteToPipeline;
                 _pp._permittedToWriteThread = _wasPermittedToWriteThread;
-                GC.SuppressFinalize(this);
             }
 
             // There is no finalizer, by design.  This class relies on always
@@ -2977,21 +2991,19 @@ internal ConfirmImpact ConfirmPreference
             {
                 // WhatIf not relevant, it never gets this far in that case
                 if (Confirm)
-                    return ConfirmImpact.Low;
-                if (Debug)
                 {
-                    if (IsConfirmFlagSet) // -Debug -Confirm:$false
-                        return ConfirmImpact.None;
                     return ConfirmImpact.Low;
                 }
 
-                if (IsConfirmFlagSet) // -Confirm:$false
+                if (IsConfirmFlagSet)
+                {
+                    // -Confirm:$false
                     return ConfirmImpact.None;
+                }
 
                 if (!_isConfirmPreferenceCached)
                 {
-                    bool defaultUsed = false;
-                    _confirmPreference = Context.GetEnumPreference(SpecialVariables.ConfirmPreferenceVarPath, _confirmPreference, out defaultUsed);
+                    _confirmPreference = Context.GetEnumPreference(SpecialVariables.ConfirmPreferenceVarPath, _confirmPreference, out _);
                     _isConfirmPreferenceCached = true;
                 }
 
diff --git a/src/System.Management.Automation/engine/MshMemberInfo.cs b/src/System.Management.Automation/engine/MshMemberInfo.cs
index 369e0f3fcd6..4bde286d165 100644
--- a/src/System.Management.Automation/engine/MshMemberInfo.cs
+++ b/src/System.Management.Automation/engine/MshMemberInfo.cs
@@ -28,8 +28,8 @@ namespace System.Management.Automation
     /// <summary>
     /// Enumerates all possible types of members.
     /// </summary>
-    [TypeConverterAttribute(typeof(LanguagePrimitives.EnumMultipleTypeConverter))]
-    [FlagsAttribute]
+    [TypeConverter(typeof(LanguagePrimitives.EnumMultipleTypeConverter))]
+    [Flags]
     public enum PSMemberTypes
     {
         /// <summary>
@@ -120,8 +120,8 @@ public enum PSMemberTypes
     /// <summary>
     /// Enumerator for all possible views available on a PSObject.
     /// </summary>
-    [TypeConverterAttribute(typeof(LanguagePrimitives.EnumMultipleTypeConverter))]
-    [FlagsAttribute]
+    [TypeConverter(typeof(LanguagePrimitives.EnumMultipleTypeConverter))]
+    [Flags]
     public enum PSMemberViewTypes
     {
         /// <summary>
@@ -148,7 +148,7 @@ public enum PSMemberViewTypes
     /// <summary>
     /// Match options.
     /// </summary>
-    [FlagsAttribute]
+    [Flags]
     internal enum MshMemberMatchOptions
     {
         /// <summary>
@@ -2009,7 +2009,7 @@ public override bool Equals(object obj)
         }
 
         public override int GetHashCode()
-            => HashCode.Combine(MethodTargetType, ParameterTypes, GenericTypeParameters);
+            => HashCode.Combine(MethodTargetType, ParameterTypes.SequenceGetHashCode(), GenericTypeParameters.SequenceGetHashCode());
 
         public override string ToString()
         {
diff --git a/src/System.Management.Automation/engine/MshObject.cs b/src/System.Management.Automation/engine/MshObject.cs
index 8303058759d..c5e8bbac443 100644
--- a/src/System.Management.Automation/engine/MshObject.cs
+++ b/src/System.Management.Automation/engine/MshObject.cs
@@ -592,7 +592,7 @@ protected PSObject(SerializationInfo info, StreamingContext context)
                 throw PSTraceSource.NewArgumentNullException(nameof(info));
             }
 
-            if (!(info.GetValue("CliXml", typeof(string)) is string serializedData))
+            if (info.GetValue("CliXml", typeof(string)) is not string serializedData)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(info));
             }
@@ -980,7 +980,7 @@ public static implicit operator PSObject(bool valueToConvert)
         /// </summary>
         internal static object Base(object obj)
         {
-            if (!(obj is PSObject mshObj))
+            if (obj is not PSObject mshObj)
             {
                 return obj;
             }
@@ -1064,7 +1064,7 @@ internal static PSObject AsPSObject(object obj, bool storeTypeNameAndInstanceMem
         /// <returns></returns>
         internal static object GetKeyForResurrectionTables(object obj)
         {
-            if (!(obj is PSObject pso))
+            if (obj is not PSObject pso)
             {
                 return obj;
             }
@@ -1611,7 +1611,7 @@ public virtual PSObject Copy()
             bool needToReAddInstanceMembersAndTypeNames = !object.ReferenceEquals(GetKeyForResurrectionTables(this), GetKeyForResurrectionTables(returnValue));
             if (needToReAddInstanceMembersAndTypeNames)
             {
-                Diagnostics.Assert(!returnValue.InstanceMembers.Any(), "needToReAddInstanceMembersAndTypeNames should mean that the new object has a fresh/empty list of instance members");
+                Diagnostics.Assert(returnValue.InstanceMembers.Count == 0, "needToReAddInstanceMembersAndTypeNames should mean that the new object has a fresh/empty list of instance members");
                 foreach (PSMemberInfo member in this.InstanceMembers)
                 {
                     if (member.IsHidden)
@@ -1851,7 +1851,7 @@ internal static object GetNoteSettingValue(PSMemberSet settings, string noteName
                 settings.ReplicateInstance(ownerObject);
             }
 
-            if (!(settings.Members[noteName] is PSNoteProperty note))
+            if (settings.Members[noteName] is not PSNoteProperty note)
             {
                 return defaultValue;
             }
diff --git a/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs b/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
index 11955713c7e..113161748c9 100644
--- a/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
+++ b/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
@@ -219,7 +219,7 @@ private static PSObject GetComponentPSObject(object component)
             PSObject mshObj = component as PSObject;
             if (mshObj == null)
             {
-                if (!(component is PSObjectTypeDescriptor descriptor))
+                if (component is not PSObjectTypeDescriptor descriptor)
                 {
                     throw PSTraceSource.NewArgumentException(nameof(component), ExtendedTypeSystem.InvalidComponent,
                                                              "component",
@@ -464,7 +464,7 @@ public override PropertyDescriptorCollection GetProperties(Attribute[] attribute
         /// <returns>True if the Instance property of <paramref name="obj"/> is equal to the current Instance; otherwise, false.</returns>
         public override bool Equals(object obj)
         {
-            if (!(obj is PSObjectTypeDescriptor other))
+            if (obj is not PSObjectTypeDescriptor other)
             {
                 return false;
             }
diff --git a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
index 7149f0a2e40..31ac506c86a 100644
--- a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
+++ b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
@@ -161,7 +161,7 @@ internal string[] ArgumentList
         /// <param name="argument">The value used with parameter.</param>
         internal void AddToArgumentList(CommandParameterInternal parameter, string argument)
         {
-            if (parameter.ParameterNameSpecified && parameter.ParameterText.EndsWith(":"))
+            if (parameter.ParameterNameSpecified && parameter.ParameterText.EndsWith(':'))
             {
                 if (argument != parameter.ParameterText)
                 {
@@ -328,7 +328,7 @@ private void AppendOneNativeArgument(ExecutionContext context, CommandParameterI
         }
 
         /// <summary>
-        /// On Windows, just append <paramref name="arg"/>.
+        /// On Windows, do tilde expansion, otherwise just append <paramref name="arg"/>.
         /// On Unix, do globbing as appropriate, otherwise just append <paramref name="arg"/>.
         /// </summary>
         /// <param name="arg">The argument that possibly needs expansion.</param>
@@ -400,23 +400,17 @@ private void PossiblyGlobArg(string arg, CommandParameterInternal parameter, boo
             {
                 // 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, "~"))
+                if (ExpandTilde(arg, parameter))
                 {
-                    _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
+#else
+            if (!usedQuotes && ExpandTilde(arg, parameter))
+            {
+                argExpanded = true;
+            }
+#endif
 
             if (!argExpanded)
             {
@@ -425,6 +419,33 @@ private void PossiblyGlobArg(string arg, CommandParameterInternal parameter, boo
             }
         }
 
+        /// <summary>
+        /// Replace tilde for unquoted arguments in the form ~ and ~/. For windows, ~\ is also expanded.
+        /// </summary>
+        /// <param name="arg">The argument that possibly needs expansion.</param>
+        /// <param name="parameter">The parameter associated with the operation.</param>
+        /// <returns>True if tilde expansion occurred.</returns>
+        private bool ExpandTilde(string arg, CommandParameterInternal parameter)
+        {
+            var fileSystemProvider = Context.EngineSessionState.GetSingleProvider(FileSystemProvider.ProviderName);
+            var home = fileSystemProvider.Home;
+            if (string.Equals(arg, "~"))
+            {
+                _arguments.Append(home);
+                AddToArgumentList(parameter, home);
+                return true;
+            }
+            else if (arg.StartsWith("~/") || (OperatingSystem.IsWindows() && arg.StartsWith(@"~\")))
+            {
+                var replacementString = string.Concat(home, arg.AsSpan(1));
+                _arguments.Append(replacementString);
+                AddToArgumentList(parameter, replacementString);
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Check to see if the string contains spaces and therefore must be quoted.
         /// </summary>
@@ -476,7 +497,7 @@ private static string GetEnumerableArgSeparator(ArrayLiteralAst arrayLiteralAst,
             afterPrev -= arrayExtent.StartOffset;
             beforeNext -= arrayExtent.StartOffset;
 
-            if (arrayText[afterPrev] == ',') 
+            if (arrayText[afterPrev] == ',')
             {
                 return ", ";
             }
@@ -485,7 +506,7 @@ private static string GetEnumerableArgSeparator(ArrayLiteralAst arrayLiteralAst,
             {
                 return " ,";
             }
-            
+
             return " , ";
         }
 
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 02af209f6ed..145fe968fda 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -11,15 +11,17 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Management.Automation.Internal;
-using System.Management.Automation.Runspaces;
-using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
+using Microsoft.PowerShell.Commands;
 using Microsoft.PowerShell.Telemetry;
+using Microsoft.Win32;
 using Dbg = System.Management.Automation.Diagnostics;
 
 namespace System.Management.Automation
@@ -133,7 +135,7 @@ internal ProcessOutputObject(object data, MinishellStream stream)
         }
     }
 
-    #nullable enable
+#nullable enable
     /// <summary>
     /// This exception is used by the NativeCommandProcessor to indicate an error
     /// when a native command returns a non-zero exit code.
@@ -187,34 +189,218 @@ internal NativeCommandExitException(string path, int exitCode, int processId, st
         public int ProcessId { get; }
 
     }
-    #nullable restore
+#nullable restore
 
     /// <summary>
     /// Provides way to create and execute native commands.
     /// </summary>
     internal class NativeCommandProcessor : CommandProcessorBase
     {
-        // This is the list of files which will trigger Legacy behavior if
-        // PSNativeCommandArgumentPassing is set to "Windows".
-        private static readonly IReadOnlySet<string> s_legacyFileExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        /// <summary>
+        /// This is the list of files which will trigger Legacy behavior if 'PSNativeCommandArgumentPassing' is set to "Windows".
+        /// </summary>
+        private static readonly HashSet<string> s_legacyFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+            {
+                ".js",
+                ".wsf",
+                ".cmd",
+                ".bat",
+                ".vbs",
+            };
+
+        /// <summary>
+        /// This is the list of native commands that have non-standard behavior with regard to argument passing.
+        /// We use Legacy argument parsing for them when 'PSNativeCommandArgumentPassing' is set to "Windows".
+        /// </summary>
+        private static readonly HashSet<string> s_legacyCommands = new(StringComparer.OrdinalIgnoreCase)
+            {
+                "cmd",
+                "cscript",
+                "find",
+                "sqlcmd",
+                "wscript",
+            };
+
+#if !UNIX
+        /// <summary>
+        /// List of known package managers pulled from the registry.
+        /// </summary>
+        private static readonly HashSet<string> s_knownPackageManagers = GetPackageManagerListFromRegistry();
+
+        /// <summary>
+        /// Indicates whether the Path Update feature is enabled in a given session.
+        /// PowerShell sessions could reuse the same thread, so we cannot cache the value with a thread static variable.
+        /// </summary>
+        private static readonly ConditionalWeakTable<ExecutionContext, string> s_pathUpdateFeatureEnabled = new();
+
+        private readonly bool _isPackageManager;
+        private string _originalUserEnvPath;
+        private string _originalSystemEnvPath;
+
+        /// <summary>
+        /// Gets the known package managers from the registry.
+        /// </summary>
+        private static HashSet<string> GetPackageManagerListFromRegistry()
+        {
+            // We only account for the first 8 package managers. This is the same behavior as in CMD.
+            const int MaxPackageManagerCount = 8;
+            const string RegKeyPath = @"Software\Microsoft\Command Processor\KnownPackageManagers";
+
+            string[] subKeyNames = null;
+            HashSet<string> retSet = null;
+
+            try
+            {
+                using RegistryKey key = Registry.LocalMachine.OpenSubKey(RegKeyPath);
+                subKeyNames = key?.GetSubKeyNames();
+            }
+            catch
+            {
+                return null;
+            }
+
+            if (subKeyNames is { Length: > 0 })
+            {
+                IEnumerable<string> names = subKeyNames.Length <= MaxPackageManagerCount
+                    ? subKeyNames
+                    : subKeyNames.Take(MaxPackageManagerCount);
+
+                retSet = new(names, StringComparer.OrdinalIgnoreCase);
+            }
+
+            return retSet;
+        }
+
+        /// <summary>
+        /// Check if the given name is a known package manager from the registry list.
+        /// </summary>
+        private static bool IsKnownPackageManager(string name)
+        {
+            if (s_knownPackageManagers is null)
+            {
+                return false;
+            }
+
+            if (s_knownPackageManagers.Contains(name))
+            {
+                return true;
+            }
+
+            int lastDotIndex = name.LastIndexOf('.');
+            if (lastDotIndex > 0)
+            {
+                string nameWithoutExt = name[..lastDotIndex];
+                if (s_knownPackageManagers.Contains(nameWithoutExt))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Check if the Path Update feature is enabled for the given session.
+        /// </summary>
+        private static bool IsPathUpdateFeatureEnabled(ExecutionContext context)
         {
-            ".js",
-            ".wsf",
-            ".cmd",
-            ".bat",
-            ".vbs",
-        };
-
-        // The following native commands have non-standard behavior with regard to argument passing,
-        // so we use Legacy argument parsing for them when PSNativeCommandArgumentPassing is set to Windows.
-        private static readonly IReadOnlySet<string> s_legacyCommands = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            // We check only once per session.
+            if (s_pathUpdateFeatureEnabled.TryGetValue(context, out string value))
+            {
+                // The feature is enabled if the value is not null.
+                return value is { };
+            }
+
+            // Disable Path Update if 'EnvironmentProvider' is disabled in the current session, or the current session is restricted.
+            bool enabled = context.EngineSessionState.Providers.ContainsKey(EnvironmentProvider.ProviderName)
+                && !Utils.IsSessionRestricted(context);
+
+            // - Use the static empty string instance to indicate that the feature is enabled.
+            // - Use the null value to indicate that the feature is disabled.
+            s_pathUpdateFeatureEnabled.TryAdd(context, enabled ? string.Empty : null);
+            return enabled;
+        }
+
+        /// <summary>
+        /// Gets the added part of the new string compared to the old string.
+        /// </summary>
+        private static ReadOnlySpan<char> GetAddedPartOfString(string oldString, string newString)
         {
-            "cmd",
-            "cscript",
-            "find",
-            "sqlcmd",
-            "wscript",
-        };
+            if (oldString.Length >= newString.Length)
+            {
+                // Nothing added or something removed.
+                return ReadOnlySpan<char>.Empty;
+            }
+
+            int index = newString.IndexOf(oldString);
+            if (index is -1)
+            {
+                // The new and old strings are drastically different. Stop trying in this case.
+                return ReadOnlySpan<char>.Empty;
+            }
+
+            if (index > 0)
+            {
+                // Found the old string at non-zero offset, so something was prepended to the old string.
+                return newString.AsSpan(0, index);
+            }
+            else
+            {
+                // Found the old string at the beginning of the new string, so something was appended to the old string.
+                return newString.AsSpan(oldString.Length);
+            }
+        }
+
+        /// <summary>
+        /// Update the process-scope environment variable Path based on the changes in the user-scope and system-scope Path.
+        /// </summary>
+        /// <param name="oldUserPath">The old value of the user-scope Path retrieved from registry.</param>
+        /// <param name="oldSystemPath">The old value of the system-scope Path retrieved from registry.</param>
+        private static void UpdateProcessEnvPath(string oldUserPath, string oldSystemPath)
+        {
+            string newUserEnvPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.User);
+            string newSystemEnvPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine);
+            string procEnvPath = Environment.GetEnvironmentVariable("Path");
+
+            ReadOnlySpan<char> userPathChange = GetAddedPartOfString(oldUserPath, newUserEnvPath).Trim(';');
+            ReadOnlySpan<char> systemPathChange = GetAddedPartOfString(oldSystemPath, newSystemEnvPath).Trim(';');
+
+            // Add 2 to account for the path separators we may need to add.
+            int maxLength = procEnvPath.Length + userPathChange.Length + systemPathChange.Length + 2;
+            StringBuilder newPath = null;
+
+            if (userPathChange.Length > 0)
+            {
+                CreateNewProcEnvPath(userPathChange);
+            }
+
+            if (systemPathChange.Length > 0)
+            {
+                CreateNewProcEnvPath(systemPathChange);
+            }
+
+            if (newPath is { Length: > 0 })
+            {
+                // Update the process env Path.
+                Environment.SetEnvironmentVariable("Path", newPath.ToString());
+            }
+
+            // Helper method to create a new env Path string.
+            void CreateNewProcEnvPath(ReadOnlySpan<char> newChange)
+            {
+                newPath ??= new StringBuilder(procEnvPath, capacity: maxLength);
+
+                if (newPath.Length is 0 || newPath[^1] is ';')
+                {
+                    newPath.Append(newChange);
+                }
+                else
+                {
+                    newPath.Append(';').Append(newChange);
+                }
+            }
+        }
+#endif
 
         #region ctor/native command properties
 
@@ -262,7 +448,11 @@ internal NativeCommandProcessor(ApplicationInfo applicationInfo, ExecutionContex
             // Create input writer for providing input to the process.
             _inputWriter = new ProcessInputWriter(Command);
 
-            _isTranscribing = this.Command.Context.EngineHostInterface.UI.IsTranscribing;
+            _isTranscribing = context.EngineHostInterface.UI.IsTranscribing;
+
+#if !UNIX
+            _isPackageManager = IsKnownPackageManager(_applicationInfo.Name) && IsPathUpdateFeatureEnabled(context);
+#endif
         }
 
         /// <summary>
@@ -418,7 +608,7 @@ internal override void ProcessRecord()
         /// <summary>
         /// Process object for the invoked application.
         /// </summary>
-        private System.Diagnostics.Process _nativeProcess;
+        private Process _nativeProcess;
 
         /// <summary>
         /// This is used for writing input to the process.
@@ -560,6 +750,12 @@ private void InitNativeProcess()
                 // must set UseShellExecute to false if we modify the environment block
                 startInfo.UseShellExecute = false;
             }
+
+            if (_isPackageManager)
+            {
+                _originalUserEnvPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.User);
+                _originalSystemEnvPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine);
+            }
 #endif
 
             if (this.Command.Context.CurrentPipelineStopping)
@@ -635,6 +831,7 @@ private void InitNativeProcess()
                             bool useSpecialArgumentPassing = UseSpecialArgumentPassing(oldFileName);
                             if (useSpecialArgumentPassing)
                             {
+                                // codeql[cs/microsoft/command-line-injection] - This is expected PowerShell behavior where user inputted paths are supported for the context of this method and the path portion of the argument is escaped. The user assumes trust for the file path specified on the user's system to start process for, and in the case of remoting, restricted remoting security guidelines should be used.
                                 startInfo.Arguments = "\"" + oldFileName + "\" " + startInfo.Arguments;
                             }
                             else
@@ -658,6 +855,8 @@ private void InitNativeProcess()
                                 {
                                     startInfo.ArgumentList.RemoveAt(0);
                                 }
+
+                                // codeql[cs/microsoft/command-line-injection-shell-execution] - This is expected PowerShell behavior where user inputted paths are supported for the context of this method. The user assumes trust for the file path specified on the user's system to retrieve process info for, and in the case of remoting, restricted remoting security guidelines should be used.
                                 startInfo.FileName = oldFileName;
                             }
                         }
@@ -814,12 +1013,6 @@ private ProcessOutputObject DequeueProcessOutput(bool blocking)
         {
             if (blocking)
             {
-                if (_stdOutByteTransfer is not null)
-                {
-                    _stdOutByteTransfer.EOF.GetAwaiter().GetResult();
-                    return null;
-                }
-
                 // If adding was completed and collection is empty (IsCompleted == true)
                 // there is no need to do a blocking Take(), we should just return.
                 if (!_nativeProcessOutputQueue.IsCompleted)
@@ -841,17 +1034,9 @@ private ProcessOutputObject DequeueProcessOutput(bool blocking)
 
                 return null;
             }
-            else
-            {
-                if (_stdOutByteTransfer is not null)
-                {
-                    return null;
-                }
 
-                ProcessOutputObject record = null;
-                _nativeProcessOutputQueue.TryTake(out record);
-                return record;
-            }
+            _nativeProcessOutputQueue.TryTake(out ProcessOutputObject record);
+            return record;
         }
 
         /// <summary>
@@ -859,21 +1044,38 @@ private ProcessOutputObject DequeueProcessOutput(bool blocking)
         /// </summary>
         private void ConsumeAvailableNativeProcessOutput(bool blocking)
         {
-            if (!_isRunningInBackground)
+            if (_isRunningInBackground)
+            {
+                return;
+            }
+
+            bool stdOutRedirected = _nativeProcess.StartInfo.RedirectStandardOutput;
+            bool stdErrRedirected = _nativeProcess.StartInfo.RedirectStandardError;
+            if (stdOutRedirected && _stdOutByteTransfer is not null)
             {
-                if (_nativeProcess.StartInfo.RedirectStandardOutput || _nativeProcess.StartInfo.RedirectStandardError)
+                if (blocking)
                 {
-                    ProcessOutputObject record;
-                    while ((record = DequeueProcessOutput(blocking)) != null)
-                    {
-                        if (this.Command.Context.CurrentPipelineStopping)
-                        {
-                            this.StopProcessing();
-                            return;
-                        }
+                    _stdOutByteTransfer.EOF.GetAwaiter().GetResult();
+                }
 
-                        ProcessOutputRecord(record);
+                if (!stdErrRedirected)
+                {
+                    return;
+                }
+            }
+
+            if (stdOutRedirected || stdErrRedirected)
+            {
+                ProcessOutputObject record;
+                while ((record = DequeueProcessOutput(blocking)) != null)
+                {
+                    if (this.Command.Context.CurrentPipelineStopping)
+                    {
+                        this.StopProcessing();
+                        return;
                     }
+
+                    ProcessOutputRecord(record);
                 }
             }
         }
@@ -886,7 +1088,7 @@ internal override void Complete()
                 if (!_isRunningInBackground)
                 {
                     // Wait for input writer to finish.
-                    if (!UpstreamIsNativeCommand)
+                    if (!UpstreamIsNativeCommand || _nativeProcess.StartInfo.RedirectStandardError)
                     {
                         _inputWriter.Done();
                     }
@@ -895,6 +1097,13 @@ internal override void Complete()
                     ConsumeAvailableNativeProcessOutput(blocking: true);
                     _nativeProcess.WaitForExit();
 
+#if !UNIX
+                    if (_isPackageManager)
+                    {
+                        UpdateProcessEnvPath(_originalUserEnvPath, _originalSystemEnvPath);
+                    }
+#endif
+
                     // Capture screen output if we are transcribing and running stand alone
                     if (_isTranscribing && (s_supportScreenScrape == true) && _runStandAlone)
                     {
@@ -969,11 +1178,17 @@ internal override void Complete()
                     }
 
                     const string errorId = nameof(CommandBaseStrings.ProgramExitedWithNonZeroCode);
+#if UNIX
+                    string hexFormatStr = "0x{0:X2}";
+#else
+                    string hexFormatStr = "0x{0:X8}";
+#endif
 
                     string errorMsg = StringUtil.Format(
                         CommandBaseStrings.ProgramExitedWithNonZeroCode,
                         NativeCommandName,
-                        _nativeProcess.ExitCode);
+                        _nativeProcess.ExitCode,
+                        string.Format(CultureInfo.InvariantCulture, hexFormatStr, _nativeProcess.ExitCode));
 
                     var exception = new NativeCommandExitException(
                         Path,
@@ -1393,6 +1608,7 @@ private ProcessStartInfo GetProcessStartInfo(
         {
             var startInfo = new ProcessStartInfo
             {
+                // codeql[cs/microsoft/command-line-injection-shell-execution] - This is expected PowerShell behavior where user inputted paths are supported for the context of this method. The user assumes trust for the file path specified on the user's system to retrieve process info for, and in the case of remoting, restricted remoting security guidelines should be used.
                 FileName = this.Path
             };
 
@@ -1430,16 +1646,17 @@ private ProcessStartInfo GetProcessStartInfo(
                 startInfo.UseShellExecute = false;
                 startInfo.RedirectStandardInput = redirectInput;
 
+                Encoding outputEncoding = GetOutputEncoding();
                 if (redirectOutput)
                 {
                     startInfo.RedirectStandardOutput = true;
-                    startInfo.StandardOutputEncoding = Console.OutputEncoding;
+                    startInfo.StandardOutputEncoding = outputEncoding;
                 }
 
                 if (redirectError)
                 {
                     startInfo.RedirectStandardError = true;
-                    startInfo.StandardErrorEncoding = Console.OutputEncoding;
+                    startInfo.StandardErrorEncoding = outputEncoding;
                 }
             }
 
@@ -1462,6 +1679,7 @@ private ProcessStartInfo GetProcessStartInfo(
                 {
                     using (ParameterBinderBase.bindingTracer.TraceScope("BIND argument [{0}]", NativeParameterBinderController.Arguments))
                     {
+                        // codeql[cs/microsoft/command-line-injection ] - This is intended PowerShell behavior as NativeParameterBinderController.Arguments is what the native parameter binder generates based on the user input when invoking the command and cannot be injected externally.
                         startInfo.Arguments = NativeParameterBinderController.Arguments;
                     }
                 }
@@ -1496,6 +1714,20 @@ private ProcessStartInfo GetProcessStartInfo(
             return startInfo;
         }
 
+#nullable enable
+        /// <summary>
+        /// Gets the encoding to use for a process' output/error pipes.
+        /// </summary>
+        /// <returns>The encoding to use for the process output.</returns>
+        private Encoding GetOutputEncoding()
+        {
+            Encoding? applicationOutputEncoding = Context.GetVariableValue(
+                    SpecialVariables.PSApplicationOutputEncodingVarPath) as Encoding;
+
+            return applicationOutputEncoding ?? Console.OutputEncoding;
+        }
+#nullable disable
+
         /// <summary>
         /// Determine if we have a special file which will change the way native argument passing
         /// is done on Windows. We use legacy behavior for cmd.exe, .bat, .cmd files.
@@ -1708,6 +1940,7 @@ private bool IsExecutable(string path)
         #region Minishell Interop
 
         private bool _isMiniShell = false;
+
         /// <summary>
         /// Returns true if native command being invoked is mini-shell.
         /// </summary>
@@ -1771,7 +2004,7 @@ public ProcessOutputHandler(
 
             // we incrementing refCount on the same thread and before running any processing
             // so it's safe to do it without Interlocked.
-            if (process.StartInfo.RedirectStandardOutput)
+            if (process.StartInfo.RedirectStandardOutput && stdOutDestination is null)
             {
                 _refCount++;
             }
@@ -2292,7 +2525,6 @@ internal static bool AllocateHiddenConsole()
     /// This remote instance of PowerShell can be in a separate process,
     /// appdomain or machine.
     /// </remarks>
-    [SuppressMessage("Microsoft.Usage", "CA2240:ImplementISerializableCorrectly")]
     public class RemoteException : RuntimeException
     {
         /// <summary>
diff --git a/src/System.Management.Automation/engine/PSConfiguration.cs b/src/System.Management.Automation/engine/PSConfiguration.cs
index e321423f768..419a4cae95f 100644
--- a/src/System.Management.Automation/engine/PSConfiguration.cs
+++ b/src/System.Management.Automation/engine/PSConfiguration.cs
@@ -89,7 +89,10 @@ private PowerShellConfig()
             // Note: This directory may or may not exist depending upon the execution scenario.
             // Writes will attempt to create the directory if it does not already exist.
             perUserConfigDirectory = Platform.ConfigDirectory;
-            perUserConfigFile = Path.Combine(perUserConfigDirectory, ConfigFileName);
+            if (!string.IsNullOrEmpty(perUserConfigDirectory))
+            {
+                perUserConfigFile = Path.Combine(perUserConfigDirectory, ConfigFileName);
+            }
 
             emptyConfig = new JObject();
             configRoots = new JObject[2];
@@ -387,6 +390,11 @@ internal PSKeyword GetLogKeywords()
         private T ReadValueFromFile<T>(ConfigScope scope, string key, T defaultValue = default)
         {
             string fileName = GetConfigFilePath(scope);
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return defaultValue;
+            }
+
             JObject configData = configRoots[(int)scope];
 
             if (configData == null)
diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index c4202737330..eef9819a568 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -335,8 +335,9 @@ IEnumerator IEnumerable.GetEnumerator()
     public sealed class SemanticVersion : IComparable, IComparable<SemanticVersion>, IEquatable<SemanticVersion>
     {
         private const string VersionSansRegEx = @"^(?<major>\d+)(\.(?<minor>\d+))?(\.(?<patch>\d+))?$";
-        private const string LabelRegEx = @"^((?<preLabel>[0-9A-Za-z][0-9A-Za-z\-\.]*))?(\+(?<buildLabel>[0-9A-Za-z][0-9A-Za-z\-\.]*))?$";
-        private const string LabelUnitRegEx = @"^[0-9A-Za-z][0-9A-Za-z\-\.]*$";
+        private const string LabelRegEx = @"^(?<preLabel>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+(?<buildLabel>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$";
+        private const string LabelUnitRegEx = @"^((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)$";
+        private const string BuildUnitRegEx = @"^([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)$";
         private const string PreLabelPropertyName = "PSSemVerPreReleaseLabel";
         private const string BuildLabelPropertyName = "PSSemVerBuildLabel";
         private const string TypeNameForVersionWithLabel = "System.Version#IncludeLabel";
@@ -370,7 +371,7 @@ public SemanticVersion(string version)
         /// <param name="buildLabel">The build metadata for the version.</param>
         /// <exception cref="FormatException">
         /// If <paramref name="preReleaseLabel"/> don't match 'LabelUnitRegEx'.
-        /// If <paramref name="buildLabel"/> don't match 'LabelUnitRegEx'.
+        /// If <paramref name="buildLabel"/> don't match 'BuildUnitRegEx'.
         /// </exception>
         public SemanticVersion(int major, int minor, int patch, string preReleaseLabel, string buildLabel)
             : this(major, minor, patch)
@@ -387,7 +388,7 @@ public SemanticVersion(int major, int minor, int patch, string preReleaseLabel,
 
             if (!string.IsNullOrEmpty(buildLabel))
             {
-                if (!Regex.IsMatch(buildLabel, LabelUnitRegEx))
+                if (!Regex.IsMatch(buildLabel, BuildUnitRegEx))
                 {
                     throw new FormatException(nameof(buildLabel));
                 }
@@ -410,7 +411,7 @@ public SemanticVersion(int major, int minor, int patch, string preReleaseLabel,
         public SemanticVersion(int major, int minor, int patch, string label)
             : this(major, minor, patch)
         {
-            // We presume the SymVer :
+            // We presume the SemVer :
             // 1) major.minor.patch-label
             // 2) 'label' starts with letter or digit.
             if (!string.IsNullOrEmpty(label))
@@ -447,7 +448,7 @@ public SemanticVersion(int major, int minor, int patch)
                 throw PSTraceSource.NewArgumentException(nameof(minor));
             }
 
-            if (patch < 0) 
+            if (patch < 0)
             {
                 throw PSTraceSource.NewArgumentException(nameof(patch));
             }
@@ -568,12 +569,12 @@ public static implicit operator Version(SemanticVersion semver)
         public int Patch { get; }
 
         /// <summary>
-        /// PreReleaseLabel position in the SymVer string 'major.minor.patch-PreReleaseLabel+BuildLabel'.
+        /// PreReleaseLabel position in the SemVer string 'major.minor.patch-PreReleaseLabel+BuildLabel'.
         /// </summary>
         public string PreReleaseLabel { get; }
 
         /// <summary>
-        /// BuildLabel position in the SymVer string 'major.minor.patch-PreReleaseLabel+BuildLabel'.
+        /// BuildLabel position in the SemVer string 'major.minor.patch-PreReleaseLabel+BuildLabel'.
         /// </summary>
         public string BuildLabel { get; }
 
@@ -643,7 +644,7 @@ private static bool TryParseVersion(string version, ref VersionResult result)
             string preLabel = null;
             string buildLabel = null;
 
-            // We parse the SymVer 'version' string 'major.minor.patch-PreReleaseLabel+BuildLabel'.
+            // We parse the SemVer 'version' string 'major.minor.patch-PreReleaseLabel+BuildLabel'.
             var dashIndex = version.IndexOf('-');
             var plusIndex = version.IndexOf('+');
 
@@ -729,7 +730,7 @@ private static bool TryParseVersion(string version, ref VersionResult result)
             }
 
             if (preLabel != null && !Regex.IsMatch(preLabel, LabelUnitRegEx) ||
-               (buildLabel != null && !Regex.IsMatch(buildLabel, LabelUnitRegEx)))
+               (buildLabel != null && !Regex.IsMatch(buildLabel, BuildUnitRegEx)))
             {
                 result.SetFailure(ParseFailureKind.FormatException);
                 return false;
@@ -794,7 +795,7 @@ public int CompareTo(object version)
                 return 1;
             }
 
-            if (!(version is SemanticVersion v))
+            if (version is not SemanticVersion v)
             {
                 throw PSTraceSource.NewArgumentException(nameof(version));
             }
@@ -804,7 +805,7 @@ public int CompareTo(object version)
 
         /// <summary>
         /// Implement <see cref="IComparable{T}.CompareTo"/>.
-        /// Meets SymVer 2.0 p.11 https://semver.org/
+        /// Meets SemVer 2.0 p.11 https://semver.org/
         /// </summary>
         public int CompareTo(SemanticVersion value)
         {
@@ -820,7 +821,7 @@ public int CompareTo(SemanticVersion value)
             if (Patch != value.Patch)
                 return Patch > value.Patch ? 1 : -1;
 
-            // SymVer 2.0 standard requires to ignore 'BuildLabel' (Build metadata).
+            // SemVer 2.0 standard requires to ignore 'BuildLabel' (Build metadata).
             return ComparePreLabel(this.PreReleaseLabel, value.PreReleaseLabel);
         }
 
@@ -837,7 +838,7 @@ public override bool Equals(object obj)
         /// </summary>
         public bool Equals(SemanticVersion other)
         {
-            // SymVer 2.0 standard requires to ignore 'BuildLabel' (Build metadata).
+            // SemVer 2.0 standard requires to ignore 'BuildLabel' (Build metadata).
             return other != null &&
                    (Major == other.Major) && (Minor == other.Minor) && (Patch == other.Patch) &&
                    string.Equals(PreReleaseLabel, other.PreReleaseLabel, StringComparison.Ordinal);
@@ -906,7 +907,7 @@ public override int GetHashCode()
 
         private static int ComparePreLabel(string preLabel1, string preLabel2)
         {
-            // Symver 2.0 standard p.9
+            // SemVer 2.0 standard p.9
             // Pre-release versions have a lower precedence than the associated normal version.
             // Comparing each dot separated identifier from left to right
             // until a difference is found as follows:
diff --git a/src/System.Management.Automation/engine/ProgressRecord.cs b/src/System.Management.Automation/engine/ProgressRecord.cs
index 8dca2c6d7fc..b3139dc8e6e 100644
--- a/src/System.Management.Automation/engine/ProgressRecord.cs
+++ b/src/System.Management.Automation/engine/ProgressRecord.cs
@@ -293,7 +293,7 @@ internal ProgressRecord(ProgressRecord other)
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.ToString"/>
+        /// Overrides <see cref="object.ToString"/>
         /// </summary>
         /// <returns>
         /// "parent = a id = b act = c stat = d cur = e pct = f sec = g type = h" where
@@ -429,28 +429,28 @@ internal static int GetPercentageComplete(DateTime startTime, TimeSpan expectedD
 
         #region DO NOT REMOVE OR RENAME THESE FIELDS - it will break remoting compatibility with Windows PowerShell
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly int id;
 
-        [DataMemberAttribute]
+        [DataMember]
         private int parentId = -1;
 
-        [DataMemberAttribute]
+        [DataMember]
         private string activity;
 
-        [DataMemberAttribute]
+        [DataMember]
         private string status;
 
-        [DataMemberAttribute]
+        [DataMember]
         private string currentOperation;
 
-        [DataMemberAttribute]
+        [DataMember]
         private int percent = -1;
 
-        [DataMemberAttribute]
+        [DataMember]
         private int secondsRemaining = -1;
 
-        [DataMemberAttribute]
+        [DataMember]
         private ProgressRecordType type = ProgressRecordType.Processing;
 
         #endregion
diff --git a/src/System.Management.Automation/engine/SessionState.cs b/src/System.Management.Automation/engine/SessionState.cs
index e65f65ff385..a53c211beb2 100644
--- a/src/System.Management.Automation/engine/SessionState.cs
+++ b/src/System.Management.Automation/engine/SessionState.cs
@@ -27,7 +27,7 @@ internal sealed partial class SessionStateInternal
         /// An instance of the PSTraceSource class used for trace output
         /// using "SessionState" as the category.
         /// </summary>
-        [Dbg.TraceSourceAttribute(
+        [Dbg.TraceSource(
              "SessionState",
              "SessionState Class")]
         private static readonly Dbg.PSTraceSource s_tracer =
@@ -337,10 +337,9 @@ internal void InitializeFixedVariables()
             this.GlobalScope.SetVariable(v.Name, v, asValue: false, force: true, this, CommandOrigin.Internal, fastPath: true);
 
             // $PID
-            Process currentProcess = Process.GetCurrentProcess();
             v = new PSVariable(
                     SpecialVariables.PID,
-                    currentProcess.Id,
+                    Environment.ProcessId,
                     ScopedItemOptions.Constant | ScopedItemOptions.AllScope,
                     RunspaceInit.PIDDescription);
             this.GlobalScope.SetVariable(v.Name, v, asValue: false, force: true, this, CommandOrigin.Internal, fastPath: true);
diff --git a/src/System.Management.Automation/engine/SessionStateCmdletAPIs.cs b/src/System.Management.Automation/engine/SessionStateCmdletAPIs.cs
index f14c25f7420..5afa8f0169f 100644
--- a/src/System.Management.Automation/engine/SessionStateCmdletAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateCmdletAPIs.cs
@@ -35,7 +35,7 @@ internal CmdletInfo GetCmdlet(string cmdletName)
         /// The name of the cmdlet value to retrieve.
         /// </param>
         /// <param name="origin">
-        /// The origin of hte command trying to retrieve this cmdlet.
+        /// The origin of the command trying to retrieve this cmdlet.
         /// </param>
         /// <returns>
         /// The CmdletInfo representing the cmdlet.
diff --git a/src/System.Management.Automation/engine/SessionStateContainer.cs b/src/System.Management.Automation/engine/SessionStateContainer.cs
index 1438671e1ec..fa8884b92e8 100644
--- a/src/System.Management.Automation/engine/SessionStateContainer.cs
+++ b/src/System.Management.Automation/engine/SessionStateContainer.cs
@@ -1839,7 +1839,7 @@ private void ProcessPathItems(
                         return;
                     }
 
-                    if (!(childNameObjects[index].BaseObject is string childName))
+                    if (childNameObjects[index].BaseObject is not string childName)
                     {
                         continue;
                     }
@@ -2584,7 +2584,7 @@ private void DoGetChildNamesManually(
                         return;
                     }
 
-                    if (!(result.BaseObject is string name))
+                    if (result.BaseObject is not string name)
                     {
                         continue;
                     }
@@ -2632,7 +2632,7 @@ private void DoGetChildNamesManually(
                                 return;
                             }
 
-                            if (!(result.BaseObject is string name))
+                            if (result.BaseObject is not string name)
                             {
                                 continue;
                             }
@@ -3497,37 +3497,7 @@ internal void NewItem(
                             throw PSTraceSource.NewArgumentNullException(nameof(content), SessionStateStrings.NewLinkTargetNotSpecified, path);
                         }
 
-                        ProviderInfo targetProvider = null;
-                        CmdletProvider targetProviderInstance = null;
-
-                        var globbedTarget = Globber.GetGlobbedProviderPathsFromMonadPath(
-                            targetPath,
-                            allowNonexistingPath,
-                            context,
-                            out targetProvider,
-                            out targetProviderInstance);
-
-                        if (!string.Equals(targetProvider.Name, "filesystem", StringComparison.OrdinalIgnoreCase))
-                        {
-                            throw PSTraceSource.NewNotSupportedException(SessionStateStrings.MustBeFileSystemPath);
-                        }
-
-                        if (globbedTarget.Count > 1)
-                        {
-                            throw PSTraceSource.NewInvalidOperationException(SessionStateStrings.PathResolvedToMultiple, targetPath);
-                        }
-
-                        if (globbedTarget.Count == 0)
-                        {
-                            throw PSTraceSource.NewInvalidOperationException(SessionStateStrings.PathNotFound, targetPath);
-                        }
-
-                        // If the original target was a relative path, we want to leave it as relative if it did not require
-                        // globbing to resolve.
-                        if (WildcardPattern.ContainsWildcardCharacters(targetPath))
-                        {
-                            content = globbedTarget[0];
-                        }
+                        content = targetPath;
                     }
 
                     NewItemPrivate(providerInstance, composedPath, type, content, context);
diff --git a/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs b/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs
index 34c1ac50521..d01d4c63f5d 100644
--- a/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs
@@ -1434,4 +1434,3 @@ internal PSDriveInfo CurrentDrive
 }
 
 #pragma warning restore 56500
-
diff --git a/src/System.Management.Automation/engine/SessionStateItem.cs b/src/System.Management.Automation/engine/SessionStateItem.cs
index 3d5262bf6c0..173043515ba 100644
--- a/src/System.Management.Automation/engine/SessionStateItem.cs
+++ b/src/System.Management.Automation/engine/SessionStateItem.cs
@@ -1375,4 +1375,3 @@ private object InvokeDefaultActionDynamicParameters(
 }
 
 #pragma warning restore 56500
-
diff --git a/src/System.Management.Automation/engine/SessionStateNavigation.cs b/src/System.Management.Automation/engine/SessionStateNavigation.cs
index a1139ebc198..d2d27ec2d83 100644
--- a/src/System.Management.Automation/engine/SessionStateNavigation.cs
+++ b/src/System.Management.Automation/engine/SessionStateNavigation.cs
@@ -1748,4 +1748,3 @@ private object MoveItemDynamicParameters(
 }
 
 #pragma warning restore 56500
-
diff --git a/src/System.Management.Automation/engine/SessionStateProperty.cs b/src/System.Management.Automation/engine/SessionStateProperty.cs
index d4568d2ebb3..9f621fa2f7a 100644
--- a/src/System.Management.Automation/engine/SessionStateProperty.cs
+++ b/src/System.Management.Automation/engine/SessionStateProperty.cs
@@ -1116,4 +1116,3 @@ private object ClearPropertyDynamicParameters(
 }
 
 #pragma warning restore 56500
-
diff --git a/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs b/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs
index 0c94c9ea059..3ad2ed99e31 100644
--- a/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs
@@ -350,7 +350,7 @@ internal DriveCmdletProvider GetDriveProviderInstance(string providerId)
                 throw PSTraceSource.NewArgumentNullException(nameof(providerId));
             }
 
-            if (!(GetProviderInstance(providerId) is DriveCmdletProvider driveCmdletProvider))
+            if (GetProviderInstance(providerId) is not DriveCmdletProvider driveCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.DriveCmdletProvider_NotSupported);
@@ -382,7 +382,7 @@ internal DriveCmdletProvider GetDriveProviderInstance(ProviderInfo provider)
                 throw PSTraceSource.NewArgumentNullException(nameof(provider));
             }
 
-            if (!(GetProviderInstance(provider) is DriveCmdletProvider driveCmdletProvider))
+            if (GetProviderInstance(provider) is not DriveCmdletProvider driveCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.DriveCmdletProvider_NotSupported);
@@ -414,7 +414,7 @@ private static DriveCmdletProvider GetDriveProviderInstance(CmdletProvider provi
                 throw PSTraceSource.NewArgumentNullException(nameof(providerInstance));
             }
 
-            if (!(providerInstance is DriveCmdletProvider driveCmdletProvider))
+            if (providerInstance is not DriveCmdletProvider driveCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.DriveCmdletProvider_NotSupported);
@@ -449,7 +449,7 @@ internal ItemCmdletProvider GetItemProviderInstance(string providerId)
                 throw PSTraceSource.NewArgumentNullException(nameof(providerId));
             }
 
-            if (!(GetProviderInstance(providerId) is ItemCmdletProvider itemCmdletProvider))
+            if (GetProviderInstance(providerId) is not ItemCmdletProvider itemCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.ItemCmdletProvider_NotSupported);
@@ -481,7 +481,7 @@ internal ItemCmdletProvider GetItemProviderInstance(ProviderInfo provider)
                 throw PSTraceSource.NewArgumentNullException(nameof(provider));
             }
 
-            if (!(GetProviderInstance(provider) is ItemCmdletProvider itemCmdletProvider))
+            if (GetProviderInstance(provider) is not ItemCmdletProvider itemCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.ItemCmdletProvider_NotSupported);
@@ -513,7 +513,7 @@ private static ItemCmdletProvider GetItemProviderInstance(CmdletProvider provide
                 throw PSTraceSource.NewArgumentNullException(nameof(providerInstance));
             }
 
-            if (!(providerInstance is ItemCmdletProvider itemCmdletProvider))
+            if (providerInstance is not ItemCmdletProvider itemCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.ItemCmdletProvider_NotSupported);
@@ -548,7 +548,7 @@ internal ContainerCmdletProvider GetContainerProviderInstance(string providerId)
                 throw PSTraceSource.NewArgumentNullException(nameof(providerId));
             }
 
-            if (!(GetProviderInstance(providerId) is ContainerCmdletProvider containerCmdletProvider))
+            if (GetProviderInstance(providerId) is not ContainerCmdletProvider containerCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.ContainerCmdletProvider_NotSupported);
@@ -580,7 +580,7 @@ internal ContainerCmdletProvider GetContainerProviderInstance(ProviderInfo provi
                 throw PSTraceSource.NewArgumentNullException(nameof(provider));
             }
 
-            if (!(GetProviderInstance(provider) is ContainerCmdletProvider containerCmdletProvider))
+            if (GetProviderInstance(provider) is not ContainerCmdletProvider containerCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.ContainerCmdletProvider_NotSupported);
@@ -612,7 +612,7 @@ private static ContainerCmdletProvider GetContainerProviderInstance(CmdletProvid
                 throw PSTraceSource.NewArgumentNullException(nameof(providerInstance));
             }
 
-            if (!(providerInstance is ContainerCmdletProvider containerCmdletProvider))
+            if (providerInstance is not ContainerCmdletProvider containerCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.ContainerCmdletProvider_NotSupported);
@@ -644,7 +644,7 @@ internal NavigationCmdletProvider GetNavigationProviderInstance(ProviderInfo pro
                 throw PSTraceSource.NewArgumentNullException(nameof(provider));
             }
 
-            if (!(GetProviderInstance(provider) is NavigationCmdletProvider navigationCmdletProvider))
+            if (GetProviderInstance(provider) is not NavigationCmdletProvider navigationCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(SessionStateStrings.NavigationCmdletProvider_NotSupported);
diff --git a/src/System.Management.Automation/engine/SessionStateSecurityDescriptorInterface.cs b/src/System.Management.Automation/engine/SessionStateSecurityDescriptorInterface.cs
index 16ebe0fc3b5..08635c7efe1 100644
--- a/src/System.Management.Automation/engine/SessionStateSecurityDescriptorInterface.cs
+++ b/src/System.Management.Automation/engine/SessionStateSecurityDescriptorInterface.cs
@@ -35,7 +35,7 @@ internal static ISecurityDescriptorCmdletProvider GetPermissionProviderInstance(
                 throw PSTraceSource.NewArgumentNullException(nameof(providerInstance));
             }
 
-            if (!(providerInstance is ISecurityDescriptorCmdletProvider permissionCmdletProvider))
+            if (providerInstance is not ISecurityDescriptorCmdletProvider permissionCmdletProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
diff --git a/src/System.Management.Automation/engine/SpecialVariables.cs b/src/System.Management.Automation/engine/SpecialVariables.cs
index 420b52d4d22..51419a0d5c2 100644
--- a/src/System.Management.Automation/engine/SpecialVariables.cs
+++ b/src/System.Management.Automation/engine/SpecialVariables.cs
@@ -41,6 +41,10 @@ internal static class SpecialVariables
 
         internal static readonly VariablePath OutputEncodingVarPath = new VariablePath(OutputEncoding);
 
+        internal const string PSApplicationOutputEncoding = nameof(PSApplicationOutputEncoding);
+
+        internal static readonly VariablePath PSApplicationOutputEncodingVarPath = new VariablePath(PSApplicationOutputEncoding);
+
         internal const string VerboseHelpErrors = "VerboseHelpErrors";
 
         internal static readonly VariablePath VerboseHelpErrorsVarPath = new VariablePath(VerboseHelpErrors);
@@ -341,6 +345,7 @@ internal static class SpecialVariables
             SpecialVariables.WarningPreference,
             SpecialVariables.InformationPreference,
             SpecialVariables.ConfirmPreference,
+            SpecialVariables.ProgressPreference,
         };
 
         internal static readonly Type[] PreferenceVariableTypes =
@@ -352,6 +357,7 @@ internal static class SpecialVariables
             /* WarningPreference */                       typeof(ActionPreference),
             /* InformationPreference */                   typeof(ActionPreference),
             /* ConfirmPreference */                       typeof(ConfirmImpact),
+            /* ProgressPreference */                      typeof(ActionPreference),
         };
 
         // The following variables are created in every session w/ AllScope.  We avoid creating local slots when we
@@ -386,6 +392,7 @@ internal static class SpecialVariables
                     SpecialVariables.NestedPromptLevel,
                     SpecialVariables.pwd,
                     SpecialVariables.Matches,
+                    SpecialVariables.PSApplicationOutputEncoding,
                 },
                 StringComparer.OrdinalIgnoreCase
             );
diff --git a/src/System.Management.Automation/engine/Subsystem/Commands/GetPSSubsystemCommand.cs b/src/System.Management.Automation/engine/Subsystem/Commands/GetPSSubsystemCommand.cs
index 1ad79404f51..df828c724a2 100644
--- a/src/System.Management.Automation/engine/Subsystem/Commands/GetPSSubsystemCommand.cs
+++ b/src/System.Management.Automation/engine/Subsystem/Commands/GetPSSubsystemCommand.cs
@@ -8,7 +8,6 @@ namespace System.Management.Automation.Subsystem
     /// <summary>
     /// Implementation of 'Get-PSSubsystem' cmdlet.
     /// </summary>
-    [Experimental("PSSubsystemPluginModel", ExperimentAction.Show)]
     [Cmdlet(VerbsCommon.Get, "PSSubsystem", DefaultParameterSetName = AllSet)]
     [OutputType(typeof(SubsystemInfo))]
     public sealed class GetPSSubsystemCommand : PSCmdlet
diff --git a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs
index 588cf086d42..b1aa781fea7 100644
--- a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs
+++ b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs
@@ -52,7 +52,7 @@ public static class FeedbackHub
         /// </summary>
         public static List<FeedbackResult>? GetFeedback(Runspace runspace)
         {
-            return GetFeedback(runspace, millisecondsTimeout: 300);
+            return GetFeedback(runspace, millisecondsTimeout: 1000);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
index 1446983f791..0af184f4e99 100644
--- a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
+++ b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
@@ -9,6 +9,7 @@
 using System.Management.Automation.Language;
 using System.Management.Automation.Runspaces;
 using System.Threading;
+using Microsoft.PowerShell.Telemetry;
 
 namespace System.Management.Automation.Subsystem.Feedback
 {
@@ -242,7 +243,7 @@ internal GeneralCommandErrorFeedback()
 
         public Guid Id => _guid;
 
-        public string Name => "general";
+        public string Name => "General Feedback";
 
         public string Description => "The built-in general feedback source for command errors.";
 
@@ -276,27 +277,25 @@ internal GeneralCommandErrorFeedback()
             }
 
             // Check fuzzy matching command names.
-            if (ExperimentalFeature.IsEnabled("PSCommandNotFoundSuggestion"))
-            {
-                var pwsh = PowerShell.Create(RunspaceMode.CurrentRunspace);
-                var results = pwsh.AddCommand("Get-Command")
-                        .AddParameter("UseFuzzyMatching")
-                        .AddParameter("FuzzyMinimumDistance", 1)
-                        .AddParameter("Name", target)
-                    .AddCommand("Select-Object")
-                        .AddParameter("First", 5)
-                        .AddParameter("Unique")
-                        .AddParameter("ExpandProperty", "Name")
-                    .Invoke<string>();
-
-                if (results.Count > 0)
-                {
-                    return new FeedbackItem(
-                        SuggestionStrings.Suggestion_CommandNotFound,
-                        new List<string>(results),
-                        FeedbackDisplayLayout.Landscape);
-                }
-            }
+            var pwsh = PowerShell.Create(RunspaceMode.CurrentRunspace);
+            var results = pwsh.AddCommand("Get-Command")
+                    .AddParameter("UseFuzzyMatching")
+                    .AddParameter("FuzzyMinimumDistance", 1)
+                    .AddParameter("Name", target)
+                .AddCommand("Select-Object")
+                    .AddParameter("First", 5)
+                    .AddParameter("Unique")
+                    .AddParameter("ExpandProperty", "Name")
+                .Invoke<string>();
+
+			if (results.Count > 0)
+			{
+				ApplicationInsightsTelemetry.SendUseTelemetry("FuzzyMatching", "CommandNotFound");
+				return new FeedbackItem(
+					SuggestionStrings.Suggestion_CommandNotFound,
+					new List<string>(results),
+					FeedbackDisplayLayout.Landscape);
+			}
 
             return null;
         }
diff --git a/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs b/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs
index c290e807ce4..8756fd69c9b 100644
--- a/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs
+++ b/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Management.Automation.Internal;
+using Microsoft.PowerShell.Telemetry;
 
 namespace System.Management.Automation.Subsystem
 {
@@ -96,6 +97,7 @@ private protected SubsystemInfo(SubsystemKind kind, Type subsystemType)
         internal void RegisterImplementation(ISubsystem impl)
         {
             AddImplementation(impl);
+            ApplicationInsightsTelemetry.SendUseTelemetry(ApplicationInsightsTelemetry.s_subsystemRegistration, impl.Name);
         }
 
         internal ISubsystem UnregisterImplementation(Guid id)
diff --git a/src/System.Management.Automation/engine/TransactedString.cs b/src/System.Management.Automation/engine/TransactedString.cs
index 22a0afe9a9a..05eab93d198 100644
--- a/src/System.Management.Automation/engine/TransactedString.cs
+++ b/src/System.Management.Automation/engine/TransactedString.cs
@@ -195,4 +195,3 @@ private void ValidateTransactionOrEnlist()
         }
     }
 }
-
diff --git a/src/System.Management.Automation/engine/TransactionManager.cs b/src/System.Management.Automation/engine/TransactionManager.cs
index 2add6f288f5..e77ffebedb4 100644
--- a/src/System.Management.Automation/engine/TransactionManager.cs
+++ b/src/System.Management.Automation/engine/TransactionManager.cs
@@ -706,4 +706,3 @@ public void Dispose(bool disposing)
         }
     }
 }
-
diff --git a/src/System.Management.Automation/engine/TypeTable.cs b/src/System.Management.Automation/engine/TypeTable.cs
index bffeb9e0ceb..a0eead95e23 100644
--- a/src/System.Management.Automation/engine/TypeTable.cs
+++ b/src/System.Management.Automation/engine/TypeTable.cs
@@ -3922,7 +3922,7 @@ internal Collection<string> GetSpecificProperties(ConsolidatedString types)
                     }
 
                     PSMemberSet settings = typeMembers[PSStandardMembers] as PSMemberSet;
-                    if (!(settings?.Members[PropertySerializationSet] is PSPropertySet typeProperties))
+                    if (settings?.Members[PropertySerializationSet] is not PSPropertySet typeProperties)
                     {
                         continue;
                     }
diff --git a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
index c1a134cdfbf..26e3621c240 100644
--- a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
+++ b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
@@ -565,9 +565,7 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
                 typeName,
                 new PSScriptProperty(
                     @"DisplayName",
-                    GetScriptBlock(@"if ($this.Name.IndexOf('-') -lt 0)
-          {
-          if ($null -ne $this.ResolvedCommand)
+                    GetScriptBlock(@"if ($null -ne $this.ResolvedCommand)
           {
           $this.Name + "" -> "" + $this.ResolvedCommand.Name
           }
@@ -575,11 +573,7 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
           {
           $this.Name + "" -> "" + $this.Definition
           }
-          }
-          else
-          {
-          $this.Name
-          }"),
+          "),
                     setterScript: null,
                     shouldCloneOnAccess: true),
                 typeMembers,
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index 1ad23a40cc6..0de9fe0d5cc 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -24,7 +24,6 @@
 using System.Threading;
 using Microsoft.PowerShell.Commands;
 using Microsoft.Win32;
-using Microsoft.Win32.SafeHandles;
 
 using TypeTable = System.Management.Automation.Runspaces.TypeTable;
 
@@ -482,9 +481,16 @@ internal static string GetWindowsPowerShellVersionFromRegistry()
 
         internal static string GetApplicationBase(string shellId)
         {
-            // Use the location of SMA.dll as the application base.
-            Assembly assembly = typeof(PSObject).Assembly;
-            return Path.GetDirectoryName(assembly.Location);
+            // Use the location of SMA.dll as the application base if it exists,
+            // otherwise, use the base directory from `AppContext`.
+            var baseDirectory = Path.GetDirectoryName(typeof(PSObject).Assembly.Location);
+            if (string.IsNullOrEmpty(baseDirectory))
+            {
+                // Need to remove any trailing directory separator characters
+                baseDirectory = AppContext.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar);
+            }
+
+            return baseDirectory;
         }
 
         private static string[] s_productFolderDirectories;
@@ -1532,14 +1538,80 @@ internal static string DisplayHumanReadableFileSize(long bytes)
         /// <returns>True if the session is restricted.</returns>
         internal static bool IsSessionRestricted(ExecutionContext context)
         {
-                CmdletInfo cmdletInfo = context.SessionState.InvokeCommand.GetCmdlet("Microsoft.PowerShell.Core\\Import-Module");
-                // if import-module is visible, then the session is not restricted,
-                // because the user can load arbitrary code.
-                if (cmdletInfo != null && cmdletInfo.Visibility == SessionStateEntryVisibility.Public)
-                {        
-                   return false; 
+            CmdletInfo cmdletInfo = context.SessionState.InvokeCommand.GetCmdlet("Microsoft.PowerShell.Core\\Import-Module");
+            // if import-module is visible, then the session is not restricted,
+            // because the user can load arbitrary code.
+            if (cmdletInfo != null && cmdletInfo.Visibility == SessionStateEntryVisibility.Public)
+            {
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Determine whether the environment variable is set and how.
+        /// </summary>
+        /// <param name="name">The name of the environment variable.</param>
+        /// <param name="defaultValue">If the environment variable is not set, use this as the default value.</param>
+        /// <returns>A boolean representing the value of the environment variable.</returns>
+        internal static bool GetEnvironmentVariableAsBool(string name, bool defaultValue)
+        {
+            var str = Environment.GetEnvironmentVariable(name);
+            if (string.IsNullOrEmpty(str))
+            {
+                return defaultValue;
+            }
+
+            var boolStr = str.AsSpan();
+
+            if (boolStr.Length == 1)
+            {
+                if (boolStr[0] == '1')
+                {
+                    return true;
+                }
+
+                if (boolStr[0] == '0')
+                {
+                    return false;
                 }
+            }
+
+            if (boolStr.Length == 3 &&
+                (boolStr[0] == 'y' || boolStr[0] == 'Y') &&
+                (boolStr[1] == 'e' || boolStr[1] == 'E') &&
+                (boolStr[2] == 's' || boolStr[2] == 'S'))
+            {
+                return true;
+            }
+
+            if (boolStr.Length == 2 &&
+                (boolStr[0] == 'n' || boolStr[0] == 'N') &&
+                (boolStr[1] == 'o' || boolStr[1] == 'O'))
+            {
+                return false;
+            }
+
+            if (boolStr.Length == 4 &&
+                (boolStr[0] == 't' || boolStr[0] == 'T') &&
+                (boolStr[1] == 'r' || boolStr[1] == 'R') &&
+                (boolStr[2] == 'u' || boolStr[2] == 'U') &&
+                (boolStr[3] == 'e' || boolStr[3] == 'E'))
+            {
                 return true;
+            }
+
+            if (boolStr.Length == 5 &&
+                (boolStr[0] == 'f' || boolStr[0] == 'F') &&
+                (boolStr[1] == 'a' || boolStr[1] == 'A') &&
+                (boolStr[2] == 'l' || boolStr[2] == 'L') &&
+                (boolStr[3] == 's' || boolStr[3] == 'S') &&
+                (boolStr[4] == 'e' || boolStr[4] == 'E'))
+            {
+                return false;
+            }
+
+            return defaultValue;
         }
     }
 }
@@ -1602,6 +1674,9 @@ public static class InternalTestHooks
         internal static bool OneDriveTestRecurseOn;
         internal static string OneDriveTestSymlinkName = "link-Beta";
 
+        // Test out smaller connection buffer size when calling WNetGetConnection.
+        internal static int WNetGetConnectionBufferSize = -1;
+
         /// <summary>This member is used for internal test purposes.</summary>
         public static void SetTestHook(string property, object value)
         {
diff --git a/src/System.Management.Automation/engine/cmdlet.cs b/src/System.Management.Automation/engine/cmdlet.cs
index b2b63d364b5..db2233d44a9 100644
--- a/src/System.Management.Automation/engine/cmdlet.cs
+++ b/src/System.Management.Automation/engine/cmdlet.cs
@@ -10,7 +10,7 @@
 using System.Reflection;
 using System.Resources;
 using System.Management.Automation.Internal;
-using Dbg = System.Management.Automation.Diagnostics;
+using System.Threading;
 
 namespace System.Management.Automation
 {
@@ -100,6 +100,11 @@ public bool Stopping
             }
         }
 
+        /// <summary>
+        /// Gets the CancellationToken that is signaled when the pipeline is stopping.
+        /// </summary>
+        public CancellationToken PipelineStopToken => StopToken;
+
         /// <summary>
         /// The name of the parameter set in effect.
         /// </summary>
@@ -453,6 +458,9 @@ public void WriteVerbose(string text)
             }
         }
 
+        internal bool IsWriteVerboseEnabled()
+            => commandRuntime is not MshCommandRuntime mshRuntime || mshRuntime.IsWriteVerboseEnabled();
+
         /// <summary>
         /// Display warning information.
         /// </summary>
@@ -490,6 +498,9 @@ public void WriteWarning(string text)
             }
         }
 
+        internal bool IsWriteWarningEnabled()
+            => commandRuntime is not MshCommandRuntime mshRuntime || mshRuntime.IsWriteWarningEnabled();
+
         /// <summary>
         /// Write text into pipeline execution log.
         /// </summary>
@@ -598,6 +609,9 @@ internal void WriteProgress(
                 throw new System.NotImplementedException("WriteProgress");
         }
 
+        internal bool IsWriteProgressEnabled()
+            => commandRuntime is not MshCommandRuntime mshRuntime || mshRuntime.IsWriteProgressEnabled();
+
         /// <summary>
         /// Display debug information.
         /// </summary>
@@ -641,6 +655,9 @@ public void WriteDebug(string text)
             }
         }
 
+        internal bool IsWriteDebugEnabled()
+            => commandRuntime is not MshCommandRuntime mshRuntime || mshRuntime.IsWriteDebugEnabled();
+
         /// <summary>
         /// Route information to the user or host.
         /// </summary>
@@ -748,6 +765,9 @@ public void WriteInformation(InformationRecord informationRecord)
             }
         }
 
+        internal bool IsWriteInformationEnabled()
+            => commandRuntime is not MshCommandRuntime mshRuntime || mshRuntime.IsWriteInformationEnabled();
+
         #endregion Write
 
         #region ShouldProcess
@@ -1311,11 +1331,11 @@ public bool ShouldContinue(string query, string caption)
         /// It may be displayed by some hosts, but not all.
         /// </param>
         /// <param name="yesToAll">
-        /// true iff user selects YesToAll.  If this is already true,
+        /// true if-and-only-if user selects YesToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return true.
         /// </param>
         /// <param name="noToAll">
-        /// true iff user selects NoToAll.  If this is already true,
+        /// true if-and-only-if user selects NoToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return false.
         /// </param>
         /// <exception cref="System.Management.Automation.PipelineStoppedException">
@@ -1451,11 +1471,11 @@ public bool ShouldContinue(
         /// the default option selected in the selection menu is 'No'.
         /// </param>
         /// <param name="yesToAll">
-        /// true iff user selects YesToAll.  If this is already true,
+        /// true if-and-only-if user selects YesToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return true.
         /// </param>
         /// <param name="noToAll">
-        /// true iff user selects NoToAll.  If this is already true,
+        /// true if-and-only-if user selects NoToAll.  If this is already true,
         /// ShouldContinue will bypass the prompt and return false.
         /// </param>
         /// <exception cref="System.Management.Automation.PipelineStoppedException">
diff --git a/src/System.Management.Automation/engine/debugger/debugger.cs b/src/System.Management.Automation/engine/debugger/debugger.cs
index 68b6d1a296e..985d90ab3ec 100644
--- a/src/System.Management.Automation/engine/debugger/debugger.cs
+++ b/src/System.Management.Automation/engine/debugger/debugger.cs
@@ -1536,7 +1536,16 @@ private List<Breakpoint> TriggerBreakpoints(List<Breakpoint> breakpoints)
 
         internal void OnSequencePointHit(FunctionContext functionContext)
         {
-            if (_context.ShouldTraceStatement && !_callStack.Last().IsFrameHidden && !functionContext._debuggerStepThrough)
+            // TraceLine uses ColumnNumber and expects it to be 1 based. For
+            // extents added by the engine and not user code the value can be
+            // set to 0 causing an exception. This skips those types of extents
+            // as tracing them wouldn't be useful for the end user anyway.
+            if (_context.ShouldTraceStatement &&
+                !_callStack.Last().IsFrameHidden &&
+                !functionContext._debuggerStepThrough &&
+                functionContext.CurrentPosition is not EmptyScriptExtent &&
+                (functionContext.CurrentPosition is InternalScriptExtent ||
+                   functionContext.CurrentPosition.StartColumnNumber > 0))
             {
                 TraceLine(functionContext.CurrentPosition);
             }
@@ -2075,8 +2084,8 @@ private void SetPendingBreakpoints(FunctionContext functionContext)
                     else
                     {
                         tuple.Item1.Add(breakpoint.SequencePointIndex, new List<LineBreakpoint> { breakpoint });
-                    } 
-                    
+                    }
+
                     // We need to keep track of any breakpoints that are bound in each script because they may
                     // need to be rebound if the script changes.
                     var boundBreakpoints = _boundBreakpoints[currentScriptFile].Item2;
@@ -2090,7 +2099,7 @@ private void SetPendingBreakpoints(FunctionContext functionContext)
             }
 
             // Here could check if all breakpoints for the current functionContext were bound, but because there is no atomic
-            // api for conditional removal we either need to lock, or do some trickery that has possibility of race conditions. 
+            // api for conditional removal we either need to lock, or do some trickery that has possibility of race conditions.
             // Instead we keep the item in the dictionary with 0 breakpoint count. This should not be a big issue,
             // because it is single entry per file that had breakpoints, so there won't be thousands of files in a session.
         }
@@ -2359,7 +2368,7 @@ public override DebuggerCommandResults ProcessCommand(PSCommand command, PSDataC
             //
             // Otherwise let root script debugger handle it.
             //
-            if (!(_context.CurrentRunspace is LocalRunspace localRunspace))
+            if (_context.CurrentRunspace is not LocalRunspace localRunspace)
             {
                 throw new PSInvalidOperationException(
                     DebuggerStrings.CannotProcessDebuggerCommandNotStopped,
@@ -3820,7 +3829,7 @@ private void HandleMonitorRunningRSDebuggerStop(object sender, DebuggerStopEvent
                 }
 
                 // Get nested debugger runspace info.
-                if (!(senderDebugger is NestedRunspaceDebugger nestedDebugger)) { return; }
+                if (senderDebugger is not NestedRunspaceDebugger nestedDebugger) { return; }
 
                 PSMonitorRunspaceType runspaceType = nestedDebugger.RunspaceType;
 
@@ -4677,7 +4686,7 @@ protected override void HandleDebuggerStop(object sender, DebuggerStopEventArgs
         private object DrainAndBlockRemoteOutput()
         {
             // We do this only for remote runspaces.
-            if (!(_runspace is RemoteRunspace remoteRunspace)) { return null; }
+            if (_runspace is not RemoteRunspace remoteRunspace) { return null; }
 
             var runningPowerShell = remoteRunspace.GetCurrentBasePowerShell();
             if (runningPowerShell != null)
diff --git a/src/System.Management.Automation/engine/hostifaces/Command.cs b/src/System.Management.Automation/engine/hostifaces/Command.cs
index 6d8cd526486..3de339ff112 100644
--- a/src/System.Management.Automation/engine/hostifaces/Command.cs
+++ b/src/System.Management.Automation/engine/hostifaces/Command.cs
@@ -662,7 +662,7 @@ internal PSObject ToPSObjectForRemoting(Version psRPVersion)
             commandAsPSObject.Properties.Add(new PSNoteProperty(RemoteDataNameStrings.MergeUnclaimedPreviousCommandResults, this.MergeUnclaimedPreviousCommandResults));
 
             if (psRPVersion != null &&
-                psRPVersion >= RemotingConstants.ProtocolVersionWin10RTM)
+                psRPVersion >= RemotingConstants.ProtocolVersion_2_3)
             {
                 // V5 merge instructions
                 commandAsPSObject.Properties.Add(new PSNoteProperty(RemoteDataNameStrings.MergeError, MergeInstructions[(int)MergeType.Error]));
@@ -672,7 +672,7 @@ internal PSObject ToPSObjectForRemoting(Version psRPVersion)
                 commandAsPSObject.Properties.Add(new PSNoteProperty(RemoteDataNameStrings.MergeInformation, MergeInstructions[(int)MergeType.Information]));
             }
             else if (psRPVersion != null &&
-                psRPVersion >= RemotingConstants.ProtocolVersionWin8RTM)
+                psRPVersion >= RemotingConstants.ProtocolVersion_2_2)
             {
                 // V3 merge instructions.
                 commandAsPSObject.Properties.Add(new PSNoteProperty(RemoteDataNameStrings.MergeError, MergeInstructions[(int)MergeType.Error]));
diff --git a/src/System.Management.Automation/engine/hostifaces/Connection.cs b/src/System.Management.Automation/engine/hostifaces/Connection.cs
index 3f5911d1c62..ccb918c7dd9 100644
--- a/src/System.Management.Automation/engine/hostifaces/Connection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/Connection.cs
@@ -761,6 +761,12 @@ public string Name
         /// Gets the Runspace Id.
         /// </summary>
         public int Id { get; }
+        
+        /// <summary>
+        /// Gets and sets a boolean indicating whether the runspace has a
+        /// debugger attached with <c>Debug-Runspace</c>.
+        /// </summary>
+        public bool IsRemoteDebuggerAttached { get; internal set; }
 
         /// <summary>
         /// Returns protocol version that the remote server uses for PS remoting.
diff --git a/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs b/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
index 23daa3c8713..0969d7b08c6 100644
--- a/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
+++ b/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
@@ -25,6 +25,28 @@ internal abstract class RunspaceBase : Runspace
     {
         #region constructors
 
+        /// <summary>
+        /// Initialize powershell AssemblyLoadContext and register the 'Resolving' event, if it's not done already.
+        /// If powershell is hosted by a native host such as DSC, then PS ALC may be initialized via 'SetPowerShellAssemblyLoadContext' before loading S.M.A.
+        /// </summary>
+        /// <remarks>
+        /// We do this both here and during the initialization of the 'ClrFacade' type.
+        /// This is because we want to make sure the assembly/library resolvers are:
+        ///  1. registered before any script/cmdlet can run.
+        ///  2. registered before 'ClrFacade' gets used for assembly related operations.
+        ///
+        /// The 'ClrFacade' type may be used without a Runspace created, for example, by calling type conversion methods in the 'LanguagePrimitive' type.
+        /// And at the mean time, script or cmdlet may run without the 'ClrFacade' type initialized.
+        /// That's why we attempt to create the singleton of 'PowerShellAssemblyLoadContext' at both places.
+        /// </remarks>
+        static RunspaceBase()
+        {
+            if (PowerShellAssemblyLoadContext.Instance is null)
+            {
+                PowerShellAssemblyLoadContext.InitializeSingleton(string.Empty, throwOnReentry: false);
+            }
+        }
+
         /// <summary>
         /// Construct an instance of an Runspace using a custom
         /// implementation of PSHost.
diff --git a/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs b/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs
index 541b1607df0..3f47fedb55e 100644
--- a/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs
+++ b/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs
@@ -89,7 +89,7 @@ public string Name
         /// </value>
         /// <remarks>
         /// If not already set by a call to <see cref="System.Management.Automation.Host.FieldDescription.SetParameterType"/>,
-        /// <see cref="System.String"/> will be used as the type.
+        /// <see cref="string"/> will be used as the type.
         /// <!--The value of ParameterTypeName is the string value returned.
         /// by System.Type.Name.-->
         /// </remarks>
@@ -115,7 +115,7 @@ public string Name
         /// </summary>
         /// <remarks>
         /// If not already set by a call to <see cref="System.Management.Automation.Host.FieldDescription.SetParameterType"/>,
-        /// <see cref="System.String"/> will be used as the type.
+        /// <see cref="string"/> will be used as the type.
         /// <!--The value of ParameterTypeName is the string value returned.
         /// by System.Type.Name.-->
         /// </remarks>
@@ -144,7 +144,7 @@ public string Name
         /// to load the containing assembly to access the type information. AssemblyName is used for this purpose.
         ///
         /// If not already set by a call to <see cref="System.Management.Automation.Host.FieldDescription.SetParameterType"/>,
-        /// <see cref="System.String"/> will be used as the type.
+        /// <see cref="string"/> will be used as the type.
         /// </remarks>
         public
         string
diff --git a/src/System.Management.Automation/engine/hostifaces/History.cs b/src/System.Management.Automation/engine/hostifaces/History.cs
index ba69da88dd3..00a090d4b22 100644
--- a/src/System.Management.Automation/engine/hostifaces/History.cs
+++ b/src/System.Management.Automation/engine/hostifaces/History.cs
@@ -859,7 +859,7 @@ public class GetHistoryCommand : PSCmdlet
         /// </summary>
         /// <value></value>
         [Parameter(Position = 0, ValueFromPipeline = true)]
-        [ValidateRangeAttribute((long)1, long.MaxValue)]
+        [ValidateRange((long)1, long.MaxValue)]
         public long[] Id
         {
             get
@@ -887,7 +887,7 @@ public long[] Id
         /// No of History Entries (starting from last) that are to be displayed.
         /// </summary>
         [Parameter(Position = 1)]
-        [ValidateRangeAttribute(0, (int)Int16.MaxValue)]
+        [ValidateRange(0, (int)Int16.MaxValue)]
         public int Count
         {
             get
@@ -1436,7 +1436,7 @@ void ProcessRecord()
                 }
 
                 // Read CommandLine property
-                if (!(GetPropertyValue(mshObject, "CommandLine") is string commandLine))
+                if (GetPropertyValue(mshObject, "CommandLine") is not string commandLine)
                 {
                     break;
                 }
@@ -1518,7 +1518,7 @@ public class ClearHistoryCommand : PSCmdlet
         /// </summary>
         [Parameter(ParameterSetName = "IDParameter", Position = 0,
            HelpMessage = "Specifies the ID of a command in the session history.Clear history clears only the specified command")]
-        [ValidateRangeAttribute((int)1, int.MaxValue)]
+        [ValidateRange((int)1, int.MaxValue)]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public int[] Id
         {
@@ -1566,7 +1566,7 @@ public string[] CommandLine
         /// Clears the specified number of history entries
         /// </summary>
         [Parameter(Mandatory = false, Position = 1, HelpMessage = "Clears the specified number of history entries")]
-        [ValidateRangeAttribute((int)1, int.MaxValue)]
+        [ValidateRange((int)1, int.MaxValue)]
         public int Count
         {
             get
diff --git a/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs b/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
index 4398269842b..8e5d30be71f 100644
--- a/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
+++ b/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
@@ -1,38 +1,19 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Management.Automation.Host;
 using System.Management.Automation.Internal;
-using System.Management.Automation.Language;
 using System.Management.Automation.Runspaces;
 using System.Management.Automation.Subsystem.Feedback;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Text.RegularExpressions;
-
-using Microsoft.PowerShell.Commands;
 using Microsoft.PowerShell.Commands.Internal.Format;
 
 namespace System.Management.Automation
 {
-    internal enum SuggestionMatchType
-    {
-        /// <summary>Match on a command.</summary>
-        Command = 0,
-        /// <summary>Match based on exception message.</summary>
-        Error = 1,
-        /// <summary>Match by running a script block.</summary>
-        Dynamic = 2,
-
-        /// <summary>Match by fully qualified ErrorId.</summary>
-        ErrorId = 3
-    }
-
     #region Public HostUtilities Class
 
     /// <summary>
@@ -44,38 +25,6 @@ public static class HostUtilities
 
         private static readonly char s_actionIndicator = HostSupportUnicode() ? '\u27a4' : '>';
 
-        private static readonly string s_checkForCommandInCurrentDirectoryScript = @"
-            [System.Diagnostics.DebuggerHidden()]
-            param()
-
-            $foundSuggestion = $false
-
-            if($lastError -and
-                ($lastError.Exception -is ""System.Management.Automation.CommandNotFoundException""))
-            {
-                $escapedCommand = [System.Management.Automation.WildcardPattern]::Escape($lastError.TargetObject)
-                $foundSuggestion = @(Get-Command ($ExecutionContext.SessionState.Path.Combine(""."", $escapedCommand)) -ErrorAction Ignore).Count -gt 0
-            }
-
-            $foundSuggestion
-        ";
-
-        private static readonly string s_createCommandExistsInCurrentDirectoryScript = @"
-            [System.Diagnostics.DebuggerHidden()]
-            param([string] $formatString)
-
-            $formatString -f $lastError.TargetObject,"".\$($lastError.TargetObject)""
-        ";
-
-        private static readonly string s_getFuzzyMatchedCommands = @"
-            [System.Diagnostics.DebuggerHidden()]
-            param([string] $formatString)
-
-            $formatString -f [string]::Join(', ', (Get-Command $lastError.TargetObject -UseFuzzyMatching -FuzzyMinimumDistance 1 | Select-Object -First 5 -Unique -ExpandProperty Name))
-        ";
-
-        private static readonly List<Hashtable> s_suggestions = InitializeSuggestions();
-
         private static bool HostSupportUnicode()
         {
             // Reference: https://github.com/zkat/supports-unicode/blob/main/src/lib.rs
@@ -95,37 +44,6 @@ private static bool HostSupportUnicode()
             return ctype.EndsWith("UTF8") || ctype.EndsWith("UTF-8");
         }
 
-        private static List<Hashtable> InitializeSuggestions()
-        {
-            var suggestions = new List<Hashtable>(
-                new Hashtable[]
-                {
-                    NewSuggestion(
-                        id: 3,
-                        category: "General",
-                        matchType: SuggestionMatchType.Dynamic,
-                        rule: ScriptBlock.CreateDelayParsedScriptBlock(s_checkForCommandInCurrentDirectoryScript, isProductCode: true),
-                        suggestion: ScriptBlock.CreateDelayParsedScriptBlock(s_createCommandExistsInCurrentDirectoryScript, isProductCode: true),
-                        suggestionArgs: new object[] { CodeGeneration.EscapeSingleQuotedStringContent(SuggestionStrings.Suggestion_CommandExistsInCurrentDirectory) },
-                        enabled: true)
-                });
-
-            if (ExperimentalFeature.IsEnabled("PSCommandNotFoundSuggestion"))
-            {
-                suggestions.Add(
-                    NewSuggestion(
-                        id: 4,
-                        category: "General",
-                        matchType: SuggestionMatchType.ErrorId,
-                        rule: "CommandNotFoundException",
-                        suggestion: ScriptBlock.CreateDelayParsedScriptBlock(s_getFuzzyMatchedCommands, isProductCode: true),
-                        suggestionArgs: new object[] { CodeGeneration.EscapeSingleQuotedStringContent(SuggestionStrings.Suggestion_CommandNotFound) },
-                        enabled: true));
-            }
-
-            return suggestions;
-        }
-
         #region GetProfileCommands
         /// <summary>
         /// Gets a PSObject whose base object is currentUserCurrentHost and with notes for the other 4 parameters.
@@ -230,10 +148,11 @@ internal static string GetFullProfileFileName(string shellId, bool forCurrentUse
             else
             {
                 basePath = GetAllUsersFolderPath(shellId);
-                if (string.IsNullOrEmpty(basePath))
-                {
-                    return string.Empty;
-                }
+            }
+
+            if (string.IsNullOrEmpty(basePath))
+            {
+                return string.Empty;
             }
 
             string profileName = useTestProfile ? "profile_test.ps1" : "profile.ps1";
@@ -304,303 +223,6 @@ internal static string GetMaxLines(string source, int maxLines)
             return returnValue.ToString();
         }
 
-        internal static List<string> GetSuggestion(Runspace runspace)
-        {
-            if (!(runspace is LocalRunspace localRunspace))
-            {
-                return new List<string>();
-            }
-
-            // Get the last value of $?
-            bool questionMarkVariableValue = localRunspace.ExecutionContext.QuestionMarkVariableValue;
-
-            // Get the last history item
-            History history = localRunspace.History;
-            HistoryInfo[] entries = history.GetEntries(-1, 1, true);
-
-            if (entries.Length == 0)
-                return new List<string>();
-
-            HistoryInfo lastHistory = entries[0];
-
-            // Get the last error
-            ArrayList errorList = (ArrayList)localRunspace.GetExecutionContext.DollarErrorVariable;
-            object lastError = null;
-
-            if (errorList.Count > 0)
-            {
-                lastError = errorList[0] as Exception;
-                ErrorRecord lastErrorRecord = null;
-
-                // The error was an actual ErrorRecord
-                if (lastError == null)
-                {
-                    lastErrorRecord = errorList[0] as ErrorRecord;
-                }
-                else if (lastError is RuntimeException)
-                {
-                    lastErrorRecord = ((RuntimeException)lastError).ErrorRecord;
-                }
-
-                // If we got information about the error invocation,
-                // we can be more careful with the errors we pass along
-                if ((lastErrorRecord != null) && (lastErrorRecord.InvocationInfo != null))
-                {
-                    if (lastErrorRecord.InvocationInfo.HistoryId == lastHistory.Id)
-                        lastError = lastErrorRecord;
-                    else
-                        lastError = null;
-                }
-            }
-
-            Runspace oldDefault = null;
-            bool changedDefault = false;
-            if (Runspace.DefaultRunspace != runspace)
-            {
-                oldDefault = Runspace.DefaultRunspace;
-                changedDefault = true;
-                Runspace.DefaultRunspace = runspace;
-            }
-
-            List<string> suggestions = null;
-
-            try
-            {
-                suggestions = GetSuggestion(lastHistory, lastError, errorList);
-            }
-            finally
-            {
-                if (changedDefault)
-                {
-                    Runspace.DefaultRunspace = oldDefault;
-                }
-            }
-
-            // Restore $?
-            localRunspace.ExecutionContext.QuestionMarkVariableValue = questionMarkVariableValue;
-            return suggestions;
-        }
-
-        [SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly")]
-        internal static List<string> GetSuggestion(HistoryInfo lastHistory, object lastError, ArrayList errorList)
-        {
-            var returnSuggestions = new List<string>();
-
-            PSModuleInfo invocationModule = new PSModuleInfo(true);
-            invocationModule.SessionState.PSVariable.Set("lastHistory", lastHistory);
-            invocationModule.SessionState.PSVariable.Set("lastError", lastError);
-
-            int initialErrorCount = 0;
-
-            // Go through all of the suggestions
-            foreach (Hashtable suggestion in s_suggestions)
-            {
-                initialErrorCount = errorList.Count;
-
-                // Make sure the rule is enabled
-                if (!LanguagePrimitives.IsTrue(suggestion["Enabled"]))
-                    continue;
-
-                SuggestionMatchType matchType = (SuggestionMatchType)LanguagePrimitives.ConvertTo(
-                    suggestion["MatchType"],
-                    typeof(SuggestionMatchType),
-                    CultureInfo.InvariantCulture);
-
-                // If this is a dynamic match, evaluate the ScriptBlock
-                if (matchType == SuggestionMatchType.Dynamic)
-                {
-                    object result = null;
-
-                    ScriptBlock evaluator = suggestion["Rule"] as ScriptBlock;
-                    if (evaluator == null)
-                    {
-                        suggestion["Enabled"] = false;
-
-                        throw new ArgumentException(
-                            SuggestionStrings.RuleMustBeScriptBlock, "Rule");
-                    }
-
-                    try
-                    {
-                        result = invocationModule.Invoke(evaluator, null);
-                    }
-                    catch (Exception)
-                    {
-                        // Catch-all OK. This is a third-party call-out.
-                        suggestion["Enabled"] = false;
-                        continue;
-                    }
-
-                    // If it returned results, evaluate its suggestion
-                    if (LanguagePrimitives.IsTrue(result))
-                    {
-                        string suggestionText = GetSuggestionText(suggestion["Suggestion"], (object[])suggestion["SuggestionArgs"], invocationModule);
-
-                        if (!string.IsNullOrEmpty(suggestionText))
-                        {
-                            string returnString = string.Format(
-                                CultureInfo.CurrentCulture,
-                                "Suggestion [{0},{1}]: {2}",
-                                (int)suggestion["Id"],
-                                (string)suggestion["Category"],
-                                suggestionText);
-
-                            returnSuggestions.Add(returnString);
-                        }
-                    }
-                }
-                else
-                {
-                    string matchText = string.Empty;
-
-                    // Otherwise, this is a Regex match against the
-                    // command or error
-                    if (matchType == SuggestionMatchType.Command)
-                    {
-                        matchText = lastHistory.CommandLine;
-                    }
-                    else if (matchType == SuggestionMatchType.Error)
-                    {
-                        if (lastError != null)
-                        {
-                            Exception lastException = lastError as Exception;
-                            if (lastException != null)
-                            {
-                                matchText = lastException.Message;
-                            }
-                            else
-                            {
-                                matchText = lastError.ToString();
-                            }
-                        }
-                    }
-                    else if (matchType == SuggestionMatchType.ErrorId)
-                    {
-                        if (lastError != null && lastError is ErrorRecord errorRecord)
-                        {
-                            matchText = errorRecord.FullyQualifiedErrorId;
-                        }
-                    }
-                    else
-                    {
-                        suggestion["Enabled"] = false;
-
-                        throw new ArgumentException(
-                            SuggestionStrings.InvalidMatchType,
-                            "MatchType");
-                    }
-
-                    // If the text matches, evaluate the suggestion
-                    if (Regex.IsMatch(matchText, (string)suggestion["Rule"], RegexOptions.IgnoreCase))
-                    {
-                        string suggestionText = GetSuggestionText(suggestion["Suggestion"], (object[])suggestion["SuggestionArgs"], invocationModule);
-
-                        if (!string.IsNullOrEmpty(suggestionText))
-                        {
-                            string returnString = string.Format(
-                                CultureInfo.CurrentCulture,
-                                "Suggestion [{0},{1}]: {2}",
-                                (int)suggestion["Id"],
-                                (string)suggestion["Category"],
-                                suggestionText);
-
-                            returnSuggestions.Add(returnString);
-                        }
-                    }
-                }
-
-                // If the rule generated an error, disable it
-                if (errorList.Count != initialErrorCount)
-                {
-                    suggestion["Enabled"] = false;
-                }
-            }
-
-            return returnSuggestions;
-        }
-
-        /// <summary>
-        /// Create suggestion with string rule and scriptblock suggestion.
-        /// </summary>
-        /// <param name="id">Identifier for the suggestion.</param>
-        /// <param name="category">Category for the suggestion.</param>
-        /// <param name="matchType">Suggestion match type.</param>
-        /// <param name="rule">Rule to match.</param>
-        /// <param name="suggestion">Scriptblock to run that returns the suggestion.</param>
-        /// <param name="suggestionArgs">Arguments to pass to suggestion scriptblock.</param>
-        /// <param name="enabled">True if the suggestion is enabled.</param>
-        /// <returns>Hashtable representing the suggestion.</returns>
-        private static Hashtable NewSuggestion(int id, string category, SuggestionMatchType matchType, string rule, ScriptBlock suggestion, object[] suggestionArgs, bool enabled)
-        {
-            Hashtable result = new Hashtable(StringComparer.CurrentCultureIgnoreCase);
-
-            result["Id"] = id;
-            result["Category"] = category;
-            result["MatchType"] = matchType;
-            result["Rule"] = rule;
-            result["Suggestion"] = suggestion;
-            result["SuggestionArgs"] = suggestionArgs;
-            result["Enabled"] = enabled;
-
-            return result;
-        }
-
-        /// <summary>
-        /// Create suggestion with scriptblock rule and suggestion.
-        /// </summary>
-        private static Hashtable NewSuggestion(int id, string category, SuggestionMatchType matchType, ScriptBlock rule, ScriptBlock suggestion, bool enabled)
-        {
-            Hashtable result = new Hashtable(StringComparer.CurrentCultureIgnoreCase);
-
-            result["Id"] = id;
-            result["Category"] = category;
-            result["MatchType"] = matchType;
-            result["Rule"] = rule;
-            result["Suggestion"] = suggestion;
-            result["Enabled"] = enabled;
-
-            return result;
-        }
-
-        /// <summary>
-        /// Create suggestion with scriptblock rule and scriptblock suggestion with arguments.
-        /// </summary>
-        private static Hashtable NewSuggestion(int id, string category, SuggestionMatchType matchType, ScriptBlock rule, ScriptBlock suggestion, object[] suggestionArgs, bool enabled)
-        {
-            Hashtable result = NewSuggestion(id, category, matchType, rule, suggestion, enabled);
-            result.Add("SuggestionArgs", suggestionArgs);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Get suggestion text from suggestion scriptblock with arguments.
-        /// </summary>
-        private static string GetSuggestionText(object suggestion, object[] suggestionArgs, PSModuleInfo invocationModule)
-        {
-            if (suggestion is ScriptBlock)
-            {
-                ScriptBlock suggestionScript = (ScriptBlock)suggestion;
-
-                object result = null;
-                try
-                {
-                    result = invocationModule.Invoke(suggestionScript, suggestionArgs);
-                }
-                catch (Exception)
-                {
-                    // Catch-all OK. This is a third-party call-out.
-                    return string.Empty;
-                }
-
-                return (string)LanguagePrimitives.ConvertTo(result, typeof(string), CultureInfo.CurrentCulture);
-            }
-            else
-            {
-                return (string)LanguagePrimitives.ConvertTo(suggestion, typeof(string), CultureInfo.CurrentCulture);
-            }
-        }
-
         /// <summary>
         /// Returns the prompt used in remote sessions: "[machine]: basePrompt"
         /// </summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/InternalHost.cs b/src/System.Management.Automation/engine/hostifaces/InternalHost.cs
index 450941b4b63..c60bff90303 100644
--- a/src/System.Management.Automation/engine/hostifaces/InternalHost.cs
+++ b/src/System.Management.Automation/engine/hostifaces/InternalHost.cs
@@ -448,7 +448,7 @@ public override void NotifyEndApplication()
         /// </summary>
         private IHostSupportsInteractiveSession GetIHostSupportsInteractiveSession()
         {
-            if (!(_externalHostRef.Value is IHostSupportsInteractiveSession host))
+            if (_externalHostRef.Value is not IHostSupportsInteractiveSession host)
             {
                 throw new PSNotImplementedException();
             }
diff --git a/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
index 94a25726f7b..d8f2ef0bf90 100644
--- a/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
@@ -209,7 +209,14 @@ public override
                 return;
             }
 
-            _externalUI.Write(foregroundColor, backgroundColor, value);
+            if (PSStyle.Instance.OutputRendering == OutputRendering.PlainText)
+            {
+                _externalUI.Write(value);
+            }
+            else
+            {
+                _externalUI.Write(foregroundColor, backgroundColor, value);
+            }
         }
 
         /// <summary>
@@ -303,7 +310,14 @@ public override
                 return;
             }
 
-            _externalUI.WriteLine(foregroundColor, backgroundColor, value);
+            if (PSStyle.Instance.OutputRendering == OutputRendering.PlainText)
+            {
+                _externalUI.WriteLine(value);
+            }
+            else
+            {
+                _externalUI.WriteLine(foregroundColor, backgroundColor, value);
+            }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/ListModifier.cs b/src/System.Management.Automation/engine/hostifaces/ListModifier.cs
index db089b68333..aab1cb2e777 100644
--- a/src/System.Management.Automation/engine/hostifaces/ListModifier.cs
+++ b/src/System.Management.Automation/engine/hostifaces/ListModifier.cs
@@ -216,7 +216,7 @@ public void ApplyTo(object collectionToUpdate)
 
             collectionToUpdate = PSObject.Base(collectionToUpdate);
 
-            if (!(collectionToUpdate is IList list))
+            if (collectionToUpdate is not IList list)
             {
                 throw PSTraceSource.NewInvalidOperationException(PSListModifierStrings.UpdateFailed);
             }
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
index 5dcc43ce2a7..822dc552204 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
@@ -1557,11 +1557,11 @@ public PSDataCollection<ErrorRecord> ErrorRecords
         /// </summary>
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected RunspaceOpenModuleLoadException(SerializationInfo info, StreamingContext context)
         {
             throw new NotSupportedException();
-        }        
+        }
         #endregion Serialization
     }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
index 93cb65f3f07..a9a3a66b859 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
@@ -1067,9 +1067,9 @@ internal override void SetHistoryString(string historyString)
         /// ExecutionContext, if it available in TLS
         /// Null, if ExecutionContext is not available in TLS
         /// </returns>
-        internal static System.Management.Automation.ExecutionContext GetExecutionContextFromTLS()
+        internal static ExecutionContext GetExecutionContextFromTLS()
         {
-            System.Management.Automation.Runspaces.Runspace runspace = Runspace.DefaultRunspace;
+            Runspace runspace = Runspace.DefaultRunspace;
             if (runspace == null)
             {
                 return null;
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHost.cs b/src/System.Management.Automation/engine/hostifaces/MshHost.cs
index 32e07f48f3e..bfa79e89f13 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHost.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHost.cs
@@ -296,6 +296,11 @@ public interface IHostSupportsInteractiveSession
         /// <summary>
         /// Called by the engine to notify the host that a runspace push has been requested.
         /// </summary>
+        /// <param name="runspace">
+        /// The runspace to push. This runspace must be a remote runspace and
+        /// not a locally created runspace.
+        /// </param>
+        /// <exception cref="ArgumentException">The specified runspace is not a remote runspace.</exception>
         /// <seealso cref="System.Management.Automation.Host.IHostSupportsInteractiveSession.PushRunspace"/>
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Runspace")]
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "runspace")]
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
index 201caf3c827..64b200b7d61 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
@@ -62,7 +62,7 @@ public int Y
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.ToString"/>
+        /// Overrides <see cref="object.ToString"/>
         /// </summary>
         /// <returns>
         /// "a,b" where a and b are the values of the X and Y properties.
@@ -75,7 +75,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.Equals(object)"/>
+        /// Overrides <see cref="object.Equals(object)"/>
         /// </summary>
         /// <param name="obj">
         /// object to be compared for equality.
@@ -99,7 +99,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.GetHashCode"/>
+        /// Overrides <see cref="object.GetHashCode"/>
         /// </summary>
         /// <returns>
         /// Hash code for this instance.
@@ -248,7 +248,7 @@ public int Height
         }
 
         /// <summary>
-        /// Overloads <see cref="System.Object.ToString"/>
+        /// Overloads <see cref="object.ToString"/>
         /// </summary>
         /// <returns>
         /// "a,b" where a and b are the values of the Width and Height properties.
@@ -261,7 +261,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.Equals(object)"/>
+        /// Overrides <see cref="object.Equals(object)"/>
         /// </summary>
         /// <param name="obj">
         /// object to be compared for equality.
@@ -285,7 +285,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.GetHashCode"/>
+        /// Overrides <see cref="object.GetHashCode"/>
         /// </summary>
         /// <returns>
         /// Hash code for this instance.
@@ -557,7 +557,7 @@ bool keyDown
         }
 
         /// <summary>
-        /// Overloads <see cref="System.Object.ToString"/>
+        /// Overloads <see cref="object.ToString"/>
         /// </summary>
         /// <returns>
         /// "a,b,c,d" where a, b, c, and d are the values of the VirtualKeyCode, Character, ControlKeyState, and KeyDown properties.
@@ -569,7 +569,7 @@ public override
             return string.Create(CultureInfo.InvariantCulture, $"{VirtualKeyCode},{Character},{ControlKeyState},{KeyDown}");
         }
         /// <summary>
-        /// Overrides <see cref="System.Object.Equals(object)"/>
+        /// Overrides <see cref="object.Equals(object)"/>
         /// </summary>
         /// <param name="obj">
         /// object to be compared for equality.
@@ -593,7 +593,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.GetHashCode"/>
+        /// Overrides <see cref="object.GetHashCode"/>
         /// </summary>
         /// <returns>
         /// Hash code for this instance.
@@ -787,7 +787,7 @@ public int Bottom
         }
 
         /// <summary>
-        /// Overloads <see cref="System.Object.ToString"/>
+        /// Overloads <see cref="object.ToString"/>
         /// </summary>
         /// <returns>
         /// "a,b ; c,d" where a, b, c, and d are values of the Left, Top, Right, and Bottom properties.
@@ -800,7 +800,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.Equals(object)"/>
+        /// Overrides <see cref="object.Equals(object)"/>
         /// </summary>
         /// <param name="obj">
         /// object to be compared for equality.
@@ -824,7 +824,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.GetHashCode"/>
+        /// Overrides <see cref="object.GetHashCode"/>
         /// </summary>
         /// <returns>
         /// Hash code for this instance.
@@ -1015,7 +1015,7 @@ public BufferCellType BufferCellType
         }
 
         /// <summary>
-        /// Overloads <see cref="System.Object.ToString"/>
+        /// Overloads <see cref="object.ToString"/>
         /// </summary>
         /// <returns>
         /// "'a' b c d" where a, b, c, and d are the values of the Character, ForegroundColor, BackgroundColor, and Type properties.
@@ -1028,7 +1028,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.Equals(object)"/>
+        /// Overrides <see cref="object.Equals(object)"/>
         /// </summary>
         /// <param name="obj">
         /// object to be compared for equality.
@@ -1052,7 +1052,7 @@ public override
         }
 
         /// <summary>
-        /// Overrides <see cref="System.Object.GetHashCode"/>
+        /// Overrides <see cref="object.GetHashCode"/>
         /// <!-- consider (ForegroundColor XOR BackgroundColor) the high-order part of a 32-bit int,
         ///      and Character the lower order half.  Then use the int32.GetHashCode.-->
         /// </summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
index 29fc5fa1f7f..5f51ba15751 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
@@ -1156,6 +1156,11 @@ internal static string GetTranscriptPath(string baseDirectory, bool includeDate)
                 }
             }
 
+            if (string.IsNullOrEmpty(baseDirectory))
+            {
+                return string.Empty;
+            }
+
             if (includeDate)
             {
                 baseDirectory = Path.Combine(baseDirectory, DateTime.Now.ToString("yyyyMMdd", CultureInfo.InvariantCulture));
diff --git a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
index eb1a796d0e7..a0945e21df1 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
@@ -335,7 +335,7 @@ protected PSDataCollection(SerializationInfo info, StreamingContext context)
                 throw PSTraceSource.NewArgumentNullException(nameof(info));
             }
 
-            if (!(info.GetValue("Data", typeof(IList<T>)) is IList<T> listToUse))
+            if (info.GetValue("Data", typeof(IList<T>)) is not IList<T> listToUse)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(info));
             }
diff --git a/src/System.Management.Automation/engine/hostifaces/PSTask.cs b/src/System.Management.Automation/engine/hostifaces/PSTask.cs
index c56225f3bb7..56bdabbff14 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSTask.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSTask.cs
@@ -952,7 +952,7 @@ private Runspace GetRunspace(int taskId)
                     iss.LanguageMode = PSLanguageMode.FullLanguage;
                     break;
             }
-            
+
             runspace = RunspaceFactory.CreateRunspace(iss);
             runspace.Name = runspaceName;
             _activeRunspaces.TryAdd(runspace.Id, runspace);
diff --git a/src/System.Management.Automation/engine/hostifaces/Pipeline.cs b/src/System.Management.Automation/engine/hostifaces/Pipeline.cs
index 66ebf7d0287..f7bca01fe7b 100644
--- a/src/System.Management.Automation/engine/hostifaces/Pipeline.cs
+++ b/src/System.Management.Automation/engine/hostifaces/Pipeline.cs
@@ -85,7 +85,7 @@ internal InvalidPipelineStateException(string message, PipelineState currentStat
         /// The <see cref="StreamingContext"/> that contains contextual information
         /// about the source or destination.
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         private InvalidPipelineStateException(SerializationInfo info, StreamingContext context)
         {
             throw new NotSupportedException();
diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
index 73bdbdb7c49..3af978ea165 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
@@ -96,7 +96,7 @@ internal InvalidPowerShellStateException(PSInvocationState currentState)
         /// The <see cref="StreamingContext"/> that contains contextual information
         /// about the source or destination.
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected
         InvalidPowerShellStateException(SerializationInfo info, StreamingContext context)
         {
@@ -946,9 +946,11 @@ private static PowerShell Create(bool isNested, PSCommand psCommand, Collection<
 
         /// <summary>
         /// Add a cmdlet to construct a command pipeline.
-        /// For example, to construct a command string "get-process | sort-object",
+        /// For example, to construct a command string "Get-Process | Sort-Object",
         ///     <code>
-        ///         PowerShell shell = PowerShell.Create("get-process").AddCommand("sort-object");
+        ///         PowerShell shell = PowerShell.Create()
+        ///             .AddCommand("Get-Process")
+        ///             .AddCommand("Sort-Object");
         ///     </code>
         /// </summary>
         /// <param name="cmdlet">
@@ -984,9 +986,11 @@ public PowerShell AddCommand(string cmdlet)
 
         /// <summary>
         /// Add a cmdlet to construct a command pipeline.
-        /// For example, to construct a command string "get-process | sort-object",
+        /// For example, to construct a command string "Get-Process | Sort-Object",
         ///     <code>
-        ///         PowerShell shell = PowerShell.Create("get-process").AddCommand("sort-object");
+        ///         PowerShell shell = PowerShell.Create()
+        ///             .AddCommand("Get-Process", true)
+        ///             .AddCommand("Sort-Object", true);
         ///     </code>
         /// </summary>
         /// <param name="cmdlet">
@@ -1025,10 +1029,10 @@ public PowerShell AddCommand(string cmdlet, bool useLocalScope)
 
         /// <summary>
         /// Add a piece of script to construct a command pipeline.
-        /// For example, to construct a command string "get-process | foreach { $_.Name }"
+        /// For example, to construct a command string "Get-Process | ForEach-Object { $_.Name }"
         ///     <code>
-        ///         PowerShell shell = PowerShell.Create("get-process").
-        ///                                     AddCommand("foreach { $_.Name }", true);
+        ///         PowerShell shell = PowerShell.Create()
+        ///             .AddScript("Get-Process | ForEach-Object { $_.Name }");
         ///     </code>
         /// </summary>
         /// <param name="script">
@@ -1064,10 +1068,10 @@ public PowerShell AddScript(string script)
 
         /// <summary>
         /// Add a piece of script to construct a command pipeline.
-        /// For example, to construct a command string "get-process | foreach { $_.Name }"
+        /// For example, to construct a command string "Get-Process | ForEach-Object { $_.Name }"
         ///     <code>
-        ///         PowerShell shell = PowerShell.Create("get-process").
-        ///                                     AddCommand("foreach { $_.Name }", true);
+        ///         PowerShell shell = PowerShell.Create()
+        ///             .AddScript("Get-Process | ForEach-Object { $_.Name }", true);
         ///     </code>
         /// </summary>
         /// <param name="script">
@@ -1173,10 +1177,11 @@ public PowerShell AddCommand(CommandInfo commandInfo)
 
         /// <summary>
         /// Add a parameter to the last added command.
-        /// For example, to construct a command string "get-process | select-object -property name"
+        /// For example, to construct a command string "Get-Process | Select-Object -Property Name"
         ///     <code>
-        ///         PowerShell shell = PowerShell.Create("get-process").
-        ///                                     AddCommand("select-object").AddParameter("property","name");
+        ///         PowerShell shell = PowerShell.Create()
+        ///             .AddCommand("Get-Process")
+        ///             .AddCommand("Select-Object").AddParameter("Property", "Name");
         ///     </code>
         /// </summary>
         /// <param name="parameterName">
@@ -1364,7 +1369,7 @@ public PowerShell AddParameters(IDictionary parameters)
 
                 foreach (DictionaryEntry entry in parameters)
                 {
-                    if (!(entry.Key is string parameterName))
+                    if (entry.Key is not string parameterName)
                     {
                         throw PSTraceSource.NewArgumentException(nameof(parameters), PowerShellStrings.KeyMustBeString);
                     }
@@ -1378,10 +1383,11 @@ public PowerShell AddParameters(IDictionary parameters)
 
         /// <summary>
         /// Adds an argument to the last added command.
-        /// For example, to construct a command string "get-process | select-object name"
+        /// For example, to construct a command string "Get-Process | Select-Object Name"
         ///     <code>
-        ///         PowerShell shell = PowerShell.Create("get-process").
-        ///                                     AddCommand("select-object").AddParameter("name");
+        ///         PowerShell shell = PowerShell.Create()
+        ///             .AddCommand("Get-Process")
+        ///             .AddCommand("Select-Object").AddArgument("Name");
         ///     </code>
         /// This will add the value "name" to the positional parameter list of "select-object"
         /// cmdlet. When the command is invoked, this value will get bound to positional parameter 0
@@ -3342,7 +3348,7 @@ public Task<PSDataCollection<PSObject>> InvokeAsync<TInput, TOutput>(PSDataColle
         /// </exception>
         private IAsyncResult BeginBatchInvoke<TInput, TOutput>(PSDataCollection<TInput> input, PSDataCollection<TOutput> output, PSInvocationSettings settings, AsyncCallback callback, object state)
         {
-            if (!((object)output is PSDataCollection<PSObject> asyncOutput))
+            if ((object)output is not PSDataCollection<PSObject> asyncOutput)
             {
                 throw PSTraceSource.NewInvalidOperationException();
             }
@@ -3730,7 +3736,7 @@ public PSDataCollection<PSObject> EndInvoke(IAsyncResult asyncResult)
         /// </exception>
         /// <remarks>
         /// When used with <see cref="PowerShell.Invoke()"/>, that call will return a partial result.
-        /// When used with <see cref="PowerShell.InvokeAsync"/>, that call will throw a <see cref="System.Management.Automation.PipelineStoppedException"/>. 
+        /// When used with <see cref="PowerShell.InvokeAsync"/>, that call will throw a <see cref="System.Management.Automation.PipelineStoppedException"/>.
         /// </remarks>
         public void Stop()
         {
@@ -3790,7 +3796,7 @@ public IAsyncResult BeginStop(AsyncCallback callback, object state)
         /// </exception>
         /// <remarks>
         /// When used with <see cref="PowerShell.Invoke()"/>, that call will return a partial result.
-        /// When used with <see cref="PowerShell.InvokeAsync"/>, that call will throw a <see cref="System.Management.Automation.PipelineStoppedException"/>. 
+        /// When used with <see cref="PowerShell.InvokeAsync"/>, that call will throw a <see cref="System.Management.Automation.PipelineStoppedException"/>.
         /// </remarks>
         public void EndStop(IAsyncResult asyncResult)
         {
@@ -3844,7 +3850,7 @@ public void EndStop(IAsyncResult asyncResult)
         /// </exception>
         /// <remarks>
         /// When used with <see cref="PowerShell.Invoke()"/>, that call will return a partial result.
-        /// When used with <see cref="PowerShell.InvokeAsync"/>, that call will throw a <see cref="System.Management.Automation.PipelineStoppedException"/>. 
+        /// When used with <see cref="PowerShell.InvokeAsync"/>, that call will throw a <see cref="System.Management.Automation.PipelineStoppedException"/>.
         /// </remarks>
         public Task StopAsync(AsyncCallback callback, object state)
             => Task.Factory.FromAsync(BeginStop(callback, state), _endStopMethod);
@@ -3874,15 +3880,50 @@ private void PipelineStateChanged(object source, PipelineStateEventArgs stateEve
         #region IDisposable Overrides
 
         /// <summary>
-        /// Dispose all managed resources. This will suppress finalizer on the object from getting called by
-        /// calling System.GC.SuppressFinalize(this).
+        /// Release all resources.
         /// </summary>
         public void Dispose()
         {
-            Dispose(true);
-            // To prevent derived types with finalizers from having to re-implement System.IDisposable to call it,
-            // unsealed types without finalizers should still call SuppressFinalize.
-            System.GC.SuppressFinalize(this);
+            lock (_syncObject)
+            {
+                // if already disposed return
+                if (_isDisposed)
+                {
+                    return;
+                }
+            }
+
+            // Stop the currently running command outside of the lock
+            if (InvocationStateInfo.State == PSInvocationState.Running ||
+                InvocationStateInfo.State == PSInvocationState.Stopping)
+            {
+                Stop();
+            }
+
+            lock (_syncObject)
+            {
+                _isDisposed = true;
+            }
+
+            if (OutputBuffer != null && OutputBufferOwner)
+            {
+                OutputBuffer.Dispose();
+            }
+
+            if (_errorBuffer != null && ErrorBufferOwner)
+            {
+                _errorBuffer.Dispose();
+            }
+
+            if (IsRunspaceOwner)
+            {
+                _runspace.Dispose();
+            }
+
+            RemotePowerShell?.Dispose();
+
+            _invokeAsyncResult = null;
+            _stopAsyncResult = null;
         }
 
         #endregion
@@ -4115,59 +4156,6 @@ private void AssertNotDisposed()
             }
         }
 
-        /// <summary>
-        /// Release all the resources.
-        /// </summary>
-        /// <param name="disposing">
-        /// if true, release all the managed objects.
-        /// </param>
-        private void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                lock (_syncObject)
-                {
-                    // if already disposed return
-                    if (_isDisposed)
-                    {
-                        return;
-                    }
-                }
-
-                // Stop the currently running command outside of the lock
-                if (InvocationStateInfo.State == PSInvocationState.Running ||
-                    InvocationStateInfo.State == PSInvocationState.Stopping)
-                {
-                    Stop();
-                }
-
-                lock (_syncObject)
-                {
-                    _isDisposed = true;
-                }
-
-                if (OutputBuffer != null && OutputBufferOwner)
-                {
-                    OutputBuffer.Dispose();
-                }
-
-                if (_errorBuffer != null && ErrorBufferOwner)
-                {
-                    _errorBuffer.Dispose();
-                }
-
-                if (IsRunspaceOwner)
-                {
-                    _runspace.Dispose();
-                }
-
-                RemotePowerShell?.Dispose();
-
-                _invokeAsyncResult = null;
-                _stopAsyncResult = null;
-            }
-        }
-
         /// <summary>
         /// Clear the internal elements.
         /// </summary>
@@ -5265,7 +5253,7 @@ private bool ServerSupportsBatchInvocation()
             if (_runspace != null)
             {
                 return _runspace.RunspaceStateInfo.State != RunspaceState.BeforeOpen &&
-                       _runspace.GetRemoteProtocolVersion() >= RemotingConstants.ProtocolVersionWin8RTM;
+                       _runspace.GetRemoteProtocolVersion() >= RemotingConstants.ProtocolVersion_2_2;
             }
 
             RemoteRunspacePoolInternal remoteRunspacePoolInternal = null;
@@ -5279,7 +5267,7 @@ private bool ServerSupportsBatchInvocation()
             }
 
             return remoteRunspacePoolInternal != null &&
-                   remoteRunspacePoolInternal.PSRemotingProtocolVersion >= RemotingConstants.ProtocolVersionWin8RTM;
+                   remoteRunspacePoolInternal.PSRemotingProtocolVersion >= RemotingConstants.ProtocolVersion_2_2;
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs b/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
index 5ab95041877..f86d2c00a54 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
@@ -179,15 +179,9 @@ public bool HasExited
         #region Dispose
 
         /// <summary>
-        /// Implementing the <see cref="IDisposable"/> interface.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool disposing)
         {
             if (_isDisposed)
             {
@@ -203,23 +197,20 @@ private void Dispose(bool disposing)
 
                 _isDisposed = true;
             }
-
-            if (disposing)
+            
+            try
+            {
+                if (Process != null && !Process.HasExited)
+                    Process.Kill();
+            }
+            catch (InvalidOperationException)
+            {
+            }
+            catch (Win32Exception)
+            {
+            }
+            catch (NotSupportedException)
             {
-                try
-                {
-                    if (Process != null && !Process.HasExited)
-                        Process.Kill();
-                }
-                catch (InvalidOperationException)
-                {
-                }
-                catch (Win32Exception)
-                {
-                }
-                catch (NotSupportedException)
-                {
-                }
             }
         }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/RunspaceInvoke.cs b/src/System.Management.Automation/engine/hostifaces/RunspaceInvoke.cs
index 5fa8370bcea..dcce30264ec 100644
--- a/src/System.Management.Automation/engine/hostifaces/RunspaceInvoke.cs
+++ b/src/System.Management.Automation/engine/hostifaces/RunspaceInvoke.cs
@@ -161,4 +161,3 @@ protected virtual void Dispose(bool disposing)
         #endregion IDisposable Members
     }
 }
-
diff --git a/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs b/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs
index e7457e2c53d..e7cfb888a88 100644
--- a/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs
+++ b/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs
@@ -90,7 +90,7 @@ RunspacePoolState expectedState
         /// The <see cref="StreamingContext"/> that contains
         /// contextual information about the source or destination.
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected
         InvalidRunspacePoolStateException(SerializationInfo info, StreamingContext context)
         {
@@ -1199,13 +1199,11 @@ public void EndClose(IAsyncResult asyncResult)
         }
 
         /// <summary>
-        /// Dispose the current runspacepool.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
         {
-            _internalPool.Dispose(true);
-
-            GC.SuppressFinalize(this);
+            _internalPool.Dispose();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
index 0fc328f0d5a..1b20fc4c85f 100644
--- a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
@@ -16,7 +16,7 @@ namespace System.Management.Automation.Runspaces.Internal
     /// <summary>
     /// Class which supports pooling local powerShell runspaces.
     /// </summary>
-    internal class RunspacePoolInternal
+    internal class RunspacePoolInternal : IDisposable
     {
         #region Private data
 
@@ -813,13 +813,23 @@ public void ReleaseRunspace(Runspace runspace)
             }
         }
 
+        /// <summary>
+        /// Release all resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+
+            GC.SuppressFinalize(this);
+        }
+
         /// <summary>
         /// Dispose off the current runspace pool.
         /// </summary>
         /// <param name="disposing">
         /// true to release all the internal resources.
         /// </param>
-        public virtual void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             if (!_isDisposed)
             {
diff --git a/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs b/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs
index 4b084ba72a8..977fee85803 100644
--- a/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs
+++ b/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs
@@ -27,23 +27,19 @@ namespace System.Management.Automation.Interpreter
 {
     internal sealed class InterpretedFrame
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly ThreadLocal<InterpretedFrame> CurrentFrame = new ThreadLocal<InterpretedFrame>();
 
         internal readonly Interpreter Interpreter;
         internal InterpretedFrame _parent;
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2105:ArrayFieldsShouldNotBeReadOnly")]
         private readonly int[] _continuations;
 
         private int _continuationIndex;
         private int _pendingContinuation;
         private object _pendingValue;
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2105:ArrayFieldsShouldNotBeReadOnly")]
         public readonly object[] Data;
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2105:ArrayFieldsShouldNotBeReadOnly")]
         public readonly StrongBox<object>[] Closure;
 
         public int StackIndex;
diff --git a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
index a006b7e0f4f..c117fbff33a 100644
--- a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
+++ b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
@@ -1298,7 +1298,7 @@ private bool TryPushLabelBlock(Expression node)
 
         private void DefineBlockLabels(Expression node)
         {
-            if (!(node is BlockExpression block))
+            if (node is not BlockExpression block)
             {
                 return;
             }
diff --git a/src/System.Management.Automation/engine/lang/parserutils.cs b/src/System.Management.Automation/engine/lang/parserutils.cs
index eb438a8a057..184c82c6815 100644
--- a/src/System.Management.Automation/engine/lang/parserutils.cs
+++ b/src/System.Management.Automation/engine/lang/parserutils.cs
@@ -1466,7 +1466,7 @@ internal static string GetTypeFullName(object obj)
                 return string.Empty;
             }
 
-            if (!(obj is PSObject mshObj))
+            if (obj is not PSObject mshObj)
             {
                 return obj.GetType().FullName;
             }
@@ -1570,7 +1570,7 @@ internal static object CallMethod(
                 // not really a method call.
                 if (valueToSet != AutomationNull.Value)
                 {
-                    if (!(targetMethod is PSParameterizedProperty propertyToSet))
+                    if (targetMethod is not PSParameterizedProperty propertyToSet)
                     {
                         throw InterpreterError.NewInterpreterException(methodName, typeof(RuntimeException), errorPosition,
                                                                        "ParameterizedPropertyAssignmentFailed", ParserStrings.ParameterizedPropertyAssignmentFailed, GetTypeFullName(target), methodName);
diff --git a/src/System.Management.Automation/engine/lang/scriptblock.cs b/src/System.Management.Automation/engine/lang/scriptblock.cs
index 8321d01319d..06fa66d0f7c 100644
--- a/src/System.Management.Automation/engine/lang/scriptblock.cs
+++ b/src/System.Management.Automation/engine/lang/scriptblock.cs
@@ -104,7 +104,7 @@ internal static ScriptBlock Create(ExecutionContext context, string script)
         /// </summary>
         /// <param name="script">The string to compile.</param>
         public static ScriptBlock Create(string script) => Create(
-            parser: new Language.Parser(),
+            parser: new Parser(),
             fileName: null,
             fileContents: script);
 
@@ -1276,14 +1276,16 @@ public Array End()
         /// 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.
+        /// <para>
+        /// The way we handle 'Clean' blocks in a steppable pipeline makes sure that:</para>
+        /// <para>1. The 'Clean' blocks get to run if any exception is thrown from 'Begin/Process/End'.</para>
+        /// <para>2. The 'Clean' blocks get to run if 'End' finished successfully.</para>
+        /// <para>
         /// 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.
+        /// pipeline. This method allows a user to do that from the 'Clean' block of the proxy function.</para>
         /// </remarks>
         public void Clean()
         {
@@ -1386,7 +1388,7 @@ internal ScriptBlockToPowerShellNotSupportedException(
         /// </summary>
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ScriptBlockToPowerShellNotSupportedException(SerializationInfo info, StreamingContext context)
         {
             throw new NotSupportedException();
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 3fac9de74f6..5ce6a6c6dc8 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -39,6 +39,9 @@ internal static class CachedReflectionInfo
         internal static readonly MethodInfo ObjectList_ToArray =
             typeof(List<object>).GetMethod(nameof(List<object>.ToArray), Type.EmptyTypes);
 
+        internal static readonly MethodInfo ArrayOps_AddObject =
+            typeof(ArrayOps).GetMethod(nameof(ArrayOps.AddObjectArray), StaticFlags);
+
         internal static readonly MethodInfo ArrayOps_GetMDArrayValue =
             typeof(ArrayOps).GetMethod(nameof(ArrayOps.GetMDArrayValue), StaticFlags);
 
@@ -474,6 +477,9 @@ internal static class CachedReflectionInfo
         internal static readonly MethodInfo PSSetMemberBinder_SetAdaptedValue =
             typeof(PSSetMemberBinder).GetMethod(nameof(PSSetMemberBinder.SetAdaptedValue), StaticFlags);
 
+        internal static readonly MethodInfo PSTraceSource_WriteLine =
+            typeof(PSTraceSource).GetMethod(nameof(PSTraceSource.WriteLine), InstanceFlags, new[] { typeof(string), typeof(object) });
+
         internal static readonly MethodInfo PSVariableAssignmentBinder_CopyInstanceMembersOfValueType =
             typeof(PSVariableAssignmentBinder).GetMethod(nameof(PSVariableAssignmentBinder.CopyInstanceMembersOfValueType), StaticFlags);
 
@@ -830,6 +836,14 @@ internal class Compiler : ICustomAstVisitor2
 
         static Compiler()
         {
+            Diagnostics.Assert(SpecialVariables.AutomaticVariables.Length == (int)AutomaticVariable.NumberOfAutomaticVariables
+                && SpecialVariables.AutomaticVariableTypes.Length == (int)AutomaticVariable.NumberOfAutomaticVariables,
+                "The 'AutomaticVariable' enum length does not match both 'AutomaticVariables' and 'AutomaticVariableTypes' length.");
+
+            Diagnostics.Assert(Enum.GetNames(typeof(PreferenceVariable)).Length == SpecialVariables.PreferenceVariables.Length
+                && Enum.GetNames(typeof(PreferenceVariable)).Length == SpecialVariables.PreferenceVariableTypes.Length,
+                "The 'PreferenceVariable' enum length does not match both 'PreferenceVariables' and 'PreferenceVariableTypes' length.");
+
             s_functionContext = Expression.Parameter(typeof(FunctionContext), "funcContext");
             s_executionContextParameter = Expression.Variable(typeof(ExecutionContext), "context");
 
@@ -1565,7 +1579,15 @@ private static Attribute NewOutputTypeAttribute(AttributeAst ast)
 
                 if (args[0] is Type)
                 {
-                    result = new OutputTypeAttribute(LanguagePrimitives.ConvertTo<Type[]>(args));
+                    // We avoid `ConvertTo<Type[]>(args)` here as CLM would throw due to `Type[]`
+                    // being a "non-core" type. NOTE: This doesn't apply to `string[]`.
+                    Type[] types = new Type[args.Length];
+                    for (int i = 0; i < args.Length; i++)
+                    {
+                        types[i] = LanguagePrimitives.ConvertTo<Type>(args[i]);
+                    }
+
+                    result = new OutputTypeAttribute(types);
                 }
                 else
                 {
@@ -2278,25 +2300,26 @@ private Expression CaptureAstResults(
             switch (context)
             {
                 case CaptureAstContext.AssignmentWithResultPreservation:
-                    result = Expression.Call(CachedReflectionInfo.PipelineOps_PipelineResult, resultList);
-
-                    // PipelineResult might get skipped in some circumstances due to an early return or a FlowControlException thrown out, in which case
-                    // we write to the oldPipe. This can happen in cases like:
-                    //     $(1;2;return 3)
-                    finallyExprs.Add(Expression.Call(CachedReflectionInfo.PipelineOps_FlushPipe, oldPipe, resultList));
-                    break;
                 case CaptureAstContext.AssignmentWithoutResultPreservation:
                     result = Expression.Call(CachedReflectionInfo.PipelineOps_PipelineResult, resultList);
 
                     // Clear the temporary pipe in case of exception, if we are not required to preserve the results
-                    var catchExprs = new List<Expression>
+                    if (context == CaptureAstContext.AssignmentWithoutResultPreservation)
                     {
-                        Expression.Call(CachedReflectionInfo.PipelineOps_ClearPipe, resultList),
-                        Expression.Rethrow(),
-                        Expression.Constant(null, typeof(object))
-                    };
+                        var catchExprs = new List<Expression>
+                        {
+                            Expression.Call(CachedReflectionInfo.PipelineOps_ClearPipe, resultList),
+                            Expression.Rethrow(),
+                            Expression.Constant(null, typeof(object))
+                        };
 
-                    catches.Add(Expression.Catch(typeof(RuntimeException), Expression.Block(typeof(object), catchExprs)));
+                        catches.Add(Expression.Catch(typeof(RuntimeException), Expression.Block(typeof(object), catchExprs)));
+                    }
+
+                    // PipelineResult might get skipped in some circumstances due to an early return or a FlowControlException thrown out,
+                    // in which case we write to the oldPipe. This can happen in cases like:
+                    //     $(1;2;return 3)
+                    finallyExprs.Add(Expression.Call(CachedReflectionInfo.PipelineOps_FlushPipe, oldPipe, resultList));
                     break;
                 case CaptureAstContext.Condition:
                     result = DynamicExpression.Dynamic(PSPipelineResultToBoolBinder.Get(), typeof(bool), resultList);
@@ -2801,7 +2824,7 @@ private static Assembly LoadAssembly(string assemblyName, string scriptFileName)
             {
                 if (!string.IsNullOrEmpty(scriptFileName) && !Path.IsPathRooted(assemblyFileName))
                 {
-                    assemblyFileName = Path.GetDirectoryName(scriptFileName) + "\\" + assemblyFileName;
+                    assemblyFileName = Path.Combine(Path.GetDirectoryName(scriptFileName), assemblyFileName);
                 }
 
                 if (File.Exists(assemblyFileName))
diff --git a/src/System.Management.Automation/engine/parser/PSType.cs b/src/System.Management.Automation/engine/parser/PSType.cs
index d01a22c305d..06f978a51ce 100644
--- a/src/System.Management.Automation/engine/parser/PSType.cs
+++ b/src/System.Management.Automation/engine/parser/PSType.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation.Internal;
@@ -276,7 +277,7 @@ private sealed class DefineTypeHelper
             internal readonly TypeBuilder _staticHelpersTypeBuilder;
             private readonly Dictionary<string, PropertyMemberAst> _definedProperties;
             private readonly Dictionary<string, List<Tuple<FunctionMemberAst, Type[]>>> _definedMethods;
-            private HashSet<Tuple<string, Type>> _interfaceProperties;
+            private Dictionary<Tuple<string, Type>, PropertyInfo> _abstractProperties;
             internal readonly List<(string fieldName, IParameterMetadataProvider bodyAst, bool isStatic)> _fieldsToInitForMemberFunctions;
             private bool _baseClassHasDefaultCtor;
 
@@ -444,11 +445,11 @@ private Type GetBaseTypes(Parser parser, TypeDefinitionAst typeDefinitionAst, ou
                 return baseClass ?? typeof(object);
             }
 
-            private bool ShouldImplementProperty(string name, Type type)
+            private bool ShouldImplementProperty(string name, Type type, [NotNullWhen(true)] out PropertyInfo interfaceProperty)
             {
-                if (_interfaceProperties == null)
+                if (_abstractProperties == null)
                 {
-                    _interfaceProperties = new HashSet<Tuple<string, Type>>();
+                    _abstractProperties = new Dictionary<Tuple<string, Type>, PropertyInfo>();
                     var allInterfaces = new HashSet<Type>();
 
                     // TypeBuilder.GetInterfaces() returns only the interfaces that was explicitly passed to its constructor.
@@ -467,12 +468,23 @@ private bool ShouldImplementProperty(string name, Type type)
                     {
                         foreach (var property in interfaceType.GetProperties())
                         {
-                            _interfaceProperties.Add(Tuple.Create(property.Name, property.PropertyType));
+                            _abstractProperties.Add(Tuple.Create(property.Name, property.PropertyType), property);
+                        }
+                    }
+
+                    if (_typeBuilder.BaseType.IsAbstract)
+                    {
+                        foreach (var property in _typeBuilder.BaseType.GetProperties())
+                        {
+                            if (property.GetAccessors().Any(m => m.IsAbstract))
+                            {
+                                _abstractProperties.Add(Tuple.Create(property.Name, property.PropertyType), property);
+                            }
                         }
                     }
                 }
 
-                return _interfaceProperties.Contains(Tuple.Create(name, type));
+                return _abstractProperties.TryGetValue(Tuple.Create(name, type), out interfaceProperty);
             }
 
             public void DefineMembers()
@@ -618,9 +630,19 @@ private PropertyBuilder EmitPropertyIl(PropertyMemberAst propertyMemberAst, Type
                 // The property set and property get methods require a special set of attributes.
                 var getSetAttributes = Reflection.MethodAttributes.SpecialName | Reflection.MethodAttributes.HideBySig;
                 getSetAttributes |= propertyMemberAst.IsPublic ? Reflection.MethodAttributes.Public : Reflection.MethodAttributes.Private;
-                if (ShouldImplementProperty(propertyMemberAst.Name, type))
+                MethodInfo implementingGetter = null;
+                MethodInfo implementingSetter = null;
+                if (ShouldImplementProperty(propertyMemberAst.Name, type, out PropertyInfo interfaceProperty))
                 {
-                    getSetAttributes |= Reflection.MethodAttributes.Virtual;
+                    if (propertyMemberAst.IsStatic)
+                    {
+                        implementingGetter = interfaceProperty.GetGetMethod();
+                        implementingSetter = interfaceProperty.GetSetMethod();
+                    }
+                    else
+                    {
+                        getSetAttributes |= Reflection.MethodAttributes.Virtual;
+                    }
                 }
 
                 if (propertyMemberAst.IsStatic)
@@ -666,6 +688,11 @@ private PropertyBuilder EmitPropertyIl(PropertyMemberAst propertyMemberAst, Type
                     getIlGen.Emit(OpCodes.Ret);
                 }
 
+                if (implementingGetter != null)
+                {
+                    _typeBuilder.DefineMethodOverride(getMethod, implementingGetter);
+                }
+
                 // Define the "set" accessor method.
                 MethodBuilder setMethod = _typeBuilder.DefineMethod(string.Concat("set_", propertyMemberAst.Name), getSetAttributes, null, new Type[] { type });
                 ILGenerator setIlGen = setMethod.GetILGenerator();
@@ -699,6 +726,11 @@ private PropertyBuilder EmitPropertyIl(PropertyMemberAst propertyMemberAst, Type
 
                 setIlGen.Emit(OpCodes.Ret);
 
+                if (implementingSetter != null)
+                {
+                    _typeBuilder.DefineMethodOverride(setMethod, implementingSetter);
+                }
+
                 // Map the two methods created above to our PropertyBuilder to
                 // their corresponding behaviors, "get" and "set" respectively.
                 property.SetGetMethod(getMethod);
@@ -1321,9 +1353,8 @@ internal static Assembly DefineTypes(Parser parser, Ast rootAst, TypeDefinitionA
             foreach (var typeDefinitionAst in typeDefinitions)
             {
                 var typeName = GetClassNameInAssembly(typeDefinitionAst);
-                if (!definedTypes.Contains(typeName))
+                if (definedTypes.Add(typeName))
                 {
-                    definedTypes.Add(typeName);
                     if ((typeDefinitionAst.TypeAttributes & TypeAttributes.Class) == TypeAttributes.Class)
                     {
                         defineTypeHelpers.Add(new DefineTypeHelper(parser, module, typeDefinitionAst, typeName));
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index a21fcc1aafa..1592d2e7e7d 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -1487,7 +1487,7 @@ private ITypeName GenericTypeNameRule(Token genericTypeName, Token firstToken, b
                 rBracketToken = null;
             }
 
-            var openGenericType = new TypeName(genericTypeName.Extent, genericTypeName.Text);
+            var openGenericType = new TypeName(genericTypeName.Extent, genericTypeName.Text, genericArguments.Count);
             var result = new GenericTypeName(
                 ExtentOf(genericTypeName.Extent, ExtentFromFirstOf(rBracketToken, genericArguments.LastOrDefault(), firstToken)),
                 openGenericType,
@@ -2984,8 +2984,8 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom
                     Runspaces.Runspace.DefaultRunspace = localRunspace;
                 }
 
-                // Configuration is not supported on ARM or in ConstrainedLanguage
-                if (PsUtils.IsRunningOnProcessorArchitectureARM() || Runspace.DefaultRunspace?.ExecutionContext?.LanguageMode == PSLanguageMode.ConstrainedLanguage)
+                // Configuration is not supported in ConstrainedLanguage
+                if (Runspace.DefaultRunspace?.ExecutionContext?.LanguageMode == PSLanguageMode.ConstrainedLanguage)
                 {
                     if (SystemPolicy.GetSystemLockdownPolicy() != SystemEnforcementMode.Audit)
                     {
@@ -3004,6 +3004,17 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom
                         dropIntoDebugger: true);
                 }
 
+                // Configuration is not supported for ARM or ARM64 process architecture.
+                if (PsUtils.IsRunningOnProcessArchitectureARM())
+                {
+                    ReportError(
+                        configurationToken.Extent,
+                        nameof(ParserStrings.ConfigurationNotAllowedOnArm64),
+                        ParserStrings.ConfigurationNotAllowedOnArm64,
+                        configurationToken.Kind.Text());
+                    return null;
+                }
+
                 // Configuration is not supported on WinPE
                 if (Utils.IsWinPEHost())
                 {
@@ -5133,7 +5144,7 @@ private StringConstantExpressionAst ResolveUsingAssembly(StringConstantExpressio
                             workingDirectory = Path.GetDirectoryName(scriptFileName);
                         }
 
-                        assemblyFileName = workingDirectory + @"\" + assemblyFileName;
+                        assemblyFileName = Path.Combine(workingDirectory, assemblyFileName);
                     }
                 }
                 catch
@@ -7143,7 +7154,7 @@ private ExpressionAst UnaryExpressionRule(bool endNumberOnTernaryOpChars = false
                             ParserStrings.UnexpectedAttribute,
                             lastAttribute.TypeName.FullName);
 
-                        return new ErrorExpressionAst(ExtentOf(token, lastAttribute));
+                        return new ErrorExpressionAst(ExtentOf(token, lastAttribute), attributes);
                     }
 
                     expr = new AttributedExpressionAst(ExtentOf(lastAttribute, child), lastAttribute, child);
diff --git a/src/System.Management.Automation/engine/parser/Position.cs b/src/System.Management.Automation/engine/parser/Position.cs
index 589c3eb92a5..9e1363e4a53 100644
--- a/src/System.Management.Automation/engine/parser/Position.cs
+++ b/src/System.Management.Automation/engine/parser/Position.cs
@@ -338,10 +338,7 @@ internal static bool IsAfter(this IScriptExtent extentToTest, IScriptExtent endE
 
         internal static bool IsWithin(this IScriptExtent extentToTest, IScriptExtent extent)
         {
-            return extentToTest.StartLineNumber >= extent.StartLineNumber &&
-                   extentToTest.EndLineNumber <= extent.EndLineNumber &&
-                   extentToTest.StartColumnNumber >= extent.StartColumnNumber &&
-                   extentToTest.EndColumnNumber <= extent.EndColumnNumber;
+            return extentToTest.StartOffset >= extent.StartOffset && extentToTest.EndOffset <= extent.EndOffset;
         }
 
         internal static bool IsAfter(this IScriptExtent extent, int line, int column)
diff --git a/src/System.Management.Automation/engine/parser/SafeValues.cs b/src/System.Management.Automation/engine/parser/SafeValues.cs
index 05c87daab5b..38181168a66 100644
--- a/src/System.Management.Automation/engine/parser/SafeValues.cs
+++ b/src/System.Management.Automation/engine/parser/SafeValues.cs
@@ -47,11 +47,15 @@ public static bool IsAstSafe(Ast ast, GetSafeValueVisitor.SafeValueContext safeV
         internal IsSafeValueVisitor(GetSafeValueVisitor.SafeValueContext safeValueContext)
         {
             _safeValueContext = safeValueContext;
+
+            bool skipSizeCheck = safeValueContext is GetSafeValueVisitor.SafeValueContext.SkipHashtableSizeCheck;
+            _maxVisitCount = skipSizeCheck ? uint.MaxValue : 5000;
+            _maxHashtableKeyCount = skipSizeCheck ? int.MaxValue : 500;
         }
 
         internal bool IsAstSafe(Ast ast)
         {
-            if ((bool)ast.Accept(this) && _visitCount < MaxVisitCount)
+            if ((bool)ast.Accept(this) && _visitCount < _maxVisitCount)
             {
                 return true;
             }
@@ -65,8 +69,8 @@ internal bool IsAstSafe(Ast ast)
         // This is a check of the number of visits
         private uint _visitCount = 0;
 
-        private const uint MaxVisitCount = 5000;
-        private const int MaxHashtableKeyCount = 500;
+        private readonly uint _maxVisitCount;
+        private readonly int _maxHashtableKeyCount;
 
         // Used to determine if we are being called within a GetPowerShell() context,
         // which does some additional security verification outside of the scope of
@@ -330,7 +334,7 @@ public object VisitArrayLiteral(ArrayLiteralAst arrayLiteralAst)
 
         public object VisitHashtable(HashtableAst hashtableAst)
         {
-            if (hashtableAst.KeyValuePairs.Count > MaxHashtableKeyCount)
+            if (hashtableAst.KeyValuePairs.Count > _maxHashtableKeyCount)
             {
                 return false;
             }
@@ -373,7 +377,7 @@ public static object GetSafeValue(Ast ast, ExecutionContext context, SafeValueCo
         {
             t_context = context;
 
-            if (safeValueContext == SafeValueContext.SkipHashtableSizeCheck || IsSafeValueVisitor.IsAstSafe(ast, safeValueContext))
+            if (IsSafeValueVisitor.IsAstSafe(ast, safeValueContext))
             {
                 return ast.Accept(new GetSafeValueVisitor());
             }
diff --git a/src/System.Management.Automation/engine/parser/SemanticChecks.cs b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
index b108e6330b4..4a2a3bb626c 100644
--- a/src/System.Management.Automation/engine/parser/SemanticChecks.cs
+++ b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
@@ -8,6 +8,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Text.RegularExpressions;
 
 using Microsoft.PowerShell;
 using System.Management.Automation.Security;
@@ -17,7 +18,7 @@
 
 namespace System.Management.Automation.Language
 {
-    internal sealed class SemanticChecks : AstVisitor2, IAstPostVisitHandler
+    internal sealed partial class SemanticChecks : AstVisitor2, IAstPostVisitHandler
     {
         private readonly Parser _parser;
 
@@ -89,17 +90,13 @@ private void CheckForDuplicateParameters(ReadOnlyCollection<ParameterAst> parame
                 foreach (var parameter in parameters)
                 {
                     string parameterName = parameter.Name.VariablePath.UserPath;
-                    if (parametersSet.Contains(parameterName))
+                    if (!parametersSet.Add(parameterName))
                     {
                         _parser.ReportError(parameter.Name.Extent,
                             nameof(ParserStrings.DuplicateFormalParameter),
                             ParserStrings.DuplicateFormalParameter,
                             parameterName);
                     }
-                    else
-                    {
-                        parametersSet.Add(parameterName);
-                    }
 
                     var voidConstraint =
                         parameter.Attributes.OfType<TypeConstraintAst>().FirstOrDefault(static t => typeof(void) == t.TypeName.GetReflectionType());
@@ -241,7 +238,7 @@ public override AstVisitAction VisitAttribute(AttributeAst attributeAst)
             foreach (var namedArg in attributeAst.NamedArguments)
             {
                 string name = namedArg.ArgumentName;
-                if (names.Contains(name))
+                if (!names.Add(name))
                 {
                     _parser.ReportError(namedArg.Extent,
                         nameof(ParserStrings.DuplicateNamedArgument),
@@ -250,8 +247,6 @@ public override AstVisitAction VisitAttribute(AttributeAst attributeAst)
                 }
                 else
                 {
-                    names.Add(name);
-
                     if (!namedArg.ExpressionOmitted && !IsValidAttributeArgument(namedArg.Argument, constantValueVisitor))
                     {
                         var error = GetNonConstantAttributeArgErrorExpr(constantValueVisitor);
@@ -1123,7 +1118,7 @@ public override AstVisitAction VisitHashtable(HashtableAst hashtableAst)
                 if (keyStrAst != null)
                 {
                     var keyStr = keyStrAst.Value.ToString();
-                    if (keys.Contains(keyStr))
+                    if (!keys.Add(keyStr))
                     {
                         string errorId;
                         string errorMsg;
@@ -1140,10 +1135,6 @@ public override AstVisitAction VisitHashtable(HashtableAst hashtableAst)
 
                         _parser.ReportError(entry.Item1.Extent, errorId, errorMsg, keyStr);
                     }
-                    else
-                    {
-                        keys.Add(keyStr);
-                    }
                 }
             }
 
@@ -1319,20 +1310,50 @@ public override AstVisitAction VisitScriptBlockExpression(ScriptBlockExpressionA
 
         public override AstVisitAction VisitUsingStatement(UsingStatementAst usingStatementAst)
         {
-            bool usingKindSupported = usingStatementAst.UsingStatementKind == UsingStatementKind.Namespace ||
-                                      usingStatementAst.UsingStatementKind == UsingStatementKind.Assembly ||
-                                      usingStatementAst.UsingStatementKind == UsingStatementKind.Module;
-            if (!usingKindSupported ||
-                usingStatementAst.Alias != null)
+            UsingStatementKind kind = usingStatementAst.UsingStatementKind;
+            bool usingKindSupported = kind is UsingStatementKind.Namespace or UsingStatementKind.Assembly or UsingStatementKind.Module;
+            if (!usingKindSupported || usingStatementAst.Alias != null)
             {
-                _parser.ReportError(usingStatementAst.Extent,
+                _parser.ReportError(
+                    usingStatementAst.Extent,
                     nameof(ParserStrings.UsingStatementNotSupported),
                     ParserStrings.UsingStatementNotSupported);
             }
 
+            if (kind is UsingStatementKind.Namespace)
+            {
+                Regex nsPattern = NamespacePattern();
+                if (!nsPattern.IsMatch(usingStatementAst.Name.Value))
+                {
+                    _parser.ReportError(
+                        usingStatementAst.Name.Extent,
+                        nameof(ParserStrings.InvalidNamespaceValue),
+                        ParserStrings.InvalidNamespaceValue);
+                }
+            }
+
             return AstVisitAction.Continue;
         }
 
+        /// <summary>
+        /// This regular expression is for validating if a namespace string is valid.
+        ///
+        /// In C#, a legit namespace is defined as `identifier ('.' identifier)*` [see https://learn.microsoft.com/dotnet/csharp/language-reference/language-specification/namespaces#143-namespace-declarations].
+        /// And `identifier` is defined in https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/identifier-names#naming-rules, summarized below:
+        ///   - Identifiers must start with a letter or underscore (_).
+        ///   - Identifiers can contain
+        ///     * Unicode letter characters (categories: Lu, Ll, Lt, Lm, Lo or Nl);
+        ///     * decimal digit characters (category: Nd);
+        ///     * Unicode connecting characters (category: Pc);
+        ///     * Unicode combining characters (categories: Mn, Mc);
+        ///     * Unicode formatting characters (category: Cf).
+        ///
+        /// For details about how Unicode categories are represented in regular expression, see the "Unicode Categories" section in the following article:
+        ///   - https://www.regular-expressions.info/unicode.html
+        /// </summary>
+        [GeneratedRegex(@"^[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Pc}\p{Mn}\p{Mc}\p{Cf}_]*(?:\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Pc}\p{Mn}\p{Mc}\p{Cf}_]*)*$")]
+        private static partial Regex NamespacePattern();
+
         public override AstVisitAction VisitConfigurationDefinition(ConfigurationDefinitionAst configurationDefinitionAst)
         {
             //
diff --git a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
index 1e1ff771ac5..a7744ac6411 100644
--- a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
@@ -150,6 +150,8 @@ public TypeInferenceContext(PowerShell powerShell)
 
         public TypeDefinitionAst CurrentTypeDefinitionAst { get; set; }
 
+        public HashSet<IParameterMetadataProvider> AnalyzedCommands { get; } = new HashSet<IParameterMetadataProvider>();
+
         public TypeInferenceRuntimePermissions RuntimePermissions { get; set; }
 
         internal PowerShellExecutionHelper Helper { get; }
@@ -195,7 +197,25 @@ internal IList<object> GetMembersByInferredType(PSTypeName typename, bool isStat
                 // Look in the type table first.
                 if (!isStatic)
                 {
-                    var consolidatedString = new ConsolidatedString(new[] { typename.Name });
+                    // The Ciminstance type adapter adds the full typename with and without a namespace to the list of type names.
+                    // So if we see one with a full typename we need to also get the types for the short version.
+                    // For example: "CimInstance#root/standardcimv2/MSFT_NetFirewallRule" and "CimInstance#MSFT_NetFirewallRule"
+                    int namespaceSeparator = typename.Name.LastIndexOf('/');
+                    ConsolidatedString consolidatedString;
+                    if (namespaceSeparator != -1
+                        && typename.Name.StartsWith("Microsoft.Management.Infrastructure.CimInstance#", StringComparison.OrdinalIgnoreCase))
+                    {
+                        consolidatedString = new ConsolidatedString(new[]
+                        {
+                            typename.Name,
+                            string.Concat("Microsoft.Management.Infrastructure.CimInstance#", typename.Name.AsSpan(namespaceSeparator + 1))
+                        });
+                    }
+                    else
+                    {
+                        consolidatedString = new ConsolidatedString(new[] { typename.Name });
+                    }
+
                     results.AddRange(ExecutionContext.TypeTable.GetMembers<PSMemberInfo>(consolidatedString));
                 }
 
@@ -584,6 +604,20 @@ object ICustomAstVisitor.VisitHashtable(HashtableAst hashtableAst)
             if (hashtableAst.KeyValuePairs.Count > 0)
             {
                 var properties = new List<PSMemberNameAndType>();
+                void AddInferredTypes(Ast ast, string keyName)
+                {
+                    bool foundAnyTypes = false;
+                    foreach (PSTypeName item in InferTypes(ast))
+                    {
+                        foundAnyTypes = true;
+                        properties.Add(new PSMemberNameAndType(keyName, item));
+                    }
+
+                    if (!foundAnyTypes)
+                    {
+                        properties.Add(new PSMemberNameAndType(keyName, new PSTypeName("System.Object")));
+                    }
+                }
 
                 foreach (var kv in hashtableAst.KeyValuePairs)
                 {
@@ -615,31 +649,18 @@ object ICustomAstVisitor.VisitHashtable(HashtableAst hashtableAst)
                                 _ = SafeExprEvaluator.TrySafeEval(expression, _context.ExecutionContext, out value);
                             }
 
-                            PSTypeName valueType;
                             if (value is null)
                             {
-                                valueType = new PSTypeName("System.Object");
-                            }
-                            else
-                            {
-                                valueType = new PSTypeName(value.GetType());
+                                AddInferredTypes(expression, name);
+                                continue;
                             }
 
+                            PSTypeName valueType = new(value.GetType());
                             properties.Add(new PSMemberNameAndType(name, valueType, value));
                         }
                         else
                         {
-                            bool foundAnyTypes = false;
-                            foreach (var item in InferTypes(kv.Item2))
-                            {
-                                foundAnyTypes = true;
-                                properties.Add(new PSMemberNameAndType(name, item));
-                            }
-
-                            if (!foundAnyTypes)
-                            {
-                                properties.Add(new PSMemberNameAndType(name, new PSTypeName("System.Object")));
-                            }
+                            AddInferredTypes(kv.Item2, name);
                         }
                     }
                 }
@@ -699,14 +720,176 @@ 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)
+            switch (binaryExpressionAst.Operator)
+            {
+                case TokenKind.And:
+                case TokenKind.Ccontains:
+                case TokenKind.Cin:
+                case TokenKind.Cnotcontains:
+                case TokenKind.Cnotin:
+                case TokenKind.Icontains:
+                case TokenKind.Iin:
+                case TokenKind.Inotcontains:
+                case TokenKind.Inotin:
+                case TokenKind.Is:
+                case TokenKind.IsNot:
+                case TokenKind.Or:
+                case TokenKind.Xor:
+                    // Always returns a bool
+                    return BinaryExpressionAst.BoolTypeNameArray;
+
+                case TokenKind.As:
+                    // TODO: Handle other kinds of expressions on the right side.
+                    if (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 };
+                    }
+                    break;
+
+                case TokenKind.Ceq:
+                case TokenKind.Cge:
+                case TokenKind.Cgt:
+                case TokenKind.Cle:
+                case TokenKind.Clike:
+                case TokenKind.Clt:
+                case TokenKind.Cmatch:
+                case TokenKind.Cne:
+                case TokenKind.Cnotlike:
+                case TokenKind.Cnotmatch:
+                case TokenKind.Ieq:
+                case TokenKind.Ige:
+                case TokenKind.Igt:
+                case TokenKind.Ile:
+                case TokenKind.Ilike:
+                case TokenKind.Ilt:
+                case TokenKind.Imatch:
+                case TokenKind.Ine:
+                case TokenKind.Inotlike:
+                case TokenKind.Inotmatch:
+                    // Returns a bool or filtered output from the left hand side if it's enumerable
+                    var comparisonOutput = new List<PSTypeName>() { new(typeof(bool)) };
+                    comparisonOutput.AddRange(InferTypes(binaryExpressionAst.Left));
+                    return comparisonOutput;
+
+                case TokenKind.Creplace:
+                case TokenKind.Format:
+                case TokenKind.Ireplace:
+                case TokenKind.Join:
+                    // Always returns a string
+                    return BinaryExpressionAst.StringTypeNameArray;
+
+                case TokenKind.Csplit:
+                case TokenKind.Isplit:
+                    // Always returns a string array
+                    return BinaryExpressionAst.StringArrayTypeNameArray;
+
+                case TokenKind.QuestionQuestion:
+                    // Can return left or right hand side
+                    var nullCoalescingOutput = InferTypes(binaryExpressionAst.Left).ToList();
+                    nullCoalescingOutput.AddRange(InferTypes(binaryExpressionAst.Right));
+                    return nullCoalescingOutput.Distinct();
+
+                default:
+                    break;
+            }
+
+            List<PSTypeName> lhsTypes = InferTypes(binaryExpressionAst.Left).ToList();
+            if (lhsTypes.Count == 0)
+            {
+                return lhsTypes;
+            }
+
+            string methodName;
+            switch (binaryExpressionAst.Operator)
+            {
+                case TokenKind.Divide:
+                    methodName = "op_Division";
+                    break;
+
+                case TokenKind.Minus:
+                    methodName = "op_Subtraction";
+                    break;
+
+                case TokenKind.Multiply:
+                    methodName = "op_Multiply";
+                    break;
+
+                case TokenKind.Plus:
+                    methodName = "op_Addition";
+                    break;
+
+                case TokenKind.Rem:
+                    methodName = "op_Modulus";
+                    break;
+
+                case TokenKind.Shl:
+                    methodName = "op_LeftShift";
+                    break;
+
+                case TokenKind.Shr:
+                    methodName = "op_RightShift";
+                    break;
+
+                default:
+                    return lhsTypes;
+            }
+
+            List<PSTypeName> rhsTypes = InferTypes(binaryExpressionAst.Right).ToList();
+            HashSet<string> addedReturnTypes = new HashSet<string>();
+            List<PSTypeName> result = new List<PSTypeName>();
+            foreach (PSTypeName lType in lhsTypes)
             {
-                var type = typeExpression.TypeName.GetReflectionType();
-                var psTypeName = type != null ? new PSTypeName(type) : new PSTypeName(typeExpression.TypeName.FullName);
-                return new[] { psTypeName };
+                if (lType.Type is null)
+                {
+                    continue;
+                }
+
+                foreach (MethodInfo method in lType.Type.GetMethods(BindingFlags.Public | BindingFlags.Static))
+                {
+                    if (!method.Name.Equals(methodName, StringComparison.Ordinal))
+                    {
+                        continue;
+                    }
+
+                    if (rhsTypes.Count == 0)
+                    {
+                        if (addedReturnTypes.Add(method.ReturnType.FullName))
+                        {
+                            result.Add(new PSTypeName(method.ReturnType));
+                        }
+
+                        continue;
+                    }
+
+                    ParameterInfo[] methodParams = method.GetParameters();
+                    if (methodParams.Length != 2)
+                    {
+                        continue;
+                    }
+
+                    foreach (PSTypeName rType in rhsTypes)
+                    {
+                        if (rType.Type is not null && rType.Type.IsAssignableTo(methodParams[1].ParameterType))
+                        {
+                            if (addedReturnTypes.Add(method.ReturnType.FullName))
+                            {
+                                result.Add(new PSTypeName(method.ReturnType));
+                            }
+
+                            break;
+                        }
+                    }
+                }
             }
-            return InferTypes(binaryExpressionAst.Left);
+
+            if (result.Count == 0)
+            {
+                result.AddRange(lhsTypes);
+            }
+
+            return result;
         }
 
         object ICustomAstVisitor.VisitUnaryExpression(UnaryExpressionAst unaryExpressionAst)
@@ -831,9 +1014,20 @@ object ICustomAstVisitor.VisitParamBlock(ParamBlockAst paramBlockAst)
         object ICustomAstVisitor.VisitNamedBlock(NamedBlockAst namedBlockAst)
         {
             var inferredTypes = new List<PSTypeName>();
-            for (var index = 0; index < namedBlockAst.Statements.Count; index++)
+            for (int index = 0; index < namedBlockAst.Statements.Count; index++)
             {
-                var ast = namedBlockAst.Statements[index];
+                StatementAst ast = namedBlockAst.Statements[index];
+                if (ast is AssignmentStatementAst
+                    || (ast is PipelineAst pipe && pipe.PipelineElements.Count == 1 && pipe.PipelineElements[0] is CommandExpressionAst cmd
+                    && cmd.Redirections.Count == 0 && cmd.Expression is UnaryExpressionAst unary
+                    && unary.TokenKind is TokenKind.PostfixPlusPlus or TokenKind.PlusPlus or TokenKind.PostfixMinusMinus or TokenKind.MinusMinus))
+                {
+                    // Assignments don't output anything to the named block unless they are wrapped in parentheses.
+                    // When they are wrapped in parentheses, they are seen as PipelineAst.
+                    // Increment/decrement operators like $i++ also don't output anything unless there's a redirection, or they are wrapped in parentheses.
+                    continue;
+                }
+
                 inferredTypes.AddRange(InferTypes(ast));
             }
 
@@ -902,8 +1096,19 @@ object ICustomAstVisitor.VisitFunctionDefinition(FunctionDefinitionAst functionD
         object ICustomAstVisitor.VisitStatementBlock(StatementBlockAst statementBlockAst)
         {
             var inferredTypes = new List<PSTypeName>();
-            foreach (var ast in statementBlockAst.Statements)
+            foreach (StatementAst ast in statementBlockAst.Statements)
             {
+                if (ast is AssignmentStatementAst
+                    || (ast is PipelineAst pipe && pipe.PipelineElements.Count == 1 && pipe.PipelineElements[0] is CommandExpressionAst cmd
+                    && cmd.Redirections.Count == 0 && cmd.Expression is UnaryExpressionAst unary
+                    && unary.TokenKind is TokenKind.PostfixPlusPlus or TokenKind.PlusPlus or TokenKind.PostfixMinusMinus or TokenKind.MinusMinus))
+                {
+                    // Assignments don't output anything to the statement block unless they are wrapped in parentheses.
+                    // When they are wrapped in parentheses, they are seen as PipelineAst.
+                    // Increment operators like $i++ also don't output anything unless there's a redirection, or they are wrapped in parentheses.
+                    continue;
+                }
+
                 inferredTypes.AddRange(InferTypes(ast));
             }
 
@@ -1036,7 +1241,18 @@ object ICustomAstVisitor.VisitDoUntilStatement(DoUntilStatementAst doUntilStatem
 
         object ICustomAstVisitor.VisitAssignmentStatement(AssignmentStatementAst assignmentStatementAst)
         {
-            return assignmentStatementAst.Left.Accept(this);
+            ExpressionAst child = assignmentStatementAst.Left;
+            while (child is AttributedExpressionAst attributeChild)
+            {
+                if (attributeChild is ConvertExpressionAst convert)
+                {
+                    return new List<PSTypeName>() { new(convert.Type.TypeName) };
+                }
+
+                child = attributeChild.Child;
+            }
+
+            return assignmentStatementAst.Right.Accept(this);
         }
 
         object ICustomAstVisitor.VisitPipeline(PipelineAst pipelineAst)
@@ -1067,8 +1283,82 @@ object ICustomAstVisitor.VisitFileRedirection(FileRedirectionAst fileRedirection
             return TypeInferenceContext.EmptyPSTypeNameArray;
         }
 
-        private void InferTypesFrom(CommandAst commandAst, List<PSTypeName> inferredTypes)
+        private void InferTypesFrom(CommandAst commandAst, List<PSTypeName> inferredTypes, bool forRedirection = false)
         {
+            if (commandAst.Redirections.Count > 0)
+            {
+                var mergedStreams = new HashSet<RedirectionStream>();
+                bool allStreamsMerged = false;
+                foreach (RedirectionAst streamRedirection in commandAst.Redirections)
+                {
+                    if (streamRedirection is FileRedirectionAst fileRedirection)
+                    {
+                        if (!forRedirection && fileRedirection.FromStream is RedirectionStream.All or RedirectionStream.Output)
+                        {
+                            // command output is redirected so it returns nothing.
+                            return;
+                        }
+                    }
+                    else if (streamRedirection is MergingRedirectionAst mergeRedirection && mergeRedirection.ToStream == RedirectionStream.Output)
+                    {
+                        if (mergeRedirection.FromStream == RedirectionStream.All)
+                        {
+                            allStreamsMerged = true;
+                            continue;
+                        }
+
+                        _ = mergedStreams.Add(mergeRedirection.FromStream);
+                    }
+                }
+
+                if (allStreamsMerged)
+                {
+                    inferredTypes.Add(new PSTypeName(typeof(ErrorRecord)));
+                    inferredTypes.Add(new PSTypeName(typeof(WarningRecord)));
+                    inferredTypes.Add(new PSTypeName(typeof(VerboseRecord)));
+                    inferredTypes.Add(new PSTypeName(typeof(DebugRecord)));
+                    inferredTypes.Add(new PSTypeName(typeof(InformationRecord)));
+                }
+                else
+                {
+                    foreach (RedirectionStream value in mergedStreams)
+                    {
+                        switch (value)
+                        {
+                            case RedirectionStream.Error:
+                                inferredTypes.Add(new PSTypeName(typeof(ErrorRecord)));
+                                break;
+
+                            case RedirectionStream.Warning:
+                                inferredTypes.Add(new PSTypeName(typeof(WarningRecord)));
+                                break;
+
+                            case RedirectionStream.Verbose:
+                                inferredTypes.Add(new PSTypeName(typeof(VerboseRecord)));
+                                break;
+
+                            case RedirectionStream.Debug:
+                                inferredTypes.Add(new PSTypeName(typeof(DebugRecord)));
+                                break;
+
+                            case RedirectionStream.Information:
+                                inferredTypes.Add(new PSTypeName(typeof(InformationRecord)));
+                                break;
+
+                            default:
+                                break;
+                        }
+                    }
+                }
+            }
+
+            if (commandAst.CommandElements[0] is ScriptBlockExpressionAst scriptBlock)
+            {
+                // An anonymous function like: & {"Do Something"}
+                inferredTypes.AddRange(InferTypes(scriptBlock.ScriptBlock));
+                return;
+            }
+
             PseudoBindingInfo pseudoBinding = new PseudoParameterBinder()
             .DoPseudoParameterBinding(commandAst, null, null, PseudoParameterBinder.BindingType.ParameterCompletion);
 
@@ -1151,6 +1441,21 @@ private void InferTypesFrom(CommandAst commandAst, List<PSTypeName> inferredType
                 }
             }
 
+            if ((commandInfo.OutputType.Count == 0
+                || (commandInfo.OutputType.Count == 1
+                && (commandInfo.OutputType[0].Name.EqualsOrdinalIgnoreCase(typeof(PSObject).FullName)
+                || commandInfo.OutputType[0].Name.EqualsOrdinalIgnoreCase(typeof(object).FullName))))
+                && commandInfo is IScriptCommandInfo scriptCommandInfo
+                && scriptCommandInfo.ScriptBlock.Ast is IParameterMetadataProvider scriptBlockWithParams
+                && _context.AnalyzedCommands.Add(scriptBlockWithParams))
+            {
+                // This is a function without an output type defined (or it's too generic to be useful)
+                // We can analyze the code inside the function to find out what it actually outputs
+                // The purpose of the hashset is to avoid infinite loops with functions that call themselves.
+                inferredTypes.AddRange(InferTypes(scriptBlockWithParams.Body));
+                return;
+            }
+
             // The OutputType property ignores the parameter set specified in the OutputTypeAttribute.
             // With pseudo-binding, we actually know the candidate parameter sets, so we could take
             // advantage of it here, but I opted for the simpler code because so few cmdlets use
@@ -1639,7 +1944,7 @@ private IEnumerable<PSTypeName> InferTypesFrom(MemberExpressionAst memberExpress
             var memberNameList = new List<string> { memberAsStringConst.Value };
             foreach (var type in exprType)
             {
-                if (type.Type == typeof(PSObject))
+                if (type.Type == typeof(PSObject) && type is not PSSyntheticTypeName)
                 {
                     continue;
                 }
@@ -1658,6 +1963,36 @@ private IEnumerable<PSTypeName> InferTypesFrom(MemberExpressionAst memberExpress
             return res;
         }
 
+        private static IEnumerable<PSTypeName> InferTypeFromRef(InvokeMemberExpressionAst invokeMember, ExpressionAst refArgument)
+        {
+            Type expressionClrType = (invokeMember.Expression as TypeExpressionAst)?.TypeName.GetReflectionType();
+            string memberName = (invokeMember.Member as StringConstantExpressionAst)?.Value;
+            int argumentIndex = invokeMember.Arguments.IndexOf(refArgument);
+            if (expressionClrType is null || string.IsNullOrEmpty(memberName) || argumentIndex == -1)
+            {
+                yield break;
+            }
+
+            foreach (MemberInfo memberInfo in expressionClrType.GetMember(memberName))
+            {
+                if (memberInfo.MemberType == MemberTypes.Method)
+                {
+                    var methodInfo = memberInfo as MethodInfo;
+                    ParameterInfo[] methodParams = methodInfo.GetParameters();
+                    if (methodParams.Length < argumentIndex)
+                    {
+                        continue;
+                    }
+
+                    ParameterInfo paramCandidate = methodParams[argumentIndex];
+                    if (paramCandidate.IsOut)
+                    {
+                        yield return new PSTypeName(paramCandidate.ParameterType.GetElementType());
+                    }
+                }
+            }
+        }
+
         private void GetTypesOfMembers(
             PSTypeName thisType,
             string memberName,
@@ -1954,7 +2289,7 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
                 return;
             }
 
-            Ast parent = variableExpressionAst.Parent;
+            Ast currentAst = variableExpressionAst.Parent;
             if (astVariablePath.IsUnqualified &&
                 (SpecialVariables.IsUnderbar(astVariablePath.UserPath)
                  || astVariablePath.UserPath.EqualsOrdinalIgnoreCase(SpecialVariables.PSItem)))
@@ -1967,54 +2302,65 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
                 // 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)
+                while (currentAst is not null)
                 {
-                    if (parent is CatchClauseAst or TrapStatementAst)
+                    if (currentAst is CatchClauseAst or TrapStatementAst)
                     {
                         break;
                     }
-                    else if (parent is SwitchStatementAst switchStatement
+                    else if (currentAst is SwitchStatementAst switchStatement
                         && switchStatement.Condition.Extent.EndOffset < variableExpressionAst.Extent.StartOffset)
                     {
-                        parent = switchStatement.Condition;
+                        currentAst = switchStatement.Condition;
                         break;
                     }
-                    else if (parent is ErrorStatementAst switchErrorStatement && switchErrorStatement.Kind?.Kind == TokenKind.Switch)
+                    else if (currentAst is ErrorStatementAst switchErrorStatement && switchErrorStatement.Kind?.Kind == TokenKind.Switch)
                     {
                         if (switchErrorStatement.Conditions?.Count > 0)
                         {
-                            parent = switchErrorStatement.Conditions[0];
+                            if (switchErrorStatement.Conditions[0].Extent.EndOffset < variableExpressionAst.Extent.StartOffset)
+                            {
+                                currentAst = switchErrorStatement.Conditions[0];
+                                break;
+                            }
+                            else
+                            {
+                                // $_ is inside the condition that is being declared, eg: Get-Process | Sort-Object -Property {switch ($_.Proc<Tab>
+                                currentAst = switchErrorStatement.Parent;
+                                continue;
+                            }
                         }
+
                         break;
                     }
-                    else if (parent is ScriptBlockExpressionAst)
+                    else if (currentAst is ScriptBlockExpressionAst)
                     {
                         hasSeenScriptBlock = true;
                     }
                     else if (hasSeenScriptBlock)
                     {
-                        if (parent is InvokeMemberExpressionAst invokeMember)
+                        if (currentAst is InvokeMemberExpressionAst invokeMember)
                         {
-                            parent = invokeMember.Expression;
+                            currentAst = invokeMember.Expression;
                             break;
                         }
-                        else if (parent is CommandAst cmdAst && cmdAst.Parent is PipelineAst pipeline && pipeline.PipelineElements.Count > 1)
+                        else if (currentAst 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)
                             {
-                                parent = pipeline.PipelineElements[indexOfPreviousCommand];
+                                currentAst = pipeline.PipelineElements[indexOfPreviousCommand];
                                 break;
                             }
                         }
                     }
 
-                    parent = parent.Parent;
+                    currentAst = currentAst.Parent;
                 }
 
-                if (parent is CatchClauseAst catchBlock)
+                if (currentAst is CatchClauseAst catchBlock)
                 {
                     if (catchBlock.CatchTypes.Count > 0)
                     {
@@ -2034,7 +2380,7 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
                         inferredTypes.Add(new PSTypeName(typeof(ErrorRecord)));
                     }
                 }
-                else if (parent is TrapStatementAst trap)
+                else if (currentAst is TrapStatementAst trap)
                 {
                     if (trap.TrapType is not null)
                     {
@@ -2049,156 +2395,134 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
                         inferredTypes.Add(new PSTypeName(typeof(ErrorRecord)));
                     }
                 }
-                else if (parent is not null)
+                else if (currentAst is not null)
                 {
-                    inferredTypes.AddRange(GetInferredEnumeratedTypes(InferTypes(parent)));
+                    inferredTypes.AddRange(GetInferredEnumeratedTypes(InferTypes(currentAst)));
                 }
 
                 return;
             }
 
-            // For certain variables, we always know their type, well at least we can assume we know.
-            if (astVariablePath.IsUnqualified)
+            // Process the well known variable $this
+            if (astVariablePath.IsUnqualified
+                && astVariablePath.UnqualifiedPath.EqualsOrdinalIgnoreCase(SpecialVariables.This)
+                && (_context.CurrentTypeDefinitionAst is not null || _context.CurrentThisType is not null))
             {
-                var isThis = astVariablePath.UserPath.EqualsOrdinalIgnoreCase(SpecialVariables.This);
-                if (!isThis || (_context.CurrentTypeDefinitionAst == null && _context.CurrentThisType == null))
+                // $this is special in script properties and in PowerShell classes
+                PSTypeName typeName = _context.CurrentThisType ?? new PSTypeName(_context.CurrentTypeDefinitionAst);
+                inferredTypes.Add(typeName);
+                return;
+            }
+
+            // Process other well known variables like $true and $pshome
+            if (SpecialVariables.AllScopeVariables.TryGetValue(astVariablePath.UnqualifiedPath, out Type knownType))
+            {
+                if (knownType == typeof(object))
                 {
-                    if (SpecialVariables.AllScopeVariables.TryGetValue(astVariablePath.UserPath, out Type knownType))
+                    if (_context.TryGetRepresentativeTypeNameFromExpressionSafeEval(variableExpressionAst, out var psType))
                     {
-                        if (knownType == typeof(object))
-                        {
-                            if (_context.TryGetRepresentativeTypeNameFromExpressionSafeEval(variableExpressionAst, out var psType))
-                            {
-                                inferredTypes.Add(psType);
-                            }
-                        }
-                        else
-                        {
-                            inferredTypes.Add(new PSTypeName(knownType));
-                        }
-
-                        return;
-                    }
-
-                    for (int i = 0; i < SpecialVariables.AutomaticVariables.Length; i++)
-                    {
-                        if (!astVariablePath.UserPath.EqualsOrdinalIgnoreCase(SpecialVariables.AutomaticVariables[i]))
-                        {
-                            continue;
-                        }
-
-                        var type = SpecialVariables.AutomaticVariableTypes[i];
-                        if (type != typeof(object))
-                        {
-                            inferredTypes.Add(new PSTypeName(type));
-                        }
-
-                        break;
+                        inferredTypes.Add(psType);
                     }
                 }
                 else
                 {
-                    var typeName = _context.CurrentThisType ?? new PSTypeName(_context.CurrentTypeDefinitionAst);
-                    inferredTypes.Add(typeName);
-                    return;
+                    inferredTypes.Add(new PSTypeName(knownType));
                 }
-            }
-            else
-            {
-                inferredTypes.Add(new PSTypeName(_context.CurrentTypeDefinitionAst));
+
                 return;
             }
 
-            if (parent is null)
+            // Process automatic variables like $MyInvocation and $PSBoundParameters
+            for (int i = 0; i < SpecialVariables.AutomaticVariables.Length; i++)
             {
+                if (!astVariablePath.UnqualifiedPath.EqualsOrdinalIgnoreCase(SpecialVariables.AutomaticVariables[i]))
+                {
+                    continue;
+                }
+
+                Type type = SpecialVariables.AutomaticVariableTypes[i];
+                if (type != typeof(object))
+                {
+                    inferredTypes.Add(new PSTypeName(type));
+                }
+
                 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)
+            // This visitor + loop finds the start of the current scope and traverses top to bottom to find the nearest variable assignment.
+            // Then repeats the process for each parent scope.
+            var assignmentVisitor = new VariableAssignmentVisitor()
             {
-                parent = parent.Parent;
-            }
-
-            int startOffset = variableExpressionAst.Extent.StartOffset;
-            var targetAsts = (List<Ast>)AstSearcher.FindAll(
-                parent,
-                ast =>
+                ScopeIsLocal = true,
+                LocalScopeOnly = variableExpressionAst.VariablePath.IsLocal || variableExpressionAst.VariablePath.IsPrivate,
+                StopSearchOffset = variableExpressionAst.Extent.StartOffset,
+                VariableTarget = variableExpressionAst
+            };
+            while (currentAst is not null)
+            {
+                if (currentAst is IParameterMetadataProvider)
                 {
-                    if (ast is ParameterAst || ast is AssignmentStatementAst || ast is CommandAst)
-                    {
-                        return variableExpressionAst.AstAssignsToSameVariable(ast)
-                            && ast.Extent.EndOffset < startOffset;
-                    }
-
-                    if (ast is ForEachStatementAst)
+                    if (currentAst is ScriptBlockAst && currentAst.Parent is FunctionDefinitionAst)
                     {
-                        return variableExpressionAst.AstAssignsToSameVariable(ast)
-                            && ast.Extent.StartOffset < startOffset;
+                        // If this scriptblock belongs to a function we want to visit that instead so we can get the parameters
+                        // function X ($Param1){}
+                        currentAst = currentAst.Parent;
                     }
 
-                    return false;
-                },
-                searchNestedScriptBlocks: true);
+                    assignmentVisitor.ScopeDefinitionAst = currentAst;
+                    currentAst.Visit(assignmentVisitor);
 
-            foreach (var ast in targetAsts)
-            {
-                if (ast is ParameterAst parameterAst)
-                {
-                    var currentCount = inferredTypes.Count;
-                    inferredTypes.AddRange(InferTypes(parameterAst));
-
-                    if (inferredTypes.Count != currentCount)
+                    if (assignmentVisitor.LocalScopeOnly
+                        || assignmentVisitor.LastConstraint is not null
+                        || ((assignmentVisitor.LastAssignment is not null || assignmentVisitor.LastAssignmentType is not null)
+                        && (currentAst.Parent is not ScriptBlockExpressionAst scriptBlock || !scriptBlock.IsDotsourced())))
                     {
-                        return;
+                        // We only care about the parent scopes if no assignment has been made in the current scope
+                        // or if it's a dot sourced scriptblock where an earlier defined type constraint could influence the final type
+                        break;
                     }
-                }
-            }
 
-            var assignAsts = targetAsts.OfType<AssignmentStatementAst>().ToArray();
-
-            // If any of the assignments lhs use a type constraint, then we use that.
-            // Otherwise, we use the rhs of the "nearest" assignment
-            for (int i = assignAsts.Length - 1; i >= 0; i--)
-            {
-                if (assignAsts[i].Left is ConvertExpressionAst lhsConvert)
-                {
-                    inferredTypes.Add(new PSTypeName(lhsConvert.Type.TypeName));
-                    return;
+                    assignmentVisitor.ScopeIsLocal = false;
+                    assignmentVisitor.StopSearchOffset = currentAst.Extent.StartOffset;
                 }
-            }
 
-            var foreachAst = targetAsts.OfType<ForEachStatementAst>().FirstOrDefault();
-            if (foreachAst != null)
-            {
-                inferredTypes.AddRange(
-                    GetInferredEnumeratedTypes(InferTypes(foreachAst.Condition)));
-                return;
+                currentAst = currentAst.Parent;
             }
 
-            var commandCompletionAst = targetAsts.OfType<CommandAst>().FirstOrDefault();
-            if (commandCompletionAst != null)
+            // The visitor is done finding the last assignment, now we need to infer the type of that assignment.
+            if (assignmentVisitor.LastConstraint is not null)
             {
-                inferredTypes.AddRange(InferTypes(commandCompletionAst));
-                return;
+                inferredTypes.Add(new PSTypeName(assignmentVisitor.LastConstraint));
             }
-
-            int smallestDiff = int.MaxValue;
-            AssignmentStatementAst closestAssignment = null;
-            foreach (var assignAst in assignAsts)
+            else if (assignmentVisitor.LastAssignment is not null)
             {
-                var endOffset = assignAst.Extent.EndOffset;
-                if ((startOffset - endOffset) < smallestDiff)
+                if (assignmentVisitor.EnumerateAssignment)
                 {
-                    smallestDiff = startOffset - endOffset;
-                    closestAssignment = assignAst;
+                    inferredTypes.AddRange(GetInferredEnumeratedTypes(InferTypes(assignmentVisitor.LastAssignment)));
+                }
+                else
+                {
+                    if (assignmentVisitor.LastAssignment is ConvertExpressionAst convertExpression
+                        && convertExpression.IsRef())
+                    {
+                        if (convertExpression.Parent is InvokeMemberExpressionAst memberInvoke)
+                        {
+                            inferredTypes.AddRange(InferTypeFromRef(memberInvoke, convertExpression));
+                        }
+                    }
+                    else if (assignmentVisitor.RedirectionAssignment && assignmentVisitor.LastAssignment is CommandAst cmdAst)
+                    {
+                        InferTypesFrom(cmdAst, inferredTypes, forRedirection: true);
+                    }
+                    else
+                    {
+                        inferredTypes.AddRange(InferTypes(assignmentVisitor.LastAssignment));
+                    }
                 }
             }
-
-            if (closestAssignment != null)
+            else if (assignmentVisitor.LastAssignmentType is not null)
             {
-                inferredTypes.AddRange(InferTypes(closestAssignment.Right));
+                inferredTypes.Add(assignmentVisitor.LastAssignmentType);
             }
 
             if (_context.TryGetRepresentativeTypeNameFromExpressionSafeEval(variableExpressionAst, out var evalTypeName))
@@ -2544,7 +2868,7 @@ object ICustomAstVisitor2.VisitPipelineChain(PipelineChainAst pipelineChainAst)
             var types = new List<PSTypeName>();
             types.AddRange(InferTypes(pipelineChainAst.LhsPipelineChain));
             types.AddRange(InferTypes(pipelineChainAst.RhsPipeline));
-            return GetArrayType(types);
+            return types.Distinct();
         }
 
         private static CommandBaseAst GetPreviousPipelineCommand(CommandAst commandAst)
@@ -2553,95 +2877,459 @@ private static CommandBaseAst GetPreviousPipelineCommand(CommandAst commandAst)
             var i = pipe.PipelineElements.IndexOf(commandAst);
             return i != 0 ? pipe.PipelineElements[i - 1] : null;
         }
-    }
 
-    internal static class TypeInferenceExtension
-    {
-        public static bool EqualsOrdinalIgnoreCase(this string s, string t)
-        {
-            return string.Equals(s, t, StringComparison.OrdinalIgnoreCase);
-        }
+        private sealed class VariableAssignmentVisitor : AstVisitor2
+        {
+            /// <summary>
+            /// If set, we only look for local/private assignments in the scope of the variable we are inferring.
+            /// </summary>
+            internal bool LocalScopeOnly;
+            
+            /// <summary>
+            /// The current scope is local to the variable that is being inferred.
+            /// </summary>
+            internal bool ScopeIsLocal;
+            
+            /// <summary>
+            /// The variable that we are trying to determine the type of.
+            /// </summary>
+            internal VariableExpressionAst VariableTarget;
+
+            /// <summary>
+            /// The last type constraint applied to the variable. This takes priority when determining the type of the variable.
+            /// </summary>
+            internal ITypeName LastConstraint;
+            
+            /// <summary>
+            /// The last ast that assigned a value to the variable. This determines the value of the variable unless a type constraint has been applied.
+            /// </summary>
+            internal Ast LastAssignment;
+            
+            /// <summary>
+            /// The inferred type from the most recent assignment. This is only used for stream redirections to variables, or the special OutVariable common parameters.
+            /// </summary>
+            internal PSTypeName LastAssignmentType;
+            
+            /// <summary>
+            /// Whether or not the types from the last assignment should be enumerated.
+            /// For assignments made by the PipelineVariable parameter or the foreach statement.
+            /// </summary>
+            internal bool EnumerateAssignment;
+            
+            /// <summary>
+            /// Whether or not the last assignment was via command redirection.
+            /// </summary>
+            internal bool RedirectionAssignment;
+
+            /// <summary>
+            /// The Ast of the scope we are currently analyzing.
+            /// </summary>
+            internal Ast ScopeDefinitionAst;
+            internal int StopSearchOffset;
+            private int LastAssignmentOffset = -1;
+
+            private void SetLastAssignment(Ast ast, bool enumerate = false, bool redirectionAssignment = false)
+            {
+                if (LastAssignmentOffset < ast.Extent.StartOffset && !VariableTarget.Extent.IsWithin(ast.Extent))
+                {
+                    // If the variable we are inferring the value of is inside this assignment then the assignment is invalid
+                    // For example: $x = Get-Random; $x = $x.Where{$_.<Tab>} here the value should be inferred based on Get-Random and not $x = $x...
+                    ClearAssignmentData();
+                    LastAssignment = ast;
+                    EnumerateAssignment = enumerate;
+                    RedirectionAssignment = redirectionAssignment;
+                    LastAssignmentOffset = ast.Extent.StartOffset;
+                }
+            }
+
+            private void SetLastAssignmentType(PSTypeName typeName, IScriptExtent assignmentExtent)
+            {
+                if (LastAssignmentOffset < assignmentExtent.StartOffset && !VariableTarget.Extent.IsWithin(assignmentExtent))
+                {
+                    // If the variable we are inferring the value of is inside this assignment then the assignment is invalid
+                    // For example: $x = 1..10; Get-Random 2>variable:x -InputObject ($x.<Tab>) here the variable should be inferred based on the initial 1..10 assignment
+                    // and not the error redirected variable.
+                    ClearAssignmentData();
+                    LastAssignmentType = typeName;
+                    LastAssignmentOffset = assignmentExtent.StartOffset;
+                }
+            }
+
+            private void ClearAssignmentData()
+            {
+                LastAssignment = null;
+                LastAssignmentType = null;
+                EnumerateAssignment = false;
+                RedirectionAssignment = false;
+            }
+
+            private bool AssignsToTargetVar(VariableExpressionAst foundVar)
+            {
+                if (!foundVar.VariablePath.UnqualifiedPath.EqualsOrdinalIgnoreCase(VariableTarget.VariablePath.UnqualifiedPath))
+                {
+                    return false;
+                }
 
-        public static IEnumerable<MethodInfo> GetGetterProperty(this Type type, string propertyName)
-        {
-            var res = new List<MethodInfo>();
-            foreach (var m in type.GetMethods(BindingFlags.Public | BindingFlags.Instance))
+                int scopeIndex = foundVar.VariablePath.UserPath.IndexOf(':');
+                string scopeName = scopeIndex == -1 ? string.Empty : foundVar.VariablePath.UserPath.Remove(scopeIndex);
+                return AssignsToTargetScope(scopeName);
+            }
+
+            private bool AssignsToTargetVar(string userPath)
             {
-                var name = m.Name;
-                // Equals without string allocation
-                if (name.Length == propertyName.Length + 4
-                    && name.StartsWith("get_")
-                    && name.IndexOf(propertyName, 4, StringComparison.Ordinal) == 4)
+                if (string.IsNullOrEmpty(userPath))
                 {
-                    res.Add(m);
+                    return false;
                 }
+
+                string scopeName;
+                string varName;
+                int scopeIndex = userPath.IndexOf(':');
+                if (scopeIndex == -1)
+                {
+                    scopeName = string.Empty;
+                    varName = userPath;
+                }
+                else
+                {
+                    scopeName = userPath.Remove(scopeIndex);
+                    varName = userPath.Substring(scopeIndex + 1);
+                }
+
+                if (!varName.EqualsOrdinalIgnoreCase(VariableTarget.VariablePath.UnqualifiedPath))
+                {
+                    return false;
+                }
+
+                return AssignsToTargetScope(scopeName);
             }
 
-            return res;
-        }
+            private bool AssignsToTargetScope(string scopeName)
+                => LocalScopeOnly
+                    ? string.IsNullOrEmpty(scopeName) || scopeName.EqualsOrdinalIgnoreCase("Local") || scopeName.EqualsOrdinalIgnoreCase("Private")
+                    : ScopeIsLocal || !(scopeName.EqualsOrdinalIgnoreCase("Local") || scopeName.EqualsOrdinalIgnoreCase("Private"));
 
-        public static bool AstAssignsToSameVariable(this VariableExpressionAst variableAst, Ast ast)
-        {
-            var parameterAst = ast as ParameterAst;
-            var variableAstVariablePath = variableAst.VariablePath;
-            if (parameterAst != null)
+            public override AstVisitAction DefaultVisit(Ast ast)
             {
-                return variableAstVariablePath.IsUnscopedVariable &&
-                       parameterAst.Name.VariablePath.UnqualifiedPath.Equals(variableAstVariablePath.UnqualifiedPath, StringComparison.OrdinalIgnoreCase) &&
-                       parameterAst.Parent.Parent.Extent.EndOffset > variableAst.Extent.StartOffset;
+                if (ast.Extent.StartOffset >= StopSearchOffset)
+                {
+                    // When visiting do while/until statements, the condition will be visited before the statement block
+                    // The condition itself may not be interesting if it's after the cursor, but the statement block could be
+                    // Example:
+                    // do
+                    // {
+                    //     $Var = gci
+                    //     $Var.<Tab>
+                    // }
+                    // until($false)
+                    return ast is PipelineBaseAst && ast.Parent is DoUntilStatementAst or DoWhileStatementAst
+                        ? AstVisitAction.SkipChildren
+                        : AstVisitAction.StopVisit;
+                }
+
+                return AstVisitAction.Continue;
             }
 
-            if (ast is ForEachStatementAst foreachAst)
+            public override AstVisitAction VisitAssignmentStatement(AssignmentStatementAst assignmentStatementAst)
             {
-                return variableAstVariablePath.IsUnscopedVariable &&
-                       foreachAst.Variable.VariablePath.UnqualifiedPath.Equals(variableAstVariablePath.UnqualifiedPath, StringComparison.OrdinalIgnoreCase);
+                if (assignmentStatementAst.Extent.StartOffset >= StopSearchOffset)
+                {
+                    return assignmentStatementAst.Parent is DoUntilStatementAst or DoWhileStatementAst
+                        ? AstVisitAction.SkipChildren
+                        : AstVisitAction.StopVisit;
+                }
+
+                if (assignmentStatementAst.Left is AttributedExpressionAst attributedExpression)
+                {
+                    var firstConvertExpression = attributedExpression as ConvertExpressionAst;
+                    ExpressionAst child = attributedExpression.Child;
+                    while (child is AttributedExpressionAst attributeChild)
+                    {
+                        if (firstConvertExpression is null && attributeChild is ConvertExpressionAst convertExpression)
+                        {
+                            // Multiple type constraint can be set on a variable like this: [int] [string] $Var1 = 1
+                            // But it's the left most type constraint that determines the final type.
+                            firstConvertExpression = convertExpression;
+                        }
+
+                        child = attributeChild.Child;
+                    }
+
+                    if (child is VariableExpressionAst variableExpression && AssignsToTargetVar(variableExpression))
+                    {
+                        if (firstConvertExpression is not null)
+                        {
+                            LastConstraint = firstConvertExpression.Type.TypeName;
+                        }
+                        else
+                        {
+                            SetLastAssignment(assignmentStatementAst.Right);
+                        }
+                    }
+                }
+                else if (assignmentStatementAst.Left is VariableExpressionAst variableExpression && AssignsToTargetVar(variableExpression))
+                {
+                    SetLastAssignment(assignmentStatementAst.Right);
+                }
+
+                return AstVisitAction.Continue;
             }
 
-            if (ast is CommandAst commandAst)
+            public override AstVisitAction VisitCommand(CommandAst commandAst)
             {
-                string[] variableParameters = { "PV", "PipelineVariable", "OV", "OutVariable" };
-                StaticBindingResult bindingResult = StaticParameterBinder.BindCommand(commandAst, false, variableParameters);
+                if (commandAst.Extent.StartOffset >= StopSearchOffset)
+                {
+                    return AstVisitAction.StopVisit;
+                }
+
+                string commandName = commandAst.GetCommandName();
+                if (commandName is not null && CompletionCompleters.s_varModificationCommands.Contains(commandName))
+                {
+                    StaticBindingResult bindingResult = StaticParameterBinder.BindCommand(commandAst, resolve: false, CompletionCompleters.s_varModificationParameters);
+                    if (bindingResult is not null
+                        && bindingResult.BoundParameters.TryGetValue("Name", out ParameterBindingResult variableName)
+                        && variableName.ConstantValue is string nameValue
+                        && AssignsToTargetVar(nameValue)
+                        && bindingResult.BoundParameters.TryGetValue("Value", out ParameterBindingResult variableValue))
+                    {
+                        SetLastAssignment(variableValue.Value);
+                        return AstVisitAction.Continue;
+                    }
+                }
 
-                if (bindingResult != null)
+                StaticBindingResult bindResult = StaticParameterBinder.BindCommand(commandAst, resolve: false);
+                if (bindResult is not null)
                 {
-                    foreach (string commandVariableParameter in variableParameters)
+                    foreach (string parameterName in CompletionCompleters.s_outVarParameters)
                     {
-                        if (bindingResult.BoundParameters.TryGetValue(commandVariableParameter, out ParameterBindingResult parameterBindingResult))
+                        if (bindResult.BoundParameters.TryGetValue(parameterName, out ParameterBindingResult outVarBind)
+                            && outVarBind.ConstantValue is string varName
+                            && AssignsToTargetVar(varName))
                         {
-                            if (string.Equals(variableAstVariablePath.UnqualifiedPath, (string)parameterBindingResult.ConstantValue, StringComparison.OrdinalIgnoreCase))
+                            // The *Variable parameters actually always results in an ArrayList
+                            // But to make type inference of individual elements better, we say it's a generic list.
+                            switch (parameterName)
                             {
-                                return true;
+                                case "ErrorVariable":
+                                case "ev":
+                                    SetLastAssignmentType(new PSTypeName(typeof(List<ErrorRecord>)), commandAst.Extent);
+                                    break;
+
+                                case "WarningVariable":
+                                case "wv":
+                                    SetLastAssignmentType(new PSTypeName(typeof(List<WarningRecord>)), commandAst.Extent);
+                                    break;
+
+                                case "InformationVariable":
+                                case "iv":
+                                    SetLastAssignmentType(new PSTypeName(typeof(List<InformationalRecord>)), commandAst.Extent);
+                                    break;
+
+                                case "OutVariable":
+                                case "ov":
+                                    SetLastAssignment(commandAst);
+                                    break;
+
+                                default:
+                                    break;
+                            }
+
+                            return AstVisitAction.Continue;
+                        }
+                    }
+
+                    if (commandAst.Parent is PipelineAst pipeline && pipeline.Extent.EndOffset > VariableTarget.Extent.StartOffset)
+                    {
+                        foreach (string parameterName in CompletionCompleters.s_pipelineVariableParameters)
+                        {
+                            if (bindResult.BoundParameters.TryGetValue(parameterName, out ParameterBindingResult pipeVarBind)
+                                && pipeVarBind.ConstantValue is string varName
+                                && AssignsToTargetVar(varName))
+                            {
+                                SetLastAssignment(commandAst, enumerate: true);
+                                return AstVisitAction.Continue;
                             }
                         }
                     }
                 }
 
-                return false;
+                foreach (RedirectionAst redirection in commandAst.Redirections)
+                {
+                    if (redirection is FileRedirectionAst fileRedirection
+                        && fileRedirection.Location is StringConstantExpressionAst redirectTarget
+                        && redirectTarget.Value.StartsWith("variable:", StringComparison.OrdinalIgnoreCase)
+                        && redirectTarget.Value.Length > "variable:".Length)
+                    {
+                        string varName = redirectTarget.Value.Substring("variable:".Length);
+                        if (!AssignsToTargetVar(varName))
+                        {
+                            continue;
+                        }
+
+                        switch (fileRedirection.FromStream)
+                        {
+                            case RedirectionStream.Error:
+                                SetLastAssignmentType(new PSTypeName(typeof(ErrorRecord)), commandAst.Extent);
+                                break;
+
+                            case RedirectionStream.Warning:
+                                SetLastAssignmentType(new PSTypeName(typeof(WarningRecord)), commandAst.Extent);
+                                break;
+
+                            case RedirectionStream.Verbose:
+                                SetLastAssignmentType(new PSTypeName(typeof(VerboseRecord)), commandAst.Extent);
+                                break;
+
+                            case RedirectionStream.Debug:
+                                SetLastAssignmentType(new PSTypeName(typeof(DebugRecord)), commandAst.Extent);
+                                break;
+
+                            case RedirectionStream.Information:
+                                SetLastAssignmentType(new PSTypeName(typeof(InformationRecord)), commandAst.Extent);
+                                break;
+
+                            default:
+                                SetLastAssignment(commandAst, redirectionAssignment: true);
+                                break;
+                        }
+                    }
+                }
+
+                return AstVisitAction.Continue;
             }
 
-            var assignmentAst = (AssignmentStatementAst)ast;
-            var lhs = assignmentAst.Left;
-            if (lhs is ConvertExpressionAst convertExpr)
+            public override AstVisitAction VisitParameter(ParameterAst parameterAst)
             {
-                lhs = convertExpr.Child;
+                if (parameterAst.Extent.StartOffset >= StopSearchOffset)
+                {
+                    return AstVisitAction.StopVisit;
+                }
+
+                if (AssignsToTargetVar(parameterAst.Name))
+                {
+                    foreach (AttributeBaseAst attribute in parameterAst.Attributes)
+                    {
+                        if (attribute is TypeConstraintAst typeConstraint)
+                        {
+                            LastConstraint = typeConstraint.TypeName;
+                            return AstVisitAction.Continue;
+                        }
+                    }
+                }
+
+                return AstVisitAction.Continue;
             }
 
-            if (lhs is not VariableExpressionAst varExpr)
+            public override AstVisitAction VisitForEachStatement(ForEachStatementAst forEachStatementAst)
             {
-                return false;
+                if (forEachStatementAst.Extent.StartOffset >= StopSearchOffset)
+                {
+                    return AstVisitAction.StopVisit;
+                }
+
+                if (AssignsToTargetVar(forEachStatementAst.Variable) && forEachStatementAst.Condition.Extent.EndOffset < VariableTarget.Extent.StartOffset)
+                {
+                    SetLastAssignment(forEachStatementAst.Condition, enumerate: true);
+                }
+
+                return AstVisitAction.Continue;
             }
 
-            var candidateVarPath = varExpr.VariablePath;
-            if (candidateVarPath.UserPath.Equals(variableAstVariablePath.UserPath, StringComparison.OrdinalIgnoreCase))
+            public override AstVisitAction VisitConvertExpression(ConvertExpressionAst convertExpressionAst)
             {
-                return true;
+                if (convertExpressionAst.IsRef()
+                    && convertExpressionAst.Child is VariableExpressionAst varAst
+                    && AssignsToTargetVar(varAst))
+                {
+                    SetLastAssignment(convertExpressionAst);
+                }
+
+                return AstVisitAction.Continue;
             }
 
-            // The following condition is making an assumption that at script scope, we didn't use $script:, but in the local scope, we did
-            // If we are searching anything other than script scope, this is wrong.
-            if (variableAstVariablePath.IsScript && variableAstVariablePath.UnqualifiedPath.Equals(candidateVarPath.UnqualifiedPath, StringComparison.OrdinalIgnoreCase))
+            public override AstVisitAction VisitAttribute(AttributeAst attributeAst)
             {
-                return true;
+                // Attributes can't assign values to variables so they aren't interesting.
+                return AstVisitAction.SkipChildren;
+            }
+
+            public override AstVisitAction VisitScriptBlockExpression(ScriptBlockExpressionAst scriptBlockExpressionAst)
+            {
+                return scriptBlockExpressionAst.IsDotsourced()
+                    ? AstVisitAction.Continue
+                    : AstVisitAction.SkipChildren;
+            }
+
+            public override AstVisitAction VisitDataStatement(DataStatementAst dataStatementAst)
+            {
+                if (dataStatementAst.Extent.StartOffset >= StopSearchOffset)
+                {
+                    return AstVisitAction.StopVisit;
+                }
+
+                if (AssignsToTargetVar(dataStatementAst.Variable) && dataStatementAst.Extent.EndOffset < VariableTarget.Extent.StartOffset)
+                {
+                    SetLastAssignment(dataStatementAst.Body);
+                }
+
+                return AstVisitAction.SkipChildren;
+            }
+
+            public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst functionDefinitionAst)
+            {
+                return functionDefinitionAst == ScopeDefinitionAst
+                    ? AstVisitAction.Continue
+                    : AstVisitAction.SkipChildren;
+            }
+        }
+    }
+
+    internal static class TypeInferenceExtension
+    {
+        public static bool EqualsOrdinalIgnoreCase(this string s, string t)
+        {
+            return string.Equals(s, t, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public static IEnumerable<MethodInfo> GetGetterProperty(this Type type, string propertyName)
+        {
+            var res = new List<MethodInfo>();
+            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_")
+                    && name.IndexOf(propertyName, 4, StringComparison.Ordinal) == 4)
+                {
+                    res.Add(m);
+                }
+            }
+
+            return res;
+        }
+
+        public static bool IsDotsourced(this ScriptBlockExpressionAst scriptBlockExpressionAst)
+        {
+            Ast parent = scriptBlockExpressionAst.Parent;
+
+            // This loop checks if the scriptblock is used as a dot sourced command
+            // or an argument for a command that uses the local scope eg: ForEach-Object -Process {$Var1 = "Hello"}, {Var2 = $true}
+            while (parent is not null)
+            {
+                if (parent is CommandAst cmdAst)
+                {
+                    string cmdName = cmdAst.GetCommandName();
+                    return CompletionCompleters.s_localScopeCommandNames.Contains(cmdName)
+                        || (cmdAst.CommandElements[0] is ScriptBlockExpressionAst && cmdAst.InvocationOperator == TokenKind.Dot);
+                }
+
+                if (parent is not CommandExpressionAst and not PipelineAst and not StatementBlockAst and not ArrayExpressionAst and not ArrayLiteralAst)
+                {
+                    break;
+                }
+
+                parent = parent.Parent;
             }
 
             return false;
diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index f70c028117d..0325cf94aeb 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -520,7 +520,7 @@ internal ErrorStatementAst(IScriptExtent extent, Token kind, IEnumerable<KeyValu
         }
 
         /// <summary>
-        /// Indicate the kind of the ErrorStatement. e.g. Kind == Switch means that this error statment is generated
+        /// Indicate the kind of the ErrorStatement. e.g. Kind == Switch means that this error statement is generated
         /// when parsing a switch statement.
         /// </summary>
         public Token Kind { get; }
@@ -4578,7 +4578,7 @@ public class DoWhileStatementAst : LoopStatementAst
         /// <summary>
         /// Construct a do/while statement.
         /// </summary>
-        /// <param name="extent">The extent of the do/while statment from the label or do keyword to the closing curly brace.</param>
+        /// <param name="extent">The extent of the do/while statement from the label or do keyword to the closing curly brace.</param>
         /// <param name="label">The optionally null label.</param>
         /// <param name="condition">The condition tested on each iteration of the loop.</param>
         /// <param name="body">The body executed on each iteration of the loop.</param>
@@ -7263,7 +7263,7 @@ internal PipelineAst GenerateCommandCallPipelineAst()
                         FunctionName.Extent,
                         new TypeName(
                             FunctionName.Extent,
-                            typeof(System.Management.Automation.Language.DynamicKeyword).FullName)),
+                            typeof(DynamicKeyword).FullName)),
                     new StringConstantExpressionAst(
                         FunctionName.Extent,
                         "GetKeyword",
@@ -7591,6 +7591,8 @@ public override Type StaticType
         }
 
         internal static readonly PSTypeName[] BoolTypeNameArray = new PSTypeName[] { new PSTypeName(typeof(bool)) };
+        internal static readonly PSTypeName[] StringTypeNameArray = new PSTypeName[] { new PSTypeName(typeof(string)) };
+        internal static readonly PSTypeName[] StringArrayTypeNameArray = new PSTypeName[] { new PSTypeName(typeof(string[])) };
 
         #region Visitors
 
@@ -8422,9 +8424,11 @@ internal interface ISupportsTypeCaching
     /// </summary>
     public sealed class TypeName : ITypeName, ISupportsTypeCaching
     {
-        internal readonly string _name;
-        internal Type _type;
-        internal readonly IScriptExtent _extent;
+        private readonly string _name;
+        private readonly IScriptExtent _extent;
+        private readonly int _genericArgumentCount;
+        private Type _type;
+
         internal TypeDefinitionAst _typeDefinitionAst;
 
         /// <summary>
@@ -8483,6 +8487,23 @@ public TypeName(IScriptExtent extent, string name, string assembly)
             AssemblyName = assembly;
         }
 
+        /// <summary>
+        /// Construct a typename that represents a generic type definition.
+        /// </summary>
+        /// <param name="extent">The extent of the typename.</param>
+        /// <param name="name">The name of the type.</param>
+        /// <param name="genericArgumentCount">The number of generic arguments.</param>
+        internal TypeName(IScriptExtent extent, string name, int genericArgumentCount)
+            : this(extent, name)
+        {
+            ArgumentOutOfRangeException.ThrowIfLessThan(genericArgumentCount, 0);
+
+            if (genericArgumentCount > 0 && !_name.Contains('`'))
+            {
+                _genericArgumentCount = genericArgumentCount;
+            }
+        }
+
         /// <summary>
         /// Returns the full name of the type.
         /// </summary>
@@ -8559,8 +8580,25 @@ public Type GetReflectionType()
         {
             if (_type == null)
             {
-                Exception e;
-                Type type = _typeDefinitionAst != null ? _typeDefinitionAst.Type : TypeResolver.ResolveTypeName(this, out e);
+                Type type = _typeDefinitionAst != null ? _typeDefinitionAst.Type : TypeResolver.ResolveTypeName(this, out _);
+
+                if (type is null && _genericArgumentCount > 0)
+                {
+                    // We try an alternate name only if it failed to resolve with the original name.
+                    // This is because for a generic type like `System.Tuple<type1, type2>`, the original name `System.Tuple`
+                    // can be resolved and hence `genericTypeName.TypeName.GetReflectionType()` in that case has always been
+                    // returning the type `System.Tuple`. If we change to directly use the alternate name for resolution, the
+                    // return value will become 'System.Tuple`1' in that case, and that's a breaking change.
+                    TypeName newTypeName = new(
+                        _extent,
+                        string.Create(CultureInfo.InvariantCulture, $"{_name}`{_genericArgumentCount}"))
+                    {
+                        AssemblyName = AssemblyName
+                    };
+
+                    type = TypeResolver.ResolveTypeName(newTypeName, out _);
+                }
+
                 if (type != null)
                 {
                     try
@@ -8595,7 +8633,11 @@ public Type GetReflectionAttributeType()
             var result = GetReflectionType();
             if (result == null || !typeof(Attribute).IsAssignableFrom(result))
             {
-                var attrTypeName = new TypeName(_extent, FullName + "Attribute");
+                TypeName attrTypeName = new(_extent, $"{_name}Attribute", _genericArgumentCount)
+                {
+                    AssemblyName = AssemblyName
+                };
+
                 result = attrTypeName.GetReflectionType();
                 if (result != null && !typeof(Attribute).IsAssignableFrom(result))
                 {
@@ -8888,8 +8930,13 @@ internal Type GetGenericType(Type generic)
             {
                 if (!TypeName.FullName.Contains('`'))
                 {
-                    var newTypeName = new TypeName(Extent,
-                        string.Create(CultureInfo.InvariantCulture, $"{TypeName.FullName}`{GenericArguments.Count}"));
+                    TypeName newTypeName = new(
+                        Extent,
+                        string.Create(CultureInfo.InvariantCulture, $"{TypeName.Name}`{GenericArguments.Count}"))
+                    {
+                        AssemblyName = TypeName.AssemblyName
+                    };
+
                     generic = newTypeName.GetReflectionType();
                 }
             }
@@ -8915,8 +8962,13 @@ public Type GetReflectionAttributeType()
                 {
                     if (!TypeName.FullName.Contains('`'))
                     {
-                        var newTypeName = new TypeName(Extent,
-                            string.Create(CultureInfo.InvariantCulture, $"{TypeName.FullName}Attribute`{GenericArguments.Count}"));
+                        TypeName newTypeName = new(
+                            Extent,
+                            string.Create(CultureInfo.InvariantCulture, $"{TypeName.Name}Attribute`{GenericArguments.Count}"))
+                        {
+                            AssemblyName = TypeName.AssemblyName
+                        };
+
                         generic = newTypeName.GetReflectionType();
                     }
                 }
diff --git a/src/System.Management.Automation/engine/parser/tokenizer.cs b/src/System.Management.Automation/engine/parser/tokenizer.cs
index 3d0aa3a18aa..e2aed94cc98 100644
--- a/src/System.Management.Automation/engine/parser/tokenizer.cs
+++ b/src/System.Management.Automation/engine/parser/tokenizer.cs
@@ -3907,7 +3907,8 @@ private Token ScanNumber(char firstChar)
                     return ScanGenericToken(GetStringBuilder());
                 }
 
-                ReportError(_currentIndex,
+                ReportError(
+                    NewScriptExtent(_tokenStart, _currentIndex),
                     nameof(ParserStrings.BadNumericConstant),
                     ParserStrings.BadNumericConstant,
                     _script.Substring(_tokenStart, _currentIndex - _tokenStart));
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index e19bf3be843..191f80e1d89 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -7,6 +7,7 @@
 using System.Management.Automation.Tracing;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
+using System.Threading;
 using Microsoft.PowerShell.Telemetry;
 
 using Dbg = System.Management.Automation.Diagnostics;
@@ -29,6 +30,7 @@ internal class PipelineProcessor : IDisposable
     {
         #region private_members
 
+        private readonly CancellationTokenSource _pipelineStopTokenSource = new CancellationTokenSource();
         private List<CommandProcessorBase> _commands = new List<CommandProcessorBase>();
         private List<PipelineProcessor> _redirectionPipes;
         private PipelineReader<object> _externalInputPipe;
@@ -85,6 +87,7 @@ private void Dispose(bool disposing)
                 _externalErrorOutput = null;
                 _executionScope = null;
                 _eventLogBuffer = null;
+                _pipelineStopTokenSource.Dispose();
 #if !CORECLR // Impersonation Not Supported On CSS
                 SecurityContext.Dispose();
                 SecurityContext = null;
@@ -118,6 +121,11 @@ internal bool ExecutionFailed
             }
         }
 
+        /// <summary>
+        /// Gets the CancellationToken that is signaled when the pipeline is stopping.
+        /// </summary>
+        internal CancellationToken PipelineStopToken => _pipelineStopTokenSource.Token;
+
         internal void LogExecutionInfo(InvocationInfo invocationInfo, string text)
         {
             string message = StringUtil.Format(PipelineStrings.PipelineExecutionInformation, GetCommand(invocationInfo), text);
@@ -896,6 +904,8 @@ internal void Stop()
                 return;
             }
 
+            _pipelineStopTokenSource.Cancel();
+
             // Call StopProcessing() for all the commands.
             foreach (CommandProcessorBase commandProcessor in commands)
             {
@@ -1441,7 +1451,7 @@ private void DisposeCommands()
         /// </summary>
         /// <param name="e">Error which terminated the pipeline.</param>
         /// <param name="command">Command against which to log SecondFailure.</param>
-        /// <returns>True iff the pipeline was not already stopped.</returns>
+        /// <returns>True if-and-only-if the pipeline was not already stopped.</returns>
         internal bool RecordFailure(Exception e, InternalCommand command)
         {
             bool wasStopping = false;
diff --git a/src/System.Management.Automation/engine/regex.cs b/src/System.Management.Automation/engine/regex.cs
index 4ca21bd1310..6e0ef9741d6 100644
--- a/src/System.Management.Automation/engine/regex.cs
+++ b/src/System.Management.Automation/engine/regex.cs
@@ -73,18 +73,6 @@ public sealed class WildcardPattern
         // Default is WildcardOptions.None.
         internal WildcardOptions Options { get; }
 
-        /// <summary>
-        /// Wildcard pattern converted to regex pattern.
-        /// </summary>
-        internal string PatternConvertedToRegex
-        {
-            get
-            {
-                var patternRegex = WildcardPatternToRegexParser.Parse(this);
-                return patternRegex.ToString();
-            }
-        }
-
         /// <summary>
         /// Initializes and instance of the WildcardPattern class
         /// for the specified wildcard pattern.
@@ -205,6 +193,35 @@ public bool IsMatch(string input)
             return input != null && _isMatch(input);
         }
 
+        /// <summary>
+        /// Converts the wildcard pattern to its regular expression equivalent.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="Regex"/> object that represents the regular expression equivalent of the wildcard pattern.
+        /// The regex is configured with options matching the wildcard pattern's options.
+        /// </returns>
+        /// <remarks>
+        /// This method converts a wildcard pattern to a regular expression.
+        /// The conversion follows these rules:
+        /// <list type="bullet">
+        /// <item><description>* (asterisk) converts to .* (matches any string)</description></item>
+        /// <item><description>? (question mark) converts to . (matches any single character)</description></item>
+        /// <item><description>[abc] (bracket expression) converts to [abc] (matches any character in the set)</description></item>
+        /// <item><description>Literal characters are escaped as needed for regex</description></item>
+        /// </list>
+        /// </remarks>
+        /// <example>
+        /// <code>
+        /// var pattern = new WildcardPattern("*.txt");
+        /// Regex regex = pattern.ToRegex();
+        /// // regex.ToString() returns: "\.txt$"
+        /// </code>
+        /// </example>
+        public Regex ToRegex()
+        {
+            return WildcardPatternToRegexParser.Parse(this);
+        }
+
         /// <summary>
         /// Escape special chars, except for those specified in <paramref name="charsNotToEscape"/>, in a string by replacing them with their escape codes.
         /// </summary>
@@ -238,9 +255,9 @@ internal static string Escape(string pattern, char[] charsNotToEscape)
                 char ch = pattern[i];
 
                 //
-                // if it is a wildcard char, escape it
+                // if it is a special char, escape it
                 //
-                if (IsWildcardChar(ch) && !charsNotToEscape.Contains(ch))
+                if (SpecialChars.Contains(ch) && !charsNotToEscape.Contains(ch))
                 {
                     temp[tempIndex++] = escapeChar;
                 }
@@ -335,7 +352,7 @@ internal static bool ContainsRangeWildcard(string pattern)
                     foundStart = true;
                     continue;
                 }
-                
+
                 if (foundStart && pattern[index] is ']')
                 {
                     result = true;
@@ -524,7 +541,7 @@ public WildcardPatternException(string message,
         /// </summary>
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected WildcardPatternException(SerializationInfo info,
                                         StreamingContext context)
         {
diff --git a/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs b/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
index 73c432158f3..9d52bcb4dc9 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
@@ -133,7 +133,7 @@ internal static void Dispatch(
         /// </summary>
         private static bool IsRunspacePushed(PSHost host)
         {
-            if (!(host is IHostSupportsInteractiveSession host2))
+            if (host is not IHostSupportsInteractiveSession host2)
             {
                 return false;
             }
diff --git a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
index bee284f0704..631e49fc189 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
@@ -19,7 +19,7 @@ internal sealed class ClientRemotePowerShell : IDisposable
     {
         #region Tracer
 
-        [TraceSourceAttribute("CRPS", "ClientRemotePowerShell")]
+        [TraceSource("CRPS", "ClientRemotePowerShell")]
         private static readonly PSTraceSource s_tracer = PSTraceSource.GetTracer("CRPS", "ClientRemotePowerShellBase");
 
         #endregion Tracer
diff --git a/src/System.Management.Automation/engine/remoting/client/Job.cs b/src/System.Management.Automation/engine/remoting/client/Job.cs
index b3a0135afc7..adf47d04cab 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job.cs
@@ -752,10 +752,10 @@ private void WriteError(Cmdlet cmdlet, ErrorRecord errorRecord)
 
         private static Exception GetExceptionFromErrorRecord(ErrorRecord errorRecord)
         {
-            if (!(errorRecord.Exception is RuntimeException runtimeException))
+            if (errorRecord.Exception is not RuntimeException runtimeException)
                 return null;
 
-            if (!(runtimeException is RemoteException remoteException))
+            if (runtimeException is not RemoteException remoteException)
                 return null;
 
             PSPropertyInfo wasThrownFromThrow =
@@ -1911,7 +1911,7 @@ internal List<Job> GetJobsForComputer(string computerName)
 
             foreach (Job j in ChildJobs)
             {
-                if (!(j is PSRemotingChildJob child)) continue;
+                if (j is not PSRemotingChildJob child) continue;
                 if (string.Equals(child.Runspace.ConnectionInfo.ComputerName, computerName,
                                 StringComparison.OrdinalIgnoreCase))
                 {
@@ -1934,7 +1934,7 @@ internal List<Job> GetJobsForRunspace(PSSession runspace)
 
             foreach (Job j in ChildJobs)
             {
-                if (!(j is PSRemotingChildJob child)) continue;
+                if (j is not PSRemotingChildJob child) continue;
                 if (child.Runspace.InstanceId.Equals(runspace.InstanceId))
                 {
                     returnJobList.Add(child);
@@ -1957,7 +1957,7 @@ internal List<Job> GetJobsForOperation(IThrottleOperation operation)
 
             foreach (Job j in ChildJobs)
             {
-                if (!(j is PSRemotingChildJob child)) continue;
+                if (j is not PSRemotingChildJob child) continue;
                 if (child.Helper.Equals(helper))
                 {
                     returnJobList.Add(child);
diff --git a/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs b/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs
index 9f6297fbfab..85cd6c7ba1f 100644
--- a/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs
+++ b/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs
@@ -413,7 +413,7 @@ public void StoreJobIdForReuse(Job2 job, bool recurse)
                 duplicateDetector.Add(job.InstanceId, job.InstanceId);
                 foreach (Job child in job.ChildJobs)
                 {
-                    if (!(child is Job2 childJob)) continue;
+                    if (child is not Job2 childJob) continue;
                     StoreJobIdForReuseHelper(duplicateDetector, childJob, true);
                 }
             }
@@ -429,7 +429,7 @@ private void StoreJobIdForReuseHelper(Hashtable duplicateDetector, Job2 job, boo
             if (!recurse || job.ChildJobs == null) return;
             foreach (Job child in job.ChildJobs)
             {
-                if (!(child is Job2 childJob)) continue;
+                if (child is not Job2 childJob) continue;
                 StoreJobIdForReuseHelper(duplicateDetector, childJob, recurse);
             }
         }
diff --git a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
index e7a3a41104a..983180bd5ca 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
@@ -23,7 +23,7 @@ namespace System.Management.Automation.Runspaces.Internal
     /// Class which supports pooling remote powerShell runspaces
     /// on the client.
     /// </summary>
-    internal class RemoteRunspacePoolInternal : RunspacePoolInternal, IDisposable
+    internal sealed class RemoteRunspacePoolInternal : RunspacePoolInternal
     {
         #region Constructor
 
@@ -291,7 +291,7 @@ internal override bool ResetRunspaceState()
             // version 2.3 or greater.
             Version remoteProtocolVersionDeclaredByServer = PSRemotingProtocolVersion;
             if ((remoteProtocolVersionDeclaredByServer == null) ||
-                (remoteProtocolVersionDeclaredByServer < RemotingConstants.ProtocolVersionWin10RTM))
+                (remoteProtocolVersionDeclaredByServer < RemotingConstants.ProtocolVersion_2_3))
             {
                 throw PSTraceSource.NewInvalidOperationException(RunspacePoolStrings.ResetRunspaceStateNotSupportedOnServer);
             }
@@ -733,7 +733,7 @@ internal bool CanDisconnect
                 {
                     // Disconnect/Connect support is currently only provided by the WSMan transport
                     // that is running PSRP protocol version 2.2 and greater.
-                    return (remoteProtocolVersionDeclaredByServer >= RemotingConstants.ProtocolVersionWin8RTM &&
+                    return (remoteProtocolVersionDeclaredByServer >= RemotingConstants.ProtocolVersion_2_2 &&
                             DataStructureHandler.EndpointSupportsDisconnect);
                 }
 
@@ -1237,7 +1237,7 @@ public override RunspacePoolCapability GetCapabilities()
 
         internal static RunspacePool[] GetRemoteRunspacePools(RunspaceConnectionInfo connectionInfo, PSHost host, TypeTable typeTable)
         {
-            if (!(connectionInfo is WSManConnectionInfo wsmanConnectionInfoParam))
+            if (connectionInfo is not WSManConnectionInfo wsmanConnectionInfoParam)
             {
                 // Disconnect-Connect currently only supported by WSMan.
                 throw new NotSupportedException();
@@ -1893,21 +1893,11 @@ private void WaitAndRaiseConnectEventsProc(object state)
 
         #region IDisposable
 
-        /// <summary>
-        /// Public method for Dispose.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-
-            GC.SuppressFinalize(this);
-        }
-
         /// <summary>
         /// Release all resources.
         /// </summary>
         /// <param name="disposing">If true, release all managed resources.</param>
-        public override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
         {
             // dispose the base class before disposing dataStructure handler.
             base.Dispose(disposing);
diff --git a/src/System.Management.Automation/engine/remoting/client/RemotingErrorRecord.cs b/src/System.Management.Automation/engine/remoting/client/RemotingErrorRecord.cs
index bb527828a4d..527bdcf9e21 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemotingErrorRecord.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemotingErrorRecord.cs
@@ -101,7 +101,7 @@ public OriginInfo OriginInfo
             get { return _originInfo; }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly OriginInfo _originInfo;
 
         /// <summary>
@@ -150,7 +150,7 @@ public OriginInfo OriginInfo
             get { return _originInfo; }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly OriginInfo _originInfo;
 
         /// <summary>
@@ -192,7 +192,7 @@ public OriginInfo OriginInfo
             get { return _originInfo; }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly OriginInfo _originInfo;
 
         /// <summary>
@@ -221,7 +221,7 @@ public OriginInfo OriginInfo
             get { return _originInfo; }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly OriginInfo _originInfo;
 
         /// <summary>
@@ -250,7 +250,7 @@ public OriginInfo OriginInfo
             get { return _originInfo; }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly OriginInfo _originInfo;
 
         /// <summary>
@@ -292,7 +292,7 @@ public string PSComputerName
             }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly string _computerName;
 
         /// <summary>
@@ -307,7 +307,7 @@ public Guid RunspaceID
             }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private readonly Guid _runspaceID;
 
         /// <summary>
@@ -327,7 +327,7 @@ public Guid InstanceID
             }
         }
 
-        [DataMemberAttribute]
+        [DataMember]
         private Guid _instanceId;
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
index ed01bc7ad1b..4c5aec933b4 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
@@ -19,7 +19,7 @@ namespace System.Management.Automation.Internal
     /// Handles all PowerShell data structure handler communication with the
     /// server side RunspacePool.
     /// </summary>
-    internal class ClientRunspacePoolDataStructureHandler : IDisposable
+    internal sealed class ClientRunspacePoolDataStructureHandler : IDisposable
     {
         private bool _reconnecting = false;
 
@@ -797,10 +797,7 @@ private void HandleReadyForDisconnect(object sender, EventArgs args)
                     return;
                 }
 
-                if (_preparingForDisconnectList.Contains(bcmdTM))
-                {
-                    _preparingForDisconnectList.Remove(bcmdTM);
-                }
+                _preparingForDisconnectList.Remove(bcmdTM);
 
                 if (_preparingForDisconnectList.Count == 0)
                 {
@@ -826,7 +823,7 @@ private void StartDisconnectAsync(object state)
             {
                 remoteSession?.DisconnectAsync();
             }
-            catch 
+            catch
             {
                 // remoteSession may have already been disposed resulting in unexpected exceptions.
             }
@@ -984,7 +981,7 @@ public void Dispose(bool disposing)
     /// Base class for ClientPowerShellDataStructureHandler to handle all
     /// references.
     /// </summary>
-    internal class ClientPowerShellDataStructureHandler
+    internal sealed class ClientPowerShellDataStructureHandler
     {
         #region Data Structure Handler events
 
@@ -1155,8 +1152,8 @@ internal void SendHostResponseToServer(RemoteHostResponse hostResponse)
             RemoteDataObject<PSObject> dataToBeSent =
                 RemoteDataObject<PSObject>.CreateFrom(RemotingDestination.Server,
                 RemotingDataType.RemotePowerShellHostResponseData,
-                clientRunspacePoolId,
-                clientPowerShellId,
+                _clientRunspacePoolId,
+                _clientPowerShellId,
                 hostResponse.Encode());
 
             TransportManager.DataToBeSentCollection.Add<PSObject>(dataToBeSent,
@@ -1178,7 +1175,7 @@ internal void SendInput(ObjectStreamBase inputstream)
                 {
                     // send input closed information to server
                     SendDataAsync(RemotingEncoder.GeneratePowerShellInputEnd(
-                        clientRunspacePoolId, clientPowerShellId));
+                        _clientRunspacePoolId, _clientPowerShellId));
                 }
             }
             else
@@ -1207,10 +1204,10 @@ internal void SendInput(ObjectStreamBase inputstream)
         internal void ProcessReceivedData(RemoteDataObject<PSObject> receivedData)
         {
             // verify if this data structure handler is the intended recipient
-            if (receivedData.PowerShellId != clientPowerShellId)
+            if (receivedData.PowerShellId != _clientPowerShellId)
             {
                 throw new PSRemotingDataStructureException(RemotingErrorIdStrings.PipelineIdsDoNotMatch,
-                                receivedData.PowerShellId, clientPowerShellId);
+                                receivedData.PowerShellId, _clientPowerShellId);
             }
 
             // decode the message and take appropriate action
@@ -1473,13 +1470,6 @@ internal void ProcessRobustConnectionNotification(
 
         #endregion Data Structure Handler Methods
 
-        #region Protected Members
-
-        protected Guid clientRunspacePoolId;
-        protected Guid clientPowerShellId;
-
-        #endregion Protected Members
-
         #region Constructors
 
         /// <summary>
@@ -1496,8 +1486,8 @@ internal ClientPowerShellDataStructureHandler(BaseClientCommandTransportManager
                     Guid clientRunspacePoolId, Guid clientPowerShellId)
         {
             TransportManager = transportManager;
-            this.clientRunspacePoolId = clientRunspacePoolId;
-            this.clientPowerShellId = clientPowerShellId;
+            _clientRunspacePoolId = clientRunspacePoolId;
+            _clientPowerShellId = clientPowerShellId;
             transportManager.SignalCompleted += OnSignalCompleted;
         }
 
@@ -1513,7 +1503,7 @@ internal Guid PowerShellId
         {
             get
             {
-                return clientPowerShellId;
+                return _clientPowerShellId;
             }
         }
 
@@ -1566,7 +1556,7 @@ private void WriteInput(ObjectStreamBase inputstream)
             foreach (object inputObject in inputObjects)
             {
                 SendDataAsync(RemotingEncoder.GeneratePowerShellInput(inputObject,
-                    clientRunspacePoolId, clientPowerShellId));
+                    _clientRunspacePoolId, _clientPowerShellId));
             }
 
             if (!inputstream.IsOpen)
@@ -1577,7 +1567,7 @@ private void WriteInput(ObjectStreamBase inputstream)
                 foreach (object inputObject in inputObjects)
                 {
                     SendDataAsync(RemotingEncoder.GeneratePowerShellInput(inputObject,
-                        clientRunspacePoolId, clientPowerShellId));
+                        _clientRunspacePoolId, _clientPowerShellId));
                 }
 
                 // we are sending input end to the server. Ignore the future
@@ -1586,7 +1576,7 @@ private void WriteInput(ObjectStreamBase inputstream)
                 inputstream.DataReady -= HandleInputDataReady;
                 // stream close: send end of input
                 SendDataAsync(RemotingEncoder.GeneratePowerShellInputEnd(
-                    clientRunspacePoolId, clientPowerShellId));
+                    _clientRunspacePoolId, _clientPowerShellId));
             }
         }
 
@@ -1608,6 +1598,9 @@ private void SetupTransportManager(bool inDisconnectMode)
 
         #region Private Members
 
+        private readonly Guid _clientRunspacePoolId;
+        private readonly Guid _clientPowerShellId;
+
         // object for synchronizing input to be sent
         // to server powershell
         private readonly object _inputSyncObject = new object();
@@ -1626,7 +1619,7 @@ private enum connectionStates
         #endregion Private Members
     }
 
-    internal class InformationalMessage
+    internal sealed class InformationalMessage
     {
         internal object Message { get; }
 
diff --git a/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs b/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
index b3bfbe9a0d9..91cf4161a99 100644
--- a/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
@@ -5,6 +5,7 @@
 using System.Management.Automation.Internal;
 using System.Management.Automation.Runspaces;
 using System.Management.Automation.Runspaces.Internal;
+using System.Management.Automation.Security;
 
 using Dbg = System.Management.Automation.Diagnostics;
 
@@ -94,7 +95,22 @@ private PSCommand ParsePsCommandUsingScriptBlock(string line, bool? useLocalScop
                 // to be parsed and evaluated on the remote session (not in the current local session).
                 RemoteRunspace remoteRunspace = _runspaceRef.Value as RemoteRunspace;
                 bool isConfiguredLoopback = remoteRunspace != null && remoteRunspace.IsConfiguredLoopBack;
-                bool isTrustedInput = !isConfiguredLoopback && (localRunspace.ExecutionContext.LanguageMode == PSLanguageMode.FullLanguage);
+
+                bool inFullLanguage = context.LanguageMode == PSLanguageMode.FullLanguage;
+                if (context.LanguageMode == PSLanguageMode.ConstrainedLanguage
+                    && SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Audit)
+                {
+                    // In audit mode, report but don't enforce.
+                    inFullLanguage = true;
+                    SystemPolicy.LogWDACAuditMessage(
+                        context: context,
+                        title: RemotingErrorIdStrings.WDACGetPowerShellLogTitle,
+                        message: RemotingErrorIdStrings.WDACGetPowerShellLogMessage,
+                        fqid: "GetPowerShellMayFail",
+                        dropIntoDebugger: true);
+                }
+
+                bool isTrustedInput = !isConfiguredLoopback && inFullLanguage;
 
                 // Create PowerShell from ScriptBlock.
                 ScriptBlock scriptBlock = ScriptBlock.Create(context, line);
@@ -310,7 +326,7 @@ internal void Override(RemoteRunspace remoteRunspace, object syncObject, out boo
                     powerShell.AddParameter("Name", new string[] { "Out-Default", "Exit-PSSession" });
                     powerShell.Runspace = _runspaceRef.Value;
 
-                    bool isReleaseCandidateBackcompatibilityMode = _runspaceRef.Value.GetRemoteProtocolVersion() == RemotingConstants.ProtocolVersionWin7RC;
+                    bool isReleaseCandidateBackcompatibilityMode = _runspaceRef.Value.GetRemoteProtocolVersion() == RemotingConstants.ProtocolVersion_2_0;
                     powerShell.IsGetCommandMetadataSpecialPipeline = !isReleaseCandidateBackcompatibilityMode;
                     int expectedNumberOfResults = isReleaseCandidateBackcompatibilityMode ? 2 : 3;
 
@@ -350,7 +366,7 @@ internal void Override(RemoteRunspace remoteRunspace, object syncObject, out boo
         /// <param name="eventArgs"></param>
         private void HandleHostCall(object sender, RemoteDataEventArgs<RemoteHostCall> eventArgs)
         {
-            System.Management.Automation.Runspaces.Internal.ClientRemotePowerShell.ExitHandler(sender, eventArgs);
+            ClientRemotePowerShell.ExitHandler(sender, eventArgs);
         }
 
         #region Robust Connection Support
diff --git a/src/System.Management.Automation/engine/remoting/client/clientremotesession.cs b/src/System.Management.Automation/engine/remoting/client/clientremotesession.cs
index 772beb61040..499062d7a18 100644
--- a/src/System.Management.Automation/engine/remoting/client/clientremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/client/clientremotesession.cs
@@ -55,7 +55,7 @@ internal class ClientRemoteSessionContext
     /// </summary>
     internal abstract class ClientRemoteSession : RemoteSession
     {
-        [TraceSourceAttribute("CRSession", "ClientRemoteSession")]
+        [TraceSource("CRSession", "ClientRemoteSession")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("CRSession", "ClientRemoteSession");
 
         #region Public_Method_API
@@ -177,7 +177,7 @@ internal RemoteRunspacePoolInternal GetRunspacePool(Guid clientRunspacePoolId)
     /// </summary>
     internal class ClientRemoteSessionImpl : ClientRemoteSession, IDisposable
     {
-        [TraceSourceAttribute("CRSessionImpl", "ClientRemoteSessionImpl")]
+        [TraceSource("CRSessionImpl", "ClientRemoteSessionImpl")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("CRSessionImpl", "ClientRemoteSessionImpl");
 
         private PSRemotingCryptoHelperClient _cryptoHelper = null;
@@ -505,20 +505,11 @@ private bool RunClientNegotiationAlgorithm(RemoteSessionCapability serverRemoteS
             _serverProtocolVersion = serverProtocolVersion;
             Version clientProtocolVersion = Context.ClientCapability.ProtocolVersion;
 
-            if (
-                clientProtocolVersion.Equals(serverProtocolVersion)
-                || (clientProtocolVersion == RemotingConstants.ProtocolVersionWin7RTM &&
-                    serverProtocolVersion == RemotingConstants.ProtocolVersionWin7RC)
-                || (clientProtocolVersion == RemotingConstants.ProtocolVersionWin8RTM &&
-                    (serverProtocolVersion == RemotingConstants.ProtocolVersionWin7RC ||
-                     serverProtocolVersion == RemotingConstants.ProtocolVersionWin7RTM
-                     ))
-                || (clientProtocolVersion == RemotingConstants.ProtocolVersionWin10RTM &&
-                    (serverProtocolVersion == RemotingConstants.ProtocolVersionWin7RC ||
-                     serverProtocolVersion == RemotingConstants.ProtocolVersionWin7RTM ||
-                     serverProtocolVersion == RemotingConstants.ProtocolVersionWin8RTM
-                     ))
-                 )
+            if (clientProtocolVersion == serverProtocolVersion ||
+                serverProtocolVersion == RemotingConstants.ProtocolVersion_2_0 ||
+                serverProtocolVersion == RemotingConstants.ProtocolVersion_2_1 ||
+                serverProtocolVersion == RemotingConstants.ProtocolVersion_2_2 ||
+                serverProtocolVersion == RemotingConstants.ProtocolVersion_2_3)
             {
                 // passed negotiation check
             }
diff --git a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
index da63b846543..2dea06d8ced 100644
--- a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
+++ b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
@@ -31,7 +31,7 @@ namespace System.Management.Automation.Remoting
     /// </summary>
     internal class ClientRemoteSessionDSHandlerStateMachine
     {
-        [TraceSourceAttribute("CRSessionFSM", "CRSessionFSM")]
+        [TraceSource("CRSessionFSM", "CRSessionFSM")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("CRSessionFSM", "CRSessionFSM");
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
index 55c2b23db75..c1b34691104 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
@@ -374,7 +374,7 @@ public static PSSession Create(
             string transportName,
             PSCmdlet psCmdlet)
         {
-            if (!(runspace is RemoteRunspace remoteRunspace))
+            if (runspace is not RemoteRunspace remoteRunspace)
             {
                 throw new PSArgumentException(RemotingErrorIdStrings.InvalidPSSessionArgument);
             }
diff --git a/src/System.Management.Automation/engine/remoting/client/remotingprotocolimplementation.cs b/src/System.Management.Automation/engine/remoting/client/remotingprotocolimplementation.cs
index 71720f6cacd..d36ddff8be3 100644
--- a/src/System.Management.Automation/engine/remoting/client/remotingprotocolimplementation.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remotingprotocolimplementation.cs
@@ -13,9 +13,9 @@ namespace System.Management.Automation.Remoting
     /// <summary>
     /// Implements ServerRemoteSessionDataStructureHandler.
     /// </summary>
-    internal class ClientRemoteSessionDSHandlerImpl : ClientRemoteSessionDataStructureHandler, IDisposable
+    internal sealed class ClientRemoteSessionDSHandlerImpl : ClientRemoteSessionDataStructureHandler, IDisposable
     {
-        [TraceSourceAttribute("CRSDSHdlerImpl", "ClientRemoteSessionDSHandlerImpl")]
+        [TraceSource("CRSDSHdlerImpl", "ClientRemoteSessionDSHandlerImpl")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("CRSDSHdlerImpl", "ClientRemoteSessionDSHandlerImpl");
 
         private const string resBaseName = "remotingerroridstrings";
@@ -735,26 +735,12 @@ internal void ProcessNonSessionMessages(RemoteDataObject<PSObject> rcvdData)
 
         #region IDisposable
 
-        /// <summary>
-        /// Public method for dispose.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-
-            GC.SuppressFinalize(this);
-        }
-
         /// <summary>
         /// Release all resources.
         /// </summary>
-        /// <param name="disposing">If true, release all managed resources.</param>
-        protected void Dispose(bool disposing)
+        public void Dispose()
         {
-            if (disposing)
-            {
-                _transportManager.Dispose();
-            }
+            _transportManager.Dispose();
         }
 
         #endregion IDisposable
diff --git a/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs b/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
index e4424fd8c9a..1d88210e7b6 100644
--- a/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
@@ -52,7 +52,8 @@ function Register-PSSessionConfiguration
       [system.security.securestring] $runAsPassword,
       [System.Management.Automation.Runspaces.PSSessionConfigurationAccessMode] $accessMode,
       [bool] $isSddlSpecified,
-      [string] $configTableSddl
+      [string] $configTableSddl,
+      [bool] $noRestart
     )
 
     begin
@@ -139,7 +140,7 @@ function Register-PSSessionConfiguration
         ## Replace the SDDL with any groups or restrictions defined in the PSSessionConfigurationFile
         if($? -and $configTableSddl -and (-not $isSddlSpecified))
         {{
-            $null = Set-PSSessionConfiguration -Name $pluginName -SecurityDescriptorSddl $configTableSddl -Force:$force
+            $null = Set-PSSessionConfiguration -Name $pluginName -SecurityDescriptorSddl $configTableSddl -NoServiceRestart:$noRestart -Force:$force
         }}
 
         if ($? -and $shouldShowUI)
@@ -227,11 +228,11 @@ function Register-PSSessionConfiguration
                 if ($runAsUserName)
                 {{
                     $runAsCredential = new-object system.management.automation.PSCredential($runAsUserName, $runAsPassword)
-                    $null = Set-PSSessionConfiguration -Name $pluginName -SecurityDescriptorSddl $newSDDL -NoServiceRestart -force -WarningAction 0 -RunAsCredential $runAsCredential
+                    $null = Set-PSSessionConfiguration -Name $pluginName -SecurityDescriptorSddl $newSDDL -NoServiceRestart:$noRestart -Force:$force -WarningAction 0 -RunAsCredential $runAsCredential
                 }}
                 else
                 {{
-                    $null = Set-PSSessionConfiguration -Name $pluginName -SecurityDescriptorSddl $newSDDL -NoServiceRestart -force -WarningAction 0
+                    $null = Set-PSSessionConfiguration -Name $pluginName -SecurityDescriptorSddl $newSDDL -NoServiceRestart:$noRestart -Force:$force -WarningAction 0
                 }}
 
             }} catch {{
@@ -262,13 +263,13 @@ function Register-PSSessionConfiguration
     }}
 }}
 
-if ($null -eq $args[14])
+if ($null -eq $args[15])
 {{
-    Register-PSSessionConfiguration -filepath $args[0] -pluginName $args[1] -shouldShowUI $args[2] -force $args[3] -whatif:$args[4] -confirm:$args[5] -restartWSManTarget $args[6] -restartWSManAction $args[7] -restartWSManRequired $args[8] -runAsUserName $args[9] -runAsPassword $args[10] -accessMode $args[11] -isSddlSpecified $args[12] -configTableSddl $args[13]
+    Register-PSSessionConfiguration -filepath $args[0] -pluginName $args[1] -shouldShowUI $args[2] -force $args[3] -whatif:$args[4] -confirm:$args[5] -restartWSManTarget $args[6] -restartWSManAction $args[7] -restartWSManRequired $args[8] -runAsUserName $args[9] -runAsPassword $args[10] -accessMode $args[11] -isSddlSpecified $args[12] -configTableSddl $args[13] -noRestart $args[14]
 }}
 else
 {{
-    Register-PSSessionConfiguration -filepath $args[0] -pluginName $args[1] -shouldShowUI $args[2] -force $args[3] -whatif:$args[4] -confirm:$args[5] -restartWSManTarget $args[6] -restartWSManAction $args[7] -restartWSManRequired $args[8] -runAsUserName $args[9] -runAsPassword $args[10] -accessMode $args[11] -isSddlSpecified $args[12] -configTableSddl $args[13] -erroraction $args[14]
+    Register-PSSessionConfiguration -filepath $args[0] -pluginName $args[1] -shouldShowUI $args[2] -force $args[3] -whatif:$args[4] -confirm:$args[5] -restartWSManTarget $args[6] -restartWSManAction $args[7] -restartWSManRequired $args[8] -runAsUserName $args[9] -runAsPassword $args[10] -accessMode $args[11] -isSddlSpecified $args[12] -configTableSddl $args[13] -noRestart $args[14] -erroraction $args[15]
 }}
 ";
 
@@ -592,6 +593,7 @@ protected override void ProcessRecord()
                                             AccessMode,
                                             isSddlSpecified,
                                             _configTableSDDL,
+                                            noRestart,
                                             errorAction
                                        });
 
@@ -1751,7 +1753,7 @@ internal static string CreateConditionalACEFromConfig(
             }
 
             StringBuilder conditionalACE = new StringBuilder();
-            if (!(configTable[ConfigFileConstants.RequiredGroups] is Hashtable requiredGroupsHash))
+            if (configTable[ConfigFileConstants.RequiredGroups] is not Hashtable requiredGroupsHash)
             {
                 throw new PSInvalidOperationException(RemotingErrorIdStrings.RequiredGroupsNotHashTable);
             }
diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
index 534362b0f17..0dd769537c6 100644
--- a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -1026,7 +1026,7 @@ protected override void BeginProcessing()
                                 {
                                     // In order to support foreach remoting properly ( icm | % { icm } ), the server must
                                     // be using protocol version 2.2. Otherwise, we skip this and assume the old behavior.
-                                    if (version >= RemotingConstants.ProtocolVersionWin8RTM)
+                                    if (version >= RemotingConstants.ProtocolVersion_2_2)
                                     {
                                         // Suppress collection behavior
                                         _needToCollect = false;
@@ -1050,7 +1050,7 @@ protected override void BeginProcessing()
                 // create collection of input writers here
                 foreach (IThrottleOperation operation in Operations)
                 {
-                    if (!(operation is ExecutionCmdletHelperRunspace ecHelper))
+                    if (operation is not ExecutionCmdletHelperRunspace ecHelper)
                     {
                         // either all the operations will be of type ExecutionCmdletHelperRunspace
                         // or not...there is no mix.
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index c633fd9fe5c..8a5df652470 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -445,6 +445,37 @@ internal enum VMState
             FastSavingCritical,
         }
 
+#nullable enable
+        /// <summary>
+        /// Get the State property from Get-VM result.
+        /// </summary>
+        /// <param name="value">The raw PSObject as returned by Get-VM.</param>
+        /// <returns>The VMState value of the State property if present and parsable, otherwise null.</returns>
+        internal VMState? GetVMStateProperty(PSObject value)
+        {
+            object? rawState = value.Properties["State"].Value;
+            if (rawState is Enum enumState)
+            {
+                // If the Hyper-V module was directly importable we have the VMState enum
+                // value which we can just cast to our VMState type.
+                return (VMState)enumState;
+            }
+            else if (rawState is string stringState && Enum.TryParse(stringState, true, out VMState result))
+            {
+                // If the Hyper-V module was imported through implicit remoting on old
+                // Windows versions we get a string back which we will try and parse
+                // as the enum label.
+                return result;
+            }
+
+            // Unknown scenario, this should not happen.
+            string message = PSRemotingErrorInvariants.FormatResourceString(
+                RemotingErrorIdStrings.HyperVFailedToGetStateUnknownType,
+                rawState?.GetType()?.FullName ?? "null");
+            throw new InvalidOperationException(message);
+        }
+#nullable disable
+
         #endregion
 
         #region Tracer
@@ -1658,7 +1689,7 @@ protected virtual void CreateHelpersForSpecifiedVMSession()
                     {
                         this.VMName[index] = (string)results[0].Properties["VMName"].Value;
 
-                        if ((VMState)results[0].Properties["State"].Value == VMState.Running)
+                        if (GetVMStateProperty(results[0]) == VMState.Running)
                         {
                             vmIsRunning[index] = true;
                         }
@@ -1707,7 +1738,7 @@ protected virtual void CreateHelpersForSpecifiedVMSession()
                         this.VMId[index] = (Guid)results[0].Properties["VMId"].Value;
                         this.VMName[index] = (string)results[0].Properties["VMName"].Value;
 
-                        if ((VMState)results[0].Properties["State"].Value == VMState.Running)
+                        if (GetVMStateProperty(results[0]) == VMState.Running)
                         {
                             vmIsRunning[index] = true;
                         }
@@ -1892,9 +1923,7 @@ internal Pipeline CreatePipeline(RemoteRunspace remoteRunspace)
             // the array-form using values if all UsingExpressions are in the same scope, otherwise, we handle the UsingExpression as
             // if the remote end is PSv2.
             string serverPsVersion = GetRemoteServerPsVersion(remoteRunspace);
-            System.Management.Automation.PowerShell powershellToUse = (serverPsVersion == PSv2)
-                                                                          ? GetPowerShellForPSv2()
-                                                                          : GetPowerShellForPSv3OrLater(serverPsVersion);
+            System.Management.Automation.PowerShell powershellToUse = GetPowerShellForPSv3OrLater(serverPsVersion);
             Pipeline pipeline =
                 remoteRunspace.CreatePipeline(powershellToUse.Commands.Commands[0].CommandText, true);
 
@@ -1915,9 +1944,9 @@ internal Pipeline CreatePipeline(RemoteRunspace remoteRunspace)
         /// </summary>
         private static string GetRemoteServerPsVersion(RemoteRunspace remoteRunspace)
         {
-            if (remoteRunspace.ConnectionInfo is NewProcessConnectionInfo)
+            if (remoteRunspace.ConnectionInfo is not WSManConnectionInfo)
             {
-                // This is for Start-Job. The remote end is actually a child local powershell process, so it must be PSv5 or later
+                // All transport types except for WSManConnectionInfo work with 5.1 or later.
                 return PSv5OrLater;
             }
 
@@ -1926,35 +1955,19 @@ private static string GetRemoteServerPsVersion(RemoteRunspace remoteRunspace)
             {
                 // The remote runspace is not opened yet, or it's disconnected before the private data is retrieved.
                 // In this case we cannot validate if the remote server is running PSv5 or later, so for safety purpose,
-                // we will handle the $using expressions as if the remote server is PSv2.
-                return PSv2;
+                // we will handle the $using expressions as if the remote server is PSv3Orv4.
+                return PSv3Orv4;
             }
 
-            // Unfortunately, the PSVersion value in the private data from PSv3 and PSv4 server is always 2.0.
-            // This got fixed in PSv5, so a PSv5 server will return 5.0. That means we need other way to tell
-            // if the remote server is PSv2 or PSv3+. After PSv3, remote runspace supports connect/disconnect,
-            // so we can use it to differentiate PSv2 from PSv3+.
-            if (remoteRunspace.CanDisconnect)
-            {
-                Version serverPsVersion = null;
-                PSPrimitiveDictionary.TryPathGet(
-                    psApplicationPrivateData,
-                    out serverPsVersion,
-                    PSVersionInfo.PSVersionTableName,
-                    PSVersionInfo.PSVersionName);
-
-                if (serverPsVersion != null)
-                {
-                    return serverPsVersion.Major >= 5 ? PSv5OrLater : PSv3Orv4;
-                }
-
-                // The private data is available but we failed to get the server powershell version.
-                // This should never happen, but in case it happens, handle the $using expressions
-                // as if the remote server is PSv2.
-                Dbg.Assert(false, "Application private data is available but we failed to get the server powershell version. This should never happen.");
-            }
+            PSPrimitiveDictionary.TryPathGet(
+                psApplicationPrivateData,
+                out Version serverPsVersion,
+                PSVersionInfo.PSVersionTableName,
+                PSVersionInfo.PSVersionName);
 
-            return PSv2;
+            // PSv5 server will return 5.0 whereas older versions will always be 2.0. As we don't care about v2
+            // anymore we can use a simple ternary check here to differenciate v5 using behaviour vs v3/4.
+            return serverPsVersion != null && serverPsVersion.Major >= 5 ? PSv5OrLater : PSv3Orv4;
         }
 
         /// <summary>
@@ -2028,7 +2041,6 @@ private void WriteErrorCreateRemoteRunspaceFailed(Exception e, Uri uri)
         /// </summary>
         private const string PSv5OrLater = "PSv5OrLater";
         private const string PSv3Orv4 = "PSv3Orv4";
-        private const string PSv2 = "PSv2";
 
         private System.Management.Automation.PowerShell _powershellV2;
         private System.Management.Automation.PowerShell _powershellV3;
@@ -2278,7 +2290,7 @@ private System.Management.Automation.PowerShell GetPowerShellForPSv3OrLater(stri
             // Semantic checks on the using statement have already validated that there are no arbitrary expressions,
             // so we'll allow these expressions in everything but NoLanguage mode.
 
-            bool allowUsingExpressions = (Context.SessionState.LanguageMode != PSLanguageMode.NoLanguage);
+            bool allowUsingExpressions = Context.SessionState.LanguageMode != PSLanguageMode.NoLanguage;
             object[] usingValuesInArray = null;
             IDictionary usingValuesInDict = null;
 
@@ -2428,7 +2440,7 @@ private List<object> GetUsingVariableValues(List<VariableExpressionAst> paramUsi
                 // GetExpressionValue ensures that it only does variable access when supplied a VariableExpressionAst.
                 // So, this is still safe to use in ConstrainedLanguage and will not result in arbitrary code
                 // execution.
-                bool allowVariableAccess = (Context.SessionState.LanguageMode != PSLanguageMode.NoLanguage);
+                bool allowVariableAccess = Context.SessionState.LanguageMode != PSLanguageMode.NoLanguage;
 
                 foreach (var varAst in paramUsingVars)
                 {
diff --git a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
index 8b76f0e2b95..bf456e85db2 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
@@ -1025,7 +1025,7 @@ private RemoteRunspace GetRunspaceForVMSession()
             //
             // VM should be in running state.
             //
-            if ((VMState)results[0].Properties["State"].Value != VMState.Running)
+            if (GetVMStateProperty(results[0]) != VMState.Running)
             {
                 WriteError(
                     new ErrorRecord(
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
index b9cf33e4b1c..67477e5b36f 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
@@ -1166,7 +1166,7 @@ private static PSSession ConnectSession(PSSession session, out Exception ex)
         /// <returns>PSSession disconnected runspace object.</returns>
         private PSSession TryGetSessionFromServer(PSSession session)
         {
-            if (!(session.Runspace is RemoteRunspace remoteRunspace))
+            if (session.Runspace is not RemoteRunspace remoteRunspace)
             {
                 return null;
             }
diff --git a/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs b/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs
index 626dd5133d1..3bbc4463fe8 100644
--- a/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs
@@ -46,7 +46,7 @@ public class WaitJobCommand : JobCmdletBase, IDisposable
         /// </summary>
         [Parameter]
         [Alias("TimeoutSec")]
-        [ValidateRangeAttribute(-1, Int32.MaxValue)]
+        [ValidateRange(-1, Int32.MaxValue)]
         public int Timeout
         {
             get
diff --git a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
index dd5a66ef4bc..fb6bf348aba 100644
--- a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
@@ -8,6 +8,7 @@
 using System.Management.Automation.Internal;
 using System.Management.Automation.Remoting;
 using System.Management.Automation.Runspaces;
+using System.Runtime.InteropServices;
 
 using Dbg = System.Management.Automation.Diagnostics;
 
@@ -341,8 +342,22 @@ public string CertificateThumbprint
         /// </summary>
         protected override void BeginProcessing()
         {
-            base.BeginProcessing();
+#if UNIX
+            if (ComputerName?.Length > 0)
+            {
+                ErrorRecord err = new(
+                    new NotImplementedException(
+                        PSRemotingErrorInvariants.FormatResourceString(
+                            RemotingErrorIdStrings.UnsupportedOSForRemoteEnumeration,
+                            RuntimeInformation.OSDescription)),
+                    "PSSessionComputerNameUnix",
+                    ErrorCategory.NotImplemented,
+                    null);
+                ThrowTerminatingError(err);
+            }
+#endif
 
+            base.BeginProcessing();
             ConfigurationName ??= string.Empty;
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
index 70ac635977d..60ca0c35e50 100644
--- a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
@@ -267,7 +267,16 @@ protected override void ProcessRecord()
 
                 case NewPSSessionCommand.UseWindowsPowerShellParameterSet:
                     {
-                        remoteRunspaces = CreateRunspacesForUseWindowsPowerShellParameterSet();
+                        if (UseWindowsPowerShell)
+                        {
+                            remoteRunspaces = CreateRunspacesForUseWindowsPowerShellParameterSet();
+                        }
+                        else
+                        {
+                            // When -UseWindowsPowerShell:$false is explicitly specified,
+                            // fall back to the default ComputerName parameter set behavior
+                            goto case NewPSSessionCommand.ComputerNameParameterSet;
+                        }
                     }
 
                     break;
@@ -932,7 +941,7 @@ private List<RemoteRunspace> CreateRunspacesWhenVMParameterSpecified()
                     //
                     // VM should be in running state.
                     //
-                    if ((VMState)results[0].Properties["State"].Value != VMState.Running)
+                    if (GetVMStateProperty(results[0]) != VMState.Running)
                     {
                         WriteError(
                             new ErrorRecord(
diff --git a/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs b/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs
index 2fd2dc0a913..989ad33e987 100644
--- a/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs
+++ b/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs
@@ -166,6 +166,9 @@ internal enum PSEventId : int
         ExperimentalFeature_InvalidName = 0x3001,
         ExperimentalFeature_ReadConfig_Error = 0x3002,
 
+        // Windows Diagnostics And Usage Data Settings
+        Telemetry_Setting_Error = 0x3011,
+
         // Scheduled Jobs
         ScheduledJob_Start = 0xD001,
         ScheduledJob_Complete = 0xD002,
@@ -240,6 +243,7 @@ internal enum PSTask : int
         ProviderStop = 0x69,
         ExecutePipeline = 0x6A,
         ExperimentalFeature = 0x6B,
+        Telemetry = 0x6C,
         ScheduledJob = 0x6E,
         NamedPipe = 0x6F,
         ISEOperation = 0x78,
diff --git a/src/System.Management.Automation/engine/remoting/common/RemoteSessionHyperVSocket.cs b/src/System.Management.Automation/engine/remoting/common/RemoteSessionHyperVSocket.cs
index 7fae8118310..8d53adf0ca8 100644
--- a/src/System.Management.Automation/engine/remoting/common/RemoteSessionHyperVSocket.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RemoteSessionHyperVSocket.cs
@@ -7,12 +7,14 @@
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
+using System.Buffers;
 
 using Dbg = System.Diagnostics.Debug;
+using SMA = System.Management.Automation;
 
 namespace System.Management.Automation.Remoting
 {
-    [SerializableAttribute]
+    [Serializable]
     internal class HyperVSocketEndPoint : EndPoint
     {
         #region Members
@@ -140,6 +142,10 @@ internal sealed class RemoteSessionHyperVSocketServer : IDisposable
         private readonly object _syncObject;
         private readonly PowerShellTraceSource _tracer = PowerShellTraceSourceFactory.GetTraceSource();
 
+        // This is to prevent persistent replay attacks.
+        // it is not meant to ensure all replay attacks are impossible.
+        private const int MAX_TOKEN_LIFE_MINUTES = 10;
+
         #endregion
 
         #region Properties
@@ -175,64 +181,74 @@ internal sealed class RemoteSessionHyperVSocketServer : IDisposable
 
         public RemoteSessionHyperVSocketServer(bool LoopbackMode)
         {
-            // TODO: uncomment below code when .NET supports Hyper-V socket duplication
-            /*
-            NamedPipeClientStream clientPipeStream;
-            byte[] buffer = new byte[1000];
-            int bytesRead;
-            */
             _syncObject = new object();
 
             Exception ex = null;
 
             try
             {
-                // TODO: uncomment below code when .NET supports Hyper-V socket duplication
-                /*
-                if (!LoopbackMode)
-                {
-                    //
-                    // Create named pipe client.
-                    //
-                    using (clientPipeStream = new NamedPipeClientStream(".",
-                                                                        "PS_VMSession",
-                                                                        PipeDirection.InOut,
-                                                                        PipeOptions.None,
-                                                                        TokenImpersonationLevel.None))
-                    {
-                        //
-                        // Connect to named pipe server.
-                        //
-                        clientPipeStream.Connect(10*1000);
-
-                        //
-                        // Read LPWSAPROTOCOL_INFO.
-                        //
-                        bytesRead = clientPipeStream.Read(buffer, 0, 1000);
-                    }
-                }
+                Guid serviceId = new Guid("a5201c21-2770-4c11-a68e-f182edb29220"); // HV_GUID_VM_SESSION_SERVICE_ID_2
+                Guid loopbackId = new Guid("e0e16197-dd56-4a10-9195-5ee7a155a838"); // HV_GUID_LOOPBACK
+                Guid parentId = new Guid("a42e7cda-d03f-480c-9cc2-a4de20abb878"); // HV_GUID_PARENT
+                Guid vmId = LoopbackMode ? loopbackId : parentId;
+                HyperVSocketEndPoint endpoint = new HyperVSocketEndPoint(HyperVSocketEndPoint.AF_HYPERV, vmId, serviceId);
+
+                Socket listenSocket = new Socket(endpoint.AddressFamily, SocketType.Stream, (System.Net.Sockets.ProtocolType)1);
+                listenSocket.Bind(endpoint);
+
+                listenSocket.Listen(1);
+                HyperVSocket = listenSocket.Accept();
+
+                Stream = new NetworkStream(HyperVSocket, true);
+
+                // Create reader/writer streams.
+                TextReader = new StreamReader(Stream);
+                TextWriter = new StreamWriter(Stream);
+                TextWriter.AutoFlush = true;
 
                 //
-                // Create duplicate socket.
+                // listenSocket is not closed when it goes out of scope here. Sometimes it is
+                // closed later in this thread, while other times it is not closed at all. This will
+                // cause problem when we set up a second PowerShell Direct session. Let's
+                // explicitly close listenSocket here for safe.
                 //
-                byte[] protocolInfo = new byte[bytesRead];
-                Array.Copy(buffer, protocolInfo, bytesRead);
+                if (listenSocket != null)
+                {
+                    try { listenSocket.Dispose(); }
+                    catch (ObjectDisposedException) { }
+                }
+            }
+            catch (Exception e)
+            {
+                ex = e;
+            }
 
-                SocketInformation sockInfo = new SocketInformation();
-                sockInfo.ProtocolInformation = protocolInfo;
-                sockInfo.Options = SocketInformationOptions.Connected;
+            if (ex != null)
+            {
+                Dbg.Fail("Unexpected error in RemoteSessionHyperVSocketServer.");
 
-                socket = new Socket(sockInfo);
-                if (socket == null)
-                {
-                    Dbg.Assert(false, "Unexpected error in RemoteSessionHyperVSocketServer.");
+                // Unexpected error.
+                string errorMessage = !string.IsNullOrEmpty(ex.Message) ? ex.Message : string.Empty;
+                _tracer.WriteMessage("RemoteSessionHyperVSocketServer", "RemoteSessionHyperVSocketServer", Guid.Empty,
+                    "Unexpected error in constructor: {0}", errorMessage);
 
-                    tracer.WriteMessage("RemoteSessionHyperVSocketServer", "RemoteSessionHyperVSocketServer", Guid.Empty,
-                        "Unexpected error in constructor: {0}", "socket duplication failure");
-                }
-                */
+                throw new PSInvalidOperationException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.RemoteSessionHyperVSocketServerConstructorFailure),
+                    ex,
+                    nameof(PSRemotingErrorId.RemoteSessionHyperVSocketServerConstructorFailure),
+                    ErrorCategory.InvalidOperation,
+                    null);
+            }
+        }
+
+        public RemoteSessionHyperVSocketServer(bool LoopbackMode, string token, DateTimeOffset tokenCreationTime)
+        {
+            _syncObject = new object();
+
+            Exception ex = null;
 
-                // TODO: remove below 6 lines of code when .NET supports Hyper-V socket duplication
+            try
+            {
                 Guid serviceId = new Guid("a5201c21-2770-4c11-a68e-f182edb29220"); // HV_GUID_VM_SESSION_SERVICE_ID_2
                 HyperVSocketEndPoint endpoint = new HyperVSocketEndPoint(HyperVSocketEndPoint.AF_HYPERV, Guid.Empty, serviceId);
 
@@ -242,6 +258,8 @@ public RemoteSessionHyperVSocketServer(bool LoopbackMode)
                 listenSocket.Listen(1);
                 HyperVSocket = listenSocket.Accept();
 
+                ValidateToken(HyperVSocket, token, tokenCreationTime, MAX_TOKEN_LIFE_MINUTES * 60);
+
                 Stream = new NetworkStream(HyperVSocket, true);
 
                 // Create reader/writer streams.
@@ -257,8 +275,13 @@ public RemoteSessionHyperVSocketServer(bool LoopbackMode)
                 //
                 if (listenSocket != null)
                 {
-                    try { listenSocket.Dispose(); }
-                    catch (ObjectDisposedException) { }
+                    try
+                    {
+                        listenSocket.Dispose();
+                    }
+                    catch (ObjectDisposedException)
+                    {
+                    }
                 }
             }
             catch (Exception e)
@@ -272,8 +295,12 @@ public RemoteSessionHyperVSocketServer(bool LoopbackMode)
 
                 // Unexpected error.
                 string errorMessage = !string.IsNullOrEmpty(ex.Message) ? ex.Message : string.Empty;
-                _tracer.WriteMessage("RemoteSessionHyperVSocketServer", "RemoteSessionHyperVSocketServer", Guid.Empty,
-                    "Unexpected error in constructor: {0}", errorMessage);
+                _tracer.WriteMessage(
+                    "RemoteSessionHyperVSocketServer",
+                    "RemoteSessionHyperVSocketServer",
+                    Guid.Empty,
+                    "Unexpected error in constructor: {0}",
+                    errorMessage);
 
                 throw new PSInvalidOperationException(
                     PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.RemoteSessionHyperVSocketServerConstructorFailure),
@@ -283,7 +310,6 @@ public RemoteSessionHyperVSocketServer(bool LoopbackMode)
                     null);
             }
         }
-
         #endregion
 
         #region IDisposable
@@ -333,6 +359,107 @@ public void Dispose()
         }
 
         #endregion
+
+        /// <summary>
+        /// Validates the token received from the client over the HyperVSocket.
+        /// Throws PSDirectException if the token is invalid or not received in time.
+        /// </summary>
+        /// <param name="socket">The connected HyperVSocket.</param>
+        /// <param name="token">The expected token string.</param>
+        /// <param name="tokenCreationTime">The creation time of the token.</param>
+        /// <param name="maxTokenLifeSeconds">The maximum lifetime of the token in seconds.</param>
+        internal static void ValidateToken(Socket socket, string token, DateTimeOffset tokenCreationTime, int maxTokenLifeSeconds)
+        {
+            TimeSpan timeout = TimeSpan.FromSeconds(maxTokenLifeSeconds);
+            DateTimeOffset timeoutExpiry = tokenCreationTime.Add(timeout);
+            DateTimeOffset now = DateTimeOffset.UtcNow;
+
+            // Calculate remaining time and create cancellation token
+            TimeSpan remainingTime = timeoutExpiry - now;
+
+            // Check if the token has already expired
+            if (remainingTime <= TimeSpan.Zero)
+            {
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.InvalidCredential, "Token has expired"));
+            }
+
+            // Create a cancellation token that will be cancelled when the timeout expires
+            using var cancellationTokenSource = new CancellationTokenSource(remainingTime);
+            CancellationToken cancellationToken = cancellationTokenSource.Token;
+
+            // Set socket timeout for receive operations to prevent indefinite blocking
+            int timeoutMs = (int)remainingTime.TotalMilliseconds;
+            socket.ReceiveTimeout = timeoutMs;
+            socket.SendTimeout = timeoutMs;
+
+            // Check for cancellation before starting validation
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // We should move to this pattern and
+            // in the tests I found I needed to get a bigger buffer than the token length
+            // and test length of the received data similar to this pattern.
+            string responseString = RemoteSessionHyperVSocketClient.ReceiveResponse(socket, RemoteSessionHyperVSocketClient.VERSION_REQUEST.Length + 4);
+            if (string.IsNullOrEmpty(responseString) || responseString.Length != RemoteSessionHyperVSocketClient.VERSION_REQUEST.Length)
+            {
+                socket.Send("FAIL"u8);
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Client", "Version Request: " + responseString));
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            socket.Send(Encoding.UTF8.GetBytes(RemoteSessionHyperVSocketClient.CLIENT_VERSION));
+            responseString = RemoteSessionHyperVSocketClient.ReceiveResponse(socket, RemoteSessionHyperVSocketClient.CLIENT_VERSION.Length + 4);
+
+            // In the future we may need to handle different versions, differently.
+            // For now, we are just checking that we exchanged versions correctly.
+            if (string.IsNullOrEmpty(responseString) || !responseString.StartsWith(RemoteSessionHyperVSocketClient.VERSION_PREFIX, StringComparison.Ordinal))
+            {
+                socket.Send("FAIL"u8);
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Client", "Version Response: " + responseString));
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            socket.Send("PASS"u8);
+
+            // The client should send the token in the format TOKEN <token>
+            // the token should be up to 256 bits, which is less than 50 characters.
+            // I'll double that to 100 characters to be safe, plus the "TOKEN " prefix.
+            // So we expect a response of length 6 + 100 = 106 characters.
+            responseString = RemoteSessionHyperVSocketClient.ReceiveResponse(socket, 110);
+
+            // Final check if we got the token before the timeout
+            cancellationToken.ThrowIfCancellationRequested();
+
+            ReadOnlySpan<byte> responseBytes = Encoding.UTF8.GetBytes(responseString);
+            string responseToken = RemoteSessionHyperVSocketClient.ExtractToken(responseBytes);
+
+            if (responseToken == null)
+            {
+                socket.Send("FAIL"u8);
+                // If the response is not in the expected format, we throw an exception.
+                // This is a failure to authenticate the client.
+                // don't send this response for risk of information disclosure.
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Client", "Token Response"));
+            }
+
+            if (!string.Equals(responseToken, token, StringComparison.Ordinal))
+            {
+                socket.Send("FAIL"u8);
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.InvalidCredential));
+            }
+
+            // Acknowledge the token is valid with "PASS".
+            socket.Send("PASS"u8);
+
+            socket.ReceiveTimeout = 0; // Disable the timeout after successful validation
+            socket.SendTimeout = 0;
+        }
     }
 
     internal sealed class RemoteSessionHyperVSocketClient : IDisposable
@@ -340,7 +467,15 @@ internal sealed class RemoteSessionHyperVSocketClient : IDisposable
         #region Members
 
         private readonly object _syncObject;
-        private readonly PowerShellTraceSource _tracer = PowerShellTraceSourceFactory.GetTraceSource();
+
+        #region tracer
+        /// <summary>
+        /// An instance of the PSTraceSource class used for trace output.
+        /// </summary>
+        [SMA.TraceSource("RemoteSessionHyperVSocketClient", "Class that has PowerShell Direct Client implementation")]
+        private static readonly PSTraceSource s_tracer = PSTraceSource.GetTracer("RemoteSessionHyperVSocketClient", "Class that has PowerShell Direct Client implementation");
+
+        #endregion tracer
 
         private static readonly ManualResetEvent s_connectDone =
                 new ManualResetEvent(false);
@@ -354,6 +489,14 @@ internal sealed class RemoteSessionHyperVSocketClient : IDisposable
 
         #endregion
 
+        #region version constants
+
+        internal const string VERSION_REQUEST = "VERSION";
+        internal const string CLIENT_VERSION = "VERSION_2";
+        internal const string VERSION_PREFIX = "VERSION_";
+
+        #endregion
+
         #region Properties
 
         /// <summary>
@@ -364,7 +507,7 @@ internal sealed class RemoteSessionHyperVSocketClient : IDisposable
         /// <summary>
         /// Returns the Hyper-V socket object.
         /// </summary>
-        public Socket HyperVSocket { get; }
+        public Socket HyperVSocket { get; private set; }
 
         /// <summary>
         /// Returns the network stream object.
@@ -381,6 +524,37 @@ internal sealed class RemoteSessionHyperVSocketClient : IDisposable
         /// </summary>
         public StreamWriter TextWriter { get; private set; }
 
+        /// <summary>
+        /// True if the client is a Hyper-V container.
+        /// </summary>
+        public bool IsContainer { get; }
+
+        /// <summary>
+        /// True if the client is using backwards compatible mode.
+        /// This is used to determine if the client should use
+        /// the backwards compatible or not.
+        /// In modern mode, the vmicvmsession service will
+        /// hand off the socket to the PowerShell process
+        /// inside the VM automatically.
+        /// In backwards compatible mode, the vmicvmsession
+        /// service create a new socket to the PowerShell process
+        /// inside the VM.
+        /// </summary>
+        public bool UseBackwardsCompatibleMode { get; private set; }
+
+        /// <summary>
+        /// The authentication token used for the session.
+        /// This token is provided by the broker and provided to the server to authenticate the server session.
+        /// This protocol uses two connections:
+        /// 1. The first is to the broker or vmicvmsession service to exchange credentials and configuration.
+        ///    The broker will respond with an authentication token.  The broker also launches a PowerShell
+        ///    server process with the authentication token.
+        /// 2. The second is to the server process, that was launched by the broker,
+        ///    inside the VM, which uses the authentication token to verify that the client is the same client
+        ///    that connected to the broker.
+        /// </summary>
+        public string AuthenticationToken { get; private set; }
+
         /// <summary>
         /// Returns true if object is currently disposed.
         /// </summary>
@@ -393,7 +567,9 @@ internal sealed class RemoteSessionHyperVSocketClient : IDisposable
         internal RemoteSessionHyperVSocketClient(
             Guid vmId,
             bool isFirstConnection,
-            bool isContainer = false)
+            bool useBackwardsCompatibleMode = false,
+            bool isContainer = false,
+            string authenticationToken = null)
         {
             Guid serviceId;
 
@@ -412,28 +588,16 @@ internal RemoteSessionHyperVSocketClient(
 
             EndPoint = new HyperVSocketEndPoint(HyperVSocketEndPoint.AF_HYPERV, vmId, serviceId);
 
-            HyperVSocket = new Socket(EndPoint.AddressFamily, SocketType.Stream, (System.Net.Sockets.ProtocolType)1);
+            IsContainer = isContainer;
 
-            //
-            // We need to call SetSocketOption() in order to set up Hyper-V socket connection between container host and Hyper-V container.
-            // Here is the scenario: the Hyper-V container is inside a utility vm, which is inside the container host
-            //
-            if (isContainer)
-            {
-                var value = new byte[sizeof(uint)];
-                value[0] = 1;
+            UseBackwardsCompatibleMode = useBackwardsCompatibleMode;
 
-                try
-                {
-                    HyperVSocket.SetSocketOption((System.Net.Sockets.SocketOptionLevel)HV_PROTOCOL_RAW,
-                                            (System.Net.Sockets.SocketOptionName)HVSOCKET_CONTAINER_PASSTHRU,
-                                            (byte[])value);
-                }
-                catch
-                {
-                    throw new PSDirectException(
-                        PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.RemoteSessionHyperVSocketClientConstructorSetSocketOptionFailure));
-                }
+            if (!isFirstConnection && !useBackwardsCompatibleMode && !string.IsNullOrEmpty(authenticationToken))
+            {
+                // If this is not the first connection and we are using backwards compatible mode,
+                // we should not set the authentication token here.
+                // The authentication token will be set during the Connect method.
+                AuthenticationToken = authenticationToken;
             }
         }
 
@@ -489,6 +653,81 @@ public void Dispose()
 
         #region Public Methods
 
+        private void ShutdownSocket()
+        {
+            if (HyperVSocket != null)
+            {
+                // Ensure the socket is disposed properly.
+                try
+                {
+                    s_tracer.WriteLine("ShutdownSocket: Disposing of the HyperVSocket.");
+                    HyperVSocket.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    s_tracer.WriteLine("ShutdownSocket: Exception while disposing the socket: {0}", ex.Message);
+                }
+            }
+
+            // Dispose of the existing stream if it exists.
+            if (Stream != null)
+            {
+                try
+                {
+                    Stream.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    s_tracer.WriteLine("ShutdownSocket: Exception while disposing the stream: {0}", ex.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Recreates the HyperVSocket and connects it to the endpoint, updating the Stream if successful.
+        /// </summary>
+        private bool ConnectSocket()
+        {
+            HyperVSocket = new Socket(EndPoint.AddressFamily, SocketType.Stream, (System.Net.Sockets.ProtocolType)1);
+
+            //
+            // We need to call SetSocketOption() in order to set up Hyper-V socket connection between container host and Hyper-V container.
+            // Here is the scenario: the Hyper-V container is inside a utility vm, which is inside the container host
+            //
+            if (IsContainer)
+            {
+                var value = new byte[sizeof(uint)];
+                value[0] = 1;
+
+                try
+                {
+                    HyperVSocket.SetSocketOption(
+                        (System.Net.Sockets.SocketOptionLevel)HV_PROTOCOL_RAW,
+                        (System.Net.Sockets.SocketOptionName)HVSOCKET_CONTAINER_PASSTHRU,
+                        value);
+                }
+                catch
+                {
+                    throw new PSDirectException(
+                        PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.RemoteSessionHyperVSocketClientConstructorSetSocketOptionFailure));
+                }
+            }
+
+            s_tracer.WriteLine("Connect: Client connecting, to {0}; isContainer: {1}.", EndPoint.ServiceId.ToString(), IsContainer);
+            HyperVSocket.Connect(EndPoint);
+
+            // Check if the socket is connected.
+            // If it is connected, create a NetworkStream.
+            if (HyperVSocket.Connected)
+            {
+                s_tracer.WriteLine("Connect: Client connected, to {0}; isContainer: {1}.", EndPoint.ServiceId.ToString(), IsContainer);
+                Stream = new NetworkStream(HyperVSocket, true);
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Connect to Hyper-V socket server.  This is a blocking call until a
         /// connection occurs or the timeout time has elapsed.
@@ -516,100 +755,51 @@ public bool Connect(
                 }
             }
 
-            HyperVSocket.Connect(EndPoint);
-
-            if (HyperVSocket.Connected)
+            if (ConnectSocket())
             {
-                _tracer.WriteMessage("RemoteSessionHyperVSocketClient", "Connect", Guid.Empty,
-                    "Client connected.");
-
-                Stream = new NetworkStream(HyperVSocket, true);
-
                 if (isFirstConnection)
                 {
-                    if (string.IsNullOrEmpty(networkCredential.Domain))
+                    var exchangeResult = ExchangeCredentialsAndConfiguration(networkCredential, configurationName, HyperVSocket, this.UseBackwardsCompatibleMode);
+                    if (!exchangeResult.success)
                     {
-                        networkCredential.Domain = "localhost";
-                    }
+                        // We will not block here for a container because a container does not have a broker.
+                        if (IsRequirePsDirectAuthenticationEnabled(@"SOFTWARE\\Microsoft\\PowerShell", Microsoft.Win32.RegistryHive.LocalMachine))
+                        {
+                            s_tracer.WriteLine("ExchangeCredentialsAndConfiguration: RequirePsDirectAuthentication is enabled, requiring latest transport version.");
+                            throw new PSDirectException(
+                                PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVNegotiationFailed));
+                        }
 
-                    bool emptyPassword = string.IsNullOrEmpty(networkCredential.Password);
-                    bool emptyConfiguration = string.IsNullOrEmpty(configurationName);
-
-                    byte[] domain = Encoding.Unicode.GetBytes(networkCredential.Domain);
-                    byte[] userName = Encoding.Unicode.GetBytes(networkCredential.UserName);
-                    byte[] password = Encoding.Unicode.GetBytes(networkCredential.Password);
-                    byte[] response = new byte[4]; // either "PASS" or "FAIL"
-                    string responseString;
-
-                    //
-                    // Send credential to VM so that PowerShell process inside VM can be
-                    // created under the correct security context.
-                    //
-                    HyperVSocket.Send(domain);
-                    HyperVSocket.Receive(response);
-
-                    HyperVSocket.Send(userName);
-                    HyperVSocket.Receive(response);
-
-                    //
-                    // We cannot simply send password because if it is empty,
-                    // the vmicvmsession service in VM will block in recv method.
-                    //
-                    if (emptyPassword)
-                    {
-                        HyperVSocket.Send("EMPTYPW"u8);
-                        HyperVSocket.Receive(response);
-                        responseString = Encoding.ASCII.GetString(response);
-                    }
-                    else
-                    {
-                        HyperVSocket.Send("NONEMPTYPW"u8);
-                        HyperVSocket.Receive(response);
+                        this.UseBackwardsCompatibleMode = true;
+                        s_tracer.WriteLine("ExchangeCredentialsAndConfiguration: Using backwards compatible mode.");
 
-                        HyperVSocket.Send(password);
-                        HyperVSocket.Receive(response);
-                        responseString = Encoding.ASCII.GetString(response);
+                        // If the first connection fails in modern mode, fall back to backwards compatible mode.
+                        ShutdownSocket(); // will terminate the broker
+                        ConnectSocket();  // restart the broker
+                        exchangeResult = ExchangeCredentialsAndConfiguration(networkCredential, configurationName, HyperVSocket, this.UseBackwardsCompatibleMode);
+                        if (!exchangeResult.success)
+                        {
+                            s_tracer.WriteLine("ExchangeCredentialsAndConfiguration: Failed to exchange credentials and configuration in backwards compatible mode.");
+                            throw new PSDirectException(
+                                PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Broker", "Credential"));
+                        }
                     }
-
-                    //
-                    // There are 3 cases for the responseString received above.
-                    // - "FAIL": credential is invalid
-                    // - "PASS": credential is valid, but PowerShell Direct in VM does not support configuration (Server 2016 TP4 and before)
-                    // - "CONF": credential is valid, and PowerShell Direct in VM supports configuration (Server 2016 TP5 and later)
-                    //
-
-                    //
-                    // Credential is invalid.
-                    //
-                    if (string.Equals(responseString, "FAIL", StringComparison.Ordinal))
+                    else
                     {
-                        HyperVSocket.Send(response);
-
-                        throw new PSDirectException(
-                            PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.InvalidCredential));
+                        this.AuthenticationToken = exchangeResult.authenticationToken;
                     }
+                }
 
-                    //
-                    // If PowerShell Direct in VM supports configuration, send configuration name.
-                    //
-                    if (string.Equals(responseString, "CONF", StringComparison.Ordinal))
+                if (!isFirstConnection)
+                {
+                    if (!this.UseBackwardsCompatibleMode)
                     {
-                        if (emptyConfiguration)
-                        {
-                            HyperVSocket.Send("EMPTYCF"u8);
-                        }
-                        else
-                        {
-                            HyperVSocket.Send("NONEMPTYCF"u8);
-                            HyperVSocket.Receive(response);
-
-                            byte[] configName = Encoding.Unicode.GetBytes(configurationName);
-                            HyperVSocket.Send(configName);
-                        }
+                        s_tracer.WriteLine("Connect-Server: Performing transport version and token exchange for Hyper-V socket.  isFirstConnection: {0}, UseBackwardsCompatibleMode: {1}", isFirstConnection, this.UseBackwardsCompatibleMode);
+                        RemoteSessionHyperVSocketClient.PerformTransportVersionAndTokenExchange(HyperVSocket, this.AuthenticationToken);
                     }
                     else
                     {
-                        HyperVSocket.Send(response);
+                        s_tracer.WriteLine("Connect-Server: Skipping transport version and token exchange for backwards compatible mode.");
                     }
                 }
 
@@ -621,8 +811,7 @@ public bool Connect(
             }
             else
             {
-                _tracer.WriteMessage("RemoteSessionHyperVSocketClient", "Connect", Guid.Empty,
-                    "Client unable to connect.");
+                s_tracer.WriteLine("Connect: Client unable to connect.");
 
                 result = false;
             }
@@ -630,12 +819,341 @@ public bool Connect(
             return result;
         }
 
+        /// <summary>
+        /// Performs the transport version and token exchange sequence for the Hyper-V socket connection.
+        /// Throws PSDirectException on failure.
+        /// </summary>
+        /// <param name="socket">The socket to use for communication.</param>
+        /// <param name="authenticationToken">The authentication token to send.</param>
+        public static void PerformTransportVersionAndTokenExchange(Socket socket, string authenticationToken)
+        {
+            if (string.IsNullOrEmpty(authenticationToken))
+            {
+                s_tracer.WriteLine("PerformTransportVersionAndTokenExchange: Authentication token is null or empty. Aborting transport version and token exchange.");
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.InvalidCredential));
+            }
+
+            socket.Send(Encoding.UTF8.GetBytes(VERSION_REQUEST));
+            string responseStr = ReceiveResponse(socket, 16);
+
+            // Check if the response starts with the expected version prefix.
+            // We will rely on the broker to determine if the two can communicate.
+            // At least, for now.
+            if (!responseStr.StartsWith(VERSION_PREFIX, StringComparison.Ordinal))
+            {
+                s_tracer.WriteLine("PerformTransportVersionAndTokenExchange: Server responded with an invalid response of {0}. Notifying the transport manager to downgrade if allowed.", responseStr);
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Server", "TransportVersion"));
+            }
+
+            socket.Send(Encoding.UTF8.GetBytes(CLIENT_VERSION));
+            string response = ReceiveResponse(socket, 4); // either "PASS" or "FAIL"
+
+            if (!string.Equals(response, "PASS", StringComparison.Ordinal))
+            {
+                s_tracer.WriteLine(
+                    "PerformTransportVersionAndTokenExchange: Transport version negotiation with server failed. Response: {0}", response);
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Server", "TransportVersion"));
+            }
+
+            byte[] tokenBytes = Encoding.UTF8.GetBytes("TOKEN " + authenticationToken);
+            socket.Send(tokenBytes);
+
+            // This is the opportunity for the server to tell the client to go away.
+            string tokenResponse = ReceiveResponse(socket, 256); // either "PASS" or "FAIL", but get a little more buffer to allow for better error in the future
+            if (!string.Equals(tokenResponse, "PASS", StringComparison.Ordinal))
+            {
+                s_tracer.WriteLine(
+                    "PerformTransportVersionAndTokenExchange: Server Authentication Token exchange failed. Response: {0}", tokenResponse);
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.InvalidCredential));
+            }
+        }
+
+        /// <summary>
+        /// Checks if the registry key RequirePsDirectAuthentication is set to 1.
+        /// Returns true if fallback should be aborted.
+        /// Uses the 64-bit registry view on 64-bit systems to ensure consistent behavior regardless of process architecture.
+        /// On 32-bit systems, uses the default registry view since there is no WOW64 redirection.
+        /// </summary>
+        internal static bool IsRequirePsDirectAuthenticationEnabled(string keyPath, Microsoft.Win32.RegistryHive registryHive)
+        {
+            const string regValueName = "RequirePsDirectAuthentication";
+
+            try
+            {
+                Microsoft.Win32.RegistryView registryView = Environment.Is64BitOperatingSystem
+                    ? Microsoft.Win32.RegistryView.Registry64
+                    : Microsoft.Win32.RegistryView.Default;
+
+                using (Microsoft.Win32.RegistryKey baseKey = Microsoft.Win32.RegistryKey.OpenBaseKey(
+                    registryHive,
+                    registryView))
+                {
+                    using (Microsoft.Win32.RegistryKey key = baseKey.OpenSubKey(keyPath))
+                    {
+                        if (key != null)
+                        {
+                            var value = key.GetValue(regValueName);
+                            if (value is int intValue && intValue != 0)
+                            {
+                                return true;
+                            }
+                        }
+
+                        return false;
+                    }
+                }
+            }
+            catch (Exception regEx)
+            {
+                s_tracer.WriteLine("IsRequirePsDirectAuthenticationEnabled: Exception while checking registry key: {0}", regEx.Message);
+                return false; // If we cannot read the registry, assume the feature is not enabled.
+            }
+        }
+
+        /// <summary>
+        /// Handles credential and configuration exchange with the VM for the first connection.
+        /// </summary>
+        public static (bool success, string authenticationToken) ExchangeCredentialsAndConfiguration(NetworkCredential networkCredential, string configurationName, Socket HyperVSocket, bool useBackwardsCompatibleMode)
+        {
+            // Encoding for the Hyper-V socket communication
+            // To send the domain, username, password, and configuration name, use UTF-16 (Encoding.Unicode)
+            // All other sends use UTF-8 (Encoding.UTF8)
+            // Receiving uses ASCII encoding
+            // NOT CONFUSING AT ALL
+
+            if (!useBackwardsCompatibleMode)
+            {
+                HyperVSocket.Send(Encoding.UTF8.GetBytes(VERSION_REQUEST));
+                // vmicvmsession service in VM will respond with "VERSION_2" or newer
+                // Version 1 protocol will respond with "PASS" or "FAIL"
+                // Receive the response and check for VERSION_2 or newer
+                string responseStr = ReceiveResponse(HyperVSocket, 16);
+                if (!responseStr.StartsWith(VERSION_PREFIX, StringComparison.Ordinal))
+                {
+                    s_tracer.WriteLine("When asking for version the server responded with an invalid response of {0}.", responseStr);
+                    s_tracer.WriteLine("Session is invalid, continuing session with a fake user to close the session with the broker for stability.");
+                    // If not the new protocol, finish the conversation
+                    // Send a fake user
+                    // Use ? <> that are illegal in user names so no one can create the user
+                    string probeUserName = "?<PSDirectVMLegacy>"; // must be less than or equal to 20 characters for Windows Server 2016
+                    s_tracer.WriteLine("probeUserName (static): length: {0}", probeUserName.Length);
+                    SendUserData(probeUserName, HyperVSocket);
+                    responseStr = ReceiveResponse(HyperVSocket, 4); // either "PASS" or "FAIL"
+                    s_tracer.WriteLine("When sending user {0}.", responseStr);
+
+                    // Send that the password is empty
+                    HyperVSocket.Send("EMPTYPW"u8);
+                    responseStr = ReceiveResponse(HyperVSocket, 4); // either "CONF", "PASS" or "FAIL"
+                    s_tracer.WriteLine("When sending EMPTYPW: {0}.", responseStr); // server responds with FAIL so we respond with FAIL and the conversation is done
+                    HyperVSocket.Send("FAIL"u8);
+
+                    s_tracer.WriteLine("Notifying the transport manager to downgrade if allowed.");
+                    // end new code
+                    return (false, null);
+                }
+
+                HyperVSocket.Send(Encoding.UTF8.GetBytes(CLIENT_VERSION));
+                ReceiveResponse(HyperVSocket, 4); // either "PASS" or "FAIL"
+            }
+
+            if (string.IsNullOrEmpty(networkCredential.Domain))
+            {
+                networkCredential.Domain = "localhost";
+            }
+
+            System.Security.SecureString securePassword = networkCredential.SecurePassword;
+            int passwordLength = securePassword.Length;
+            bool emptyPassword = (passwordLength <= 0);
+            bool emptyConfiguration = string.IsNullOrEmpty(configurationName);
+
+            string responseString;
+
+            // Send credential to VM so that PowerShell process inside VM can be
+            // created under the correct security context.
+            SendUserData(networkCredential.Domain, HyperVSocket);
+            ReceiveResponse(HyperVSocket, 4); // only "PASS" is expected
+
+            SendUserData(networkCredential.UserName, HyperVSocket);
+            ReceiveResponse(HyperVSocket, 4); // only "PASS" is expected
+
+            // We cannot simply send password because if it is empty,
+            // the vmicvmsession service in VM will block in recv method.
+            if (emptyPassword)
+            {
+                HyperVSocket.Send("EMPTYPW"u8);
+                responseString = ReceiveResponse(HyperVSocket, 4); // either "CONF", "PASS" or "FAIL" (note, "PASS" is not used in VERSION_2 or newer mode)
+            }
+            else
+            {
+                HyperVSocket.Send("NONEMPTYPW"u8);
+                ReceiveResponse(HyperVSocket, 4); // only "PASS" is expected
+
+                // Get the password bytes from the SecureString, send them, and then zero out the byte array.
+                byte[] passwordBytes = Microsoft.PowerShell.SecureStringHelper.GetData(securePassword);
+                try
+                {
+                    HyperVSocket.Send(passwordBytes);
+                }
+                finally
+                {
+                    // Zero out the byte array for security
+                    Array.Clear(passwordBytes);
+                }
+
+                responseString = ReceiveResponse(HyperVSocket, 4); // either "CONF", "PASS" or "FAIL" (note, "PASS" is not used in VERSION_2 or newer mode)
+            }
+
+            // Check for invalid response from server
+            if (!string.Equals(responseString, "FAIL", StringComparison.Ordinal) &&
+                !string.Equals(responseString, "PASS", StringComparison.Ordinal) &&
+                !string.Equals(responseString, "CONF", StringComparison.Ordinal))
+            {
+                s_tracer.WriteLine("ExchangeCredentialsAndConfiguration: Server responded with an invalid response of {0} for credentials.", responseString);
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Broker", "Credential"));
+            }
+
+            // Credential is invalid.
+            if (string.Equals(responseString, "FAIL", StringComparison.Ordinal))
+            {
+                HyperVSocket.Send("FAIL"u8);
+                // should we be doing this?  Disabling the test for now
+                // HyperVSocket.Shutdown(SocketShutdown.Both);
+                s_tracer.WriteLine("ExchangeCredentialsAndConfiguration: Server responded with FAIL for credentials.");
+                throw new PSDirectException(
+                    PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.InvalidCredential));
+            }
+
+            // If PowerShell Direct in VM supports configuration, send configuration name.
+            if (string.Equals(responseString, "CONF", StringComparison.Ordinal))
+            {
+                if (emptyConfiguration)
+                {
+                    HyperVSocket.Send("EMPTYCF"u8);
+                }
+                else
+                {
+                    HyperVSocket.Send("NONEMPTYCF"u8);
+                    ReceiveResponse(HyperVSocket, 4); // only "PASS" is expected
+
+                    SendUserData(configurationName, HyperVSocket);
+                }
+            }
+            else
+            {
+                HyperVSocket.Send("PASS"u8);
+            }
+
+            if (!useBackwardsCompatibleMode)
+            {
+                // Receive the token from the server
+                // Getting 1024 bytes because it is well above the expected token size
+                // The expected size at the time of writing this would be about 50 based64 characters,
+                // plus the 6 characters for the "TOKEN " prefix.
+                // The 50 character size is designed to last 10 years of cryptographic changes.
+                // Since the broker completely controls the cryptographic portion here,
+                // allowing a significant larger size, allows the broker to make almost arbitrary changes,
+                // without breaking the client.
+                string token = ReceiveResponse(HyperVSocket, 1024); // either "PASS" or "FAIL"
+
+                ReadOnlySpan<byte> tokenResponseBytes = Encoding.UTF8.GetBytes(token);
+                string extractedToken = ExtractToken(tokenResponseBytes);
+
+                if (extractedToken == null)
+                {
+                    s_tracer.WriteLine("ExchangeCredentialsAndConfiguration: Server did not respond with a valid token. Response: {0}", token);
+                    throw new PSDirectException(
+                        PSRemotingErrorInvariants.FormatResourceString(RemotingErrorIdStrings.HyperVInvalidResponse, "Broker", "Token " + token));
+                }
+
+                token = extractedToken;
+
+                HyperVSocket.Send("PASS"u8); // acknowledge the token
+                return (true, token);
+            }
+
+            return (true, null);
+        }
+
         public void Close()
         {
             Stream.Dispose();
             HyperVSocket.Dispose();
         }
 
+        /// <summary>
+        /// Receives a response from the socket and decodes it.
+        /// </summary>
+        /// <param name="socket">The socket to receive from.</param>
+        /// <param name="bufferSize">The size of the buffer to use for receiving data.</param>
+        /// <returns>The decoded response string.</returns>
+        internal static string ReceiveResponse(Socket socket, int bufferSize)
+        {
+            System.Buffers.ArrayPool<byte> pool = System.Buffers.ArrayPool<byte>.Shared;
+            byte[] responseBuffer = pool.Rent(bufferSize);
+            int bytesReceived = 0;
+            try
+            {
+                bytesReceived = socket.Receive(responseBuffer);
+                if (bytesReceived == 0)
+                {
+                    return null;
+                }
+
+                string response = Encoding.ASCII.GetString(responseBuffer, 0, bytesReceived);
+
+                // Handle null terminators and log if found
+                if (response.EndsWith('\0'))
+                {
+                    int originalLength = response.Length;
+                    response = response.TrimEnd('\0');
+                    // Cannot log actual response, because we don't know if it is sensitive
+                    s_tracer.WriteLine(
+                        "ReceiveResponse: Removed null terminator(s). Original length: {0}, New length: {1}",
+                        originalLength,
+                        response.Length);
+                }
+
+                return response;
+            }
+            finally
+            {
+                pool.Return(responseBuffer);
+            }
+        }
+
+        internal static string ExtractToken(ReadOnlySpan<byte> tokenResponse)
+        {
+            string token = Encoding.UTF8.GetString(tokenResponse);
+
+            if (token == null || !token.StartsWith("TOKEN ", StringComparison.Ordinal))
+            {
+                return null; // caller method will write trace (and determine when to expose token info as appropriate)
+            }
+
+            token = token.Substring(6).Trim(); // remove "TOKEN " prefix
+
+            if (token.Length == 0)
+            {
+                return null;
+            }
+
+            return token;
+        }
+
+        /// <summary>
+        /// Sends user data (domain, username, etc.) over the HyperVSocket using Unicode encoding.
+        /// </summary>
+        private static void SendUserData(string data, Socket socket)
+        {
+            // this encodes the data in UTF-16 (Unicode)
+            byte[] buffer = Encoding.Unicode.GetBytes(data);
+            socket.Send(buffer);
+        }
         #endregion
     }
 }
diff --git a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
index e80c51fb816..fc5226a007e 100644
--- a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
@@ -12,7 +12,6 @@
 using System.Security.AccessControl;
 using System.Security.Principal;
 using System.Threading;
-using System.Threading.Tasks;
 
 using Microsoft.Win32.SafeHandles;
 
@@ -454,7 +453,7 @@ private static NamedPipeServerStream CreateNamedPipe(
             SafePipeHandle pipeHandle = NamedPipeNative.CreateNamedPipe(
                 fullPipeName,
                 NamedPipeNative.PIPE_ACCESS_DUPLEX | NamedPipeNative.FILE_FLAG_FIRST_PIPE_INSTANCE | NamedPipeNative.FILE_FLAG_OVERLAPPED,
-                NamedPipeNative.PIPE_TYPE_MESSAGE | NamedPipeNative.PIPE_READMODE_MESSAGE,
+                NamedPipeNative.PIPE_TYPE_MESSAGE | NamedPipeNative.PIPE_READMODE_MESSAGE | NamedPipeNative.PIPE_REJECT_REMOTE_CLIENTS,
                 1,
                 _namedPipeBufferSizeForRemoting,
                 _namedPipeBufferSizeForRemoting,
@@ -500,13 +499,14 @@ static RemoteSessionNamedPipeServer()
         {
             s_syncObject = new object();
 
-            // All PowerShell instances will start with the named pipe
-            // and listener created and running.
-            IPCNamedPipeServerEnabled = true;
-
-            CreateIPCNamedPipeServerSingleton();
+            // Unless opt-out, all PowerShell instances will start with the named-pipe listener created and running.
+            IPCNamedPipeServerEnabled = !Utils.GetEnvironmentVariableAsBool(name: "POWERSHELL_DIAGNOSTICS_OPTOUT", defaultValue: false);
 
-            CreateProcessExitHandler();
+            if (IPCNamedPipeServerEnabled)
+            {
+                CreateIPCNamedPipeServerSingleton();
+                CreateProcessExitHandler();
+            }
         }
 
         #endregion
@@ -1302,7 +1302,6 @@ protected override NamedPipeClientStream DoConnect(int timeout)
                 return new NamedPipeClientStream(
                     PipeDirection.InOut,
                     isAsync: true,
-                    isConnected: true,
                     pipeHandle);
             }
             catch (Exception)
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index 9c221f01dbb..242bde2ac53 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -1174,7 +1174,7 @@ private static string ResolveShellUri(string shell)
         internal static T ExtractPropertyAsWsManConnectionInfo<T>(RunspaceConnectionInfo rsCI,
             string property, T defaultValue)
         {
-            if (!(rsCI is WSManConnectionInfo wsCI))
+            if (rsCI is not WSManConnectionInfo wsCI)
             {
                 return defaultValue;
             }
@@ -2206,14 +2206,56 @@ internal int StartSSHProcess(
             var context = Runspaces.LocalPipeline.GetExecutionContextFromTLS();
             if (context != null)
             {
-                var cmdInfo = context.CommandDiscovery.LookupCommandInfo(sshCommand, CommandOrigin.Internal) as ApplicationInfo;
-                if (cmdInfo != null)
+                var cmdInfo = CommandDiscovery.LookupCommandInfo(
+                    sshCommand,
+                    CommandTypes.Application,
+                    SearchResolutionOptions.None,
+                    CommandOrigin.Internal,
+                    context);
+
+                if (cmdInfo is ApplicationInfo appInfo)
+                {
+                    filePath = appInfo.Path;
+                }
+            }
+            else
+            {
+                // A Runspace may not be present in the TLS in SDK hosted apps
+                // or if running in another thread without a Runspace. While
+                // 'ProcessStartInfo' can lookup the full path in PATH, it searches
+                // the process' working directory first. 'LookupCommandInfo' does
+                // not search the process' working directory and we want to keep that
+                // behavior. We also get the parent dir of the full path to set as the
+                // new WorkingDirectory. So, we do a manual lookup here only in PATH.
+                string[] entries = Environment.GetEnvironmentVariable("PATH")?.Split(
+                    Path.PathSeparator,
+                    StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? [];
+                foreach (var path in entries)
                 {
-                    filePath = cmdInfo.Path;
+                    if (!Path.IsPathFullyQualified(path))
+                    {
+                        continue;
+                    }
+
+                    var sshCommandPath = Path.Combine(path, sshCommand);
+                    if (File.Exists(sshCommandPath))
+                    {
+                        filePath = sshCommandPath;
+                        break;
+                    }
                 }
             }
+            
+            if (string.IsNullOrEmpty(filePath))
+            {
+                throw new CommandNotFoundException(
+                    sshCommand,
+                    null,
+                    "CommandNotFoundException",
+                    DiscoveryExceptions.CommandNotFoundException);
+            }
 
-            // Create a local ssh process (client) that conects to a remote sshd process (server) using a 'powershell' subsystem.
+            // Create a local ssh process (client) that connects to a remote sshd process (server) using a 'powershell' subsystem.
             //
             // Local ssh invoked as:
             //   windows:
@@ -2230,13 +2272,14 @@ internal int StartSSHProcess(
             //   linux|macos:
             //     Subsystem powershell /usr/local/bin/pwsh -SSHServerMode -NoLogo -NoProfile
 
-            System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo(filePath);
+            // codeql[cs/microsoft/command-line-injection-shell-execution] - This is expected Poweshell behavior where user inputted paths are supported for the context of this method. The user assumes trust for the file path specified, so any file executed in the runspace would be in the user's local system/process or a system they have access to in which case restricted remoting security guidelines should be used.
+            ProcessStartInfo startInfo = new(filePath);
 
             // pass "-i identity_file" command line argument to ssh if KeyFilePath is set
             // if KeyFilePath is not set, then ssh will use IdentityFile / IdentityAgent from ssh_config if defined else none by default
             if (!string.IsNullOrEmpty(this.KeyFilePath))
             {
-                if (!System.IO.File.Exists(this.KeyFilePath))
+                if (!File.Exists(this.KeyFilePath))
                 {
                     throw new FileNotFoundException(
                         StringUtil.Format(RemotingErrorIdStrings.KeyFileNotFound, this.KeyFilePath));
@@ -2283,7 +2326,7 @@ internal int StartSSHProcess(
             // note that ssh expects IPv6 addresses to not be enclosed in square brackets so trim them if present
             startInfo.ArgumentList.Add(string.Create(CultureInfo.InvariantCulture, $@"-s {this.ComputerName.TrimStart('[').TrimEnd(']')} {this.Subsystem}"));
 
-            startInfo.WorkingDirectory = System.IO.Path.GetDirectoryName(filePath);
+            startInfo.WorkingDirectory = Path.GetDirectoryName(filePath);
             startInfo.CreateNoWindow = true;
             startInfo.UseShellExecute = false;
 
@@ -2537,7 +2580,7 @@ private static unsafe void AllocNullTerminatedArray(string[] arr, ref byte** arr
             // Allocate the unmanaged array to hold each string pointer.
             // It needs to have an extra element to null terminate the array.
             arrPtr = (byte**)Marshal.AllocHGlobal(sizeof(IntPtr) * arrLength);
-            System.Diagnostics.Debug.Assert(arrPtr != null, "Invalid array ptr");
+            Debug.Assert(arrPtr != null, "Invalid array ptr");
 
             // Zero the memory so that if any of the individual string allocations fails,
             // we can loop through the array to free any that succeeded.
@@ -2554,7 +2597,7 @@ private static unsafe void AllocNullTerminatedArray(string[] arr, ref byte** arr
                 byte[] byteArr = System.Text.Encoding.UTF8.GetBytes(arr[i]);
 
                 arrPtr[i] = (byte*)Marshal.AllocHGlobal(byteArr.Length + 1); // +1 for null termination
-                System.Diagnostics.Debug.Assert(arrPtr[i] != null, "Invalid array ptr");
+                Debug.Assert(arrPtr[i] != null, "Invalid array ptr");
 
                 Marshal.Copy(byteArr, 0, (IntPtr)arrPtr[i], byteArr.Length); // copy over the data from the managed byte array
                 arrPtr[i][byteArr.Length] = (byte)'\0'; // null terminate
@@ -2598,13 +2641,13 @@ internal static extern unsafe int ForkAndExecProcess(
         /// P-Invoking native APIs.
         /// </summary>
         private static int StartSSHProcessImpl(
-            System.Diagnostics.ProcessStartInfo startInfo,
+            ProcessStartInfo startInfo,
             out StreamWriter stdInWriterVar,
             out StreamReader stdOutReaderVar,
             out StreamReader stdErrReaderVar)
         {
             Exception ex = null;
-            System.Diagnostics.Process sshProcess = null;
+            Process sshProcess = null;
             //
             // These std pipe handles are bound to managed Reader/Writer objects and returned to the transport
             // manager object, which uses them for PSRP communication.  The lifetime of these handles are then
@@ -2625,7 +2668,7 @@ private static int StartSSHProcessImpl(
             catch (InvalidOperationException e) { ex = e; }
             catch (ArgumentException e) { ex = e; }
             catch (FileNotFoundException e) { ex = e; }
-            catch (System.ComponentModel.Win32Exception e) { ex = e; }
+            catch (Win32Exception e) { ex = e; }
 
             if ((ex != null) ||
                 (sshProcess == null) ||
@@ -2650,9 +2693,9 @@ private static int StartSSHProcessImpl(
             {
                 if (stdInWriterVar != null) { stdInWriterVar.Dispose(); } else { stdInPipeServer.Dispose(); }
 
-                if (stdOutReaderVar != null) { stdInWriterVar.Dispose(); } else { stdOutPipeServer.Dispose(); }
+                if (stdOutReaderVar != null) { stdOutReaderVar.Dispose(); } else { stdOutPipeServer.Dispose(); }
 
-                if (stdErrReaderVar != null) { stdInWriterVar.Dispose(); } else { stdErrPipeServer.Dispose(); }
+                if (stdErrReaderVar != null) { stdErrReaderVar.Dispose(); } else { stdErrPipeServer.Dispose(); }
 
                 throw;
             }
@@ -2662,7 +2705,7 @@ private static int StartSSHProcessImpl(
 
         private static void KillSSHProcessImpl(int pid)
         {
-            using (var sshProcess = System.Diagnostics.Process.GetProcessById(pid))
+            using (var sshProcess = Process.GetProcessById(pid))
             {
                 if ((sshProcess != null) && (sshProcess.Handle != IntPtr.Zero) && !sshProcess.HasExited)
                 {
@@ -2693,7 +2736,7 @@ private static Process CreateProcessWithRedirectedStd(
             SafeFileHandle stdInPipeClient = null;
             SafeFileHandle stdOutPipeClient = null;
             SafeFileHandle stdErrPipeClient = null;
-            string randomName = System.IO.Path.GetFileNameWithoutExtension(System.IO.Path.GetRandomFileName());
+            string randomName = Path.GetFileNameWithoutExtension(Path.GetRandomFileName());
 
             try
             {
@@ -2786,16 +2829,14 @@ private static Process CreateProcessWithRedirectedStd(
             catch (Exception)
             {
                 stdInPipeServer?.Dispose();
-                stdInPipeClient?.Dispose();
                 stdOutPipeServer?.Dispose();
-                stdOutPipeClient?.Dispose();
                 stdErrPipeServer?.Dispose();
-                stdErrPipeClient?.Dispose();
 
                 throw;
             }
             finally
             {
+                lpStartupInfo.Dispose();
                 lpProcessInformation.Dispose();
             }
         }
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 70693c4c3d9..e26f3421cda 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
@@ -76,10 +76,11 @@ internal static class RemotingConstants
     {
         internal static readonly Version HostVersion = PSVersionInfo.PSVersion;
 
-        internal static readonly Version ProtocolVersionWin7RC = new Version(2, 0);
-        internal static readonly Version ProtocolVersionWin7RTM = new Version(2, 1);
-        internal static readonly Version ProtocolVersionWin8RTM = new Version(2, 2);
-        internal static readonly Version ProtocolVersionWin10RTM = new Version(2, 3);
+        internal static readonly Version ProtocolVersion_2_0 = new(2, 0); // Window 7 RC
+        internal static readonly Version ProtocolVersion_2_1 = new(2, 1); // Window 7 RTM
+        internal static readonly Version ProtocolVersion_2_2 = new(2, 2); // Window 8 RTM
+        internal static readonly Version ProtocolVersion_2_3 = new(2, 3); // Window 10 RTM
+        internal static readonly Version ProtocolVersion_2_4 = new(2, 4); // PowerShell 7.6
 
         // Minor will be incremented for each change in PSRP client/server stack and new versions will be
         // forked on early major release/drop changes history.
@@ -87,7 +88,15 @@ internal static class RemotingConstants
         //      2.102 to 2.103 - Key exchange protocol changes in M3
         //      2.103 to 2.2   - Final ship protocol version value, no change to protocol
         //      2.2 to 2.3     - Enabling informational stream
-        internal static readonly Version ProtocolVersionCurrent = new Version(2, 3);
+        //      2.3 to 2.4     - Deprecate the 'Session_Key' exchange. The following messages are obsolete when both server and client are v2.4+:
+        //                        - PUBLIC_KEY
+        //                        - PUBLIC_KEY_REQUEST
+        //                        - ENCRYPTED_SESSION_KEY
+        //                       The padding algorithm 'RSAEncryptionPadding.Pkcs1' used in the 'Session_Key' exchange is NOT secure, and therefore,
+        //                       PSRP needs to be used on top of a secure transport and the 'Session_Key' doesn't add any extra security.
+        //                       So, we decided to deprecate the 'Session_Key' exchange in PSRP and skip encryption and decryption for 'SecureString'
+        //                       objects. Instead, we require the transport to be secure for secure data transfer between PSRP clients and servers.
+        internal static readonly Version ProtocolVersionCurrent = new(2, 4);
         internal static readonly Version ProtocolVersion = ProtocolVersionCurrent;
         // Used by remoting commands to add remoting specific note properties.
         internal static readonly string ComputerNameNoteProperty = "PSComputerName";
@@ -1860,7 +1869,7 @@ internal static object GetPowerShellOutput(object data)
         /// <returns>PSInvocationInfo.</returns>
         internal static PSInvocationStateInfo GetPowerShellStateInfo(object data)
         {
-            if (!(data is PSObject dataAsPSObject))
+            if (data is not PSObject dataAsPSObject)
             {
                 throw new PSRemotingDataStructureException(
                     RemotingErrorIdStrings.DecodingErrorForPowerShellStateInfo);
@@ -2128,7 +2137,7 @@ internal static RemoteStreamOptions GetRemoteStreamOptions(object data)
         /// <returns>RemoteSessionCapability object.</returns>
         internal static RemoteSessionCapability GetSessionCapability(object data)
         {
-            if (!(data is PSObject dataAsPSObject))
+            if (data is not PSObject dataAsPSObject)
             {
                 throw new PSRemotingDataStructureException(
                     RemotingErrorIdStrings.CantCastRemotingDataToPSObject, data.GetType().FullName);
@@ -2158,7 +2167,7 @@ internal static bool ServerSupportsBatchInvocation(Runspace runspace)
                 return false;
             }
 
-            return (runspace.GetRemoteProtocolVersion() >= RemotingConstants.ProtocolVersionWin8RTM);
+            return (runspace.GetRemoteProtocolVersion() >= RemotingConstants.ProtocolVersion_2_2);
         }
     }
 }
diff --git a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
index 8517fb059f5..e0a82e46cf2 100644
--- a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
+++ b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
@@ -432,7 +432,7 @@ internal static int GetBlobLength(byte[] fragmentBytes, int startIndex)
     /// </summary>
     internal class SerializedDataStream : Stream, IDisposable
     {
-        [TraceSourceAttribute("SerializedDataStream", "SerializedDataStream")]
+        [TraceSource("SerializedDataStream", "SerializedDataStream")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("SerializedDataStream", "SerializedDataStream");
         #region Global Constants
 
diff --git a/src/System.Management.Automation/engine/remoting/common/remotingexceptions.cs b/src/System.Management.Automation/engine/remoting/common/remotingexceptions.cs
index c7a2c561bd4..8830bb32152 100644
--- a/src/System.Management.Automation/engine/remoting/common/remotingexceptions.cs
+++ b/src/System.Management.Automation/engine/remoting/common/remotingexceptions.cs
@@ -18,6 +18,7 @@ internal enum PSRemotingErrorId : uint
         // OS related 1-9
         DefaultRemotingExceptionMessage = 0,
         OutOfMemory = 1,
+        UnsupportedOSForRemoteEnumeration = 2,
 
         // Pipeline related range: 10-99
         PipelineIdsDoNotMatch = 10,
@@ -266,7 +267,7 @@ internal static class PSRemotingErrorInvariants
         /// This parameter holds the string in the resource file.
         /// </param>
         /// <param name="args">
-        /// Optional parameters required by the resource string formating information.
+        /// Optional parameters required by the resource string formatting information.
         /// </param>
         /// <returns>
         /// The formatted localized string.
diff --git a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
index 2a9d68bd55f..0859a54965f 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
@@ -195,7 +195,7 @@ public abstract class BaseTransportManager : IDisposable
     {
         #region tracer
 
-        [TraceSourceAttribute("Transport", "Traces BaseWSManTransportManager")]
+        [TraceSource("Transport", "Traces BaseWSManTransportManager")]
         private static readonly PSTraceSource s_baseTracer = PSTraceSource.GetTracer("Transport", "Traces BaseWSManTransportManager");
 
         #endregion
@@ -472,7 +472,7 @@ namespace System.Management.Automation.Remoting.Client
     public abstract class BaseClientTransportManager : BaseTransportManager, IDisposable
     {
         #region Tracer
-        [TraceSourceAttribute("ClientTransport", "Traces ClientTransportManager")]
+        [TraceSource("ClientTransport", "Traces ClientTransportManager")]
         internal static PSTraceSource tracer = PSTraceSource.GetTracer("ClientTransport", "Traces ClientTransportManager");
         #endregion
 
diff --git a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
index 9cea542ab95..07e17e8b63a 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
@@ -340,7 +340,7 @@ public abstract class PSSessionConfiguration : IDisposable
         /// <summary>
         /// Tracer for Server Remote session.
         /// </summary>
-        [TraceSourceAttribute("ServerRemoteSession", "ServerRemoteSession")]
+        [TraceSource("ServerRemoteSession", "ServerRemoteSession")]
         private static readonly PSTraceSource s_tracer = PSTraceSource.GetTracer("ServerRemoteSession", "ServerRemoteSession");
         #endregion tracer
 
@@ -2836,7 +2836,7 @@ internal static Hashtable[] TryGetHashtableArray(object hashObj)
 
                     for (int i = 0; i < hashArray.Length; i++)
                     {
-                        if (!(objArray[i] is Hashtable hash))
+                        if (objArray[i] is not Hashtable hash)
                         {
                             return null;
                         }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index 96a8b833885..47ff6270dba 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -1014,7 +1014,7 @@ internal void OnCloseTimeOutTimerElapsed(object source)
         }
 
         #endregion
-    
+
         #region Protected Methods
 
         /// <summary>
@@ -1544,8 +1544,9 @@ internal VMHyperVSocketClientSessionTransportManager(
         /// </summary>
         public override void CreateAsync()
         {
-            _client = new RemoteSessionHyperVSocketClient(_vmGuid, true);
-            if (!_client.Connect(_networkCredential, _configurationName, true))
+            // isFirstConnection: true - specifies to use VM_SESSION_SERVICE_ID socket.
+            _client = new RemoteSessionHyperVSocketClient(_vmGuid, useBackwardsCompatibleMode: false, isFirstConnection: true);
+            if (!_client.Connect(_networkCredential, _configurationName, isFirstConnection: true))
             {
                 _client.Dispose();
                 throw new PSInvalidOperationException(
@@ -1555,11 +1556,14 @@ public override void CreateAsync()
                     ErrorCategory.InvalidOperation,
                     null);
             }
+            bool useBackwardsCompatibleMode = _client.UseBackwardsCompatibleMode;
+            string token = _client.AuthenticationToken;
 
-            // TODO: remove below 3 lines when Hyper-V socket duplication is supported in .NET framework.
             _client.Dispose();
-            _client = new RemoteSessionHyperVSocketClient(_vmGuid, false);
-            if (!_client.Connect(_networkCredential, _configurationName, false))
+
+            // isFirstConnection: false - specifies to use the SESSION_SERVICE_ID_2 socket.
+            _client = new RemoteSessionHyperVSocketClient(_vmGuid, useBackwardsCompatibleMode: useBackwardsCompatibleMode, isFirstConnection: false, authenticationToken: token);
+            if (!_client.Connect(_networkCredential, _configurationName, isFirstConnection: false))
             {
                 _client.Dispose();
                 throw new PSInvalidOperationException(
@@ -1617,7 +1621,9 @@ internal ContainerHyperVSocketClientSessionTransportManager(
         /// </summary>
         public override void CreateAsync()
         {
-            _client = new RemoteSessionHyperVSocketClient(_targetGuid, false, true);
+            // Container scenario is not working.
+            // When we fix it we need to setup the token in ContainerConnectionInfo and use it here.
+            _client = new RemoteSessionHyperVSocketClient(_targetGuid, isFirstConnection: false, useBackwardsCompatibleMode: false, isContainer: true);
             if (!_client.Connect(null, string.Empty, false))
             {
                 _client.Dispose();
@@ -1716,7 +1722,7 @@ public override void CreateAsync()
             // Start connection timeout timer if requested.
             // Timer callback occurs only once after timeout time.
             _connectionTimer = new Timer(
-                callback: (_) => 
+                callback: (_) =>
                 {
                     if (_connectionEstablished)
                     {
@@ -1727,7 +1733,7 @@ public override void CreateAsync()
                     bool sshTerminated = false;
                     try
                     {
-                        using (var sshProcess = System.Diagnostics.Process.GetProcessById(_sshProcessId))
+                        using (var sshProcess = Process.GetProcessById(_sshProcessId))
                         {
                             sshTerminated = sshProcess == null || sshProcess.Handle == IntPtr.Zero || sshProcess.HasExited;
                         }
@@ -1841,7 +1847,7 @@ private void ProcessErrorThread(object state)
                         // 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);
+                        Console.WriteLine(error);
                     }
                     catch (IOException)
                     { }
@@ -1901,10 +1907,10 @@ private void ProcessReaderThread(object state)
                         break;
                     }
 
-                    if (data.StartsWith(System.Management.Automation.Remoting.Server.FormattedErrorTextWriter.ErrorPrefix, StringComparison.OrdinalIgnoreCase))
+                    if (data.StartsWith(OutOfProcessTextWriter.ErrorPrefix, StringComparison.OrdinalIgnoreCase))
                     {
                         // Error message from the server.
-                        string errorData = data.Substring(System.Management.Automation.Remoting.Server.FormattedErrorTextWriter.ErrorPrefix.Length);
+                        string errorData = data.Substring(OutOfProcessTextWriter.ErrorPrefix.Length);
                         HandleErrorDataReceived(errorData);
                     }
                     else
@@ -2505,7 +2511,7 @@ internal OutOfProcessServerSessionTransportManager(OutOfProcessTextWriter outWri
             _stdErrWriter = errWriter;
             _cmdTransportManagers = new Dictionary<Guid, OutOfProcessServerTransportManager>();
 
-            this.WSManTransportErrorOccured += (object sender, TransportErrorOccuredEventArgs e) => 
+            this.WSManTransportErrorOccured += (object sender, TransportErrorOccuredEventArgs e) =>
             {
                 string msg = e.Exception.TransportMessage ?? e.Exception.InnerException?.Message ?? string.Empty;
                 _stdErrWriter.WriteLine(StringUtil.Format(RemotingErrorIdStrings.RemoteTransportError, msg));
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
index f13970274b6..4d8535ca4a9 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
@@ -301,7 +301,7 @@ internal class ReceiveDataCollection : IDisposable
     {
         #region tracer
 
-        [TraceSourceAttribute("Transport", "Traces BaseWSManTransportManager")]
+        [TraceSource("Transport", "Traces BaseWSManTransportManager")]
         private static readonly PSTraceSource s_baseTracer = PSTraceSource.GetTracer("Transport", "Traces BaseWSManTransportManager");
 
         #endregion
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
index 289f88c576f..d7bce634620 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
@@ -304,7 +304,6 @@ internal struct WSManUserNameCredentialStruct
                 /// <summary>
                 /// Making password secure.
                 /// </summary>
-                [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
                 internal IntPtr password;
             }
 
@@ -626,7 +625,6 @@ internal class WSManBinaryOrTextDataStruct
         {
             internal int bufferLength;
 
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr data;
         }
 
@@ -637,10 +635,8 @@ internal class WSManData_ManToUn : IDisposable
         {
             private readonly WSManDataStruct _internalData;
 
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             private IntPtr _marshalledObject = IntPtr.Zero;
 
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             private IntPtr _marshalledBuffer = IntPtr.Zero;
 
             /// <summary>
@@ -933,7 +929,6 @@ internal struct WSManStreamIDSetStruct
         {
             internal int streamIDsCount;
 
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr streamIDs;
         }
 
@@ -1085,7 +1080,6 @@ internal struct WSManOptionSetStruct
             /// <summary>
             /// Pointer to an array of WSManOption objects.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr options;
 
             internal bool optionsMustUnderstand;
@@ -1223,13 +1217,11 @@ internal struct WSManCommandArgSetInternal
             {
                 internal int argsCount;
 
-                [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
                 internal IntPtr args;
             }
 
             private WSManCommandArgSetInternal _internalData;
 
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             private MarshalledObject _data;
 
             #region Managed to Unmanaged
@@ -1733,7 +1725,6 @@ internal struct WSManShellAsyncCallback
             // GC handle which prevents garbage collector from collecting this delegate.
             private GCHandle _gcHandle;
 
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             private readonly IntPtr _asyncCallback;
 
             internal WSManShellAsyncCallback(WSManShellCompletionFunction callback)
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
index 7fbc236a4dd..2d99a42cfb9 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
@@ -343,61 +343,51 @@ internal class WSManPluginEntryDelegatesInternal
             /// <summary>
             /// WsManPluginShutdownPluginCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginShutdownPluginCallbackNative;
 
             /// <summary>
             /// WSManPluginShellCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginShellCallbackNative;
 
             /// <summary>
             /// WSManPluginReleaseShellContextCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginReleaseShellContextCallbackNative;
 
             /// <summary>
             /// WSManPluginCommandCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginCommandCallbackNative;
 
             /// <summary>
             /// WSManPluginReleaseCommandContextCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginReleaseCommandContextCallbackNative;
 
             /// <summary>
             /// WSManPluginSendCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginSendCallbackNative;
 
             /// <summary>
             /// WSManPluginReceiveCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginReceiveCallbackNative;
 
             /// <summary>
             /// WSManPluginSignalCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginSignalCallbackNative;
 
             /// <summary>
             /// WSManPluginConnectCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginConnectCallbackNative;
 
             /// <summary>
             /// WSManPluginCommandCallbackNative.
             /// </summary>
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             internal IntPtr wsManPluginShutdownCallbackNative;
         }
     }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
index 6ff9187d3bf..d4ee779b5a2 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
@@ -317,18 +317,13 @@ internal CompletionEventArgs(CompletionNotification notification)
         #endregion
 
         #region Private Data
+
         // operation handles are owned by WSMan
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _wsManSessionHandle;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _wsManShellOperationHandle;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _wsManReceiveOperationHandle;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _wsManSendOperationHandle;
+
         // this is used with WSMan callbacks to represent a session transport manager.
         private long _sessionContextID;
 
@@ -1258,7 +1253,7 @@ public override void CloseAsync()
         /// <param name="serverProtocolVersion">Server negotiated protocol version.</param>
         internal void AdjustForProtocolVariations(Version serverProtocolVersion)
         {
-            if (serverProtocolVersion <= RemotingConstants.ProtocolVersionWin7RTM)
+            if (serverProtocolVersion <= RemotingConstants.ProtocolVersion_2_1)
             {
                 int maxEnvSize;
                 WSManNativeApi.WSManGetSessionOptionAsDword(_wsManSessionHandle,
@@ -2643,7 +2638,6 @@ private void DisposeWSManAPIDataAsync()
         /// </summary>
         internal class WSManAPIDataCommon : IDisposable
         {
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
             private IntPtr _handle;
             // if any
             private WSManNativeApi.WSManStreamIDSet_ManToUn _inputStreamSet;
@@ -2791,18 +2785,11 @@ internal sealed class WSManClientCommandTransportManager : BaseClientCommandTran
 
         // operation handles
         private readonly IntPtr _wsManShellOperationHandle;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _wsManCmdOperationHandle;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _cmdSignalOperationHandle;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _wsManReceiveOperationHandle;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private IntPtr _wsManSendOperationHandle;
+
         // this is used with WSMan callbacks to represent a command transport manager.
         private long _cmdContextId;
 
diff --git a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
index 14b0240858b..6c794e21b24 100644
--- a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
+++ b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
@@ -635,6 +635,16 @@ private HyperVSocketMediator()
             originalStdErr = new HyperVSocketErrorTextWriter(_hypervSocketServer.TextWriter);
         }
 
+        private HyperVSocketMediator(string token,
+            DateTimeOffset tokenCreationTime)
+            : base(false)
+        {
+            _hypervSocketServer = new RemoteSessionHyperVSocketServer(false, token: token, tokenCreationTime: tokenCreationTime);
+
+            originalStdIn = _hypervSocketServer.TextReader;
+            originalStdOut = new OutOfProcessTextWriter(_hypervSocketServer.TextWriter);
+            originalStdErr = new HyperVSocketErrorTextWriter(_hypervSocketServer.TextWriter);
+        }
         #endregion
 
         #region Static Methods
@@ -656,6 +666,24 @@ internal static void Run(
                 configurationFile: null);
         }
 
+        internal static void Run(
+            string initialCommand,
+            string configurationName,
+            string token,
+            DateTimeOffset tokenCreationTime)
+        {
+            lock (SyncObject)
+            {
+                s_instance = new HyperVSocketMediator(token, tokenCreationTime);
+            }
+
+            s_instance.Start(
+                initialCommand: initialCommand,
+                cryptoHelper: new PSRemotingCryptoHelperServer(),
+                workingDirectory: null,
+                configurationName: configurationName,
+                configurationFile: null);
+        }
         #endregion
     }
 
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs b/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
index 7e7aa767d5c..71dda0d0b7a 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
@@ -327,7 +327,7 @@ public override void PushRunspace(Runspace runspace)
                 throw new PSInvalidOperationException(RemotingErrorIdStrings.ServerDriverRemoteHostAlreadyPushed);
             }
 
-            if (!(runspace is RemoteRunspace remoteRunspace))
+            if (runspace is not RemoteRunspace remoteRunspace)
             {
                 throw new PSInvalidOperationException(RemotingErrorIdStrings.ServerDriverRemoteHostNotRemoteRunspace);
             }
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
index ba0728790e7..a5e0da4968e 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
@@ -716,7 +716,7 @@ private void HandleCreateAndInvokePowerShell(object _, RemoteDataEventArgs<Remot
             bool isNested = false;
 
             // The server would've dropped the protocol version of an older client was connecting
-            if (_serverCapability.ProtocolVersion >= RemotingConstants.ProtocolVersionWin8RTM)
+            if (_serverCapability.ProtocolVersion >= RemotingConstants.ProtocolVersion_2_2)
             {
                 isNested = RemotingDecoder.GetIsNested(data.Data);
             }
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
index 7f0e5636a4e..b1e05909d2c 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
@@ -69,7 +69,7 @@ internal ServerRemoteSessionContext()
     /// </summary>
     internal class ServerRemoteSession : RemoteSession
     {
-        [TraceSourceAttribute("ServerRemoteSession", "ServerRemoteSession")]
+        [TraceSource("ServerRemoteSession", "ServerRemoteSession")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("ServerRemoteSession", "ServerRemoteSession");
 
         private readonly PSSenderInfo _senderInfo;
@@ -973,35 +973,21 @@ private bool RunServerNegotiationAlgorithm(RemoteSessionCapability clientCapabil
 
             if (onConnect)
             {
-                bool connectSupported = false;
-
-                // Win10 server can support reconstruct/reconnect for all 2.x protocol versions
-                // that support reconstruct/reconnect, Protocol 2.2+
-                // Major protocol version differences (2.x -> 3.x) are not supported.
-                // A reconstruct can only be initiated by a client that understands disconnect (2.2+),
-                // so we only need to check major versions from client and this server for compatibility.
-                if (clientProtocolVersion.Major == RemotingConstants.ProtocolVersion.Major)
+                // PS v7.6 server can support reconstruct/reconnect for all 2.x protocol versions that support reconstruct/reconnect (v2.2+).
+                // Major protocol version differences (2.x -> 3.x) are not supported. A reconstruct can only be initiated by a client that understands disconnect (v2.2+).
+                if (clientProtocolVersion == RemotingConstants.ProtocolVersion_2_2 ||
+                    clientProtocolVersion == RemotingConstants.ProtocolVersion_2_3)
                 {
-                    if (clientProtocolVersion.Minor == RemotingConstants.ProtocolVersionWin8RTM.Minor)
-                    {
-                        // Report that server is Win8 version to the client
-                        // Protocol: 2.2
-                        connectSupported = true;
-                        serverProtocolVersion = RemotingConstants.ProtocolVersionWin8RTM;
-                        Context.ServerCapability.ProtocolVersion = serverProtocolVersion;
-                    }
-                    else if (clientProtocolVersion.Minor > RemotingConstants.ProtocolVersionWin8RTM.Minor)
-                    {
-                        // All other minor versions are supported and the server returns its full capability
-                        // Protocol: 2.3, 2.4, 2.5 ...
-                        connectSupported = true;
-                    }
+                    // Report the server as the same version to the client.
+                    // Client protocol: v2.2, v2.3
+                    serverProtocolVersion = clientProtocolVersion;
+                    Context.ServerCapability.ProtocolVersion = serverProtocolVersion;
                 }
-
-                if (!connectSupported)
+                else if (!(clientProtocolVersion.Major == serverProtocolVersion.Major &&
+                           clientProtocolVersion.Minor >= serverProtocolVersion.Minor))
                 {
                     // Throw for protocol versions 2.x that don't support disconnect/reconnect.
-                    // Protocol: < 2.2
+                    // Client protocol: < 2.2
                     PSRemotingDataStructureException reasonOfFailure =
                         new PSRemotingDataStructureException(RemotingErrorIdStrings.ServerConnectFailedOnNegotiation,
                             RemoteDataNameStrings.PS_STARTUP_PROTOCOL_VERSION_NAME,
@@ -1010,47 +996,23 @@ private bool RunServerNegotiationAlgorithm(RemoteSessionCapability clientCapabil
                             RemotingConstants.ProtocolVersion);
                     throw reasonOfFailure;
                 }
+
+                // All other minor versions are supported and the server returns its full capability.
+                // Client protocol: v2.4, v2.5 ...
             }
             else
             {
-                // Win10 server can support Win8 client
-                if (clientProtocolVersion == RemotingConstants.ProtocolVersionWin8RTM &&
-                    (
-                        (serverProtocolVersion == RemotingConstants.ProtocolVersionWin10RTM)
-                    ))
-                {
-                    // - report that server is Win8 version to the client
-                    serverProtocolVersion = RemotingConstants.ProtocolVersionWin8RTM;
-                    Context.ServerCapability.ProtocolVersion = serverProtocolVersion;
-                }
-
-                // Win8, Win10 server can support Win7 client
-                if (clientProtocolVersion == RemotingConstants.ProtocolVersionWin7RTM &&
-                    (
-                        (serverProtocolVersion == RemotingConstants.ProtocolVersionWin8RTM) ||
-                        (serverProtocolVersion == RemotingConstants.ProtocolVersionWin10RTM)
-                    ))
-                {
-                    // - report that server is Win7 version to the client
-                    serverProtocolVersion = RemotingConstants.ProtocolVersionWin7RTM;
-                    Context.ServerCapability.ProtocolVersion = serverProtocolVersion;
-                }
-
-                // Win7, Win8, Win10 server can support Win7 RC client
-                if (clientProtocolVersion == RemotingConstants.ProtocolVersionWin7RC &&
-                    (
-                        (serverProtocolVersion == RemotingConstants.ProtocolVersionWin7RTM) ||
-                        (serverProtocolVersion == RemotingConstants.ProtocolVersionWin8RTM) ||
-                        (serverProtocolVersion == RemotingConstants.ProtocolVersionWin10RTM)
-                    ))
+                if (clientProtocolVersion == RemotingConstants.ProtocolVersion_2_0 ||
+                    clientProtocolVersion == RemotingConstants.ProtocolVersion_2_1 ||
+                    clientProtocolVersion == RemotingConstants.ProtocolVersion_2_2 ||
+                    clientProtocolVersion == RemotingConstants.ProtocolVersion_2_3)
                 {
-                    // - report that server is RC version to the client
-                    serverProtocolVersion = RemotingConstants.ProtocolVersionWin7RC;
+                    // We support the those client versions and report the server as the same version to the client.
+                    serverProtocolVersion = clientProtocolVersion;
                     Context.ServerCapability.ProtocolVersion = serverProtocolVersion;
                 }
-
-                if (!((clientProtocolVersion.Major == serverProtocolVersion.Major) &&
-                      (clientProtocolVersion.Minor >= serverProtocolVersion.Minor)))
+                else if (!(clientProtocolVersion.Major == serverProtocolVersion.Major &&
+                           clientProtocolVersion.Minor >= serverProtocolVersion.Minor))
                 {
                     PSRemotingDataStructureException reasonOfFailure =
                         new PSRemotingDataStructureException(RemotingErrorIdStrings.ServerNegotiationFailed,
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
index 3a6bb4c1f53..67d47ea404c 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
@@ -31,7 +31,7 @@ namespace System.Management.Automation.Remoting
     /// </summary>
     internal class ServerRemoteSessionDSHandlerStateMachine
     {
-        [TraceSourceAttribute("ServerRemoteSessionDSHandlerStateMachine", "ServerRemoteSessionDSHandlerStateMachine")]
+        [TraceSource("ServerRemoteSessionDSHandlerStateMachine", "ServerRemoteSessionDSHandlerStateMachine")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("ServerRemoteSessionDSHandlerStateMachine", "ServerRemoteSessionDSHandlerStateMachine");
 
         private readonly ServerRemoteSession _session;
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index c93041a7b68..027c4886380 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Buffers;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -2717,6 +2718,14 @@ private DynamicMetaObject BinaryAdd(DynamicMetaObject target, DynamicMetaObject
                                            lhsEnumerator.Expression.Cast(typeof(IEnumerator)),
                                            rhsEnumerator.Expression.Cast(typeof(IEnumerator)));
                 }
+                else if (target.Value is object[] targetArray)
+                {
+                    // Adding 1 item to an object[]
+                    // This is an optimisation over the default EnumerableOps_AddObject.
+                    call = Expression.Call(CachedReflectionInfo.ArrayOps_AddObject,
+                                           target.Expression.Cast(typeof(object[])),
+                                           arg.Expression.Cast(typeof(object)));
+                }
                 else
                 {
                     // Adding 1 item to a list
@@ -5289,7 +5298,8 @@ public override DynamicMetaObject FallbackGetMember(DynamicMetaObject target, Dy
                             var propertyAccessor = adapterData.member as PropertyInfo;
                             if (propertyAccessor != null)
                             {
-                                if (propertyAccessor.GetMethod.IsFamily &&
+                                var propertyGetter = propertyAccessor.GetMethod;
+                                if ((propertyGetter.IsFamily || propertyGetter.IsFamilyOrAssembly) &&
                                     (_classScope == null || !_classScope.IsSubclassOf(propertyAccessor.DeclaringType)))
                                 {
                                     return GenerateGetPropertyException(restrictions).WriteToDebugLog(this);
@@ -5524,7 +5534,7 @@ internal static DynamicMetaObject EnsureAllowedInLanguageMode(DynamicMetaObject
                     return target.ThrowRuntimeError(args, moreTests, errorID, resourceString);
                 }
 
-                string targetName = (targetValue as Type)?.FullName;
+                string targetName = (targetValue as Type)?.FullName ?? targetValue?.GetType().FullName;
                 SystemPolicy.LogWDACAuditMessage(
                     context: context,
                     title: ParameterBinderStrings.WDACBinderInvocationLogTitle,
@@ -5749,8 +5759,8 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
                             var getMethod = propertyInfo.GetGetMethod(nonPublic: true);
                             var setMethod = propertyInfo.GetSetMethod(nonPublic: true);
 
-                            if ((getMethod == null || getMethod.IsFamily || getMethod.IsPublic) &&
-                                (setMethod == null || setMethod.IsFamily || setMethod.IsPublic))
+                            if ((getMethod == null || getMethod.IsPublic || getMethod.IsFamily || getMethod.IsFamilyOrAssembly) &&
+                                (setMethod == null || setMethod.IsPublic || setMethod.IsFamily || setMethod.IsFamilyOrAssembly))
                             {
                                 memberInfo = new PSProperty(this.Name, PSObject.DotNetInstanceAdapter, target.Value, new DotNetAdapter.PropertyCacheEntry(propertyInfo));
                             }
@@ -5760,7 +5770,7 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
                             var fieldInfo = member as FieldInfo;
                             if (fieldInfo != null)
                             {
-                                if (fieldInfo.IsFamily)
+                                if (fieldInfo.IsFamily || fieldInfo.IsFamilyOrAssembly)
                                 {
                                     memberInfo = new PSProperty(this.Name, PSObject.DotNetInstanceAdapter, target.Value, new DotNetAdapter.PropertyCacheEntry(fieldInfo));
                                 }
@@ -5768,7 +5778,7 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
                             else
                             {
                                 var methodInfo = member as MethodInfo;
-                                if (methodInfo != null && (methodInfo.IsPublic || methodInfo.IsFamily))
+                                if (methodInfo != null && (methodInfo.IsPublic || methodInfo.IsFamily || methodInfo.IsFamilyOrAssembly))
                                 {
                                     candidateMethods ??= new List<MethodBase>();
 
@@ -6283,7 +6293,8 @@ public override DynamicMetaObject FallbackSetMember(DynamicMetaObject target, Dy
                         var targetExpr = _static ? null : PSGetMemberBinder.GetTargetExpr(target, data.member.DeclaringType);
                         if (propertyInfo != null)
                         {
-                            if (propertyInfo.SetMethod.IsFamily &&
+                            var propertySetter = propertyInfo.SetMethod;
+                            if ((propertySetter.IsFamily || propertySetter.IsFamilyOrAssembly) &&
                                 (_classScope == null || !_classScope.IsSubclassOf(propertyInfo.DeclaringType)))
                             {
                                 return GeneratePropertyAssignmentException(restrictions).WriteToDebugLog(this);
@@ -6525,6 +6536,21 @@ public override DynamicMetaObject FallbackInvoke(DynamicMetaObject target, Dynam
 
     internal sealed class PSInvokeMemberBinder : InvokeMemberBinder
     {
+        [TraceSource("MethodInvocation", "Traces the invocation of .NET methods.")]
+        internal static readonly PSTraceSource MethodInvocationTracer =
+            PSTraceSource.GetTracer(
+                "MethodInvocation",
+                "Traces the invocation of .NET methods.",
+                false);
+
+        private static readonly SearchValues<string> s_whereSearchValues = SearchValues.Create(
+            ["Where", "PSWhere"],
+            StringComparison.OrdinalIgnoreCase);
+
+        private static readonly SearchValues<string> s_foreachSearchValues = SearchValues.Create(
+            ["ForEach", "PSForEach"],
+            StringComparison.OrdinalIgnoreCase);
+
         internal enum MethodInvocationType
         {
             Ordinary,
@@ -6673,12 +6699,14 @@ public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target,
                         .WriteToDebugLog(this);
                     BindingRestrictions argRestrictions = args.Aggregate(BindingRestrictions.Empty, static (current, arg) => current.Merge(arg.PSGetMethodArgumentRestriction()));
 
-                    if (string.Equals(Name, "Where", StringComparison.OrdinalIgnoreCase))
+                    // We need to pass the empty enumerator to the ForEach/Where operators, so that they can return an empty collection.
+                    // The ForEach/Where operators will not be able to call the script block if the enumerator is empty.
+                    if (s_whereSearchValues.Contains(Name))
                     {
                         return InvokeWhereOnCollection(emptyEnumerator, args, argRestrictions).WriteToDebugLog(this);
                     }
 
-                    if (string.Equals(Name, "ForEach", StringComparison.OrdinalIgnoreCase))
+                    if (s_foreachSearchValues.Contains(Name))
                     {
                         return InvokeForEachOnCollection(emptyEnumerator, args, argRestrictions).WriteToDebugLog(this);
                     }
@@ -6858,12 +6886,12 @@ public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target,
             if (!_static && !_nonEnumerating && target.Value != AutomationNull.Value)
             {
                 // Invoking Where and ForEach operators on collections.
-                if (string.Equals(Name, "Where", StringComparison.OrdinalIgnoreCase))
+                if (s_whereSearchValues.Contains(Name))
                 {
                     return InvokeWhereOnCollection(target, args, restrictions).WriteToDebugLog(this);
                 }
 
-                if (string.Equals(Name, "ForEach", StringComparison.OrdinalIgnoreCase))
+                if (s_foreachSearchValues.Contains(Name))
                 {
                     return InvokeForEachOnCollection(target, args, restrictions).WriteToDebugLog(this);
                 }
@@ -6935,19 +6963,16 @@ internal static DynamicMetaObject InvokeDotNetMethod(
                     expr = Expression.Block(expr, ExpressionCache.AutomationNullConstant);
                 }
 
-                // 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 (MethodInvocationTracer.IsEnabled)
+                {
+                    expr = Expression.Block(
+                        Expression.Call(
+                            Expression.Constant(MethodInvocationTracer),
+                            CachedReflectionInfo.PSTraceSource_WriteLine,
+                            Expression.Constant("Invoking method: {0}"),
+                            Expression.Constant(result.methodDefinition)),
+                        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
@@ -7111,6 +7136,7 @@ internal static Expression InvokeMethod(MethodBase mi, DynamicMetaObject target,
                 invocationType != MethodInvocationType.NonVirtual;
             var parameters = mi.GetParameters();
             var argExprs = new Expression[parameters.Length];
+            var argsToLog = new List<Expression>(Math.Max(parameters.Length, args.Length));
 
             for (int i = 0; i < parameters.Length; ++i)
             {
@@ -7135,16 +7161,21 @@ internal static Expression InvokeMethod(MethodBase mi, DynamicMetaObject target,
 
                     if (expandParameters)
                     {
-                        argExprs[i] = Expression.NewArrayInit(
-                            paramElementType,
-                            args.Skip(i).Select(
-                                a => a.CastOrConvertMethodArgument(
+                        IEnumerable<Expression> elements = args
+                            .Skip(i)
+                            .Select(a =>
+                                a.CastOrConvertMethodArgument(
                                     paramElementType,
                                     paramName,
                                     mi.Name,
                                     allowCastingToByRefLikeType: false,
                                     temps,
-                                    initTemps)));
+                                    initTemps))
+                            .ToList();
+
+                        argExprs[i] = Expression.NewArrayInit(paramElementType, elements);
+                        // User specified the element arguments, so we log them instead of the compiler-created array.
+                        argsToLog.AddRange(elements);
                     }
                     else
                     {
@@ -7155,16 +7186,35 @@ internal static Expression InvokeMethod(MethodBase mi, DynamicMetaObject target,
                             allowCastingToByRefLikeType: false,
                             temps,
                             initTemps);
+
                         argExprs[i] = arg;
+                        argsToLog.Add(arg);
                     }
                 }
                 else if (i >= args.Length)
                 {
-                    Diagnostics.Assert(parameters[i].IsOptional,
+                    // We don't log the default value for an optional parameter, as it's not specified by the user.
+                    Diagnostics.Assert(
+                        parameters[i].IsOptional,
                         "if there are too few arguments, FindBestMethod should only succeed if parameters are optional");
+
                     var argValue = parameters[i].DefaultValue;
                     if (argValue == null)
                     {
+                        if (parameterType.IsByRef)
+                        {
+                            // When the default value is null for a ByRef parameter (e.g. an optional `in` parameter
+                            // using `default`), expression trees cannot create Expression.Default for the T& type.
+                            // In that case we switch to the element type and use Default(TElement) instead.
+                            parameterType = parameterType.GetElementType();
+                        }
+                        argExprs[i] = Expression.Default(parameterType);
+                    }
+                    else if (!parameters[i].HasDefaultValue && parameterType != typeof(object) && argValue == Type.Missing)
+                    {
+                        // If the method contains just [Optional] without a default value set then we cannot use
+                        // Type.Missing as a placeholder. Instead we use the default value for that type. Only
+                        // exception to this rule is when the parameter type is object.
                         argExprs[i] = Expression.Default(parameterType);
                     }
                     else
@@ -7192,17 +7242,25 @@ internal static Expression InvokeMethod(MethodBase mi, DynamicMetaObject target,
                         var psRefValue = Expression.Property(args[i].Expression.Cast(typeof(PSReference)), CachedReflectionInfo.PSReference_Value);
                         initTemps.Add(Expression.Assign(temp, psRefValue.Convert(temp.Type)));
                         copyOutTemps.Add(Expression.Assign(psRefValue, temp.Cast(typeof(object))));
+
                         argExprs[i] = temp;
+                        argsToLog.Add(temp);
                     }
                     else
                     {
-                        argExprs[i] = args[i].CastOrConvertMethodArgument(
+                        var convertedArg = args[i].CastOrConvertMethodArgument(
                             parameterType,
                             paramName,
                             mi.Name,
                             allowCastingToByRefLikeType,
                             temps,
                             initTemps);
+
+                        argExprs[i] = convertedArg;
+                        // If the converted arg is a byref-like type, then we log the original arg.
+                        argsToLog.Add(convertedArg.Type.IsByRefLike
+                            ? args[i].Expression
+                            : convertedArg);
                     }
                 }
             }
@@ -7248,6 +7306,12 @@ internal static Expression InvokeMethod(MethodBase mi, DynamicMetaObject target,
                 }
             }
 
+            // We need to add one expression to log the .NET invocation before actually invoking:
+            //  - Log method invocation to AMSI Notifications (can throw PSSecurityException)
+            //  - Invoke method
+            string targetName = mi.ReflectedType?.FullName ?? string.Empty;
+            string methodName = mi.Name is ".ctor" ? "new" : mi.Name;
+
             if (temps.Count > 0)
             {
                 if (call.Type != typeof(void) && copyOutTemps.Count > 0)
@@ -7258,8 +7322,13 @@ internal static Expression InvokeMethod(MethodBase mi, DynamicMetaObject target,
                     copyOutTemps.Add(retValue);
                 }
 
+                AddMemberInvocationLogging(initTemps, targetName, methodName, argsToLog);
                 call = Expression.Block(call.Type, temps, initTemps.Append(call).Concat(copyOutTemps));
             }
+            else
+            {
+                call = AddMemberInvocationLogging(call, targetName, methodName, argsToLog);
+            }
 
             return call;
         }
@@ -7459,7 +7528,7 @@ internal static object InvokeAdaptedMember(object obj, string methodName, object
             // As a last resort, we invoke 'Where' and 'ForEach' operators on singletons like
             //    ([pscustomobject]@{ foo = 'bar' }).Foreach({$_})
             //    ([pscustomobject]@{ foo = 'bar' }).Where({1})
-            if (string.Equals(methodName, "Where", StringComparison.OrdinalIgnoreCase))
+            if (s_whereSearchValues.Contains(methodName))
             {
                 var enumerator = (new object[] { obj }).GetEnumerator();
                 switch (args.Length)
@@ -7475,7 +7544,7 @@ internal static object InvokeAdaptedMember(object obj, string methodName, object
                 }
             }
 
-            if (string.Equals(methodName, "Foreach", StringComparison.OrdinalIgnoreCase))
+            if (s_foreachSearchValues.Contains(methodName))
             {
                 var enumerator = (new object[] { obj }).GetEnumerator();
                 object[] argsToPass;
@@ -7551,6 +7620,55 @@ internal static void InvalidateCache()
             }
         }
 
+#nullable enable
+        private static Expression AddMemberInvocationLogging(
+            Expression expr,
+            string targetName,
+            string name,
+            List<Expression> args)
+        {
+#if UNIX
+            // For efficiency this is a no-op on non-Windows platforms.
+            return expr;
+#else
+            Expression[] invocationArgs = new Expression[args.Count];
+            for (int i = 0; i < args.Count; i++)
+            {
+                invocationArgs[i] = args[i].Cast(typeof(object));
+            }
+
+            return Expression.Block(
+                Expression.Call(
+                    CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
+                    Expression.Constant(targetName),
+                    Expression.Constant(name),
+                    Expression.NewArrayInit(typeof(object), invocationArgs)),
+                expr);
+#endif
+        }
+
+        private static void AddMemberInvocationLogging(
+            List<Expression> exprs,
+            string targetName,
+            string name,
+            List<Expression> args)
+        {
+#if !UNIX
+            Expression[] invocationArgs = new Expression[args.Count];
+            for (int i = 0; i < args.Count; i++)
+            {
+                invocationArgs[i] = args[i].Cast(typeof(object));
+            }
+
+            exprs.Add(Expression.Call(
+                CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
+                Expression.Constant(targetName),
+                Expression.Constant(name),
+                Expression.NewArrayInit(typeof(object), invocationArgs)));
+#endif
+        }
+#nullable disable
+
         #endregion
     }
 
@@ -7811,7 +7929,7 @@ public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target,
                 ? BindingRestrictions.GetTypeRestriction(target.Expression, target.Value.GetType())
                 : target.PSGetTypeRestriction();
             restrictions = args.Aggregate(restrictions, static (current, arg) => current.Merge(arg.PSGetMethodArgumentRestriction()));
-            var newConstructors = DotNetAdapter.GetMethodInformationArray(ctors.Where(static c => c.IsPublic || c.IsFamily).ToArray());
+            var newConstructors = DotNetAdapter.GetMethodInformationArray(ctors.Where(static c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly).ToArray());
             return PSInvokeMemberBinder.InvokeDotNetMethod(_callInfo, "new", _constraints, PSInvokeMemberBinder.MethodInvocationType.BaseCtor,
                                                            target, args, restrictions, newConstructors, typeof(MethodException));
         }
diff --git a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
index 2569dd3a492..f4829bc3547 100644
--- a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
+++ b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
@@ -196,7 +196,7 @@ private void ReallyCompile(bool optimize)
 
         private void PerformSecurityChecks()
         {
-            if (!(Ast is ScriptBlockAst scriptBlockAst))
+            if (Ast is not ScriptBlockAst scriptBlockAst)
             {
                 // Checks are only needed at the top level.
                 return;
@@ -266,12 +266,12 @@ bool IsScriptBlockInFactASafeHashtable()
                     return false;
                 }
 
-                if (!(endBlock.Statements[0] is PipelineAst pipelineAst))
+                if (endBlock.Statements[0] is not PipelineAst pipelineAst)
                 {
                     return false;
                 }
 
-                if (!(pipelineAst.GetPureExpression() is HashtableAst hashtableAst))
+                if (pipelineAst.GetPureExpression() is not HashtableAst hashtableAst)
                 {
                     return false;
                 }
@@ -769,7 +769,7 @@ private PipelineAst GetSimplePipeline(Func<string, PipelineAst> errorHandler)
                 return errorHandler(AutomationExceptions.CantConvertScriptBlockWithTrap);
             }
 
-            if (!(statements[0] is PipelineAst pipeAst))
+            if (statements[0] is not PipelineAst pipeAst)
             {
                 return errorHandler(AutomationExceptions.CanOnlyConvertOnePipeline);
             }
diff --git a/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs b/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs
index fa4c2c2b565..4fd68cdd201 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs
@@ -12,6 +12,15 @@ namespace System.Management.Automation
 {
     internal static class ArrayOps
     {
+        internal static object AddObjectArray(object[] lhs, object rhs)
+        {
+            int newIdx = lhs.Length;
+            Array.Resize(ref lhs, newIdx + 1);
+            lhs[newIdx] = rhs;
+
+            return lhs;
+        }
+
         internal static object[] SlicingIndex(object target, object[] indexes, Func<object, object, object> indexer)
         {
             var result = new object[indexes.Length];
diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index eb3100ea512..d584666ab62 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -714,6 +714,18 @@ internal static SteppablePipeline GetSteppablePipeline(PipelineAst pipelineAst,
                 // of invoking it. So the trustworthiness is defined by the trustworthiness of the
                 // script block's language mode.
                 bool isTrusted = scriptBlock.LanguageMode == PSLanguageMode.FullLanguage;
+                if (scriptBlock.LanguageMode == PSLanguageMode.ConstrainedLanguage
+                    && SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Audit)
+                {
+                    // In audit mode, report but don't enforce.
+                    isTrusted = true;
+                    SystemPolicy.LogWDACAuditMessage(
+                        context: context,
+                        title: ParserStrings.WDACGetSteppablePipelineLogTitle,
+                        message: ParserStrings.WDACGetSteppablePipelineLogMessage,
+                        fqid: "GetSteppablePipelineMayFail",
+                        dropIntoDebugger: true);
+                }
 
                 foreach (var commandAst in pipelineAst.PipelineElements.Cast<CommandAst>())
                 {
@@ -729,7 +741,7 @@ internal static SteppablePipeline GetSteppablePipeline(PipelineAst pipelineAst,
 
                         var exprAst = (ExpressionAst)commandElement;
                         var argument = Compiler.GetExpressionValue(exprAst, isTrusted, context);
-                        var splatting = (exprAst is VariableExpressionAst && ((VariableExpressionAst)exprAst).Splatted);
+                        var splatting = exprAst is VariableExpressionAst && ((VariableExpressionAst)exprAst).Splatted;
                         commandParameters.Add(CommandParameterInternal.CreateArgument(argument, exprAst, splatting));
                     }
 
@@ -797,8 +809,8 @@ private static CommandParameterInternal GetCommandParameter(CommandParameterAst
             }
 
             object argumentValue = Compiler.GetExpressionValue(argumentAst, isTrusted, context);
-            bool spaceAfterParameter = (errorPos.EndLineNumber != argumentAst.Extent.StartLineNumber ||
-                                        errorPos.EndColumnNumber != argumentAst.Extent.StartColumnNumber);
+            bool spaceAfterParameter = errorPos.EndLineNumber != argumentAst.Extent.StartLineNumber ||
+                                       errorPos.EndColumnNumber != argumentAst.Extent.StartColumnNumber;
             return CommandParameterInternal.CreateParameterWithArgument(commandParameterAst, commandParameterAst.ParameterName,
                                                                         errorPos.Text, argumentAst, argumentValue,
                                                                         spaceAfterParameter);
@@ -1078,10 +1090,20 @@ public override string ToString()
         //    dir > out
         internal override void Bind(PipelineProcessor pipelineProcessor, CommandProcessorBase commandProcessor, ExecutionContext context)
         {
+            // Check first to see if File is a variable path. If so, we'll not create the FileBytePipe
+            bool redirectToVariable = false;
+
+            context.SessionState.Path.GetUnresolvedProviderPathFromPSPath(File, out ProviderInfo p, out _);
+            if (p != null && p.NameEquals(context.ProviderNames.Variable))
+            {
+                redirectToVariable = true;
+            }
+
             if (commandProcessor is NativeCommandProcessor nativeCommand
                 && nativeCommand.CommandRuntime.ErrorMergeTo is not MshCommandRuntime.MergeDataStream.Output
                 && FromStream is RedirectionStream.Output
-                && !string.IsNullOrWhiteSpace(File))
+                && !string.IsNullOrWhiteSpace(File)
+                && !redirectToVariable)
             {
                 nativeCommand.StdOutDestination = FileBytePipe.Create(File, Appending);
                 return;
@@ -1196,26 +1218,49 @@ internal Pipe GetRedirectionPipe(ExecutionContext context, PipelineProcessor par
                 return new Pipe { NullPipe = true };
             }
 
-            CommandProcessorBase commandProcessor = context.CreateCommand("out-file", false);
-            Diagnostics.Assert(commandProcessor != null, "CreateCommand returned null");
-
-            // Previously, we mandated Unicode encoding here
-            // Now, We can take what ever has been set if PSDefaultParameterValues
-            // Unicode is still the default, but now may be overridden
+            // determine whether we're trying to set a variable by inspecting the file path
+            // if we can determine that it's a variable, we'll use Set-Variable rather than Out-File
+            CommandProcessorBase commandProcessor;
+            var name = context.SessionState.Path.GetUnresolvedProviderPathFromPSPath(File, out ProviderInfo p, out _);
 
-            var cpi = CommandParameterInternal.CreateParameterWithArgument(
-                /*parameterAst*/null, "Filepath", "-Filepath:",
-                /*argumentAst*/null, File,
-                false);
-            commandProcessor.AddParameter(cpi);
+            if (p != null && p.NameEquals(context.ProviderNames.Variable))
+            {
+                commandProcessor = context.CreateCommand("Set-Variable", false);
+                Diagnostics.Assert(commandProcessor != null, "CreateCommand returned null");
+                var cpi = CommandParameterInternal.CreateParameterWithArgument(
+                    /*parameterAst*/null, "Name", "-Name:",
+                    /*argumentAst*/null, name,
+                    false);
+                commandProcessor.AddParameter(cpi);
 
-            if (this.Appending)
+                if (this.Appending)
+                {
+                    commandProcessor.AddParameter(CommandParameterInternal.CreateParameter("Append", "-Append", null));
+                }
+            }
+            else
             {
-                cpi = CommandParameterInternal.CreateParameterWithArgument(
-                    /*parameterAst*/null, "Append", "-Append:",
-                    /*argumentAst*/null, true,
+                commandProcessor = context.CreateCommand("out-file", false);
+                Diagnostics.Assert(commandProcessor != null, "CreateCommand returned null");
+
+                // Previously, we mandated Unicode encoding here
+                // Now, We can take what ever has been set if PSDefaultParameterValues
+                // Unicode is still the default, but now may be overridden
+
+                var cpi = CommandParameterInternal.CreateParameterWithArgument(
+                    /*parameterAst*/null, "Filepath", "-Filepath:",
+                    /*argumentAst*/null, File,
                     false);
                 commandProcessor.AddParameter(cpi);
+
+                if (this.Appending)
+                {
+                    cpi = CommandParameterInternal.CreateParameterWithArgument(
+                        /*parameterAst*/null, "Append", "-Append:",
+                        /*argumentAst*/null, true,
+                        false);
+                    commandProcessor.AddParameter(cpi);
+                }
             }
 
             PipelineProcessor = new PipelineProcessor();
@@ -1231,9 +1276,15 @@ internal Pipe GetRedirectionPipe(ExecutionContext context, PipelineProcessor par
                 // is more specific tp the redirection operation...
                 if (rte.ErrorRecord.Exception is System.ArgumentException)
                 {
-                    throw InterpreterError.NewInterpreterExceptionWithInnerException(null,
-                        typeof(RuntimeException), null, "RedirectionFailed", ParserStrings.RedirectionFailed,
-                            rte.ErrorRecord.Exception, File, rte.ErrorRecord.Exception.Message);
+                    throw InterpreterError.NewInterpreterExceptionWithInnerException(
+                        null,
+                        typeof(RuntimeException),
+                        null,
+                        "RedirectionFailed",
+                        ParserStrings.RedirectionFailed,
+                        rte.ErrorRecord.Exception,
+                        File,
+                        rte.ErrorRecord.Exception.Message);
                 }
 
                 throw;
@@ -3593,6 +3644,7 @@ internal static object[] GetSlice(IList list, int startIndex)
 
     internal static class MemberInvocationLoggingOps
     {
+#if DEBUG
         private static readonly Lazy<bool> DumpLogAMSIContent = new Lazy<bool>(
             () => {
                 object result = Environment.GetEnvironmentVariable("__PSDumpAMSILogContent");
@@ -3603,6 +3655,7 @@ internal static class MemberInvocationLoggingOps
                 return false;
             }
         );
+#endif
 
         private static string ArgumentToString(object arg)
         {
@@ -3657,20 +3710,24 @@ internal static void LogMemberInvocation(string targetName, string name, object[
 
                 string content = $"<{targetName}>.{name}({argsBuilder})";
 
+#if DEBUG
                 if (DumpLogAMSIContent.Value)
                 {
                     Console.WriteLine("\n=== Amsi notification report content ===");
                     Console.WriteLine(content);
                 }
+#endif
 
                 var success = AmsiUtils.ReportContent(
                     name: contentName,
                     content: content);
 
+#if DEBUG
                 if (DumpLogAMSIContent.Value)
                 {
                     Console.WriteLine($"=== Amsi notification report success: {success} ===");
                 }
+#endif
             }
             catch (PSSecurityException)
             {
@@ -3678,12 +3735,16 @@ internal static void LogMemberInvocation(string targetName, string name, object[
                 // must be propagated.
                 throw;
             }
+#pragma warning disable CS0168 // variable declared but never used
             catch (Exception ex)
+#pragma warning restore CS0168
             {
+#if DEBUG
                 if (DumpLogAMSIContent.Value)
                 {
                     Console.WriteLine($"!!! Amsi notification report exception: {ex} !!!");
                 }
+#endif
             }
         }
     }
diff --git a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
index b0017080571..defd87662e8 100644
--- a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
+++ b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
@@ -327,8 +327,8 @@ internal static Dictionary<string, object> GetUsingValuesForEachParallel(
             bool isTrustedInput,
             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 
+            // 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
             // only within the current (outer) Foreach-Object -Parallel call scope.
             var usingAsts = UsingExpressionAstSearcher.FindAllUsingExpressions(scriptBlock.Ast).ToList();
             UsingExpressionAst usingAst = null;
@@ -358,11 +358,11 @@ internal static Dictionary<string, object> GetUsingValuesForEachParallel(
                 if (rte.ErrorRecord.FullyQualifiedErrorId.Equals("VariableIsUndefined", StringComparison.Ordinal))
                 {
                     throw InterpreterError.NewInterpreterException(
-                        targetObject: null, 
+                        targetObject: null,
                         exceptionType: typeof(RuntimeException),
-                        errorPosition: usingAst.Extent, 
+                        errorPosition: usingAst.Extent,
                         resourceIdAndErrorId: "UsingVariableIsUndefined",
-                        resourceString: AutomationExceptions.UsingVariableIsUndefined, 
+                        resourceString: AutomationExceptions.UsingVariableIsUndefined,
                         args: rte.ErrorRecord.TargetObject);
                 }
             }
@@ -435,7 +435,7 @@ private static bool IsInForeachParallelCallingScope(
             /*
                 Example:
                 $Test1 = "Hello"
-                1 | ForEach-Object -Parallel { 
+                1 | ForEach-Object -Parallel {
                    $using:Test1
                    $Test2 = "Goodbye"
                    1 | ForEach-Object -Parallel {
@@ -450,7 +450,7 @@ private static bool IsInForeachParallelCallingScope(
             while (currentParent != scriptblockAst)
             {
                 // Look for Foreach-Object outer commands
-                if (currentParent is CommandAst commandAst && 
+                if (currentParent is CommandAst commandAst &&
                     FindForEachInCommand(commandAst))
                 {
                     // Using Ast is outside the invoking foreach scope.
@@ -542,7 +542,7 @@ private static Tuple<Dictionary<string, object>, object[]> GetUsingValues(
 
                     if (variables != null)
                     {
-                        if (!(usingAst.SubExpression is VariableExpressionAst variableAst))
+                        if (usingAst.SubExpression is not VariableExpressionAst variableAst)
                         {
                             throw InterpreterError.NewInterpreterException(null, typeof(RuntimeException),
                                 usingAst.Extent, "CantGetUsingExpressionValueWithSpecifiedVariableDictionary", AutomationExceptions.CantGetUsingExpressionValueWithSpecifiedVariableDictionary, usingAst.Extent.Text);
diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
index 8c05240ecf0..add0eab25dc 100644
--- a/src/System.Management.Automation/engine/serialization.cs
+++ b/src/System.Management.Automation/engine/serialization.cs
@@ -122,6 +122,45 @@ public static string Serialize(object source, int depth)
             return sb.ToString();
         }
 
+        /// <summary>
+        /// Serializes list of objects into PowerShell CliXml.
+        /// </summary>
+        /// <param name="source">The input objects to serialize.</param>
+        /// <param name="depth">The depth of the members to serialize.</param>
+        /// <param name="enumerate">Enumerates input objects and serializes one at a time.</param>
+        /// <returns>The serialized object, as CliXml.</returns>
+        internal static string Serialize(IList<object> source, int depth, bool enumerate)
+        {
+            StringBuilder sb = new();
+
+            XmlWriterSettings xmlSettings = new()
+            {
+                CloseOutput = true,
+                Encoding = Encoding.Unicode,
+                Indent = true,
+                OmitXmlDeclaration = true
+            };
+
+            XmlWriter xw = XmlWriter.Create(sb, xmlSettings);
+            Serializer serializer = new(xw, depth, useDepthFromTypes: true);
+
+            if (enumerate)
+            {
+                foreach (object item in source)
+                {
+                    serializer.Serialize(item);
+                }
+            }
+            else
+            {
+                serializer.Serialize(source);
+            }
+
+            serializer.Done();
+
+            return sb.ToString();
+        }
+
         /// <summary>
         /// Deserializes PowerShell CliXml into an object.
         /// </summary>
@@ -1979,7 +2018,7 @@ int depth
 
             foreach (PSMemberInfo info in propertyCollection)
             {
-                if (!(info is PSProperty prop))
+                if (info is not PSProperty prop)
                 {
                     continue;
                 }
@@ -3334,28 +3373,28 @@ private CimClass RehydrateCimClass(PSPropertyInfo classMetadataProperty)
 
                 PSObject psoDeserializedClass = PSObject.AsPSObject(deserializedClass);
 
-                if (!(psoDeserializedClass.InstanceMembers[InternalDeserializer.CimNamespaceProperty] is PSPropertyInfo namespaceProperty))
+                if (psoDeserializedClass.InstanceMembers[InternalDeserializer.CimNamespaceProperty] is not PSPropertyInfo namespaceProperty)
                 {
                     return null;
                 }
 
                 string cimNamespace = namespaceProperty.Value as string;
 
-                if (!(psoDeserializedClass.InstanceMembers[InternalDeserializer.CimClassNameProperty] is PSPropertyInfo classNameProperty))
+                if (psoDeserializedClass.InstanceMembers[InternalDeserializer.CimClassNameProperty] is not PSPropertyInfo classNameProperty)
                 {
                     return null;
                 }
 
                 string cimClassName = classNameProperty.Value as string;
 
-                if (!(psoDeserializedClass.InstanceMembers[InternalDeserializer.CimServerNameProperty] is PSPropertyInfo computerNameProperty))
+                if (psoDeserializedClass.InstanceMembers[InternalDeserializer.CimServerNameProperty] is not PSPropertyInfo computerNameProperty)
                 {
                     return null;
                 }
 
                 string computerName = computerNameProperty.Value as string;
 
-                if (!(psoDeserializedClass.InstanceMembers[InternalDeserializer.CimHashCodeProperty] is PSPropertyInfo hashCodeProperty))
+                if (psoDeserializedClass.InstanceMembers[InternalDeserializer.CimHashCodeProperty] is not PSPropertyInfo hashCodeProperty)
                 {
                     return null;
                 }
@@ -3472,7 +3511,7 @@ private PSObject RehydrateCimInstance(PSObject deserializedObject)
             {
                 foreach (PSMemberInfo deserializedMemberInfo in deserializedObject.AdaptedMembers)
                 {
-                    if (!(deserializedMemberInfo is PSPropertyInfo deserializedProperty))
+                    if (deserializedMemberInfo is not PSPropertyInfo deserializedProperty)
                     {
                         continue;
                     }
@@ -3492,7 +3531,7 @@ private PSObject RehydrateCimInstance(PSObject deserializedObject)
             // process properties that were originally "extended" properties
             foreach (PSMemberInfo deserializedMemberInfo in deserializedObject.InstanceMembers)
             {
-                if (!(deserializedMemberInfo is PSPropertyInfo deserializedProperty))
+                if (deserializedMemberInfo is not PSPropertyInfo deserializedProperty)
                 {
                     continue;
                 }
@@ -4952,7 +4991,7 @@ private static string DecodeString(string s)
 
         #endregion misc
 
-        [TraceSourceAttribute("InternalDeserializer", "InternalDeserializer class")]
+        [TraceSource("InternalDeserializer", "InternalDeserializer class")]
         private static readonly PSTraceSource s_trace = PSTraceSource.GetTracer("InternalDeserializer", "InternalDeserializer class");
     }
 
@@ -7253,7 +7292,9 @@ internal static PSSenderInfo RehydratePSSenderInfo(PSObject pso)
         private static System.Security.Cryptography.X509Certificates.X509Certificate2 RehydrateX509Certificate2(PSObject pso)
         {
             byte[] rawData = GetPropertyValue<byte[]>(pso, "RawData");
+            #pragma warning disable SYSLIB0057
             return new System.Security.Cryptography.X509Certificates.X509Certificate2(rawData);
+            #pragma warning restore SYSLIB0057
         }
 
         private static System.Security.Cryptography.X509Certificates.X500DistinguishedName RehydrateX500DistinguishedName(PSObject pso)
@@ -7304,7 +7345,7 @@ public static UInt32 GetParameterSetMetadataFlags(PSObject instance)
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
 
-            if (!(instance.BaseObject is ParameterSetMetadata parameterSetMetadata))
+            if (instance.BaseObject is not ParameterSetMetadata parameterSetMetadata)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
@@ -7325,7 +7366,7 @@ public static PSObject GetInvocationInfo(PSObject instance)
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
 
-            if (!(instance.BaseObject is DebuggerStopEventArgs dbgStopEventArgs))
+            if (instance.BaseObject is not DebuggerStopEventArgs dbgStopEventArgs)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
@@ -7584,7 +7625,7 @@ public static Guid GetFormatViewDefinitionInstanceId(PSObject instance)
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
 
-            if (!(instance.BaseObject is FormatViewDefinition formatViewDefinition))
+            if (instance.BaseObject is not FormatViewDefinition formatViewDefinition)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(instance));
             }
diff --git a/src/System.Management.Automation/help/CabinetNativeApi.cs b/src/System.Management.Automation/help/CabinetNativeApi.cs
index 9abe5a894b4..fd369ca03be 100644
--- a/src/System.Management.Automation/help/CabinetNativeApi.cs
+++ b/src/System.Management.Automation/help/CabinetNativeApi.cs
@@ -543,7 +543,7 @@ internal static FileShare ConvertPermissionModeToFileShare(int pmode)
 
         #region IO classes, structures, and enums
 
-        [FlagsAttribute]
+        [Flags]
         internal enum PermissionMode : int
         {
             None = 0x0000,
@@ -551,7 +551,7 @@ internal enum PermissionMode : int
             Read = 0x0100
         }
 
-        [FlagsAttribute]
+        [Flags]
         internal enum OpFlags : int
         {
             RdOnly = 0x0000,
diff --git a/src/System.Management.Automation/help/CommandHelpProvider.cs b/src/System.Management.Automation/help/CommandHelpProvider.cs
index f55b345e45b..15af80745db 100644
--- a/src/System.Management.Automation/help/CommandHelpProvider.cs
+++ b/src/System.Management.Automation/help/CommandHelpProvider.cs
@@ -1081,10 +1081,7 @@ internal override IEnumerable<HelpInfo> SearchHelp(HelpRequest helpRequest, bool
                         {
                             // this command is not visible to the user (from CommandOrigin) so
                             // dont show help topic for it.
-                            if (!hiddenCommands.Contains(helpName))
-                            {
-                                hiddenCommands.Add(helpName);
-                            }
+                            hiddenCommands.Add(helpName);
 
                             continue;
                         }
diff --git a/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs b/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
index d553f242c16..bce76b005a2 100644
--- a/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
+++ b/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
@@ -605,9 +605,7 @@ internal static void AddInputTypesProperties(PSObject obj, Dictionary<string, Pa
 
                     foreach (ParameterAttribute attrib in attribs)
                     {
-                        if (attrib.ValueFromPipeline ||
-                            attrib.ValueFromPipelineByPropertyName ||
-                            attrib.ValueFromRemainingArguments)
+                        if (attrib.ValueFromPipeline || attrib.ValueFromPipelineByPropertyName)
                         {
                             if (!inputs.Contains(parameter.Value.ParameterType.FullName))
                             {
diff --git a/src/System.Management.Automation/help/HelpCommands.cs b/src/System.Management.Automation/help/HelpCommands.cs
index 1b451637a5d..3bed2a26820 100644
--- a/src/System.Management.Automation/help/HelpCommands.cs
+++ b/src/System.Management.Automation/help/HelpCommands.cs
@@ -734,10 +734,8 @@ internal static void VerifyParameterForbiddenInRemoteRunspace(Cmdlet cmdlet, str
         #endregion
 
         #region trace
-
-        [TraceSourceAttribute("GetHelpCommand ", "GetHelpCommand ")]
-        private static readonly PSTraceSource s_tracer = PSTraceSource.GetTracer("GetHelpCommand ", "GetHelpCommand ");
-
+        [TraceSource("GetHelpCommand", "GetHelpCommand")]
+        private static readonly PSTraceSource s_tracer = PSTraceSource.GetTracer("GetHelpCommand", "GetHelpCommand");
         #endregion
     }
 
diff --git a/src/System.Management.Automation/help/HelpFileHelpProvider.cs b/src/System.Management.Automation/help/HelpFileHelpProvider.cs
index 71680c13866..a6c21a3bacc 100644
--- a/src/System.Management.Automation/help/HelpFileHelpProvider.cs
+++ b/src/System.Management.Automation/help/HelpFileHelpProvider.cs
@@ -170,11 +170,7 @@ private Collection<string> FilterToLatestModuleVersion(Collection<string> filesM
             {
                 string fileName = Path.GetFileName(file);
 
-                if (!fileNameHash.Contains(fileName))
-                {
-                    fileNameHash.Add(fileName);
-                }
-                else
+                if (!fileNameHash.Add(fileName))
                 {
                     // If the file need to be removed, add it to matchedFilesToRemove, if not already present.
                     if (!matchedFilesToRemove.Contains(file))
diff --git a/src/System.Management.Automation/help/SaveHelpCommand.cs b/src/System.Management.Automation/help/SaveHelpCommand.cs
index 2cefef9e23f..5df8f974f5c 100644
--- a/src/System.Management.Automation/help/SaveHelpCommand.cs
+++ b/src/System.Management.Automation/help/SaveHelpCommand.cs
@@ -88,7 +88,7 @@ public string[] LiteralPath
         [Parameter(Position = 1, ValueFromPipelineByPropertyName = true, ValueFromPipeline = true, ParameterSetName = LiteralPathParameterSetName)]
         [Alias("Name")]
         [ValidateNotNull]
-        [ArgumentToModuleTransformationAttribute]
+        [ArgumentToModuleTransformation]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public PSModuleInfo[] Module { get; set; }
 
diff --git a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
index dad75a6b69c..687faa68246 100644
--- a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
@@ -179,13 +179,13 @@ static UpdatableHelpCommandBase()
 
             // NOTE: The HelpInfoUri must be updated with each release.
 
-            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");
+            s_metadataCache.Add("Microsoft.PowerShell.Diagnostics", "https://aka.ms/powershell75-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Core", "https://aka.ms/powershell75-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Utility", "https://aka.ms/powershell75-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Host", "https://aka.ms/powershell75-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Management", "https://aka.ms/powershell75-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Security", "https://aka.ms/powershell75-help");
+            s_metadataCache.Add("Microsoft.WSMan.Management", "https://aka.ms/powershell75-help");
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/help/UpdatableHelpSystem.cs b/src/System.Management.Automation/help/UpdatableHelpSystem.cs
index 6ab8d469a97..14edabf9613 100644
--- a/src/System.Management.Automation/help/UpdatableHelpSystem.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpSystem.cs
@@ -419,6 +419,7 @@ private string ResolveUri(string baseUri, bool verbose)
                         using (HttpClient client = new HttpClient(handler))
                         {
                             client.Timeout = new TimeSpan(0, 0, 30); // Set 30 second timeout
+                            // codeql[cs/ssrf] - This is expected Poweshell behavior and the user assumes trust for the module they download and any URIs it references. The URIs are also not executables or scripts that would be invoked by this method.
                             Task<HttpResponseMessage> responseMessage = client.GetAsync(uri);
                             using (HttpResponseMessage response = responseMessage.Result)
                             {
@@ -783,6 +784,7 @@ private bool DownloadHelpContentHttpClient(string uri, string fileName, Updatabl
                 using (HttpClient client = new HttpClient(handler))
                 {
                     client.Timeout = _defaultTimeout;
+                    // codeql[cs/ssrf] - This is expected Poweshell behavior and the user assumes trust for the module they download and any URIs it references. The URIs are also not executables or scripts that would be invoked by this method.
                     Task<HttpResponseMessage> responseMsg = client.GetAsync(new Uri(uri), _cancelTokenSource.Token);
 
                     // TODO: Should I use a continuation to write the stream to a file?
diff --git a/src/System.Management.Automation/namespaces/ContainerProviderBase.cs b/src/System.Management.Automation/namespaces/ContainerProviderBase.cs
index cc3e0ac83e2..2a600097108 100644
--- a/src/System.Management.Automation/namespaces/ContainerProviderBase.cs
+++ b/src/System.Management.Automation/namespaces/ContainerProviderBase.cs
@@ -840,7 +840,7 @@ protected virtual object RenameItemDynamicParameters(string path, string newName
         ///
         /// The <paramref name="newItemValue"/> parameter can be any type of object that the provider can use
         /// to create the item. It is recommended that the provider accept at a minimum strings, and an instance
-        /// of the type of object that would be returned from GetItem() for this path. <see cref="LanguagePrimitives.ConvertTo(System.Object, System.Type)"/>
+        /// of the type of object that would be returned from GetItem() for this path. <see cref="LanguagePrimitives.ConvertTo(object, System.Type)"/>
         /// can be used to convert some types to the desired type.
         ///
         /// The default implementation of this method throws an <see cref="System.Management.Automation.PSNotSupportedException"/>.
diff --git a/src/System.Management.Automation/namespaces/CoreCommandContext.cs b/src/System.Management.Automation/namespaces/CoreCommandContext.cs
index 5c62ed6fa98..cf8c43c4b3e 100644
--- a/src/System.Management.Automation/namespaces/CoreCommandContext.cs
+++ b/src/System.Management.Automation/namespaces/CoreCommandContext.cs
@@ -29,7 +29,7 @@ internal sealed class CmdletProviderContext
         /// An instance of the PSTraceSource class used for trace output
         /// using "CmdletProviderContext" as the category.
         /// </summary>
-        [Dbg.TraceSourceAttribute(
+        [Dbg.TraceSource(
              "CmdletProviderContext",
              "The context under which a core command is being run.")]
         private static readonly Dbg.PSTraceSource s_tracer =
@@ -551,7 +551,7 @@ internal SwitchParameter Force
         /// <param name="target">
         /// Name of the target resource being acted upon
         /// </param>
-        /// <remarks>true iff the action should be performed</remarks>
+        /// <remarks>true if-and-only-if the action should be performed</remarks>
         /// <exception cref="PipelineStoppedException">
         /// The ActionPreference.Stop or ActionPreference.Inquire policy
         /// triggered a terminating error.  The pipeline failure will be
@@ -577,7 +577,7 @@ internal bool ShouldProcess(
         /// Name of the target resource being acted upon
         /// </param>
         /// <param name="action">What action was being performed.</param>
-        /// <remarks>true iff the action should be performed</remarks>
+        /// <remarks>true if-and-only-if the action should be performed</remarks>
         /// <exception cref="PipelineStoppedException">
         /// The ActionPreference.Stop or ActionPreference.Inquire policy
         /// triggered a terminating error.  The pipeline failure will be
@@ -616,7 +616,7 @@ internal bool ShouldProcess(
         /// if the user is prompted whether or not to perform the action.
         /// It may be displayed by some hosts, but not all.
         /// </param>
-        /// <remarks>true iff the action should be performed</remarks>
+        /// <remarks>true if-and-only-if the action should be performed</remarks>
         /// <exception cref="PipelineStoppedException">
         /// The ActionPreference.Stop or ActionPreference.Inquire policy
         /// triggered a terminating error.  The pipeline failure will be
@@ -665,7 +665,7 @@ internal bool ShouldProcess(
         /// <see cref="System.Management.Automation.ShouldProcessReason"/>
         /// are returned.
         /// </param>
-        /// <remarks>true iff the action should be performed</remarks>
+        /// <remarks>true if-and-only-if the action should be performed</remarks>
         /// <exception cref="PipelineStoppedException">
         /// The ActionPreference.Stop or ActionPreference.Inquire policy
         /// triggered a terminating error.  The pipeline failure will be
diff --git a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
index 5aa81ccd680..d0f8f08deab 100644
--- a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
@@ -35,7 +35,7 @@ internal class FileSystemContentReaderWriter : IContentReader, IContentWriter
         /// An instance of the PSTraceSource class used for trace output
         /// using "FileSystemContentStream" as the category.
         /// </summary>
-        [Dbg.TraceSourceAttribute(
+        [Dbg.TraceSource(
             "FileSystemContentStream",
             "The provider content reader and writer for the file system")]
         private static readonly Dbg.PSTraceSource s_tracer =
@@ -1475,26 +1475,6 @@ _currentEncoding is UTF32Encoding ||
 
             return _byteCount;
         }
-
-        private static class NativeMethods
-        {
-            // Default values
-            private const int MAX_DEFAULTCHAR = 2;
-            private const int MAX_LEADBYTES = 12;
-
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-            internal struct CPINFO
-            {
-                [MarshalAs(UnmanagedType.U4)]
-                internal int MaxCharSize;
-
-                [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEFAULTCHAR)]
-                public byte[] DefaultChar;
-
-                [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_LEADBYTES)]
-                public byte[] LeadBytes;
-            }
-        }
     }
 
     /// <summary>
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 9337b466805..05c8fff76e0 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -46,7 +46,7 @@ namespace Microsoft.PowerShell.Commands
     [OutputType(typeof(FileSecurity), typeof(DirectorySecurity), ProviderCmdlet = ProviderCmdlet.GetAcl)]
     [OutputType(typeof(bool), typeof(string), typeof(FileInfo), typeof(DirectoryInfo), ProviderCmdlet = ProviderCmdlet.GetItem)]
     [OutputType(typeof(bool), typeof(string), typeof(DateTime), typeof(System.IO.FileInfo), typeof(System.IO.DirectoryInfo), ProviderCmdlet = ProviderCmdlet.GetItemProperty)]
-    [OutputType(typeof(string), typeof(System.IO.FileInfo), ProviderCmdlet = ProviderCmdlet.NewItem)]
+    [OutputType(typeof(string), typeof(System.IO.FileInfo), typeof(DirectoryInfo), ProviderCmdlet = ProviderCmdlet.NewItem)]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "This coupling is required")]
     public sealed partial class FileSystemProvider : NavigationCmdletProvider,
                                                      IContentCmdletProvider,
@@ -61,6 +61,7 @@ public sealed partial class FileSystemProvider : NavigationCmdletProvider,
         private const int FILETRANSFERSIZE = 4 * 1024 * 1024;
 
         private const int COPY_FILE_ACTIVITY_ID = 0;
+        private const int REMOVE_FILE_ACTIVITY_ID = 0;
 
         // The name of the key in an exception's Data dictionary when attempting
         // to copy an item onto itself.
@@ -70,7 +71,7 @@ public sealed partial class FileSystemProvider : NavigationCmdletProvider,
         /// An instance of the PSTraceSource class used for trace output
         /// using "FileSystemProvider" as the category.
         /// </summary>
-        [Dbg.TraceSourceAttribute("FileSystemProvider", "The namespace navigation provider for the file system")]
+        [Dbg.TraceSource("FileSystemProvider", "The namespace navigation provider for the file system")]
         private static readonly Dbg.PSTraceSource s_tracer =
             Dbg.PSTraceSource.GetTracer("FileSystemProvider", "The namespace navigation provider for the file system");
 
@@ -568,7 +569,7 @@ protected override PSDriveInfo NewDrive(PSDriveInfo drive)
             if (driveIsFixed)
             {
                 // Since the drive is fixed, ensure the root is valid.
-                validDrive = Directory.Exists(drive.Root);
+                validDrive = SafeDoesPathExist(drive.Root);
             }
 
             if (validDrive)
@@ -907,7 +908,7 @@ protected override Collection<PSDriveInfo> InitializeDefaultDrives()
 
                         if (newDrive.DriveType == DriveType.Fixed)
                         {
-                            if (!newDrive.RootDirectory.Exists)
+                            if (!SafeDoesPathExist(newDrive.RootDirectory.FullName))
                             {
                                 continue;
                             }
@@ -1080,6 +1081,20 @@ protected override bool IsValidPath(string path)
                 }
             }
 
+            // .NET introduced a change where invalid characters are accepted https://learn.microsoft.com/en-us/dotnet/core/compatibility/2.1#path-apis-dont-throw-an-exception-for-invalid-characters
+            // We need to check for invalid characters ourselves.  `Path.GetInvalidFileNameChars()` is a supserset of `Path.GetInvalidPathChars()`
+
+            // Remove drive root first
+            string pathWithoutDriveRoot = path.Substring(Path.GetPathRoot(path).Length);
+
+            foreach (string segment in pathWithoutDriveRoot.Split(Path.DirectorySeparatorChar))
+            {
+                if (PathUtils.ContainsInvalidFileNameChars(segment))
+                {
+                    return false;
+                }
+            }
+
             return true;
         }
 
@@ -1212,6 +1227,29 @@ protected override void GetItem(string path)
             }
         }
 
+        private static bool SafeDoesPathExist(string rootDirectory)
+        {
+            if (Directory.Exists(rootDirectory))
+            {
+                return true;
+            }
+
+            try
+            {
+                return (File.GetAttributes(rootDirectory) & FileAttributes.Directory) is not 0;
+            }
+            // In some scenarios (like AppContainers) direct access to the root directory may
+            // be prevented, but more specific paths may be accessible.
+            catch (UnauthorizedAccessException)
+            {
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
         private FileSystemInfo GetFileSystemItem(string path, ref bool isContainer, bool showHidden)
         {
             path = NormalizePath(path);
@@ -1309,6 +1347,7 @@ protected override void InvokeDefaultAction(string path)
             if (ShouldProcess(resource, action))
             {
                 var invokeProcess = new System.Diagnostics.Process();
+                // codeql[cs/microsoft/command-line-injection-shell-execution] - This is expected Poweshell behavior where user inputted paths are supported for the context of this method. The user assumes trust for the file path they are specifying. If there is concern for remoting, restricted remoting guidelines should be used.
                 invokeProcess.StartInfo.FileName = path;
 #if UNIX
                 bool useShellExecute = false;
@@ -1887,15 +1926,16 @@ string ToModeString(FileSystemInfo fileSystemInfo)
                     }
                 }
 
-                bool isDirectory = fileAttributes.HasFlag(FileAttributes.Directory);
-                ReadOnlySpan<char> mode = stackalloc char[]
-                {
-                    isLink ? 'l' : isDirectory ? 'd' : '-',
+                ReadOnlySpan<char> mode =
+                [
+                    isLink ?
+                        'l' :
+                        fileAttributes.HasFlag(FileAttributes.Directory) ? 'd' : '-',
                     fileAttributes.HasFlag(FileAttributes.Archive) ? 'a' : '-',
                     fileAttributes.HasFlag(FileAttributes.ReadOnly) ? 'r' : '-',
                     fileAttributes.HasFlag(FileAttributes.Hidden) ? 'h' : '-',
                     fileAttributes.HasFlag(FileAttributes.System) ? 's' : '-',
-                };
+                ];
                 return new string(mode);
             }
 
@@ -2242,24 +2282,21 @@ protected override void NewItem(
                         {
                             exists = true;
 
-                            var normalizedTargetPath = strTargetPath;
-                            if (strTargetPath.StartsWith(".\\", StringComparison.OrdinalIgnoreCase) ||
-                                strTargetPath.StartsWith("./", StringComparison.OrdinalIgnoreCase))
-                            {
-                                normalizedTargetPath = Path.Join(SessionState.Internal.CurrentLocation.ProviderPath, strTargetPath.AsSpan(2));
-                            }
+                            // unify directory separators to be consistent with the rest of PowerShell even on non-Windows platforms;
+                            // do this before resolving the target, otherwise e.g. `.\test` would break on Linux, since the combined
+                            // path below would be something like `/path/to/cwd/.\test`
+                            strTargetPath = strTargetPath.Replace(StringLiterals.AlternatePathSeparator, StringLiterals.DefaultPathSeparator);
 
+                            // check if the target is a file or directory
+                            var normalizedTargetPath = Path.Combine(Path.GetDirectoryName(path), strTargetPath);
                             GetFileSystemInfo(normalizedTargetPath, out isDirectory);
-
-                            strTargetPath = strTargetPath.Replace(StringLiterals.AlternatePathSeparator, StringLiterals.DefaultPathSeparator);
                         }
                         else
                         {
                             // for hardlinks we resolve the target to an absolute path
                             if (!IsAbsolutePath(strTargetPath))
                             {
-                                // there is already a check before here so that strTargetPath should only resolve to 1 path
-                                strTargetPath = SessionState.Path.GetResolvedPSPathFromPSPath(strTargetPath).FirstOrDefault()?.Path;
+                                strTargetPath = SessionState.Path.GetUnresolvedProviderPathFromPSPath(strTargetPath);
                             }
 
                             exists = GetFileSystemInfo(strTargetPath, out isDirectory) != null;
@@ -2653,12 +2690,6 @@ private void CreateDirectory(string path, bool streamOutput)
                 !string.IsNullOrEmpty(path),
                 "The caller should verify path");
 
-            // Get the parent path
-            string parentPath = GetParentPath(path, null);
-
-            // The directory name
-            string childName = GetChildName(path);
-
             ErrorRecord error = null;
             if (!Force && ItemExists(path, out error))
             {
@@ -2688,7 +2719,7 @@ private void CreateDirectory(string path, bool streamOutput)
 
                 if (ShouldProcess(resource, action))
                 {
-                    var result = Directory.CreateDirectory(Path.Combine(parentPath, childName));
+                    var result = Directory.CreateDirectory(path);
 
                     if (streamOutput)
                     {
@@ -2703,8 +2734,15 @@ private void CreateDirectory(string path, bool streamOutput)
             }
             catch (IOException ioException)
             {
-                // Ignore the error if force was specified
+#if UNIX
                 if (!Force)
+#else
+                // Windows error code for invalid characters in file or directory name
+                const int ERROR_INVALID_NAME = unchecked((int)0x8007007B);
+
+                // Do not suppress IOException on Windows if it has the specific HResult for invalid characters in directory name
+                if (ioException.HResult == ERROR_INVALID_NAME || !Force)
+#endif
                 {
                     // IOException contains specific message about the error occurred and so no need for errordetails.
                     WriteError(new ErrorRecord(ioException, "CreateDirectoryIOError", ErrorCategory.WriteError, path));
@@ -2860,6 +2898,19 @@ protected override void RemoveItem(string path, bool recurse)
                     return;
                 }
 
+                if (Context != null
+                    && Context.ExecutionContext.SessionState.PSVariable.Get(SpecialVariables.ProgressPreferenceVarPath.UserPath).Value is ActionPreference progressPreference
+                    && progressPreference == ActionPreference.Continue)
+                {
+                    {
+                        Task.Run(() =>
+                        {
+                            GetTotalFiles(path, recurse);
+                        });
+                        _removeStopwatch.Start();
+                    }
+                }
+
 #if UNIX
                 if (iscontainer)
                 {
@@ -2923,6 +2974,16 @@ protected override void RemoveItem(string path, bool recurse)
                         RemoveFileInfoItem((FileInfo)fsinfo, Force);
                     }
                 }
+
+                if (Stopping || _removedFiles == _totalFiles)
+                {
+                    _removeStopwatch.Stop();
+                    var progress = new ProgressRecord(REMOVE_FILE_ACTIVITY_ID, " ", " ")
+                    {
+                        RecordType = ProgressRecordType.Completed
+                    };
+                    WriteProgress(progress);
+                }
 #endif
             }
             catch (IOException exception)
@@ -3057,6 +3118,8 @@ void WriteErrorHelper(Exception exception)
 
                     if (file != null)
                     {
+                        long fileBytesSize = file.Length;
+
                         if (recurse)
                         {
                             // When recurse is specified we need to confirm each
@@ -3069,6 +3132,25 @@ void WriteErrorHelper(Exception exception)
                             // subitems without confirming with the user.
                             RemoveFileSystemItem(file, force);
                         }
+
+                        if (_totalFiles > 0)
+                        {
+                            _removedFiles++;
+                            _removedBytes += fileBytesSize;
+                            if (_removeStopwatch.Elapsed.TotalSeconds > ProgressBarDurationThreshold)
+                            {
+                                double speed = _removedBytes / 1024 / 1024 / _removeStopwatch.Elapsed.TotalSeconds;
+                                var progress = new ProgressRecord(
+                                    REMOVE_FILE_ACTIVITY_ID,
+                                    StringUtil.Format(FileSystemProviderStrings.RemovingLocalFileActivity, _removedFiles, _totalFiles),
+                                    StringUtil.Format(FileSystemProviderStrings.RemovingLocalBytesStatus, Utils.DisplayHumanReadableFileSize(_removedBytes), Utils.DisplayHumanReadableFileSize(_totalBytes), speed)
+                                );
+                                var percentComplete = _totalBytes != 0 ? (int)Math.Min(_removedBytes * 100 / _totalBytes, 100) : 100;
+                                progress.PercentComplete = percentComplete;
+                                progress.RecordType = ProgressRecordType.Processing;
+                                WriteProgress(progress);
+                            }
+                        }
                     }
                 }
 
@@ -3319,12 +3401,12 @@ private bool ItemExists(string path, out ErrorRecord error)
 
                     if (itemExistsDynamicParameters.OlderThan.HasValue)
                     {
-                        result = lastWriteTime < itemExistsDynamicParameters.OlderThan.Value;
+                        result &= lastWriteTime < itemExistsDynamicParameters.OlderThan.Value;
                     }
 
                     if (itemExistsDynamicParameters.NewerThan.HasValue)
                     {
-                        result = lastWriteTime > itemExistsDynamicParameters.NewerThan.Value;
+                        result &= lastWriteTime > itemExistsDynamicParameters.NewerThan.Value;
                     }
                 }
             }
@@ -3937,16 +4019,19 @@ private void CopyFileInfoItem(FileInfo file, string destinationPath, bool force,
                             {
                                 _copiedFiles++;
                                 _copiedBytes += file.Length;
-                                double speed = (double)(_copiedBytes / 1024 / 1024) / _copyStopwatch.Elapsed.TotalSeconds;
-                                var progress = new ProgressRecord(
-                                    COPY_FILE_ACTIVITY_ID,
-                                    StringUtil.Format(FileSystemProviderStrings.CopyingLocalFileActivity, _copiedFiles, _totalFiles),
-                                    StringUtil.Format(FileSystemProviderStrings.CopyingLocalBytesStatus, Utils.DisplayHumanReadableFileSize(_copiedBytes), Utils.DisplayHumanReadableFileSize(_totalBytes), speed)
-                                );
-                                var percentComplete = _totalBytes != 0 ? (int)Math.Min(_copiedBytes * 100 / _totalBytes, 100) : 100;
-                                progress.PercentComplete = percentComplete;
-                                progress.RecordType = ProgressRecordType.Processing;
-                                WriteProgress(progress);
+                                if (_copyStopwatch.Elapsed.TotalSeconds > ProgressBarDurationThreshold)
+                                {
+                                    double speed = (double)(_copiedBytes / 1024 / 1024) / _copyStopwatch.Elapsed.TotalSeconds;
+                                    var progress = new ProgressRecord(
+                                        COPY_FILE_ACTIVITY_ID,
+                                        StringUtil.Format(FileSystemProviderStrings.CopyingLocalFileActivity, _copiedFiles, _totalFiles),
+                                        StringUtil.Format(FileSystemProviderStrings.CopyingLocalBytesStatus, Utils.DisplayHumanReadableFileSize(_copiedBytes), Utils.DisplayHumanReadableFileSize(_totalBytes), speed)
+                                    );
+                                    var percentComplete = _totalBytes != 0 ? (int)Math.Min(_copiedBytes * 100 / _totalBytes, 100) : 100;
+                                    progress.PercentComplete = percentComplete;
+                                    progress.RecordType = ProgressRecordType.Processing;
+                                    WriteProgress(progress);
+                                }
                             }
                         }
                         else
@@ -4884,6 +4969,11 @@ private bool PathIsReservedDeviceName(string destinationPath, string errorId)
         private long _copiedBytes;
         private readonly Stopwatch _copyStopwatch = new Stopwatch();
 
+        private long _removedBytes;
+        private long _removedFiles;
+        private readonly Stopwatch _removeStopwatch = new();
+
+        private const double ProgressBarDurationThreshold = 2.0;
         #endregion CopyItem
 
         #endregion ContainerCmdletProvider members
@@ -5777,8 +5867,10 @@ 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))
+                    // Don't allow moving a directory into itself or its sub-directory.
+                    string pathWithoutEndingSeparator = Path.TrimEndingDirectorySeparator(path);
+                    if (destination.StartsWith(pathWithoutEndingSeparator + Path.DirectorySeparatorChar)
+                        || destination.Equals(pathWithoutEndingSeparator, StringComparison.OrdinalIgnoreCase))
                     {
                         string error = StringUtil.Format(FileSystemProviderStrings.TargetCannotBeSubdirectoryOfSource, destination);
                         var e = new IOException(error);
@@ -7365,8 +7457,8 @@ internal FileSystemContentDynamicParametersBase(FileSystemProvider provider)
         /// reading data from the file.
         /// </summary>
         [Parameter]
-        [ArgumentToEncodingTransformationAttribute()]
-        [ArgumentEncodingCompletionsAttribute]
+        [ArgumentToEncodingTransformation]
+        [ArgumentEncodingCompletions]
         [ValidateNotNullOrEmpty]
         public Encoding Encoding
         {
@@ -8133,8 +8225,7 @@ internal static List<AlternateStreamData> GetStreams(string path)
                     AlternateStreamData data = new AlternateStreamData();
                     data.Stream = findStreamData.Name;
                     data.Length = findStreamData.Length;
-                    data.FileName = path.Replace(data.Stream, string.Empty);
-                    data.FileName = data.FileName.Trim(':');
+                    data.FileName = path;
 
                     alternateStreams.Add(data);
                     findStreamData = new AlternateStreamNativeData();
@@ -8219,7 +8310,7 @@ internal static void DeleteFileStream(string path, string streamName)
             ArgumentNullException.ThrowIfNull(streamName);
 
             string adjustedStreamName = streamName.Trim();
-            if (adjustedStreamName.IndexOf(':') != 0)
+            if (!adjustedStreamName.StartsWith(':'))
             {
                 adjustedStreamName = ":" + adjustedStreamName;
             }
diff --git a/src/System.Management.Automation/namespaces/FileSystemSecurity.cs b/src/System.Management.Automation/namespaces/FileSystemSecurity.cs
index 31e996e9b63..9af94c2d604 100644
--- a/src/System.Management.Automation/namespaces/FileSystemSecurity.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemSecurity.cs
@@ -168,13 +168,15 @@ public void SetSecurityDescriptor(
                 {
                     // Get the security descriptor of the destination path
                     ObjectSecurity existingDescriptor = new FileInfo(path).GetAccessControl();
-                    Type ntAccountType = typeof(System.Security.Principal.NTAccount);
+                    // Use SecurityIdentifier to avoid having the below comparison steps
+                    // fail when dealing with an untranslatable SID in the SD
+                    Type identityType = typeof(System.Security.Principal.SecurityIdentifier);
 
                     AccessControlSections sections = AccessControlSections.All;
 
                     // If they didn't modify any audit information, don't try to set
                     // the audit section.
-                    int auditRuleCount = sd.GetAuditRules(true, true, ntAccountType).Count;
+                    int auditRuleCount = sd.GetAuditRules(true, true, identityType).Count;
                     if ((auditRuleCount == 0) &&
                         (sd.AreAuditRulesProtected == existingDescriptor.AreAccessRulesProtected))
                     {
@@ -182,13 +184,13 @@ public void SetSecurityDescriptor(
                     }
 
                     // If they didn't modify the owner, don't try to set that section.
-                    if (sd.GetOwner(ntAccountType) == existingDescriptor.GetOwner(ntAccountType))
+                    if (sd.GetOwner(identityType) == existingDescriptor.GetOwner(identityType))
                     {
                         sections &= ~AccessControlSections.Owner;
                     }
 
                     // If they didn't modify the group, don't try to set that section.
-                    if (sd.GetGroup(ntAccountType) == existingDescriptor.GetGroup(ntAccountType))
+                    if (sd.GetGroup(identityType) == existingDescriptor.GetGroup(identityType))
                     {
                         sections &= ~AccessControlSections.Group;
                     }
diff --git a/src/System.Management.Automation/namespaces/LocationGlobber.cs b/src/System.Management.Automation/namespaces/LocationGlobber.cs
index 6cf082fc1f6..65c28f1586d 100644
--- a/src/System.Management.Automation/namespaces/LocationGlobber.cs
+++ b/src/System.Management.Automation/namespaces/LocationGlobber.cs
@@ -22,7 +22,7 @@ internal sealed class LocationGlobber
         /// An instance of the PSTraceSource class used for trace output
         /// using "LocationGlobber" as the category.
         /// </summary>
-        [Dbg.TraceSourceAttribute(
+        [Dbg.TraceSource(
              "LocationGlobber",
              "The location globber converts PowerShell paths with glob characters to zero or more paths.")]
         private static readonly Dbg.PSTraceSource s_tracer =
@@ -32,7 +32,7 @@ internal sealed class LocationGlobber
         /// <summary>
         /// User level tracing for path resolution.
         /// </summary>
-        [Dbg.TraceSourceAttribute(
+        [Dbg.TraceSource(
              "PathResolution",
              "Traces the path resolution algorithm.")]
         private static readonly Dbg.PSTraceSource s_pathResolutionTracer =
@@ -4539,7 +4539,7 @@ internal static bool IsHomePath(string path)
                 }
             }
 
-            if (path.IndexOf(StringLiterals.HomePath, StringComparison.Ordinal) == 0)
+            if (path.StartsWith(StringLiterals.HomePath, StringComparison.Ordinal))
             {
                 // Support the single "~"
                 if (path.Length == 1)
@@ -4638,7 +4638,7 @@ internal string GetHomeRelativePath(string path)
                     }
                 }
 
-                if (path.IndexOf(StringLiterals.HomePath, StringComparison.Ordinal) == 0)
+                if (path.StartsWith(StringLiterals.HomePath, StringComparison.Ordinal))
                 {
                     // Strip of the ~ and the \ or / if present
 
diff --git a/src/System.Management.Automation/namespaces/ProviderBase.cs b/src/System.Management.Automation/namespaces/ProviderBase.cs
index 259bfd7fee9..4345ec9f8ec 100644
--- a/src/System.Management.Automation/namespaces/ProviderBase.cs
+++ b/src/System.Management.Automation/namespaces/ProviderBase.cs
@@ -76,7 +76,7 @@ public abstract partial class CmdletProvider : IResourceSupplier
         /// An instance of the PSTraceSource class used for trace output
         /// using "CmdletProviderClasses" as the category.
         /// </summary>
-        [TraceSourceAttribute(
+        [TraceSource(
              "CmdletProviderClasses",
              "The namespace provider base classes tracer")]
         internal static readonly PSTraceSource providerBaseTracer = PSTraceSource.GetTracer(
@@ -260,7 +260,7 @@ internal void GetProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IPropertyCmdletProvider propertyProvider))
+            if (this is not IPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -298,7 +298,7 @@ internal object GetPropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IPropertyCmdletProvider propertyProvider))
+            if (this is not IPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -327,7 +327,7 @@ internal void SetProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IPropertyCmdletProvider propertyProvider))
+            if (this is not IPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -365,7 +365,7 @@ internal object SetPropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IPropertyCmdletProvider propertyProvider))
+            if (this is not IPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -397,7 +397,7 @@ internal void ClearProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IPropertyCmdletProvider propertyProvider))
+            if (this is not IPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -435,7 +435,7 @@ internal object ClearPropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IPropertyCmdletProvider propertyProvider))
+            if (this is not IPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -479,7 +479,7 @@ internal void NewProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -524,7 +524,7 @@ internal object NewPropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -556,7 +556,7 @@ internal void RemoveProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -593,7 +593,7 @@ internal object RemovePropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -629,7 +629,7 @@ internal void RenameProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -670,7 +670,7 @@ internal object RenamePropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -710,7 +710,7 @@ internal void CopyProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -755,7 +755,7 @@ internal object CopyPropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -795,7 +795,7 @@ internal void MoveProperty(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -840,7 +840,7 @@ internal object MovePropertyDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IDynamicPropertyCmdletProvider propertyProvider))
+            if (this is not IDynamicPropertyCmdletProvider propertyProvider)
             {
                 return null;
             }
@@ -871,7 +871,7 @@ internal IContentReader GetContentReader(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IContentCmdletProvider contentProvider))
+            if (this is not IContentCmdletProvider contentProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -904,7 +904,7 @@ internal object GetContentReaderDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IContentCmdletProvider contentProvider))
+            if (this is not IContentCmdletProvider contentProvider)
             {
                 return null;
             }
@@ -931,7 +931,7 @@ internal IContentWriter GetContentWriter(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IContentCmdletProvider contentProvider))
+            if (this is not IContentCmdletProvider contentProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -964,7 +964,7 @@ internal object GetContentWriterDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IContentCmdletProvider contentProvider))
+            if (this is not IContentCmdletProvider contentProvider)
             {
                 return null;
             }
@@ -988,7 +988,7 @@ internal void ClearContent(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IContentCmdletProvider contentProvider))
+            if (this is not IContentCmdletProvider contentProvider)
             {
                 throw
                     PSTraceSource.NewNotSupportedException(
@@ -1021,7 +1021,7 @@ internal object ClearContentDynamicParameters(
         {
             Context = cmdletProviderContext;
 
-            if (!(this is IContentCmdletProvider contentProvider))
+            if (this is not IContentCmdletProvider contentProvider)
             {
                 return null;
             }
@@ -1984,4 +1984,3 @@ public void WriteError(ErrorRecord errorRecord)
 }
 
 #pragma warning restore 56506
-
diff --git a/src/System.Management.Automation/namespaces/RegistryProvider.cs b/src/System.Management.Automation/namespaces/RegistryProvider.cs
index ecf36bec4ca..4e3b84716cd 100644
--- a/src/System.Management.Automation/namespaces/RegistryProvider.cs
+++ b/src/System.Management.Automation/namespaces/RegistryProvider.cs
@@ -1825,8 +1825,19 @@ public void GetProperty(
                     notePropertyName = LocalizedDefaultToken;
                 }
 
-                propertyResults.Properties.Add(new PSNoteProperty(notePropertyName, key.GetValue(valueName)));
-                valueAdded = true;
+                try
+                {
+                    propertyResults.Properties.Add(new PSNoteProperty(notePropertyName, key.GetValue(valueName)));
+                    valueAdded = true;
+                }
+                catch (InvalidCastException invalidCast)
+                {
+                    WriteError(new ErrorRecord(
+                        invalidCast,
+                        invalidCast.GetType().FullName,
+                        ErrorCategory.ReadError,
+                        path));
+                }
             }
 
             key.Close();
diff --git a/src/System.Management.Automation/namespaces/SessionStateProviderBase.cs b/src/System.Management.Automation/namespaces/SessionStateProviderBase.cs
index 3f0f52c942e..e4199291437 100644
--- a/src/System.Management.Automation/namespaces/SessionStateProviderBase.cs
+++ b/src/System.Management.Automation/namespaces/SessionStateProviderBase.cs
@@ -26,7 +26,7 @@ public abstract class SessionStateProviderBase : ContainerCmdletProvider, IConte
         /// <summary>
         /// An instance of the PSTraceSource class used for trace output.
         /// </summary>
-        [Dbg.TraceSourceAttribute(
+        [Dbg.TraceSource(
              "SessionStateProvider",
              "Providers that produce a view of session state data.")]
         private static readonly Dbg.PSTraceSource s_tracer =
diff --git a/src/System.Management.Automation/namespaces/TransactedRegistry.cs b/src/System.Management.Automation/namespaces/TransactedRegistry.cs
index 56062e6de6c..6465ea1819c 100644
--- a/src/System.Management.Automation/namespaces/TransactedRegistry.cs
+++ b/src/System.Management.Automation/namespaces/TransactedRegistry.cs
@@ -42,7 +42,6 @@ internal static class TransactedRegistry
         /// subkeys, there must be a Transaction.Current and the resulting TransactedRegistryKey from those operations ARE associated with
         /// the transaction.</para>
         /// </summary>
-        [ResourceExposure(ResourceScope.Machine)]
         // The TransactedRegistryKey's members cannot be changed.
         [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         internal static readonly TransactedRegistryKey CurrentUser = TransactedRegistryKey.GetBaseKey(BaseRegistryKeys.HKEY_CURRENT_USER);
@@ -61,7 +60,6 @@ internal static class TransactedRegistry
         /// subkeys, there must be a Transaction.Current and the resulting TransactedRegistryKey from those operations ARE associated with
         /// the transaction.</para>
         /// </summary>
-        [ResourceExposure(ResourceScope.Machine)]
         // The TransactedRegistryKey's members cannot be changed.
         [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         internal static readonly TransactedRegistryKey LocalMachine = TransactedRegistryKey.GetBaseKey(BaseRegistryKeys.HKEY_LOCAL_MACHINE);
@@ -80,7 +78,6 @@ internal static class TransactedRegistry
         /// subkeys, there must be a Transaction.Current and the resulting TransactedRegistryKey from those operations ARE associated with
         /// the transaction.</para>
         /// </summary>
-        [ResourceExposure(ResourceScope.Machine)]
         // The TransactedRegistryKey's members cannot be changed.
         [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         internal static readonly TransactedRegistryKey ClassesRoot = TransactedRegistryKey.GetBaseKey(BaseRegistryKeys.HKEY_CLASSES_ROOT);
@@ -99,7 +96,6 @@ internal static class TransactedRegistry
         /// subkeys, there must be a Transaction.Current and the resulting TransactedRegistryKey from those operations ARE associated with
         /// the transaction.</para>
         /// </summary>
-        [ResourceExposure(ResourceScope.Machine)]
         // The TransactedRegistryKey's members cannot be changed.
         [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         internal static readonly TransactedRegistryKey Users = TransactedRegistryKey.GetBaseKey(BaseRegistryKeys.HKEY_USERS);
@@ -118,7 +114,6 @@ internal static class TransactedRegistry
         /// subkeys, there must be a Transaction.Current and the resulting TransactedRegistryKey from those operations ARE associated with
         /// the transaction.</para>
         /// </summary>
-        [ResourceExposure(ResourceScope.Machine)]
         // The TransactedRegistryKey's members cannot be changed.
         [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         internal static readonly TransactedRegistryKey CurrentConfig = TransactedRegistryKey.GetBaseKey(BaseRegistryKeys.HKEY_CURRENT_CONFIG);
diff --git a/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs b/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
index 23316a31724..d899d9257b4 100644
--- a/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
+++ b/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
@@ -141,9 +141,6 @@ public sealed class TransactedRegistryKey : MarshalByRefObject, IDisposable
         // If that call fails with ERROR_INVALID_TRANSACTION, we have possibly run into bug 181242. To workaround
         // this, we open the key without a transaction and then open it again with
         // a transaction and return THAT hkey.
-
-        // Suppressed because there is no way for arbitrary data to be passed.
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         private int RegOpenKeyTransactedWrapper(SafeRegistryHandle hKey, string lpSubKey,
                     int ulOptions, int samDesired, out SafeRegistryHandle hkResult,
                     SafeTransactionHandle hTransaction, IntPtr pExtendedParameter)
@@ -346,8 +343,6 @@ public void Dispose()
         /// otherwise an ArgumentException is thrown.</param>
         /// <returns>A TransactedRegistryKey object for the subkey, which is associated with Transaction.Current.
         /// returns null if the operation failed.</returns>
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public TransactedRegistryKey CreateSubKey(string subkey)
@@ -366,8 +361,6 @@ public TransactedRegistryKey CreateSubKey(string subkey)
         /// <param name='permissionCheck'>One of the Microsoft.Win32.RegistryKeyPermissionCheck values that
         /// specifies whether the key is opened for read or read/write access.</param>
         [ComVisible(false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public TransactedRegistryKey CreateSubKey(string subkey, RegistryKeyPermissionCheck permissionCheck)
@@ -387,8 +380,6 @@ public TransactedRegistryKey CreateSubKey(string subkey, RegistryKeyPermissionCh
         /// specifies whether the key is opened for read or read/write access.</param>
         /// <param name='registrySecurity'>A TransactedRegistrySecurity object that specifies the access control security for the new key.</param>
         [ComVisible(false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public unsafe TransactedRegistryKey CreateSubKey(string subkey, RegistryKeyPermissionCheck permissionCheck, TransactedRegistrySecurity registrySecurity)
@@ -397,8 +388,6 @@ public unsafe TransactedRegistryKey CreateSubKey(string subkey, RegistryKeyPermi
         }
 
         [ComVisible(false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         private unsafe TransactedRegistryKey CreateSubKeyInternal(string subkey, RegistryKeyPermissionCheck permissionCheck, object registrySecurityObj)
@@ -489,8 +478,6 @@ private unsafe TransactedRegistryKey CreateSubKeyInternal(string subkey, Registr
         /// <exception cref="InvalidOperationException">Thrown if the subkey as child subkeys.</exception>
         /// </summary>
         /// <param name='subkey'>The subkey to delete.</param>
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public void DeleteSubKey(string subkey)
@@ -510,8 +497,6 @@ public void DeleteSubKey(string subkey)
         /// <param name='throwOnMissingSubKey'>Specify true if an ArgumentException should be thrown if
         /// the specified subkey does not exist. If false is specified, a missing subkey does not throw
         /// an exception.</param>
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public void DeleteSubKey(string subkey, bool throwOnMissingSubKey)
@@ -569,8 +554,6 @@ public void DeleteSubKey(string subkey, bool throwOnMissingSubKey)
         /// Utilizes Transaction.Current for its transaction.</para>
         /// </summary>
         /// <param name="subkey">The subkey to delete.</param>
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public void DeleteSubKeyTree(string subkey)
@@ -626,8 +609,6 @@ public void DeleteSubKeyTree(string subkey)
 
         // An internal version which does no security checks or argument checking.  Skipping the
         // security checks should give us a slight perf gain on large trees.
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         private void DeleteSubKeyTreeInternal(string subkey)
@@ -672,8 +653,6 @@ private void DeleteSubKeyTreeInternal(string subkey)
         /// Utilizes Transaction.Current for its transaction.</para>
         /// </summary>
         /// <param name="name">Name of the value to delete.</param>
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         public void DeleteValue(string name)
         {
             DeleteValue(name, true);
@@ -687,8 +666,6 @@ public void DeleteValue(string name)
         /// <param name="throwOnMissingValue">Specify true if an ArgumentException should be thrown if
         /// the specified value does not exist. If false is specified, a missing value does not throw
         /// an exception.</param>
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         public void DeleteValue(string name, bool throwOnMissingValue)
         {
             EnsureWriteable();
@@ -758,8 +735,6 @@ internal static TransactedRegistryKey GetBaseKey(IntPtr hKey)
         /// <returns>The subkey requested or null if the operation failed.</returns>
         /// <param name="name">Name or path of the subkey to open.</param>
         /// <param name="writable">Set to true of you only need readonly access.</param>
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public TransactedRegistryKey OpenSubKey(string name, bool writable)
@@ -803,8 +778,6 @@ public TransactedRegistryKey OpenSubKey(string name, bool writable)
         /// <param name="permissionCheck">One of the Microsoft.Win32.RegistryKeyPermissionCheck values that specifies
         /// whether the key is opened for read or read/write access.</param>
         [ComVisible(false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public TransactedRegistryKey OpenSubKey(string name, RegistryKeyPermissionCheck permissionCheck)
@@ -823,8 +796,6 @@ public TransactedRegistryKey OpenSubKey(string name, RegistryKeyPermissionCheck
         /// whether the key is opened for read or read/write access.</param>
         /// <param name="rights">A bitwise combination of Microsoft.Win32.RegistryRights values that specifies the desired security access.</param>
         [ComVisible(false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public TransactedRegistryKey OpenSubKey(string name, RegistryKeyPermissionCheck permissionCheck, RegistryRights rights)
@@ -832,8 +803,6 @@ public TransactedRegistryKey OpenSubKey(string name, RegistryKeyPermissionCheck
             return InternalOpenSubKey(name, permissionCheck, (int)rights);
         }
 
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         private TransactedRegistryKey InternalOpenSubKey(string name, RegistryKeyPermissionCheck permissionCheck, int rights)
@@ -874,8 +843,6 @@ private TransactedRegistryKey InternalOpenSubKey(string name, RegistryKeyPermiss
 
         // This required no security checks. This is to get around the Deleting SubKeys which only require
         // write permission. They call OpenSubKey which required read. Now instead call this function w/o security checks
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         internal TransactedRegistryKey InternalOpenSubKey(string name, bool writable)
@@ -906,8 +873,6 @@ internal TransactedRegistryKey InternalOpenSubKey(string name, bool writable)
         /// </summary>
         /// <returns>The subkey requested or null if the operation failed.</returns>
         /// <param name="name">Name or path of the subkey to open.</param>
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
         // Suppressed to be consistent with naming in Microsoft.Win32.RegistryKey
         [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly")]
         public TransactedRegistryKey OpenSubKey(string name)
diff --git a/src/System.Management.Automation/namespaces/Win32Native.cs b/src/System.Management.Automation/namespaces/Win32Native.cs
index 3814058bd0e..4f2c65c49f5 100644
--- a/src/System.Management.Automation/namespaces/Win32Native.cs
+++ b/src/System.Management.Automation/namespaces/Win32Native.cs
@@ -27,7 +27,7 @@ namespace Microsoft.PowerShell.Commands.Internal
     // Remove the default demands for all N/Direct methods with this
     // global declaration on the class.
     //
-    [SuppressUnmanagedCodeSecurityAttribute]
+    [SuppressUnmanagedCodeSecurity]
     internal static class Win32Native
     {
         #region Integer Const
@@ -76,14 +76,14 @@ internal enum SID_NAME_USE
 
         #region Struct
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct SID_AND_ATTRIBUTES
         {
             internal IntPtr Sid;
             internal uint Attributes;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct TOKEN_USER
         {
             internal SID_AND_ATTRIBUTES User;
@@ -106,8 +106,6 @@ internal struct TOKEN_USER
         /// <param name="peUse"></param>
         /// <returns></returns>
         [DllImport(PinvokeDllNames.LookupAccountSidDllName, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static extern unsafe bool LookupAccountSid(string lpSystemName,
                                                      IntPtr sid,
@@ -139,8 +137,6 @@ internal static unsafe bool LookupAccountSid(string lpSystemName,
         }
 
         [DllImport(PinvokeDllNames.CloseHandleDllName, SetLastError = true)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool CloseHandle(IntPtr handle);
 
@@ -152,8 +148,6 @@ internal static unsafe bool LookupAccountSid(string lpSystemName,
         /// <param name="tokenHandle">Process token.</param>
         /// <returns>The current process token.</returns>
         [DllImport(PinvokeDllNames.OpenProcessTokenDllName, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool OpenProcessToken(IntPtr processHandle, uint desiredAccess, out IntPtr tokenHandle);
 
@@ -168,8 +162,6 @@ internal static unsafe bool LookupAccountSid(string lpSystemName,
         /// <param name="returnLength"></param>
         /// <returns></returns>
         [DllImport(PinvokeDllNames.GetTokenInformationDllName, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool GetTokenInformation(IntPtr tokenHandle,
                                                         TOKEN_INFORMATION_CLASS tokenInformationClass,
diff --git a/src/System.Management.Automation/resources/CommandBaseStrings.resx b/src/System.Management.Automation/resources/CommandBaseStrings.resx
index 0ff1aac4716..e869e98e742 100644
--- a/src/System.Management.Automation/resources/CommandBaseStrings.resx
+++ b/src/System.Management.Automation/resources/CommandBaseStrings.resx
@@ -163,7 +163,7 @@
       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>
+    <value>Program "{0}" ended with non-zero exit code: {1} ({2}).</value>
   </data>
   <data name="ShouldProcessMessage" xml:space="preserve">
     <value>Performing the operation "{0}" on target "{1}".</value>
diff --git a/src/System.Management.Automation/resources/FileSystemProviderStrings.resx b/src/System.Management.Automation/resources/FileSystemProviderStrings.resx
index d23ff660f09..360c2eceb7e 100644
--- a/src/System.Management.Automation/resources/FileSystemProviderStrings.resx
+++ b/src/System.Management.Automation/resources/FileSystemProviderStrings.resx
@@ -334,7 +334,7 @@
     <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>
+    <value>Destination path cannot be a subdirectory of the source or the source itself: {0}.</value>
   </data>
   <data name="NewItemTargetIsSameAsLink" xml:space="preserve">
     <value>The target and path cannot be the same.</value>
@@ -345,6 +345,12 @@
   <data name="CopyingLocalBytesStatus" xml:space="preserve">
     <value>{0} of {1} ({2:0.0} MB/s)</value>
   </data>
+  <data name="RemovingLocalFileActivity" xml:space="preserve">
+    <value>Removed {0} of {1} files</value>
+  </data>
+  <data name="RemovingLocalBytesStatus" xml:space="preserve">
+    <value>{0} of {1} ({2:0.0} MB/s)</value>
+  </data>
   <data name="JunctionAbsolutePath" xml:space="preserve">
     <value>Creating a junction requires an absolute path for the target.</value>
   </data>
diff --git a/src/System.Management.Automation/resources/HelpErrors.resx b/src/System.Management.Automation/resources/HelpErrors.resx
index 27634de2995..ae797e8af12 100644
--- a/src/System.Management.Automation/resources/HelpErrors.resx
+++ b/src/System.Management.Automation/resources/HelpErrors.resx
@@ -179,7 +179,7 @@
 To update these Help topics, start PowerShell by using the "Run as Administrator" command, and try running Update-Help again.</value>
   </data>
   <data name="GraphicalHostAssemblyIsNotFound" xml:space="preserve">
-    <value>To use the {0}, install Windows PowerShell ISE by using Server Manager, and then restart this application. ({1})</value>
+    <value>To use the {0}, make sure your application uses 'Microsoft.NET.Sdk.WindowsDesktop' as the project SDK and the corresponding assembly 'Microsoft.PowerShell.GraphicalHost' is available. ({1})</value>
   </data>
   <data name="RemotingNotSupportedForFeature" xml:space="preserve">
     <value>{0} does not work in a remote session.</value>
diff --git a/src/System.Management.Automation/resources/Metadata.resx b/src/System.Management.Automation/resources/Metadata.resx
index de0a30f77e2..b8dc3ea4eb4 100644
--- a/src/System.Management.Automation/resources/Metadata.resx
+++ b/src/System.Management.Automation/resources/Metadata.resx
@@ -175,7 +175,7 @@
     <value>The character length ({1}) of the argument is too short. Specify an argument with a length that is greater than or equal to "{0}", and then try the command again.</value>
   </data>
   <data name="ValidateLengthMaxLengthFailure" xml:space="preserve">
-    <value>The character length of the {1} argument is too long. Shorten the character length of the argument so it is fewer than or equal to "{0}" characters, and then try the command again.</value>
+    <value>The character length ({1}) of the argument is too long. Specify an argument with a length that is shorter than or equal to "{0}", and then try the command again.</value>
   </data>
   <data name="ValidateSetFailure" xml:space="preserve">
     <value>The argument "{0}" does not belong to the set "{1}" specified by the ValidateSet attribute. Supply an argument that is in the set and then try the command again.</value>
diff --git a/src/System.Management.Automation/resources/ParserStrings.resx b/src/System.Management.Automation/resources/ParserStrings.resx
index 5631525cacc..a76527cfbab 100644
--- a/src/System.Management.Automation/resources/ParserStrings.resx
+++ b/src/System.Management.Automation/resources/ParserStrings.resx
@@ -1229,6 +1229,9 @@ ModuleVersion : Version of module to import. If used, ModuleName must represent
   <data name="UsingStatementNotSupported" xml:space="preserve">
     <value>This syntax of the 'using' statement is not supported.</value>
   </data>
+  <data name="InvalidNamespaceValue" xml:space="preserve">
+    <value>The specified namespace in the 'using' statement contains invalid characters.</value>
+  </data>
   <data name="InformationStream" xml:space="preserve">
     <value>information stream</value>
   </data>
@@ -1361,4 +1364,13 @@ ModuleVersion : Version of module to import. If used, ModuleName must represent
   <data name="WDACParserForEachOperatorLogMessage" xml:space="preserve">
     <value>The ForEach keyword will fail '{0}' iteration item method invocation when run in Constrained Language mode.</value>
   </data>
+  <data name="WDACGetSteppablePipelineLogTitle" xml:space="preserve">
+    <value>Expression Evaluation May Fail</value>
+  </data>
+  <data name="WDACGetSteppablePipelineLogMessage" xml:space="preserve">
+    <value>Creating a steppable pipeline from a script block may require evaluating some expressions within the script block. The expression evaluation will silently fail and return 'null' in Constrained Language mode, unless the expression represents a constant value.</value>
+  </data>
+  <data name="ConfigurationNotAllowedOnArm64" xml:space="preserve">
+    <value>Configuration keyword is not supported on ARM64 processors.</value>
+  </data>
 </root>
diff --git a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
index f65d536f639..b5905f1cf7a 100644
--- a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
+++ b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
@@ -123,6 +123,9 @@
   <data name="OutOfMemory" xml:space="preserve">
     <value>Out of process memory.</value>
   </data>
+  <data name="UnsupportedOSForRemoteEnumeration" xml:space="preserve">
+    <value>Remote PSSession enumeration with -ComputerName is only supported on Windows and not "{0}".</value>
+  </data>
   <data name="PipelineIdsDoNotMatch" xml:space="preserve">
     <value>Pipeline ID "{0}" does not match the InstanceId of the pipeline that is currently running, "{1}".</value>
   </data>
@@ -846,7 +849,7 @@ Note that 'Start-Job' is not supported by design in scenarios where PowerShell i
     <value>The WriteEvents parameter cannot be used without the Wait parameter.</value>
   </data>
   <data name="PowerShellVersionNotSupported" xml:space="preserve">
-    <value>PowerShell remoting endpoint versioning is not supported on PowerShell Core.</value>
+    <value>PowerShell remoting endpoint versioning is not supported on PowerShell 7+.</value>
   </data>
   <data name="JobManagerRegistrationConstructorError" xml:space="preserve">
     <value>The following type cannot be instantiated because its constructor is not public: {0}.</value>
@@ -1408,7 +1411,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 with Id '{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 or the named-pipe listener was disabled.</value>
   </data>
   <data name="EnterPSHostProcessNoProcessFoundWithId" xml:space="preserve">
     <value>No process was found with Id: {0}.</value>
@@ -1714,4 +1717,19 @@ SSH client process terminated before connection could be established.</value>
   <data name="DISCUnknownConfigName" xml:space="preserve">
     <value>The session configuration file contains an unknown configuration option: {0}.</value>
   </data>
+  <data name="WDACGetPowerShellLogTitle" xml:space="preserve">
+    <value>Expression Evaluation May Fail</value>
+  </data>
+  <data name="WDACGetPowerShellLogMessage" xml:space="preserve">
+    <value>Creating a PowerShell object from a script block may require evaluating some expressions within the script block. The expression evaluation will silently fail and return 'null' in Constrained Language mode, unless the expression represents a constant value.</value>
+  </data>
+  <data name="HyperVFailedToGetStateUnknownType" xml:space="preserve">
+    <value>Failed to get Hyper-V VM State. The value was of the type {0} but was expected to be Microsoft.HyperV.PowerShell.VMState or System.String.</value>
+  </data>
+  <data name="HyperVInvalidResponse" xml:space="preserve">
+    <value>Hyper-V {0} sent an invalid {1} response during the connection negotiation.</value>
+  </data>
+  <data name="HyperVNegotiationFailed" xml:space="preserve">
+    <value>Negotiating a secure connection to Hyper-V failed. Make sure the Host and Guest are updated with all relevant Microsoft Updates.</value>
+  </data>
 </root>
diff --git a/src/System.Management.Automation/resources/RunspaceInit.resx b/src/System.Management.Automation/resources/RunspaceInit.resx
index f12ba3f71c5..985056b69ee 100644
--- a/src/System.Management.Automation/resources/RunspaceInit.resx
+++ b/src/System.Management.Automation/resources/RunspaceInit.resx
@@ -153,6 +153,9 @@
   <data name="OutputEncodingDescription" xml:space="preserve">
     <value>The text encoding used when piping text to a native executable file</value>
   </data>
+  <data name="PSApplicationOutputEncodingDescription" xml:space="preserve">
+    <value>The text encoding used when reading output text from a native executable file</value>
+  </data>
   <data name="PSStyleDescription" xml:space="preserve">
     <value>Configuration controlling how text is rendered.</value>
   </data>
diff --git a/src/System.Management.Automation/resources/SuggestionStrings.resx b/src/System.Management.Automation/resources/SuggestionStrings.resx
index ea249db55e7..39fbc3469f2 100644
--- a/src/System.Management.Automation/resources/SuggestionStrings.resx
+++ b/src/System.Management.Automation/resources/SuggestionStrings.resx
@@ -126,10 +126,4 @@ If you trust this command, run the following command instead:</value>
   <data name="Suggestion_CommandNotFound" xml:space="preserve">
     <value>The most similar commands are:</value>
   </data>
-  <data name="RuleMustBeScriptBlock" xml:space="preserve">
-    <value>Rule must be a ScriptBlock for dynamic match types.</value>
-  </data>
-  <data name="InvalidMatchType" xml:space="preserve">
-    <value>MatchType must be 'Command', 'Error', or 'Dynamic'.</value>
-  </data>
 </root>
diff --git a/src/System.Management.Automation/resources/TabCompletionStrings.resx b/src/System.Management.Automation/resources/TabCompletionStrings.resx
index 26d4dc4e14e..298de92da3c 100644
--- a/src/System.Management.Automation/resources/TabCompletionStrings.resx
+++ b/src/System.Management.Automation/resources/TabCompletionStrings.resx
@@ -329,6 +329,218 @@
   <data name="shrOperatorDescription" xml:space="preserve">
     <value>Shift Right bit operator. Inserts zero in the left-most bit position. For signed values, sign bit is preserved.</value>
   </data>
+  <data name="NameHashtableKeyDescription" xml:space="preserve">
+    <value>[string]
+Specifies the name of the property being created.</value>
+  </data>
+  <data name="LabelHashtableKeyDescription" xml:space="preserve">
+    <value>[string]
+Specifies the name of the property being created.</value>
+  </data>
+  <data name="ExpressionHashtableKeyDescription" xml:space="preserve">
+    <value>[scriptblock]
+A script block used to calculate the value of the new property.</value>
+  </data>
+  <data name="AlignmentHashtableKeyDescription" xml:space="preserve">
+    <value>[string]
+Define how the values are displayed in a column.
+Valid values are 'left', 'center', or 'right'.</value>
+  </data>
+  <data name="FormatStringHashtableKeyDescription" xml:space="preserve">
+    <value>[string]
+Specifies a format string that defines how the value is formatted for output.</value>
+  </data>
+  <data name="WidthHashtableKeyDescription" xml:space="preserve">
+    <value>[int]
+Specifies the maximum column width in a table when the value is displayed.
+The value must be greater than 0.</value>
+  </data>
+  <data name="DepthHashtableKeyDescription" xml:space="preserve">
+    <value>[int]
+The depth key specifies the depth of expansion per property.</value>
+  </data>
+  <data name="AscendingHashtableKeyDescription" xml:space="preserve">
+    <value>[bool]
+Specifies the order of sorting for one or more properties.</value>
+  </data>
+  <data name="DescendingHashtableKeyDescription" xml:space="preserve">
+    <value>[bool]
+Specifies the order of sorting for one or more properties.</value>
+  </data>
+  <data name="LogNameHashtableKeyDescription" xml:space="preserve">
+    <value>[String[]]
+Specifies the log names to get events from.
+Supports wildcards.</value>
+  </data>
+  <data name="ProviderNameHashtableKeyDescription" xml:space="preserve">
+    <value>[String[]]
+Specifies the event log providers to get events from.
+Supports wildcards.</value>
+  </data>
+  <data name="PathHashtableKeyDescription" xml:space="preserve">
+    <value>[String[]]
+Specifies file paths to log files to get events from.
+Valid file formats are: .etl, .evt, and .evtx</value>
+  </data>
+  <data name="KeywordsHashtableKeyDescription" xml:space="preserve">
+    <value>[Long[]]
+Selects events with the specified keyword bitmasks.
+The following are standard keywords:
+4503599627370496: AuditFailure
+9007199254740992: AuditSuccess
+4503599627370496: CorrelationHint
+18014398509481984: CorrelationHint2
+36028797018963968: EventLogClassic
+281474976710656: ResponseTime
+2251799813685248: Sqm
+562949953421312: WdiContext
+1125899906842624: WdiDiagnostic</value>
+  </data>
+  <data name="IDHashtableKeyDescription" xml:space="preserve">
+    <value>[int[]]
+Selects events with the specified event IDs.</value>
+  </data>
+  <data name="LevelHashtableKeyDescription" xml:space="preserve">
+    <value>[int[]]
+Selects events with the specified log levels.
+The following log levels are valid:
+1: Critical
+2: Error
+3: Warning
+4: Informational
+5: Verbose</value>
+  </data>
+  <data name="StartTimeHashtableKeyDescription" xml:space="preserve">
+    <value>[datetime]
+Selects events created after the specified date and time.</value>
+  </data>
+  <data name="EndTimeHashtableKeyDescription" xml:space="preserve">
+    <value>[datetime]
+Selects events created before the specified date and time.</value>
+  </data>
+  <data name="UserIDHashtableKeyDescription" xml:space="preserve">
+    <value>[string]
+Selects events generated by the specified user.
+This can either be a string representation of a SID or a domain and username in the format DOMAIN\USERNAME or USERNAME@DOMAIN</value>
+  </data>
+  <data name="DataHashtableKeyDescription" xml:space="preserve">
+    <value>[string[]]
+Selects events with any of the specified values in the EventData section.</value>
+  </data>  
+  <data name="SuppressHashFilterHashtableKeyDescription" xml:space="preserve">
+    <value>[hashtable]
+Excludes events that match the values specified in the hashtable.</value>
+  </data>
+  <data name="RequiresModulesParameterDescription" xml:space="preserve">
+    <value>[string] or [hashtable]
+Specifies an array of PowerShell modules that the script requires.
+Each element can either be a string with the module name as value or a hashtable with the following keys:
+Name: Name of the module
+GUID: GUID of the module
+One of the following:
+ModuleVersion: Specifies a minimum acceptable version of the module.
+RequiredVersion: Specifies an exact, required version of the module.
+MaximumVersion: Specifies the maximum acceptable version of the module.</value>
+  </data>
+  <data name="RequiresPSEditionParameterDescription" xml:space="preserve">
+    <value>[string]
+Specifies a PowerShell edition that the script requires.
+Valid values are "Core" and "Desktop"</value>
+  </data>
+  <data name="RequiresRunAsAdministratorParameterDescription" xml:space="preserve">
+    <value>[switch]
+Specifies that PowerShell must be running as administrator on Windows.
+This must be the last parameter on the #requires statement line.</value>
+  </data>
+  <data name="RequiresVersionParameterDescription" xml:space="preserve">
+    <value>[version]
+Specifies the minimum version of PowerShell that the script requires.</value>
+  </data>
+  <data name="RequiresPsEditionCoreDescription" xml:space="preserve">
+    <value>Specifies that the script requires PowerShell 7+ to run.</value>
+  </data>
+  <data name="RequiresPsEditionDesktopDescription" xml:space="preserve">
+    <value>Specifies that the script requires Windows PowerShell 5.1 to run.</value>
+  </data>
+  <data name="RequiresModuleSpecModuleNameDescription" xml:space="preserve">
+    <value>[string]
+Required. Specifies the module name.</value>
+  </data>
+  <data name="RequiresModuleSpecGUIDDescription" xml:space="preserve">
+    <value>[string]
+Optional. Specifies the GUID of the module.</value>
+  </data>
+  <data name="RequiresModuleSpecModuleVersionDescription" xml:space="preserve">
+    <value>[string]
+Specifies a minimum acceptable version of the module.</value>
+  </data>
+  <data name="RequiresModuleSpecRequiredVersionDescription" xml:space="preserve">
+    <value>[string]
+Specifies an exact, required version of the module.</value>
+  </data>
+  <data name="RequiresModuleSpecMaximumVersionDescription" xml:space="preserve">
+    <value>[string]
+Specifies the maximum acceptable version of the module.</value>
+  </data>
+  <data name="CommentHelpSYNOPSISKeywordDescription" xml:space="preserve">
+    <value>A brief description of the function or script.
+This keyword can be used only once in each topic.</value>
+  </data>
+  <data name="CommentHelpDESCRIPTIONKeywordDescription" xml:space="preserve">
+    <value>A detailed description of the function or script.
+This keyword can be used only once in each topic.</value>
+  </data>
+  <data name="CommentHelpPARAMETERKeywordDescription" xml:space="preserve">
+    <value>.PARAMETER  &lt;Parameter-Name&gt;
+The description of a parameter.
+Add a .PARAMETER keyword for each parameter in the function or script syntax.</value>
+  </data>
+  <data name="CommentHelpEXAMPLEKeywordDescription" xml:space="preserve">
+    <value>A sample command that uses the function or script, optionally followed by sample output and a description.
+Repeat this keyword for each example.</value>
+  </data>
+  <data name="CommentHelpINPUTSKeywordDescription" xml:space="preserve">
+    <value>The .NET types of objects that can be piped to the function or script.
+You can also include a description of the input objects.</value>
+  </data>
+  <data name="CommentHelpOUTPUTSKeywordDescription" xml:space="preserve">
+    <value>The .NET type of the objects that the cmdlet returns.
+You can also include a description of the returned objects.</value>
+  </data>
+  <data name="CommentHelpNOTESKeywordDescription" xml:space="preserve">
+    <value>Additional information about the function or script.</value>
+  </data>
+  <data name="CommentHelpLINKKeywordDescription" xml:space="preserve">
+    <value>The name of a related topic.
+Repeat the .LINK keyword for each related topic.
+The .Link keyword content can also include a URI to an online version of the same help topic.</value>
+  </data>
+  <data name="CommentHelpCOMPONENTKeywordDescription" xml:space="preserve">
+    <value>The name of the technology or feature that the function or script uses, or to which it is related.</value>
+  </data>
+  <data name="CommentHelpROLEKeywordDescription" xml:space="preserve">
+    <value>The name of the user role for the help topic.</value>
+  </data>
+  <data name="CommentHelpFUNCTIONALITYKeywordDescription" xml:space="preserve">
+    <value>The keywords that describe the intended use of the function.</value>
+  </data>
+  <data name="CommentHelpFORWARDHELPTARGETNAMEKeywordDescription" xml:space="preserve">
+    <value>.FORWARDHELPTARGETNAME &lt;Command-Name&gt;
+Redirects to the help topic for the specified command.</value>
+  </data>
+  <data name="CommentHelpFORWARDHELPCATEGORYKeywordDescription" xml:space="preserve">
+    <value>.FORWARDHELPCATEGORY &lt;Category&gt;
+Specifies the help category of the item in .ForwardHelpTargetName</value>
+  </data>
+  <data name="CommentHelpREMOTEHELPRUNSPACEKeywordDescription" xml:space="preserve">
+    <value>.REMOTEHELPRUNSPACE &lt;PSSession-variable&gt;
+Specifies a session that contains the help topic.
+Enter a variable that contains a PSSession object.</value>
+  </data>
+  <data name="CommentHelpEXTERNALHELPKeywordDescription" xml:space="preserve">
+    <value>.EXTERNALHELP &lt;XML Help File&gt;
+The .ExternalHelp keyword is required when a function or script is documented in XML files.</value>
+  </data>
   <data name="AssemblyKeywordDescription" xml:space="preserve">
     <value>Specifies the path to a .NET assembly to load.
 
@@ -353,4 +565,46 @@ using namespace &lt;AliasName&gt; = &lt;.NET-namespace&gt;</value>
 
 using type &lt;AliasName&gt; = &lt;.NET-type&gt;</value>
   </data>
+  <data name="RegistryStringToolTip" xml:space="preserve">
+    <value>A normal string.</value>
+  </data>
+  <data name="RegistryExpandStringToolTip" xml:space="preserve">
+    <value>A string that contains unexpanded references to environment variables that are expanded when the value is retrieved.</value>
+  </data>
+  <data name="RegistryBinaryToolTip" xml:space="preserve">
+    <value>Binary data in any form.</value>
+  </data>
+  <data name="RegistryDWordToolTip" xml:space="preserve">
+    <value>A 32-bit binary number.</value>
+  </data>
+  <data name="RegistryMultiStringToolTip" xml:space="preserve">
+    <value>An array of strings.</value>
+  </data>
+  <data name="RegistryQWordToolTip" xml:space="preserve">
+    <value>A 64-bit binary number.</value>
+  </data>
+  <data name="RegistryUnknownToolTip" xml:space="preserve">
+    <value>An unsupported registry data type.</value>
+  </data>
+  <data name="SeparatorCommaToolTip" xml:space="preserve">
+    <value>',' - Comma</value>
+  </data>
+  <data name="SeparatorCommaSpaceToolTip" xml:space="preserve">
+    <value>', ' - Comma-Space</value>
+  </data>
+  <data name="SeparatorSemiColonToolTip" xml:space="preserve">
+    <value>';' - Semi-Colon</value>
+  </data>
+  <data name="SeparatorSemiColonSpaceToolTip" xml:space="preserve">
+    <value>'; ' - Semi-Colon-Space</value>
+  </data>
+  <data name="SeparatorNewlineToolTip" xml:space="preserve">
+    <value>{0} - Newline</value>
+  </data>
+  <data name="SeparatorDashToolTip" xml:space="preserve">
+    <value>'-' - Dash</value>
+  </data>
+  <data name="SeparatorSpaceToolTip" xml:space="preserve">
+    <value>' ' - Space</value>
+  </data>
 </root>
diff --git a/src/System.Management.Automation/security/Authenticode.cs b/src/System.Management.Automation/security/Authenticode.cs
index 591f64d6298..3a7720616d1 100644
--- a/src/System.Management.Automation/security/Authenticode.cs
+++ b/src/System.Management.Automation/security/Authenticode.cs
@@ -115,8 +115,8 @@ internal static Signature SignFile(SigningOption option,
             if (!string.IsNullOrEmpty(timeStampServerUrl))
             {
                 if ((timeStampServerUrl.Length <= 7) || (
-                    (timeStampServerUrl.IndexOf("http://", StringComparison.OrdinalIgnoreCase) != 0) &&
-                    (timeStampServerUrl.IndexOf("https://", StringComparison.OrdinalIgnoreCase) != 0)))
+                    !timeStampServerUrl.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
+                    !timeStampServerUrl.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
                 {
                     throw PSTraceSource.NewArgumentException(
                         nameof(certificate),
diff --git a/src/System.Management.Automation/security/CatalogHelper.cs b/src/System.Management.Automation/security/CatalogHelper.cs
index 405e8baa384..4892f7434e4 100644
--- a/src/System.Management.Automation/security/CatalogHelper.cs
+++ b/src/System.Management.Automation/security/CatalogHelper.cs
@@ -220,9 +220,8 @@ internal static void ProcessFileToBeAddedInCatalogDefinitionFile(FileInfo fileTo
                 relativePath = fileToHash.Name;
             }
 
-            if (!relativePaths.Contains(relativePath))
+            if (relativePaths.Add(relativePath))
             {
-                relativePaths.Add(relativePath);
                 if (fileToHash.Length != 0)
                 {
                     cdfFilesContent += "<HASH>" + fileToHash.FullName + "=" + fileToHash.FullName + Environment.NewLine;
@@ -423,7 +422,7 @@ internal static string CalculateFileHash(string filePath, string hashAlgorithm)
             FileStream fileStream;
             try
             {
-                fileStream = File.Open(filePath, FileMode.Open, FileAccess.Read);
+                fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
             }
             catch (Exception e)
             {
diff --git a/src/System.Management.Automation/security/CredentialParameter.cs b/src/System.Management.Automation/security/CredentialParameter.cs
index 0d48e4fa738..1ea19691ae7 100644
--- a/src/System.Management.Automation/security/CredentialParameter.cs
+++ b/src/System.Management.Automation/security/CredentialParameter.cs
@@ -89,4 +89,3 @@ public override object Transform(EngineIntrinsics engineIntrinsics, object input
 }
 
 #pragma warning restore 56506
-
diff --git a/src/System.Management.Automation/security/MshSignature.cs b/src/System.Management.Automation/security/MshSignature.cs
index fd8dd4f67ef..7cbaf98d3a5 100644
--- a/src/System.Management.Automation/security/MshSignature.cs
+++ b/src/System.Management.Automation/security/MshSignature.cs
@@ -185,6 +185,11 @@ public string Path
         /// </summary>
         public bool IsOSBinary { get; internal set; }
 
+        /// <summary>
+        /// Gets the Subject Alternative Name from the signer certificate.
+        /// </summary>
+        public string[] SubjectAlternativeName { get; private set; }
+
         /// <summary>
         /// Constructor for class Signature
         ///
@@ -277,6 +282,9 @@ private void Init(string filePath,
             _statusMessage = GetSignatureStatusMessage(isc,
                                                       error,
                                                       filePath);
+
+            // Extract Subject Alternative Name from the signer certificate
+            SubjectAlternativeName = GetSubjectAlternativeName(signer);
         }
 
         private static SignatureStatus GetSignatureStatusFromWin32Error(DWORD error)
@@ -389,5 +397,34 @@ private static string GetSignatureStatusMessage(SignatureStatus status,
 
             return message;
         }
+
+        /// <summary>
+        /// Extracts the Subject Alternative Name from the certificate.
+        /// </summary>
+        /// <param name="certificate">The certificate to extract SAN from.</param>
+        /// <returns>Array of SAN entries or null if not found.</returns>
+        private static string[] GetSubjectAlternativeName(X509Certificate2 certificate)
+        {
+            if (certificate == null)
+            {
+                return null;
+            }
+
+            foreach (X509Extension extension in certificate.Extensions)
+            {
+                if (extension.Oid != null && extension.Oid.Value == CertificateFilterInfo.SubjectAlternativeNameOid)
+                {
+                    string formatted = extension.Format(multiLine: true);
+                    if (string.IsNullOrEmpty(formatted))
+                    {
+                        return null;
+                    }
+
+                    return formatted.Split(new[] { "\r\n", "\n", "\r" }, StringSplitOptions.RemoveEmptyEntries);
+                }
+            }
+
+            return null;
+        }
     }
 }
diff --git a/src/System.Management.Automation/security/SecureStringHelper.cs b/src/System.Management.Automation/security/SecureStringHelper.cs
index 2f7c991abc4..5ff5881bab4 100644
--- a/src/System.Management.Automation/security/SecureStringHelper.cs
+++ b/src/System.Management.Automation/security/SecureStringHelper.cs
@@ -31,7 +31,7 @@ internal static class SecureStringHelper
         /// </summary>
         /// <param name="data">Input data.</param>
         /// <returns>A SecureString .</returns>
-        private static SecureString New(byte[] data)
+        internal static SecureString New(byte[] data)
         {
             if ((data.Length % 2) != 0)
             {
@@ -594,7 +594,7 @@ internal static class CAPI
         internal const int E_FILENOTFOUND = unchecked((int)0x80070002); // File not found
         internal const int ERROR_FILE_NOT_FOUND = 2;                    // File not found
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTOAPI_BLOB
         {
             internal uint cbData;
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
index 2089c2217ed..dc6d048c5b1 100644
--- a/src/System.Management.Automation/security/SecuritySupport.cs
+++ b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -815,6 +815,7 @@ internal DateTime Expiring
         // The OID arc 1.3.6.1.4.1.311.80 is assigned to PowerShell. If we need
         // new OIDs, we can assign them under this branch.
         internal const string DocumentEncryptionOid = "1.3.6.1.4.1.311.80.1";
+        internal const string SubjectAlternativeNameOid = "2.5.29.17";
     }
 }
 
@@ -1104,7 +1105,10 @@ private void ResolveFromBase64Encoding(ResolutionPurpose purpose, out ErrorRecor
             var certificatesToProcess = new X509Certificate2Collection();
             try
             {
+                #pragma warning disable SYSLIB0057
                 X509Certificate2 newCertificate = new X509Certificate2(messageBytes);
+                #pragma warning restore SYSLIB0057
+
                 certificatesToProcess.Add(newCertificate);
             }
             catch (Exception)
@@ -1182,7 +1186,9 @@ private void ResolveFromPath(SessionState sessionState, ResolutionPurpose purpos
 
                     try
                     {
+                        #pragma warning disable SYSLIB0057
                         certificate = new X509Certificate2(path);
+                        #pragma warning restore SYSLIB0057
                     }
                     catch (Exception)
                     {
@@ -1337,7 +1343,7 @@ internal static class AmsiUtils
         static AmsiUtils()
         {
 #if !UNIX
-            try 
+            try
             {
                 s_amsiInitFailed = !CheckAmsiInit();
             }
@@ -1347,7 +1353,7 @@ static AmsiUtils()
                 s_amsiInitFailed = true;
                 return;
             }
-            
+
             PSEtwLog.LogAmsiUtilStateEvent($"init-{s_amsiInitFailed}", $"{s_amsiContext}-{s_amsiSession}");
 #endif
         }
@@ -1601,10 +1607,8 @@ internal static void CurrentDomain_ProcessExit(object sender, EventArgs e)
             }
         }
 
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private static IntPtr s_amsiContext = IntPtr.Zero;
 
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
         private static IntPtr s_amsiSession = IntPtr.Zero;
 
         private static readonly bool s_amsiInitFailed = false;
@@ -1698,29 +1702,29 @@ internal enum AMSI_RESULT
             /// Return Type: HRESULT->LONG->int
             ///appName: LPCWSTR->WCHAR*
             ///amsiContext: HAMSICONTEXT*
-            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
-            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiInitialize", CallingConvention = CallingConvention.StdCall)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+            [DllImport("amsi.dll", EntryPoint = "AmsiInitialize", CallingConvention = CallingConvention.StdCall)]
             internal static extern int AmsiInitialize(
-                [InAttribute()][MarshalAsAttribute(UnmanagedType.LPWStr)] string appName, ref System.IntPtr amsiContext);
+                [In][MarshalAs(UnmanagedType.LPWStr)] string appName, ref System.IntPtr amsiContext);
 
             /// Return Type: void
             ///amsiContext: HAMSICONTEXT->HAMSICONTEXT__*
-            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
-            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiUninitialize", CallingConvention = CallingConvention.StdCall)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+            [DllImport("amsi.dll", EntryPoint = "AmsiUninitialize", CallingConvention = CallingConvention.StdCall)]
             internal static extern void AmsiUninitialize(System.IntPtr amsiContext);
 
             /// Return Type: HRESULT->LONG->int
             ///amsiContext: HAMSICONTEXT->HAMSICONTEXT__*
             ///amsiSession: HAMSISESSION*
-            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
-            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiOpenSession", CallingConvention = CallingConvention.StdCall)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+            [DllImport("amsi.dll", EntryPoint = "AmsiOpenSession", CallingConvention = CallingConvention.StdCall)]
             internal static extern int AmsiOpenSession(System.IntPtr amsiContext, ref System.IntPtr amsiSession);
 
             /// Return Type: void
             ///amsiContext: HAMSICONTEXT->HAMSICONTEXT__*
             ///amsiSession: HAMSISESSION->HAMSISESSION__*
-            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
-            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiCloseSession", CallingConvention = CallingConvention.StdCall)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+            [DllImport("amsi.dll", EntryPoint = "AmsiCloseSession", CallingConvention = CallingConvention.StdCall)]
             internal static extern void AmsiCloseSession(System.IntPtr amsiContext, System.IntPtr amsiSession);
 
             /// Return Type: HRESULT->LONG->int
@@ -1730,13 +1734,13 @@ internal static extern int AmsiInitialize(
             ///contentName: LPCWSTR->WCHAR*
             ///amsiSession: HAMSISESSION->HAMSISESSION__*
             ///result: AMSI_RESULT*
-            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
-            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiScanBuffer", CallingConvention = CallingConvention.StdCall)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+            [DllImport("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,
+                [In][MarshalAs(UnmanagedType.LPWStr)] string contentName,
                 System.IntPtr amsiSession,
                 ref AMSI_RESULT result);
 
@@ -1746,13 +1750,13 @@ internal static extern int AmsiScanBuffer(
             /// length: ULONG->unsigned int
             /// contentName: LPCWSTR->WCHAR*
             /// result: AMSI_RESULT*
-            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
-            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiNotifyOperation", CallingConvention = CallingConvention.StdCall)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+            [DllImport("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,
+                [In][MarshalAs(UnmanagedType.LPWStr)] string contentName,
                 ref AMSI_RESULT result);
 
             /// Return Type: HRESULT->LONG->int
@@ -1761,11 +1765,11 @@ internal static extern int AmsiNotifyOperation(
             ///contentName: LPCWSTR->WCHAR*
             ///amsiSession: HAMSISESSION->HAMSISESSION__*
             ///result: AMSI_RESULT*
-            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
-            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiScanString", CallingConvention = CallingConvention.StdCall)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+            [DllImport("amsi.dll", EntryPoint = "AmsiScanString", CallingConvention = CallingConvention.StdCall)]
             internal static extern int AmsiScanString(
-                System.IntPtr amsiContext, [InAttribute()][MarshalAsAttribute(UnmanagedType.LPWStr)] string @string,
-                [InAttribute()][MarshalAsAttribute(UnmanagedType.LPWStr)] string contentName, System.IntPtr amsiSession, ref AMSI_RESULT result);
+                System.IntPtr amsiContext, [In][MarshalAs(UnmanagedType.LPWStr)] string @string,
+                [In][MarshalAs(UnmanagedType.LPWStr)] string contentName, System.IntPtr amsiSession, ref AMSI_RESULT result);
         }
     }
 }
diff --git a/src/System.Management.Automation/security/Win32Native/WinTrust.cs b/src/System.Management.Automation/security/Win32Native/WinTrust.cs
index c3b7bb85d91..a0ae8bc0e99 100644
--- a/src/System.Management.Automation/security/Win32Native/WinTrust.cs
+++ b/src/System.Management.Automation/security/Win32Native/WinTrust.cs
@@ -94,10 +94,10 @@ internal struct CRYPT_ATTR_BLOB
         public IntPtr pbData;
     }
 
-    [StructLayoutAttribute(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct CRYPT_ALGORITHM_IDENTIFIER
     {
-        [MarshalAsAttribute(UnmanagedType.LPStr)] public string pszObjId;
+        [MarshalAs(UnmanagedType.LPStr)] public string pszObjId;
         public CRYPT_ATTR_BLOB Parameters;
     }
 
@@ -158,7 +158,7 @@ internal struct CRYPTCATSTORE
         public IntPtr hSorted;
     }
 
-    [StructLayoutAttribute(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct WINTRUST_DATA
     {
         public uint cbStruct;
@@ -184,7 +184,7 @@ internal struct WINTRUST_FILE_INFO
         public IntPtr pgKnownSubject;
     }
 
-    [StructLayoutAttribute(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct WINTRUST_BLOB_INFO
     {
         public uint cbStruct;
diff --git a/src/System.Management.Automation/security/nativeMethods.cs b/src/System.Management.Automation/security/nativeMethods.cs
index b1c907f1fe2..6dd8f59d613 100644
--- a/src/System.Management.Automation/security/nativeMethods.cs
+++ b/src/System.Management.Automation/security/nativeMethods.cs
@@ -653,11 +653,11 @@ internal struct CRYPT_OID_INFO
             public uint cbSize;
 
             /// LPCSTR->CHAR*
-            [MarshalAsAttribute(UnmanagedType.LPStr)]
+            [MarshalAs(UnmanagedType.LPStr)]
             public string pszOID;
 
             /// LPCWSTR->WCHAR*
-            [MarshalAsAttribute(UnmanagedType.LPWStr)]
+            [MarshalAs(UnmanagedType.LPWStr)]
             public string pwszName;
 
             /// DWORD->unsigned int
@@ -898,7 +898,7 @@ internal enum SIGNATURE_INFO_TYPE
             SIT_CATALOG,
         }
 
-        [StructLayoutAttribute(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct SIGNATURE_INFO
         {
             /// DWORD->unsigned int
@@ -917,21 +917,21 @@ internal struct SIGNATURE_INFO
             internal uint dwInfoAvailability;
 
             /// PWSTR->WCHAR*
-            [MarshalAsAttribute(UnmanagedType.LPWStr)]
+            [MarshalAs(UnmanagedType.LPWStr)]
             internal string pszDisplayName;
 
             /// DWORD->unsigned int
             internal uint cchDisplayName;
 
             /// PWSTR->WCHAR*
-            [MarshalAsAttribute(UnmanagedType.LPWStr)]
+            [MarshalAs(UnmanagedType.LPWStr)]
             internal string pszPublisherName;
 
             /// DWORD->unsigned int
             internal uint cchPublisherName;
 
             /// PWSTR->WCHAR*
-            [MarshalAsAttribute(UnmanagedType.LPWStr)]
+            [MarshalAs(UnmanagedType.LPWStr)]
             internal string pszMoreInfoURL;
 
             /// DWORD->unsigned int
@@ -947,7 +947,7 @@ internal struct SIGNATURE_INFO
             internal int fOSBinary;
         }
 
-        [StructLayoutAttribute(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct CERT_INFO
         {
             /// DWORD->unsigned int
@@ -987,18 +987,18 @@ internal struct CERT_INFO
             internal System.IntPtr rgExtension;
         }
 
-        [StructLayoutAttribute(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPT_ALGORITHM_IDENTIFIER
         {
             /// LPSTR->CHAR*
-            [MarshalAsAttribute(UnmanagedType.LPStr)]
+            [MarshalAs(UnmanagedType.LPStr)]
             internal string pszObjId;
 
             /// CRYPT_OBJID_BLOB->_CRYPTOAPI_BLOB
             internal CRYPT_ATTR_BLOB Parameters;
         }
 
-        [StructLayoutAttribute(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct FILETIME
         {
             /// DWORD->unsigned int
@@ -1008,7 +1008,7 @@ internal struct FILETIME
             internal uint dwHighDateTime;
         }
 
-        [StructLayoutAttribute(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct CERT_PUBLIC_KEY_INFO
         {
             /// CRYPT_ALGORITHM_IDENTIFIER->_CRYPT_ALGORITHM_IDENTIFIER
@@ -1018,7 +1018,7 @@ internal struct CERT_PUBLIC_KEY_INFO
             internal CRYPT_BIT_BLOB PublicKey;
         }
 
-        [StructLayoutAttribute(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPT_BIT_BLOB
         {
             /// DWORD->unsigned int
@@ -1031,11 +1031,11 @@ internal struct CRYPT_BIT_BLOB
             internal uint cUnusedBits;
         }
 
-        [StructLayoutAttribute(LayoutKind.Sequential)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct CERT_EXTENSION
         {
             /// LPSTR->CHAR*
-            [MarshalAsAttribute(UnmanagedType.LPStr)]
+            [MarshalAs(UnmanagedType.LPStr)]
             internal string pszObjId;
 
             /// BOOL->int
@@ -1086,15 +1086,15 @@ internal static partial class NativeMethods
         ///pCodeProperties: PSAFER_CODE_PROPERTIES->_SAFER_CODE_PROPERTIES*
         ///pLevelHandle: SAFER_LEVEL_HANDLE*
         ///lpReserved: LPVOID->void*
-        [DllImportAttribute("advapi32.dll", EntryPoint = "SaferIdentifyLevel", SetLastError = true)]
-        [return: MarshalAsAttribute(UnmanagedType.Bool)]
+        [DllImport("advapi32.dll", EntryPoint = "SaferIdentifyLevel", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool SaferIdentifyLevel(
             uint dwNumProperties,
-            [InAttribute()]
+            [In]
             ref SAFER_CODE_PROPERTIES pCodeProperties,
             out IntPtr pLevelHandle,
-            [InAttribute()]
-            [MarshalAsAttribute(UnmanagedType.LPWStr)]
+            [In]
+            [MarshalAs(UnmanagedType.LPWStr)]
             string bucket);
 
         /// Return Type: BOOL->int
@@ -1103,12 +1103,12 @@ internal static extern bool SaferIdentifyLevel(
         ///OutAccessToken: PHANDLE->HANDLE*
         ///dwFlags: DWORD->unsigned int
         ///lpReserved: LPVOID->void*
-        [DllImportAttribute("advapi32.dll", EntryPoint = "SaferComputeTokenFromLevel", SetLastError = true)]
-        [return: MarshalAsAttribute(UnmanagedType.Bool)]
+        [DllImport("advapi32.dll", EntryPoint = "SaferComputeTokenFromLevel", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool SaferComputeTokenFromLevel(
-            [InAttribute()]
+            [In]
             IntPtr LevelHandle,
-            [InAttribute()]
+            [In]
             System.IntPtr InAccessToken,
             ref System.IntPtr OutAccessToken,
             uint dwFlags,
@@ -1116,18 +1116,18 @@ internal static extern bool SaferComputeTokenFromLevel(
 
         /// Return Type: BOOL->int
         ///hLevelHandle: SAFER_LEVEL_HANDLE->SAFER_LEVEL_HANDLE__*
-        [DllImportAttribute("advapi32.dll", EntryPoint = "SaferCloseLevel")]
-        [return: MarshalAsAttribute(UnmanagedType.Bool)]
-        internal static extern bool SaferCloseLevel([InAttribute()] IntPtr hLevelHandle);
+        [DllImport("advapi32.dll", EntryPoint = "SaferCloseLevel")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool SaferCloseLevel([In] IntPtr hLevelHandle);
 
         /// Return Type: BOOL->int
         ///hObject: HANDLE->void*
-        [DllImportAttribute(PinvokeDllNames.CloseHandleDllName, EntryPoint = "CloseHandle")]
-        [return: MarshalAsAttribute(UnmanagedType.Bool)]
-        internal static extern bool CloseHandle([InAttribute()] System.IntPtr hObject);
+        [DllImport(PinvokeDllNames.CloseHandleDllName, EntryPoint = "CloseHandle")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool CloseHandle([In] System.IntPtr hObject);
     }
 
-    [StructLayoutAttribute(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct SAFER_CODE_PROPERTIES
     {
         /// DWORD->unsigned int
@@ -1137,7 +1137,7 @@ internal struct SAFER_CODE_PROPERTIES
         public uint dwCheckFlags;
 
         /// LPCWSTR->WCHAR*
-        [MarshalAsAttribute(UnmanagedType.LPWStr)]
+        [MarshalAs(UnmanagedType.LPWStr)]
         public string ImagePath;
 
         /// HANDLE->void*
@@ -1147,7 +1147,7 @@ internal struct SAFER_CODE_PROPERTIES
         public uint UrlZoneId;
 
         /// BYTE[SAFER_MAX_HASH_SIZE]
-        [MarshalAsAttribute(
+        [MarshalAs(
             UnmanagedType.ByValArray,
             SizeConst = NativeConstants.SAFER_MAX_HASH_SIZE,
             ArraySubType = UnmanagedType.I1)]
@@ -1172,30 +1172,30 @@ internal struct SAFER_CODE_PROPERTIES
         public uint dwWVTUIChoice;
     }
 
-    [StructLayoutAttribute(LayoutKind.Explicit)]
+    [StructLayout(LayoutKind.Explicit)]
     internal struct LARGE_INTEGER
     {
         /// Anonymous_9320654f_2227_43bf_a385_74cc8c562686
-        [FieldOffsetAttribute(0)]
+        [FieldOffset(0)]
         public Anonymous_9320654f_2227_43bf_a385_74cc8c562686 Struct1;
 
         /// Anonymous_947eb392_1446_4e25_bbd4_10e98165f3a9
-        [FieldOffsetAttribute(0)]
+        [FieldOffset(0)]
         public Anonymous_947eb392_1446_4e25_bbd4_10e98165f3a9 u;
 
         /// LONGLONG->__int64
-        [FieldOffsetAttribute(0)]
+        [FieldOffset(0)]
         public long QuadPart;
     }
 
-    [StructLayoutAttribute(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct HWND__
     {
         /// int
         public int unused;
     }
 
-    [StructLayoutAttribute(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct Anonymous_9320654f_2227_43bf_a385_74cc8c562686
     {
         /// DWORD->unsigned int
@@ -1205,7 +1205,7 @@ internal struct Anonymous_9320654f_2227_43bf_a385_74cc8c562686
         public int HighPart;
     }
 
-    [StructLayoutAttribute(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct Anonymous_947eb392_1446_4e25_bbd4_10e98165f3a9
     {
         /// DWORD->unsigned int
@@ -1287,28 +1287,28 @@ internal enum SecurityInformation : uint
             UNPROTECTED_SACL_SECURITY_INFORMATION = 0x10000000
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct LUID
         {
             internal uint LowPart;
             internal uint HighPart;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct LUID_AND_ATTRIBUTES
         {
             internal LUID Luid;
             internal uint Attributes;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct TOKEN_PRIVILEGE
         {
             internal uint PrivilegeCount;
             internal LUID_AND_ATTRIBUTES Privilege;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct ACL
         {
             internal byte AclRevision;
@@ -1318,7 +1318,7 @@ internal struct ACL
             internal ushort Sbz2;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct ACE_HEADER
         {
             internal byte AceType;
@@ -1326,7 +1326,7 @@ internal struct ACE_HEADER
             internal ushort AceSize;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct SYSTEM_AUDIT_ACE
         {
             internal ACE_HEADER Header;
@@ -1334,7 +1334,7 @@ internal struct SYSTEM_AUDIT_ACE
             internal uint SidStart;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct LSA_UNICODE_STRING
         {
             internal ushort Length;
@@ -1342,7 +1342,7 @@ internal struct LSA_UNICODE_STRING
             internal IntPtr Buffer;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct CENTRAL_ACCESS_POLICY
         {
             internal IntPtr CAPID;
diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
index a95a78dbdbe..ab49f927614 100644
--- a/src/System.Management.Automation/security/wldpNativeMethods.cs
+++ b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -6,8 +6,10 @@
 //
 #if !UNIX
 
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Management.Automation.Internal;
+using System.Management.Automation.Runspaces;
 using System.Management.Automation.Tracing;
 using System.Runtime.InteropServices;
 
@@ -91,9 +93,8 @@ internal static void LogWDACAuditMessage(
             string messageToWrite = message;
 
             // Augment the log message with current script information from the script debugger, if available.
-            context ??= System.Management.Automation.Runspaces.LocalPipeline.GetExecutionContextFromTLS();
+            context ??= LocalPipeline.GetExecutionContextFromTLS();
             bool debuggerAvailable = context is not null &&
-                                     context._debugger is not null &&
                                      context._debugger is ScriptDebugger;
 
             if (debuggerAvailable)
@@ -108,10 +109,9 @@ context._debugger is not null &&
             PSEtwLog.LogWDACAuditEvent(title, messageToWrite, fqid);
 
             // We drop into the debugger only if requested and we are running in the interactive host session runspace (Id == 1).
-            if (debuggerAvailable &&
-                dropIntoDebugger is true && 
+            if (debuggerAvailable && dropIntoDebugger &&
                 context._debugger.DebugMode.HasFlag(DebugModes.LocalScript) &&
-                System.Management.Automation.Runspaces.Runspace.DefaultRunspace.Id == 1 &&
+                Runspace.DefaultRunspace?.Id == 1 &&
                 context.DebugPreferenceVariable.HasFlag(ActionPreference.Break) &&
                 context.InternalHost?.UI is not null)
             {
@@ -149,7 +149,7 @@ public static SystemEnforcementMode GetSystemLockdownPolicy()
             {
                 lock (s_systemLockdownPolicyLock)
                 {
-                    s_systemLockdownPolicy = GetDebugLockdownPolicy(path: null);
+                    s_systemLockdownPolicy = GetDebugLockdownPolicy(path: null, out _);
                 }
             }
 
@@ -173,93 +173,89 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement(
             System.IO.FileStream fileStream)
         {
             SafeHandle fileHandle = fileStream.SafeFileHandle;
-            var systemLockdownPolicy = SystemPolicy.GetSystemLockdownPolicy();
+            SystemEnforcementMode systemLockdownPolicy = GetSystemLockdownPolicy();
 
             // First check latest WDAC APIs if available.
-            // Revert to legacy APIs if system policy is in AUDIT mode or debug hook is in effect.
-            Exception errorException = null;
-            if (s_wldpCanExecuteAvailable && systemLockdownPolicy == SystemEnforcementMode.Enforce)
+            if (systemLockdownPolicy is SystemEnforcementMode.Enforce
+                && s_wldpCanExecuteAvailable
+                && TryGetWldpCanExecuteFileResult(filePath, fileHandle, out SystemScriptFileEnforcement wldpFilePolicy))
             {
-                try
-                {
-                    string fileName = System.IO.Path.GetFileNameWithoutExtension(filePath);
-                    string auditMsg = $"PowerShell ExternalScriptInfo reading file: {fileName}";
+                return GetLockdownPolicy(filePath, fileHandle, wldpFilePolicy);
+            }
 
-                    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);
+            // Failed to invoke WldpCanExecuteFile, revert to legacy APIs.
+            if (systemLockdownPolicy is SystemEnforcementMode.None)
+            {
+                return SystemScriptFileEnforcement.None;
+            }
 
-                    PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile", filePath, hr, (int)canExecuteResult);
+            // WldpCanExecuteFile was invoked successfully so we can skip running
+            // legacy WDAC APIs. AppLocker must still be checked in case it is more
+            // strict than the current WDAC policy.
+            return GetLockdownPolicy(filePath, fileHandle, canExecuteResult: null);
+        }
 
-                    if (hr >= 0)
-                    {
-                        switch (canExecuteResult)
-                        {
-                            case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_ALLOWED:
-                                return SystemScriptFileEnforcement.Allow;
+        private static SystemScriptFileEnforcement ConvertToModernFileEnforcement(SystemEnforcementMode legacyMode)
+        {
+            return legacyMode switch
+            {
+                SystemEnforcementMode.None => SystemScriptFileEnforcement.Allow,
+                SystemEnforcementMode.Audit => SystemScriptFileEnforcement.AllowConstrainedAudit,
+                SystemEnforcementMode.Enforce => SystemScriptFileEnforcement.AllowConstrained,
+                _ => SystemScriptFileEnforcement.Block,
+            };
+        }
 
-                            case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_BLOCKED:
-                                return SystemScriptFileEnforcement.Block;
+        private static bool TryGetWldpCanExecuteFileResult(string filePath, SafeHandle fileHandle, out SystemScriptFileEnforcement result)
+        {
+            try
+            {
+                string fileName = System.IO.Path.GetFileNameWithoutExtension(filePath);
+                string auditMsg = $"PowerShell ExternalScriptInfo reading file: {fileName}";
 
-                            case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_REQUIRE_SANDBOX:
-                                return SystemScriptFileEnforcement.AllowConstrained;
+                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);
 
-                            default:
-                                // Fall through to legacy system policy checks.
-                                System.Diagnostics.Debug.Assert(false, $"Unknown execution policy returned from WldCanExecute: {canExecuteResult}");
-                                break;
-                        }
-                    }
+                PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile", filePath, hr, (int)canExecuteResult);
 
-                    // If HResult is unsuccessful (such as E_NOTIMPL (0x80004001)), fall through to legacy system checks.
-                }
-                catch (DllNotFoundException ex)
-                {
-                    // Fall back to legacy system policy checks.
-                    s_wldpCanExecuteAvailable = false;
-                    errorException = ex;
-                }
-                catch (EntryPointNotFoundException ex)
+                if (hr >= 0)
                 {
-                    // Fall back to legacy system policy checks.
-                    s_wldpCanExecuteAvailable = false;
-                    errorException = ex;
+                    switch (canExecuteResult)
+                    {
+                        case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_ALLOWED:
+                            result = SystemScriptFileEnforcement.Allow;
+                            return true;
+
+                        case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_BLOCKED:
+                            result = SystemScriptFileEnforcement.Block;
+                            return true;
+
+                        case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_REQUIRE_SANDBOX:
+                            result = SystemScriptFileEnforcement.AllowConstrained;
+                            return true;
+
+                        default:
+                            // Fall through to legacy system policy checks.
+                            Debug.Assert(false, $"Unknown policy result returned from WldCanExecute: {canExecuteResult}");
+                            break;
+                    }
                 }
 
-                if (errorException != null)
-                {
-                    PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile_Failed", filePath, errorException.HResult, 0);
-                }
+                // If HResult is unsuccessful (such as E_NOTIMPL (0x80004001)), fall through to legacy system checks.
             }
-
-            // Original (legacy) WDAC and AppLocker system checks.
-            if (systemLockdownPolicy == SystemEnforcementMode.None)
+            catch (Exception ex) when (ex is DllNotFoundException or EntryPointNotFoundException)
             {
-                return SystemScriptFileEnforcement.None;
+                // Fall back to legacy system policy checks.
+                s_wldpCanExecuteAvailable = false;
+                PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile_Failed", filePath, ex.HResult, 0);
             }
 
-            // Check policy for file.
-            switch (SystemPolicy.GetLockdownPolicy(filePath, fileHandle))
-            {
-                case SystemEnforcementMode.Enforce:
-                    // File is not allowed by policy enforcement and must run in CL mode.
-                    return SystemScriptFileEnforcement.AllowConstrained;
-
-                case SystemEnforcementMode.Audit:
-                    // File is allowed but would be run in CL mode if policy was enforced and not audit.
-                    return SystemScriptFileEnforcement.AllowConstrainedAudit;
-
-                case SystemEnforcementMode.None:
-                    // No restrictions, file will run in FL mode.
-                    return SystemScriptFileEnforcement.Allow;
-
-                default:
-                    System.Diagnostics.Debug.Assert(false, "GetFilePolicyEnforcement: Unknown SystemEnforcementMode.");
-                    return SystemScriptFileEnforcement.Block;
-            }
+            result = default;
+            return false;
         }
 
         /// <summary>
@@ -268,9 +264,32 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement(
         /// <returns>An EnforcementMode that describes policy.</returns>
         public static SystemEnforcementMode GetLockdownPolicy(string path, SafeHandle handle)
         {
+            SystemScriptFileEnforcement modernMode = GetLockdownPolicy(path, handle, canExecuteResult: null);
+            Debug.Assert(
+                modernMode is not SystemScriptFileEnforcement.Block,
+                "Block should never be converted to legacy file enforcement.");
+
+            return modernMode switch
+            {
+                SystemScriptFileEnforcement.Block => SystemEnforcementMode.Enforce,
+                SystemScriptFileEnforcement.AllowConstrained => SystemEnforcementMode.Enforce,
+                SystemScriptFileEnforcement.AllowConstrainedAudit => SystemEnforcementMode.Audit,
+                SystemScriptFileEnforcement.Allow => SystemEnforcementMode.None,
+                SystemScriptFileEnforcement.None => SystemEnforcementMode.None,
+                _ => throw new ArgumentOutOfRangeException(nameof(modernMode)),
+            };
+        }
+
+        private static SystemScriptFileEnforcement GetLockdownPolicy(
+            string path,
+            SafeHandle handle,
+            SystemScriptFileEnforcement? canExecuteResult)
+        {
+            SystemScriptFileEnforcement wldpFilePolicy = canExecuteResult
+                ?? ConvertToModernFileEnforcement(GetWldpPolicy(path, handle));
+
             // Check the WLDP File policy via API
-            var wldpFilePolicy = GetWldpPolicy(path, handle);
-            if (wldpFilePolicy == SystemEnforcementMode.Enforce)
+            if (wldpFilePolicy is SystemScriptFileEnforcement.Block or SystemScriptFileEnforcement.AllowConstrained)
             {
                 return wldpFilePolicy;
             }
@@ -282,29 +301,28 @@ public static SystemEnforcementMode GetLockdownPolicy(string path, SafeHandle ha
             var appLockerFilePolicy = GetAppLockerPolicy(path, handle);
             if (appLockerFilePolicy == SystemEnforcementMode.Enforce)
             {
-                return appLockerFilePolicy;
+                return ConvertToModernFileEnforcement(appLockerFilePolicy);
             }
 
             // At this point, LockdownPolicy = Audit or Allowed.
             // If there was a WLDP policy, but WLDP didn't block it,
             // then it was explicitly allowed. Therefore, return the result for the file.
-            SystemEnforcementMode systemWldpPolicy = s_cachedWldpSystemPolicy.GetValueOrDefault(SystemEnforcementMode.None);
-            if ((systemWldpPolicy == SystemEnforcementMode.Audit) ||
-                (systemWldpPolicy == SystemEnforcementMode.Enforce))
+            if (s_cachedWldpSystemPolicy is SystemEnforcementMode.Audit or SystemEnforcementMode.Enforce
+                || wldpFilePolicy is SystemScriptFileEnforcement.AllowConstrainedAudit)
             {
                 return wldpFilePolicy;
             }
 
             // If there was a system-wide AppLocker policy, but AppLocker didn't block it,
             // then return AppLocker's status.
-            if (s_cachedSaferSystemPolicy.GetValueOrDefault(SaferPolicy.Allowed) ==
-                SaferPolicy.Disallowed)
+            if (s_cachedSaferSystemPolicy is SaferPolicy.Disallowed)
             {
-                return appLockerFilePolicy;
+                return ConvertToModernFileEnforcement(appLockerFilePolicy);
             }
 
             // If it's not set to 'Enforce' by the platform, allow debug overrides
-            return GetDebugLockdownPolicy(path);
+            GetDebugLockdownPolicy(path, out SystemScriptFileEnforcement debugPolicy);
+            return debugPolicy;
         }
 
         [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods",
@@ -559,7 +577,7 @@ private static SaferPolicy TestSaferPolicy(string testPathScript, string testPat
             return result;
         }
 
-        private static SystemEnforcementMode GetDebugLockdownPolicy(string path)
+        private static SystemEnforcementMode GetDebugLockdownPolicy(string path, out SystemScriptFileEnforcement modernEnforcement)
         {
             s_allowDebugOverridePolicy = true;
 
@@ -570,10 +588,19 @@ private static SystemEnforcementMode GetDebugLockdownPolicy(string path)
                 // check so that we can actually put it in the filename during testing.
                 if (path.Contains("System32", StringComparison.OrdinalIgnoreCase))
                 {
+                    modernEnforcement = SystemScriptFileEnforcement.Allow;
                     return SystemEnforcementMode.None;
                 }
 
                 // No explicit debug allowance for the file, so return the system policy if there is one.
+                modernEnforcement = s_systemLockdownPolicy switch
+                {
+                    SystemEnforcementMode.Enforce => SystemScriptFileEnforcement.AllowConstrained,
+                    SystemEnforcementMode.Audit => SystemScriptFileEnforcement.AllowConstrainedAudit,
+                    SystemEnforcementMode.None => SystemScriptFileEnforcement.None,
+                    _ => SystemScriptFileEnforcement.None,
+                };
+
                 return s_systemLockdownPolicy.GetValueOrDefault(SystemEnforcementMode.None);
             }
 
@@ -583,10 +610,13 @@ private static SystemEnforcementMode GetDebugLockdownPolicy(string path)
             if (result != null)
             {
                 pdwLockdownState = LanguagePrimitives.ConvertTo<uint>(result);
-                return GetLockdownPolicyForResult(pdwLockdownState);
+                SystemEnforcementMode policy = GetLockdownPolicyForResult(pdwLockdownState);
+                modernEnforcement = ConvertToModernFileEnforcement(policy);
+                return policy;
             }
 
             // If the system-wide debug policy had no preference, then there is no enforcement.
+            modernEnforcement = SystemScriptFileEnforcement.None;
             return SystemEnforcementMode.None;
         }
 
diff --git a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
index 643e649ca7e..df01b053665 100644
--- a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
+++ b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
@@ -407,8 +407,9 @@ internal PSSnapInInfo Clone()
         }
 
         /// <summary>
-        /// Returns true if the PSSnapIn Id is valid. A PSSnapIn is valid iff it contains only
-        /// "Alpha Numeric","-","_","." characters.
+        /// Returns true if the PSSnapIn Id is valid. A PSSnapIn is valid
+        /// if-and-only-if it contains only "Alpha Numeric","-","_","."
+        /// characters.
         /// </summary>
         /// <param name="psSnapinId">PSSnapIn Id to validate.</param>
         internal static bool IsPSSnapinIdValid(string psSnapinId)
@@ -422,8 +423,8 @@ internal static bool IsPSSnapinIdValid(string psSnapinId)
         }
 
         /// <summary>
-        /// Validates the PSSnapIn Id. A PSSnapIn is valid iff it contains only
-        /// "Alpha Numeric","-","_","." characters.
+        /// Validates the PSSnapIn Id. A PSSnapIn is valid if-and-only-if it
+        /// contains only "Alpha Numeric","-","_","." characters.
         /// </summary>
         /// <param name="psSnapinId">PSSnapIn Id to validate.</param>
         /// <exception cref="PSArgumentException">
diff --git a/src/System.Management.Automation/singleshell/config/MshSnapinLoadException.cs b/src/System.Management.Automation/singleshell/config/MshSnapinLoadException.cs
index f0e61f01a9e..71c81611440 100644
--- a/src/System.Management.Automation/singleshell/config/MshSnapinLoadException.cs
+++ b/src/System.Management.Automation/singleshell/config/MshSnapinLoadException.cs
@@ -171,7 +171,7 @@ public override string Message
         /// </summary>
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PSSnapInException(SerializationInfo info,
                                         StreamingContext context)
         {
diff --git a/src/System.Management.Automation/utils/ClrFacade.cs b/src/System.Management.Automation/utils/ClrFacade.cs
index aa997734353..058c33a68bf 100644
--- a/src/System.Management.Automation/utils/ClrFacade.cs
+++ b/src/System.Management.Automation/utils/ClrFacade.cs
@@ -22,13 +22,23 @@ internal static class ClrFacade
     {
         /// <summary>
         /// Initialize powershell AssemblyLoadContext and register the 'Resolving' event, if it's not done already.
-        /// If powershell is hosted by a native host such as DSC, then PS ALC might be initialized via 'SetPowerShellAssemblyLoadContext' before loading S.M.A.
+        /// If powershell is hosted by a native host such as DSC, then PS ALC may be initialized via 'SetPowerShellAssemblyLoadContext' before loading S.M.A.
         /// </summary>
+        /// <remarks>
+        /// We do this both here and during the initialization of the 'RunspaceBase' type.
+        /// This is because we want to make sure the assembly/library resolvers are:
+        ///  1. registered before any script/cmdlet can run.
+        ///  2. registered before 'ClrFacade' gets used for assembly related operations.
+        ///
+        /// The 'ClrFacade' type may be used without a Runspace created, for example, by calling type conversion methods in the 'LanguagePrimitive' type.
+        /// And at the mean time, script or cmdlet may run without the 'ClrFacade' type initialized.
+        /// That's why we attempt to create the singleton of 'PowerShellAssemblyLoadContext' at both places.
+        /// </remarks>
         static ClrFacade()
         {
-            if (PowerShellAssemblyLoadContext.Instance == null)
+            if (PowerShellAssemblyLoadContext.Instance is null)
             {
-                PowerShellAssemblyLoadContext.InitializeSingleton(string.Empty);
+                PowerShellAssemblyLoadContext.InitializeSingleton(string.Empty, throwOnReentry: false);
             }
         }
 
diff --git a/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs b/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
index 6c2380023ca..89580932359 100644
--- a/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
+++ b/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
@@ -78,7 +78,7 @@ public CommandNotFoundException(string message, Exception innerException) : base
         /// <param name="context">
         /// streaming context
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected CommandNotFoundException(SerializationInfo info,
                                         StreamingContext context)
         {
@@ -336,13 +336,13 @@ public ScriptRequiresException(string message, Exception innerException) : base(
         /// <param name="context">
         /// streaming context
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ScriptRequiresException(SerializationInfo info,
                                         StreamingContext context)
         {
             throw new NotSupportedException();
         }
-        
+
         #endregion Serialization
 
         #region Properties
diff --git a/src/System.Management.Automation/utils/CommandProcessorExceptions.cs b/src/System.Management.Automation/utils/CommandProcessorExceptions.cs
index f63ff69bd2c..668c95a25e6 100644
--- a/src/System.Management.Automation/utils/CommandProcessorExceptions.cs
+++ b/src/System.Management.Automation/utils/CommandProcessorExceptions.cs
@@ -24,7 +24,7 @@ public class ApplicationFailedException : RuntimeException
         /// <param name="info">The serialization information to use when initializing this object.</param>
         /// <param name="context">The streaming context to use when initializing this object.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ApplicationFailedException(SerializationInfo info,
                            StreamingContext context)
         {
diff --git a/src/System.Management.Automation/utils/CryptoUtils.cs b/src/System.Management.Automation/utils/CryptoUtils.cs
index 2441d416a4d..c82c96ecdc3 100644
--- a/src/System.Management.Automation/utils/CryptoUtils.cs
+++ b/src/System.Management.Automation/utils/CryptoUtils.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation.Remoting;
-using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Security;
 using System.Security.Cryptography;
@@ -434,6 +433,7 @@ internal string SafeExportSessionKey()
             GenerateSessionKey();
 
             // encrypt it
+            // codeql[cs/cryptography/rsa-unapproved-encryption-padding-scheme] - PowerShell v7.4 and later versions have deprecated the key exchange in the remoting protocol. This code is kept only for backward compatibility reason.
             byte[] encryptedKey = _rsa.Encrypt(_aes.Key, RSAEncryptionPadding.Pkcs1);
 
             // convert the key to capi simpleblob format before exporting
@@ -467,6 +467,7 @@ internal void ImportSessionKeyFromBase64EncodedString(string sessionKey)
             byte[] sessionKeyBlob = Convert.FromBase64String(sessionKey);
             byte[] rsaEncryptedKey = PSCryptoNativeConverter.FromCapiSimpleKeyBlob(sessionKeyBlob);
 
+            // codeql[cs/cryptography/rsa-unapproved-encryption-padding-scheme] - PowerShell v7.4 and later versions have deprecated the key exchange in the remoting protocol. This code is kept only for backward compatibility reason.
             _aes.Key = _rsa.Decrypt(rsaEncryptedKey, RSAEncryptionPadding.Pkcs1);
 
             // now we have imported the key and will be able to
@@ -575,21 +576,12 @@ internal static PSRSACryptoServiceProvider GetRSACryptoServiceProviderForServer(
         #region IDisposable
 
         /// <summary>
-        /// Dispose resources.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
         {
-            Dispose(true);
-            System.GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _rsa?.Dispose();
-                _aes?.Dispose();
-            }
+            _rsa?.Dispose();
+            _aes?.Dispose();
         }
 
         #endregion IDisposable
@@ -658,6 +650,78 @@ protected void RunKeyExchangeIfRequired()
             }
         }
 
+        /// <summary>
+        /// Gets the bytes of a secure string.
+        /// </summary>
+        private static byte[] GetBytesFromSecureString(SecureString secureString)
+        {
+            return secureString is null
+                ? null
+                : Microsoft.PowerShell.SecureStringHelper.GetData(secureString);
+        }
+
+        /// <summary>
+        /// Gets a secure string from the specified byte array.
+        /// </summary>
+        private static SecureString GetSecureStringFromBytes(byte[] data)
+        {
+            Dbg.Assert(data is not null, "The passed-in data cannot be null.");
+
+            try
+            {
+                return Microsoft.PowerShell.SecureStringHelper.New(data);
+            }
+            finally
+            {
+                // zero out the contents
+                Array.Clear(data);
+            }
+        }
+
+        /// <summary>
+        /// Convert a secure string to a base64 encoded string.
+        /// </summary>
+        protected string ConvertSecureStringToBase64String(SecureString secureString)
+        {
+            string dataAsString = null;
+            byte[] data = GetBytesFromSecureString(secureString);
+
+            if (data is not null)
+            {
+                try
+                {
+                    dataAsString = Convert.ToBase64String(data);
+                }
+                finally
+                {
+                    Array.Clear(data);
+                }
+            }
+
+            return dataAsString;
+        }
+
+        /// <summary>
+        /// Convert a base64 encoded string to a secure string.
+        /// </summary>
+        /// <param name="base64String"></param>
+        /// <returns></returns>
+        protected SecureString ConvertBase64StringToSecureString(string base64String)
+        {
+            try
+            {
+                byte[] data = Convert.FromBase64String(base64String);
+                return GetSecureStringFromBytes(data);
+            }
+            catch (FormatException)
+            {
+                // do nothing
+                // this catch is to ensure that the exception doesn't
+                // go unhandled leading to a crash
+                throw new PSCryptoException();
+            }
+        }
+
         /// <summary>
         /// Core logic to encrypt a string. Assumes session key is already generated.
         /// </summary>
@@ -671,18 +735,10 @@ protected string EncryptSecureStringCore(SecureString secureString)
 
             if (_rsaCryptoProvider.CanEncrypt)
             {
-                IntPtr ptr = Marshal.SecureStringToCoTaskMemUnicode(secureString);
+                byte[] data = GetBytesFromSecureString(secureString);
 
-                if (ptr != IntPtr.Zero)
+                if (data is not null)
                 {
-                    byte[] data = new byte[secureString.Length * 2];
-                    for (int i = 0; i < data.Length; i++)
-                    {
-                        data[i] = Marshal.ReadByte(ptr, i);
-                    }
-
-                    Marshal.ZeroFreeCoTaskMemUnicode(ptr);
-
                     try
                     {
                         byte[] encryptedData = _rsaCryptoProvider.EncryptWithSessionKey(data);
@@ -690,10 +746,7 @@ protected string EncryptSecureStringCore(SecureString secureString)
                     }
                     finally
                     {
-                        for (int j = 0; j < data.Length; j++)
-                        {
-                            data[j] = 0;
-                        }
+                        Array.Clear(data);
                     }
                 }
             }
@@ -723,10 +776,11 @@ protected SecureString DecryptSecureStringCore(string encryptedString)
             // happened successfully
             if (_rsaCryptoProvider.CanEncrypt)
             {
-                byte[] data = null;
                 try
                 {
-                    data = Convert.FromBase64String(encryptedString);
+                    byte[] data = Convert.FromBase64String(encryptedString);
+                    byte[] decryptedData = _rsaCryptoProvider.DecryptWithSessionKey(data);
+                    secureString = GetSecureStringFromBytes(decryptedData);
                 }
                 catch (FormatException)
                 {
@@ -735,36 +789,6 @@ protected SecureString DecryptSecureStringCore(string encryptedString)
                     // go unhandled leading to a crash
                     throw new PSCryptoException();
                 }
-
-                if (data != null)
-                {
-                    byte[] decryptedData = _rsaCryptoProvider.DecryptWithSessionKey(data);
-
-                    secureString = new SecureString();
-                    UInt16 value = 0;
-                    try
-                    {
-                        for (int i = 0; i < decryptedData.Length; i += 2)
-                        {
-                            value = (UInt16)(decryptedData[i] + (UInt16)(decryptedData[i + 1] << 8));
-                            secureString.AppendChar((char)value);
-                            value = 0;
-                        }
-                    }
-                    finally
-                    {
-                        // if there was an exception for whatever reason,
-                        // clear the last value store in Value
-                        value = 0;
-
-                        // zero out the contents
-                        for (int i = 0; i < decryptedData.Length; i += 2)
-                        {
-                            decryptedData[i] = 0;
-                            decryptedData[i + 1] = 0;
-                        }
-                    }
-                }
             }
             else
             {
@@ -867,14 +891,29 @@ internal PSRemotingCryptoHelperServer()
         internal override string EncryptSecureString(SecureString secureString)
         {
             // session!=null check required for DRTs TestEncryptSecureString* entries in CryptoUtilsTest/UTUtils.dll
-            // for newer clients, server will never initiate key exchange.
-            // for server, just the session key is required to encrypt/decrypt anything
-            if (Session is ServerRemoteSession session && session.Context.ClientCapability.ProtocolVersion >= RemotingConstants.ProtocolVersionWin8RTM)
+            bool initiateKeyExchange = true;
+
+            if (Session is ServerRemoteSession session)
             {
-                _rsaCryptoProvider.GenerateSessionKey();
+                Version clientProtocolVersion = session.Context.ClientCapability.ProtocolVersion;
+                if (clientProtocolVersion >= RemotingConstants.ProtocolVersion_2_4)
+                {
+                    // For client v2.4+, we no longer encrypt secure strings, but rely on the underlying secure transport to do the right thing.
+                    return ConvertSecureStringToBase64String(secureString);
+                }
+
+                if (clientProtocolVersion >= RemotingConstants.ProtocolVersion_2_2)
+                {
+                    // For client v2.2+, server will never initiate key exchange.
+                    // For server, just the session key is required to encrypt/decrypt anything
+                    initiateKeyExchange = false;
+                    _rsaCryptoProvider.GenerateSessionKey();
+                }
             }
-            else // older clients
+
+            if (initiateKeyExchange)
             {
+                // older clients.
                 RunKeyExchangeIfRequired();
             }
 
@@ -883,6 +922,12 @@ internal override string EncryptSecureString(SecureString secureString)
 
         internal override SecureString DecryptSecureString(string encryptedString)
         {
+            if (Session is ServerRemoteSession session && session.Context.ClientCapability.ProtocolVersion >= RemotingConstants.ProtocolVersion_2_4)
+            {
+                // For client v2.4+, we no longer encrypt secure strings, but rely on the underlying secure transport to do the right thing.
+                return ConvertBase64StringToSecureString(encryptedString);
+            }
+
             RunKeyExchangeIfRequired();
 
             return DecryptSecureStringCore(encryptedString);
@@ -994,6 +1039,12 @@ internal PSRemotingCryptoHelperClient()
 
         internal override string EncryptSecureString(SecureString secureString)
         {
+            if (Session is ClientRemoteSession session && session.ServerProtocolVersion >= RemotingConstants.ProtocolVersion_2_4)
+            {
+                // For server v2.4+, we no longer encrypt secure strings, but rely on the underlying secure transport to do the right thing.
+                return ConvertSecureStringToBase64String(secureString);
+            }
+
             RunKeyExchangeIfRequired();
 
             return EncryptSecureStringCore(secureString);
@@ -1001,6 +1052,12 @@ internal override string EncryptSecureString(SecureString secureString)
 
         internal override SecureString DecryptSecureString(string encryptedString)
         {
+            if (Session is ClientRemoteSession session && session.ServerProtocolVersion >= RemotingConstants.ProtocolVersion_2_4)
+            {
+                // For server v2.4+, we no longer encrypt secure strings, but rely on the underlying secure transport to do the right thing.
+                return ConvertBase64StringToSecureString(encryptedString);
+            }
+
             RunKeyExchangeIfRequired();
 
             return DecryptSecureStringCore(encryptedString);
diff --git a/src/System.Management.Automation/utils/EncodingUtils.cs b/src/System.Management.Automation/utils/EncodingUtils.cs
index 060b052f744..cdb467d213a 100644
--- a/src/System.Management.Automation/utils/EncodingUtils.cs
+++ b/src/System.Management.Automation/utils/EncodingUtils.cs
@@ -115,6 +115,8 @@ internal sealed class ArgumentToEncodingTransformationAttribute : ArgumentTransf
     {
         public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)
         {
+            inputData = PSObject.Base(inputData);
+
             switch (inputData)
             {
                 case string stringName:
diff --git a/src/System.Management.Automation/utils/ExecutionExceptions.cs b/src/System.Management.Automation/utils/ExecutionExceptions.cs
index 69a58d326b2..ff41e045bbb 100644
--- a/src/System.Management.Automation/utils/ExecutionExceptions.cs
+++ b/src/System.Management.Automation/utils/ExecutionExceptions.cs
@@ -114,12 +114,12 @@ public CmdletInvocationException(string message,
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected CmdletInvocationException(SerializationInfo info,
                                             StreamingContext context)
         {
             throw new NotSupportedException();
-        }        
+        }
         #endregion Serialization
         #endregion ctor
 
@@ -154,7 +154,7 @@ public override ErrorRecord ErrorRecord
     /// <see cref="System.Management.Automation.ProviderInvocationException"/>.
     /// This is generally reported from the standard provider navigation cmdlets
     /// such as get-childitem.
-    /// </summary>    
+    /// </summary>
     public class CmdletProviderInvocationException : CmdletInvocationException
     {
         #region ctor
@@ -193,7 +193,7 @@ public CmdletProviderInvocationException()
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected CmdletProviderInvocationException(SerializationInfo info,
                                                     StreamingContext context)
         {
@@ -281,7 +281,7 @@ private static Exception GetInnerException(Exception e)
     /// Catching this exception is optional; if the cmdlet or providers chooses not to
     /// handle PipelineStoppedException and instead allow it to propagate to the
     /// PowerShell Engine's call to ProcessRecord, the PowerShell Engine will handle it properly.
-    /// </remarks>    
+    /// </remarks>
     public class PipelineStoppedException : RuntimeException
     {
         #region ctor
@@ -304,7 +304,7 @@ public PipelineStoppedException()
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PipelineStoppedException(SerializationInfo info,
                                            StreamingContext context)
         {
@@ -342,7 +342,7 @@ public PipelineStoppedException(string message,
     /// to an asynchronous pipeline source and the pipeline has already
     /// been stopped.
     /// </summary>
-    /// <seealso cref="System.Management.Automation.Runspaces.Pipeline.Input"/>    
+    /// <seealso cref="System.Management.Automation.Runspaces.Pipeline.Input"/>
     public class PipelineClosedException : RuntimeException
     {
         #region ctor
@@ -387,7 +387,7 @@ public PipelineClosedException(string message,
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PipelineClosedException(SerializationInfo info,
                                           StreamingContext context)
         {
@@ -405,7 +405,7 @@ protected PipelineClosedException(SerializationInfo info,
     /// <remarks>
     /// For example, if $WarningPreference is "Stop", the command will fail with
     /// this error if a cmdlet calls WriteWarning.
-    /// </remarks>    
+    /// </remarks>
     public class ActionPreferenceStopException : RuntimeException
     {
         #region ctor
@@ -467,12 +467,12 @@ internal ActionPreferenceStopException(InvocationInfo invocationInfo,
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ActionPreferenceStopException(SerializationInfo info,
                                                 StreamingContext context)
         {
             throw new NotSupportedException();
-        }        
+        }
         #endregion Serialization
 
         /// <summary>
@@ -612,7 +612,7 @@ public ParentContainsErrorRecordException(string message,
         /// <param name="context">Streaming context.</param>
         /// <returns>Doesn't return.</returns>
         /// <exception cref="NotImplementedException">Always.</exception>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ParentContainsErrorRecordException(
             SerializationInfo info, StreamingContext context)
         {
@@ -648,7 +648,7 @@ public override string Message
     /// The redirected object is available as
     /// <see cref="System.Management.Automation.ErrorRecord.TargetObject"/>
     /// in the ErrorRecord which contains this exception.
-    /// </remarks>    
+    /// </remarks>
     public class RedirectedException : RuntimeException
     {
         #region constructors
@@ -697,7 +697,7 @@ public RedirectedException(string message,
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected RedirectedException(SerializationInfo info,
                                       StreamingContext context)
         {
@@ -719,7 +719,7 @@ protected RedirectedException(SerializationInfo info,
     /// call depth to prevent stack overflows.  The maximum call depth is configurable
     /// but generally high enough that scripts which are not deeply recursive
     /// should not have a problem.
-    /// </remarks>    
+    /// </remarks>
     public class ScriptCallDepthException : SystemException, IContainsErrorRecord
     {
         #region ctor
@@ -765,7 +765,7 @@ public ScriptCallDepthException(string message,
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ScriptCallDepthException(SerializationInfo info,
                                            StreamingContext context)
         {
@@ -860,11 +860,11 @@ public PipelineDepthException(string message,
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PipelineDepthException(SerializationInfo info,
-                                           StreamingContext context)            
+                                           StreamingContext context)
         {
-            throw new NotSupportedException();            
+            throw new NotSupportedException();
         }
         #endregion Serialization
 
@@ -918,7 +918,7 @@ public int CallDepth
     ///
     /// Note that HaltCommandException does not define IContainsErrorRecord.
     /// This is because it is not reported to the user.
-    /// </remarks>    
+    /// </remarks>
     public class HaltCommandException : SystemException
     {
         #region ctor
@@ -963,7 +963,7 @@ public HaltCommandException(string message,
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected HaltCommandException(SerializationInfo info,
                                        StreamingContext context)
         {
diff --git a/src/System.Management.Automation/utils/GraphicalHostReflectionWrapper.cs b/src/System.Management.Automation/utils/GraphicalHostReflectionWrapper.cs
index a0b12f986de..ec780222345 100644
--- a/src/System.Management.Automation/utils/GraphicalHostReflectionWrapper.cs
+++ b/src/System.Management.Automation/utils/GraphicalHostReflectionWrapper.cs
@@ -55,7 +55,7 @@ private GraphicalHostReflectionWrapper()
         /// <exception cref="RuntimeException">When it was not possible to load Microsoft.PowerShell.GraphicalHost.dlly.</exception>
         internal static GraphicalHostReflectionWrapper GetGraphicalHostReflectionWrapper(PSCmdlet parentCmdlet, string graphicalHostHelperTypeName)
         {
-            return GraphicalHostReflectionWrapper.GetGraphicalHostReflectionWrapper(parentCmdlet, graphicalHostHelperTypeName, parentCmdlet.CommandInfo.Name);
+            return GetGraphicalHostReflectionWrapper(parentCmdlet, graphicalHostHelperTypeName, parentCmdlet.CommandInfo.Name);
         }
 
         /// <summary>
@@ -73,9 +73,9 @@ internal static GraphicalHostReflectionWrapper GetGraphicalHostReflectionWrapper
         [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Assembly.Load has been found to throw unadvertised exceptions")]
         internal static GraphicalHostReflectionWrapper GetGraphicalHostReflectionWrapper(PSCmdlet parentCmdlet, string graphicalHostHelperTypeName, string featureName)
         {
-            GraphicalHostReflectionWrapper returnValue = new GraphicalHostReflectionWrapper();
+            GraphicalHostReflectionWrapper returnValue = new();
 
-            if (GraphicalHostReflectionWrapper.IsInputFromRemoting(parentCmdlet))
+            if (IsInputFromRemoting(parentCmdlet))
             {
                 ErrorRecord error = new ErrorRecord(
                     new NotSupportedException(StringUtil.Format(HelpErrors.RemotingNotSupportedForFeature, featureName)),
@@ -87,9 +87,10 @@ internal static GraphicalHostReflectionWrapper GetGraphicalHostReflectionWrapper
             }
 
             // Prepare the full assembly name.
-            AssemblyName graphicalHostAssemblyName = new AssemblyName();
+            AssemblyName smaAssemblyName = typeof(PSObject).Assembly.GetName();
+            AssemblyName graphicalHostAssemblyName = new();
             graphicalHostAssemblyName.Name = "Microsoft.PowerShell.GraphicalHost";
-            graphicalHostAssemblyName.Version = new Version(3, 0, 0, 0);
+            graphicalHostAssemblyName.Version = smaAssemblyName.Version;
             graphicalHostAssemblyName.CultureInfo = new CultureInfo(string.Empty); // Neutral culture
             graphicalHostAssemblyName.SetPublicKeyToken(new byte[] { 0x31, 0xbf, 0x38, 0x56, 0xad, 0x36, 0x4e, 0x35 });
 
@@ -124,7 +125,7 @@ internal static GraphicalHostReflectionWrapper GetGraphicalHostReflectionWrapper
 
             returnValue._graphicalHostHelperType = returnValue._graphicalHostAssembly.GetType(graphicalHostHelperTypeName);
 
-            Diagnostics.Assert(returnValue._graphicalHostHelperType != null, "the type exists in Microsoft.PowerShell.GraphicalHost");
+            Diagnostics.Assert(returnValue._graphicalHostHelperType != null, "the type should exist in Microsoft.PowerShell.GraphicalHost");
             ConstructorInfo constructor = returnValue._graphicalHostHelperType.GetConstructor(
                 BindingFlags.NonPublic | BindingFlags.Instance,
                 null,
diff --git a/src/System.Management.Automation/utils/HostInterfacesExceptions.cs b/src/System.Management.Automation/utils/HostInterfacesExceptions.cs
index 362a1448207..df36d248d18 100644
--- a/src/System.Management.Automation/utils/HostInterfacesExceptions.cs
+++ b/src/System.Management.Automation/utils/HostInterfacesExceptions.cs
@@ -100,7 +100,7 @@ class HostException : RuntimeException
         /// <param name="context">
         /// The contextual information about the source or destination.
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected
         HostException(SerializationInfo info, StreamingContext context)
         {
@@ -120,7 +120,7 @@ private void SetDefaultErrorRecord()
 
     /// <summary>
     /// Defines the exception thrown when an error occurs from prompting for a command parameter.
-    /// </summary>    
+    /// </summary>
     public
     class PromptingException : HostException
     {
@@ -209,7 +209,7 @@ class PromptingException : HostException
         /// <param name="context">
         /// The contextual information about the source or destination.
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected
         PromptingException(SerializationInfo info, StreamingContext context)
         {
diff --git a/src/System.Management.Automation/utils/MetadataExceptions.cs b/src/System.Management.Automation/utils/MetadataExceptions.cs
index f2c4ace8647..24660d348e7 100644
--- a/src/System.Management.Automation/utils/MetadataExceptions.cs
+++ b/src/System.Management.Automation/utils/MetadataExceptions.cs
@@ -71,7 +71,6 @@ internal MetadataException(
     /// <summary>
     /// Defines the exception thrown for all Validate attributes.
     /// </summary>
-    [SuppressMessage("Microsoft.Usage", "CA2240:ImplementISerializableCorrectly")]
     public class ValidationMetadataException : MetadataException
     {
         internal const string ValidateRangeElementType = "ValidateRangeElementType";
diff --git a/src/System.Management.Automation/utils/MshArgumentException.cs b/src/System.Management.Automation/utils/MshArgumentException.cs
index baa3f8c3163..452527d1c18 100644
--- a/src/System.Management.Automation/utils/MshArgumentException.cs
+++ b/src/System.Management.Automation/utils/MshArgumentException.cs
@@ -68,7 +68,7 @@ public PSArgumentException(string message, string paramName)
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PSArgumentException(SerializationInfo info,
                            StreamingContext context)
         {
diff --git a/src/System.Management.Automation/utils/MshArgumentNullException.cs b/src/System.Management.Automation/utils/MshArgumentNullException.cs
index a4f50256e44..16ef442e5ec 100644
--- a/src/System.Management.Automation/utils/MshArgumentNullException.cs
+++ b/src/System.Management.Automation/utils/MshArgumentNullException.cs
@@ -79,12 +79,12 @@ public PSArgumentNullException(string paramName, string message)
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PSArgumentNullException(SerializationInfo info,
                            StreamingContext context)
         {
             throw new NotSupportedException();
-        }        
+        }
         #endregion Serialization
         #endregion ctor
 
diff --git a/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs b/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs
index 8d666778a4f..4e65ed0acb1 100644
--- a/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs
+++ b/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs
@@ -67,13 +67,13 @@ public PSArgumentOutOfRangeException(string paramName, object actualValue, strin
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PSArgumentOutOfRangeException(SerializationInfo info,
                            StreamingContext context)
         {
             throw new NotSupportedException();
         }
-        
+
         #endregion Serialization
 
         /// <summary>
diff --git a/src/System.Management.Automation/utils/MshInvalidOperationException.cs b/src/System.Management.Automation/utils/MshInvalidOperationException.cs
index f398e4a2e99..8400e762360 100644
--- a/src/System.Management.Automation/utils/MshInvalidOperationException.cs
+++ b/src/System.Management.Automation/utils/MshInvalidOperationException.cs
@@ -38,7 +38,7 @@ public PSInvalidOperationException()
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PSInvalidOperationException(SerializationInfo info,
                            StreamingContext context)
         {
diff --git a/src/System.Management.Automation/utils/MshNotImplementedException.cs b/src/System.Management.Automation/utils/MshNotImplementedException.cs
index 7d1082bf747..1b925053410 100644
--- a/src/System.Management.Automation/utils/MshNotImplementedException.cs
+++ b/src/System.Management.Automation/utils/MshNotImplementedException.cs
@@ -38,12 +38,12 @@ public PSNotImplementedException()
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PSNotImplementedException(SerializationInfo info,
                                               StreamingContext context)
         {
             throw new NotSupportedException();
-        }        
+        }
         #endregion Serialization
 
         /// <summary>
diff --git a/src/System.Management.Automation/utils/MshNotSupportedException.cs b/src/System.Management.Automation/utils/MshNotSupportedException.cs
index 1268636742b..a1e519a960e 100644
--- a/src/System.Management.Automation/utils/MshNotSupportedException.cs
+++ b/src/System.Management.Automation/utils/MshNotSupportedException.cs
@@ -38,13 +38,13 @@ public PSNotSupportedException()
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected PSNotSupportedException(SerializationInfo info,
                                             StreamingContext context)
         {
             throw new NotSupportedException();
         }
-        
+
         #endregion Serialization
 
         /// <summary>
diff --git a/src/System.Management.Automation/utils/ParameterBinderExceptions.cs b/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
index 4052eec0b81..a28de586d8e 100644
--- a/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
+++ b/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
@@ -297,7 +297,7 @@ internal ParameterBindingException(
         /// <param name="context">
         /// streaming context
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ParameterBindingException(
             SerializationInfo info,
             StreamingContext context)
@@ -486,7 +486,7 @@ private string BuildMessage()
 
         #endregion Private
     }
-    
+
     internal class ParameterBindingValidationException : ParameterBindingException
     {
         #region Preferred constructors
@@ -654,7 +654,7 @@ internal ParameterBindingValidationException(
         /// <param name="context">
         /// streaming context
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ParameterBindingValidationException(
             SerializationInfo info,
             StreamingContext context)
@@ -844,7 +844,7 @@ internal ParameterBindingArgumentTransformationException(
         /// <param name="context">
         /// streaming context
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ParameterBindingArgumentTransformationException(
             SerializationInfo info,
             StreamingContext context)
@@ -854,7 +854,7 @@ protected ParameterBindingArgumentTransformationException(
 
         #endregion serialization
     }
-    
+
     internal class ParameterBindingParameterDefaultValueException : ParameterBindingException
     {
         #region Preferred constructors
@@ -1018,7 +1018,7 @@ internal ParameterBindingParameterDefaultValueException(
         /// <param name="context">
         /// streaming context
         /// </param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected ParameterBindingParameterDefaultValueException(
             SerializationInfo info,
             StreamingContext context)
diff --git a/src/System.Management.Automation/utils/PathUtils.cs b/src/System.Management.Automation/utils/PathUtils.cs
index 1d7c3140d69..3afea30a962 100644
--- a/src/System.Management.Automation/utils/PathUtils.cs
+++ b/src/System.Management.Automation/utils/PathUtils.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
@@ -870,5 +871,37 @@ private static bool IsDirectorySeparator(char c)
         }
 
         #endregion
+
+        #region Helpers for checking invalid paths using SearchValues
+
+        /// <summary>
+        /// Contains characters that are invalid in file names.
+        /// </summary>
+        private static readonly SearchValues<char> s_invalidFileNameChars
+            = SearchValues.Create(Path.GetInvalidFileNameChars());
+
+        /// <summary>
+        /// Contains characters that are invalid in path names.
+        /// </summary>
+        private static readonly SearchValues<char> s_invalidPathChars
+            = SearchValues.Create(Path.GetInvalidPathChars());
+
+        /// <summary>
+        /// Checks if the specified filename contains any characters that are invalid in file names.
+        /// </summary>
+        /// <param name="filename">The path to check.</param>
+        /// <returns>True if the filename contains invalid file name characters, otherwise false.</returns>
+        internal static bool ContainsInvalidFileNameChars(ReadOnlySpan<char> filename)
+            => filename.ContainsAny(s_invalidFileNameChars);
+
+        /// <summary>
+        /// Checks if the specified path contains any characters that are invalid in path names.
+        /// </summary>
+        /// <param name="path">The path to check.</param>
+        /// <returns>True if the path contains invalid path characters, otherwise false.</returns>
+        internal static bool ContainsInvalidPathChars(ReadOnlySpan<char> path)
+            => path.ContainsAny(s_invalidPathChars);
+
+        #endregion
     }
 }
diff --git a/src/System.Management.Automation/utils/PlatformInvokes.cs b/src/System.Management.Automation/utils/PlatformInvokes.cs
index 4405f2f6910..f9e78f5d1d3 100644
--- a/src/System.Management.Automation/utils/PlatformInvokes.cs
+++ b/src/System.Management.Automation/utils/PlatformInvokes.cs
@@ -11,7 +11,7 @@ namespace System.Management.Automation
     internal static class PlatformInvokes
     {
         [StructLayout(LayoutKind.Sequential)]
-        internal class FILETIME
+        internal sealed class FILETIME
         {
             internal uint dwLowDateTime;
             internal uint dwHighDateTime;
@@ -92,7 +92,7 @@ internal enum FileAttributes : uint
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        internal class SecurityAttributes
+        internal sealed class SecurityAttributes
         {
             internal int nLength;
             internal SafeLocalMemHandle lpSecurityDescriptor;
@@ -235,7 +235,6 @@ internal static extern IntPtr CreateFile(
         /// </returns>
         [DllImport(PinvokeDllNames.CloseHandleDllName, SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        // [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         internal static extern bool CloseHandle(IntPtr handle);
 
         [DllImport(PinvokeDllNames.DosDateTimeToFileTimeDllName, SetLastError = false)]
@@ -412,7 +411,6 @@ internal static bool RestoreTokenPrivilege(string privilegeName, ref TOKEN_PRIVI
         /// <param name="lpLuid"></param>
         /// <returns></returns>
         [DllImport(PinvokeDllNames.LookupPrivilegeValueDllName, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool LookupPrivilegeValue(string lpSystemName, string lpName, ref LUID lpLuid);
 
@@ -424,7 +422,6 @@ internal static bool RestoreTokenPrivilege(string privilegeName, ref TOKEN_PRIVI
         /// <param name="pfResult"></param>
         /// <returns></returns>
         [DllImport(PinvokeDllNames.PrivilegeCheckDllName, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool PrivilegeCheck(IntPtr tokenHandler, ref PRIVILEGE_SET requiredPrivileges, out bool pfResult);
 
@@ -441,35 +438,34 @@ internal static bool RestoreTokenPrivilege(string privilegeName, ref TOKEN_PRIVI
         /// <param name="returnLength"></param>
         /// <returns></returns>
         [DllImport(PinvokeDllNames.AdjustTokenPrivilegesDllName, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool AdjustTokenPrivileges(IntPtr tokenHandler, bool disableAllPrivilege,
                                                           ref TOKEN_PRIVILEGE newPrivilegeState, int bufferLength,
                                                           out TOKEN_PRIVILEGE previousPrivilegeState,
                                                           ref int returnLength);
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct TOKEN_PRIVILEGE
         {
             internal uint PrivilegeCount;
             internal LUID_AND_ATTRIBUTES Privilege;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct LUID
         {
             internal uint LowPart;
             internal uint HighPart;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct LUID_AND_ATTRIBUTES
         {
             internal LUID Luid;
             internal uint Attributes;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct PRIVILEGE_SET
         {
             internal uint PrivilegeCount;
@@ -482,7 +478,6 @@ internal struct PRIVILEGE_SET
         /// </summary>
         /// <returns></returns>
         [DllImport(PinvokeDllNames.GetCurrentProcessDllName)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         internal static extern IntPtr GetCurrentProcess();
 
         /// <summary>
@@ -494,7 +489,6 @@ internal struct PRIVILEGE_SET
         /// <param name="tokenHandle">Process token.</param>
         /// <returns>The current process token.</returns>
         [DllImport(PinvokeDllNames.OpenProcessTokenDllName, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage")]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool OpenProcessToken(IntPtr processHandle, uint desiredAccess, out IntPtr tokenHandle);
 
@@ -536,7 +530,7 @@ internal struct PRIVILEGE_SET
         internal static readonly UInt32 OPEN_EXISTING = 3;
 
         [StructLayout(LayoutKind.Sequential)]
-        internal class PROCESS_INFORMATION
+        internal sealed class PROCESS_INFORMATION
         {
             public IntPtr hProcess;
             public IntPtr hThread;
@@ -581,7 +575,7 @@ private void Dispose(bool disposing)
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        internal class STARTUPINFO
+        internal sealed class STARTUPINFO
         {
             public int cb;
             public IntPtr lpReserved;
@@ -645,7 +639,7 @@ public void Dispose()
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        internal class SECURITY_ATTRIBUTES
+        internal sealed class SECURITY_ATTRIBUTES
         {
             public int nLength;
             public SafeLocalMemHandle lpSecurityDescriptor;
diff --git a/src/System.Management.Automation/utils/PsUtils.cs b/src/System.Management.Automation/utils/PsUtils.cs
index 53809e586a0..0a4682bcdd6 100644
--- a/src/System.Management.Automation/utils/PsUtils.cs
+++ b/src/System.Management.Automation/utils/PsUtils.cs
@@ -74,12 +74,12 @@ internal static Process GetParentProcess(Process current)
         }
 
         /// <summary>
-        /// Return true/false to indicate whether the processor architecture is ARM.
+        /// Return true/false to indicate whether the process architecture is ARM.
         /// </summary>
         /// <returns></returns>
-        internal static bool IsRunningOnProcessorArchitectureARM()
+        internal static bool IsRunningOnProcessArchitectureARM()
         {
-            Architecture arch = RuntimeInformation.OSArchitecture;
+            Architecture arch = RuntimeInformation.ProcessArchitecture;
             return arch == Architecture.Arm || arch == Architecture.Arm64;
         }
 
@@ -308,7 +308,7 @@ internal static Hashtable EvaluatePowerShellDataFile(
                          ex.Message);
             }
 
-            if (!(evaluationResult is Hashtable retResult))
+            if (evaluationResult is not Hashtable retResult)
             {
                 throw PSTraceSource.NewInvalidOperationException(
                          ParserStrings.InvalidPowerShellDataFile,
@@ -340,7 +340,7 @@ internal static Hashtable EvaluatePowerShellDataFile(
 
         internal static Hashtable GetModuleManifestProperties(string psDataFilePath, string[] keys)
         {
-            string dataFileContents = ScriptAnalysis.ReadScript(psDataFilePath);
+            string dataFileContents = File.ReadAllText(psDataFilePath, Encoding.Default);
             ParseError[] parseErrors;
             var ast = (new Parser()).Parse(psDataFilePath, dataFileContents, null, out parseErrors, ParseMode.ModuleAnalysis);
             if (parseErrors.Length > 0)
@@ -453,14 +453,14 @@ internal static object[] Base64ToArgsConverter(string base64)
                 throw PSTraceSource.NewArgumentException(MinishellParameterBinderController.ArgsParameter);
             }
 
-            if (!(dso is PSObject mo))
+            if (dso is not PSObject mo)
             {
                 // This helper function should move the host. Provide appropriate error message.
                 // Format of args parameter is not correct.
                 throw PSTraceSource.NewArgumentException(MinishellParameterBinderController.ArgsParameter);
             }
 
-            if (!(mo.BaseObject is ArrayList argsList))
+            if (mo.BaseObject is not ArrayList argsList)
             {
                 // This helper function should move the host. Provide appropriate error message.
                 // Format of args parameter is not correct.
diff --git a/src/System.Management.Automation/utils/RuntimeException.cs b/src/System.Management.Automation/utils/RuntimeException.cs
index 4cfdc31bcb6..ab013359d5c 100644
--- a/src/System.Management.Automation/utils/RuntimeException.cs
+++ b/src/System.Management.Automation/utils/RuntimeException.cs
@@ -40,12 +40,12 @@ public RuntimeException()
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
         /// <returns>Constructed object.</returns>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected RuntimeException(SerializationInfo info,
                            StreamingContext context)
         {
             throw new NotSupportedException();
-        }        
+        }
         #endregion Serialization
 
         /// <summary>
@@ -221,7 +221,7 @@ internal static string RetrieveMessage(Exception e)
             if (e == null)
                 return string.Empty;
 
-            if (!(e is IContainsErrorRecord icer))
+            if (e is not IContainsErrorRecord icer)
                 return e.Message;
             ErrorRecord er = icer.ErrorRecord;
             if (er == null)
diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index 020d009b107..fbb7f588283 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Runtime.InteropServices;
-using System.Security.AccessControl;
 using System.Threading;
 
 using Microsoft.ApplicationInsights;
@@ -83,6 +82,13 @@ internal enum TelemetryType
         /// Remote session creation.
         /// </summary>
         RemoteSessionOpen,
+
+        /// <summary>
+        /// Send telemetry for a stable feature when used.
+        /// By making a distinction between this and experimental feature use, it will make
+        /// queries much easier.
+        /// </summary>
+        FeatureUse,
     }
 
     /// <summary>
@@ -110,6 +116,9 @@ public void Initialize(ITelemetry telemetry)
     /// </summary>
     public static class ApplicationInsightsTelemetry
     {
+        // The string for SubsystermRegistration
+        internal const string s_subsystemRegistration = "Subsystem.Registration";
+
         // If this env var is true, yes, or 1, telemetry will NOT be sent.
         private const string _telemetryOptoutEnvVar = "POWERSHELL_TELEMETRY_OPTOUT";
 
@@ -152,8 +161,12 @@ public static class ApplicationInsightsTelemetry
         private static readonly HashSet<string> s_knownModules;
         private static readonly HashSet<string> s_knownModuleTags;
 
+        private static readonly HashSet<string> s_knownSubsystemNames;
+
+        private static readonly string s_uuidPath;
+
         /// <summary>Gets a value indicating whether telemetry can be sent.</summary>
-        public static bool CanSendTelemetry { get; private set; } = false;
+        public static bool CanSendTelemetry { get; private set; }
 
         /// <summary>
         /// Initializes static members of the <see cref="ApplicationInsightsTelemetry"/> class.
@@ -164,527 +177,483 @@ public static class ApplicationInsightsTelemetry
         /// </summary>
         static ApplicationInsightsTelemetry()
         {
-            // If we can't send telemetry, there's no reason to do any of this
-            CanSendTelemetry = !GetEnvironmentVariableAsBool(name: _telemetryOptoutEnvVar, defaultValue: false);
+            CanSendTelemetry = !Utils.GetEnvironmentVariableAsBool(name: _telemetryOptoutEnvVar, defaultValue: false)
+                && Platform.TryDeriveFromCache("telemetry.uuid", out s_uuidPath);
+
+#if !UNIX
             if (CanSendTelemetry)
             {
-                s_sessionId = Guid.NewGuid().ToString();
-                TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
-                configuration.ConnectionString = "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);
-
-                // use a hashset when looking for module names, it should be quicker than a string comparison
-                s_knownModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-                    {
-                        "AADRM",
-                        "activedirectory",
-                        "adcsadministration",
-                        "adcsdeployment",
-                        "addsadministration",
-                        "addsdeployment",
-                        "adfs",
-                        "adrms",
-                        "adrmsadmin",
-                        "agpm",
-                        "appbackgroundtask",
-                        "applocker",
-                        "appv",
-                        "appvclient",
-                        "appvsequencer",
-                        "appvserver",
-                        "appx",
-                        "assignedaccess",
-                        "Az",
-                        "Az.Accounts",
-                        "Az.Advisor",
-                        "Az.Aks",
-                        "Az.AlertsManagement",
-                        "Az.AnalysisServices",
-                        "Az.ApiManagement",
-                        "Az.ApplicationInsights",
-                        "Az.Attestation",
-                        "Az.Automation",
-                        "Az.Batch",
-                        "Az.Billing",
-                        "Az.Blueprint",
-                        "Az.Cdn",
-                        "Az.CognitiveServices",
-                        "Az.Compute",
-                        "Az.ContainerInstance",
-                        "Az.ContainerRegistry",
-                        "Az.DataBox",
-                        "Az.DataFactory",
-                        "Az.DataLakeAnalytics",
-                        "Az.DataLakeStore",
-                        "Az.DataMigration",
-                        "Az.DataShare",
-                        "Az.DeploymentManager",
-                        "Az.DeviceProvisioningServices",
-                        "Az.DevSpaces",
-                        "Az.DevTestLabs",
-                        "Az.Dns",
-                        "Az.EventGrid",
-                        "Az.EventHub",
-                        "Az.FrontDoor",
-                        "Az.GuestConfiguration",
-                        "Az.HDInsight",
-                        "Az.HealthcareApis",
-                        "Az.IotCentral",
-                        "Az.IotHub",
-                        "Az.KeyVault",
-                        "Az.Kusto",
-                        "Az.LogicApp",
-                        "Az.MachineLearning",
-                        "Az.ManagedServiceIdentity",
-                        "Az.ManagedServices",
-                        "Az.ManagementPartner",
-                        "Az.Maps",
-                        "Az.MarketplaceOrdering",
-                        "Az.Media",
-                        "Az.MixedReality",
-                        "Az.Monitor",
-                        "Az.NetAppFiles",
-                        "Az.Network",
-                        "Az.NotificationHubs",
-                        "Az.OperationalInsights",
-                        "Az.Peering",
-                        "Az.PolicyInsights",
-                        "Az.PowerBIEmbedded",
-                        "Az.PrivateDns",
-                        "Az.RecoveryServices",
-                        "Az.RedisCache",
-                        "Az.Relay",
-                        "Az.Reservations",
-                        "Az.ResourceGraph",
-                        "Az.Resources",
-                        "Az.Search",
-                        "Az.Security",
-                        "Az.ServiceBus",
-                        "Az.ServiceFabric",
-                        "Az.SignalR",
-                        "Az.Sql",
-                        "Az.Storage",
-                        "Az.StorageSync",
-                        "Az.StorageTable",
-                        "Az.StreamAnalytics",
-                        "Az.Subscription",
-                        "Az.Tools.Predictor",
-                        "Az.TrafficManager",
-                        "Az.Websites",
-                        "Azs.Azurebridge.Admin",
-                        "Azs.Backup.Admin",
-                        "Azs.Commerce.Admin",
-                        "Azs.Compute.Admin",
-                        "Azs.Fabric.Admin",
-                        "Azs.Gallery.Admin",
-                        "Azs.Infrastructureinsights.Admin",
-                        "Azs.Keyvault.Admin",
-                        "Azs.Network.Admin",
-                        "Azs.Storage.Admin",
-                        "Azs.Subscriptions",
-                        "Azs.Subscriptions.Admin",
-                        "Azs.Update.Admin",
-                        "AzStorageTable",
-                        "Azure",
-                        "Azure.AnalysisServices",
-                        "Azure.Storage",
-                        "AzureAD",
-                        "AzureInformationProtection",
-                        "AzureRM.Aks",
-                        "AzureRM.AnalysisServices",
-                        "AzureRM.ApiManagement",
-                        "AzureRM.ApplicationInsights",
-                        "AzureRM.Automation",
-                        "AzureRM.Backup",
-                        "AzureRM.Batch",
-                        "AzureRM.Billing",
-                        "AzureRM.Cdn",
-                        "AzureRM.CognitiveServices",
-                        "AzureRm.Compute",
-                        "AzureRM.Compute.ManagedService",
-                        "AzureRM.Consumption",
-                        "AzureRM.ContainerInstance",
-                        "AzureRM.ContainerRegistry",
-                        "AzureRM.DataFactories",
-                        "AzureRM.DataFactoryV2",
-                        "AzureRM.DataLakeAnalytics",
-                        "AzureRM.DataLakeStore",
-                        "AzureRM.DataMigration",
-                        "AzureRM.DeploymentManager",
-                        "AzureRM.DeviceProvisioningServices",
-                        "AzureRM.DevSpaces",
-                        "AzureRM.DevTestLabs",
-                        "AzureRm.Dns",
-                        "AzureRM.EventGrid",
-                        "AzureRM.EventHub",
-                        "AzureRM.FrontDoor",
-                        "AzureRM.HDInsight",
-                        "AzureRm.Insights",
-                        "AzureRM.IotCentral",
-                        "AzureRM.IotHub",
-                        "AzureRm.Keyvault",
-                        "AzureRM.LocationBasedServices",
-                        "AzureRM.LogicApp",
-                        "AzureRM.MachineLearning",
-                        "AzureRM.MachineLearningCompute",
-                        "AzureRM.ManagedServiceIdentity",
-                        "AzureRM.ManagementPartner",
-                        "AzureRM.Maps",
-                        "AzureRM.MarketplaceOrdering",
-                        "AzureRM.Media",
-                        "AzureRM.Network",
-                        "AzureRM.NotificationHubs",
-                        "AzureRM.OperationalInsights",
-                        "AzureRM.PolicyInsights",
-                        "AzureRM.PowerBIEmbedded",
-                        "AzureRM.Profile",
-                        "AzureRM.RecoveryServices",
-                        "AzureRM.RecoveryServices.Backup",
-                        "AzureRM.RecoveryServices.SiteRecovery",
-                        "AzureRM.RedisCache",
-                        "AzureRM.Relay",
-                        "AzureRM.Reservations",
-                        "AzureRM.ResourceGraph",
-                        "AzureRM.Resources",
-                        "AzureRM.Scheduler",
-                        "AzureRM.Search",
-                        "AzureRM.Security",
-                        "AzureRM.ServerManagement",
-                        "AzureRM.ServiceBus",
-                        "AzureRM.ServiceFabric",
-                        "AzureRM.SignalR",
-                        "AzureRM.SiteRecovery",
-                        "AzureRM.Sql",
-                        "AzureRm.Storage",
-                        "AzureRM.StorageSync",
-                        "AzureRM.StreamAnalytics",
-                        "AzureRM.Subscription",
-                        "AzureRM.Subscription.Preview",
-                        "AzureRM.Tags",
-                        "AzureRM.TrafficManager",
-                        "AzureRm.UsageAggregates",
-                        "AzureRm.Websites",
-                        "AzureRmStorageTable",
-                        "bestpractices",
-                        "bitlocker",
-                        "bitstransfer",
-                        "booteventcollector",
-                        "branchcache",
-                        "CimCmdlets",
-                        "clusterawareupdating",
-                        "CompatPowerShellGet",
-                        "configci",
-                        "ConfigurationManager",
-                        "DataProtectionManager",
-                        "dcbqos",
-                        "deduplication",
-                        "defender",
-                        "devicehealthattestation",
-                        "dfsn",
-                        "dfsr",
-                        "dhcpserver",
-                        "directaccessclient",
-                        "directaccessclientcomponent",
-                        "directaccessclientcomponents",
-                        "dism",
-                        "dnsclient",
-                        "dnsserver",
-                        "ElasticDatabaseJobs",
-                        "EventTracingManagement",
-                        "failoverclusters",
-                        "fileserverresourcemanager",
-                        "FIMAutomation",
-                        "GPRegistryPolicy",
-                        "grouppolicy",
-                        "hardwarecertification",
-                        "hcs",
-                        "hgsattestation",
-                        "hgsclient",
-                        "hgsdiagnostics",
-                        "hgskeyprotection",
-                        "hgsserver",
-                        "hnvdiagnostics",
-                        "hostcomputeservice",
-                        "hpc",
-                        "HPC.ACM",
-                        "HPC.ACM.API.PS",
-                        "HPCPack2016",
-                        "hyper-v",
-                        "IISAdministration",
-                        "international",
-                        "ipamserver",
-                        "iscsi",
-                        "iscsitarget",
-                        "ISE",
-                        "kds",
-                        "Microsoft.MBAM",
-                        "Microsoft.MEDV",
-                        "MgmtSvcAdmin",
-                        "MgmtSvcConfig",
-                        "MgmtSvcMySql",
-                        "MgmtSvcSqlServer",
-                        "Microsoft.AzureStack.ReadinessChecker",
-                        "Microsoft.Crm.PowerShell",
-                        "Microsoft.DiagnosticDataViewer",
-                        "Microsoft.DirectoryServices.MetadirectoryServices.Config",
-                        "Microsoft.Dynamics.Nav.Apps.Management",
-                        "Microsoft.Dynamics.Nav.Apps.Tools",
-                        "Microsoft.Dynamics.Nav.Ide",
-                        "Microsoft.Dynamics.Nav.Management",
-                        "Microsoft.Dynamics.Nav.Model.Tools",
-                        "Microsoft.Dynamics.Nav.Model.Tools.Crm",
-                        "Microsoft.EnterpriseManagement.Warehouse.Cmdlets",
-                        "Microsoft.Medv.Administration.Commands.WorkspacePackager",
-                        "Microsoft.PowerApps.Checker.PowerShell",
-                        "Microsoft.PowerShell.Archive",
-                        "Microsoft.PowerShell.ConsoleGuiTools",
-                        "Microsoft.PowerShell.Core",
-                        "Microsoft.PowerShell.Crescendo",
-                        "Microsoft.PowerShell.Diagnostics",
-                        "Microsoft.PowerShell.Host",
-                        "Microsoft.PowerShell.LocalAccounts",
-                        "Microsoft.PowerShell.Management",
-                        "Microsoft.PowerShell.ODataUtils",
-                        "Microsoft.PowerShell.Operation.Validation",
-                        "Microsoft.PowerShell.PSAdapter",
-                        "Microsoft.PowerShell.PSResourceGet",
-                        "Microsoft.PowerShell.RemotingTools",
-                        "Microsoft.PowerShell.SecretManagement",
-                        "Microsoft.PowerShell.SecretStore",
-                        "Microsoft.PowerShell.Security",
-                        "Microsoft.PowerShell.TextUtility",
-                        "Microsoft.PowerShell.Utility",
-                        "Microsoft.SharePoint.Powershell",
-                        "Microsoft.SystemCenter.ServiceManagementAutomation",
-                        "Microsoft.Windows.ServerManager.Migration",
-                        "Microsoft.WSMan.Management",
-                        "Microsoft.Xrm.OnlineManagementAPI",
-                        "Microsoft.Xrm.Tooling.CrmConnector.PowerShell",
-                        "Microsoft.Xrm.Tooling.PackageDeployment",
-                        "Microsoft.Xrm.Tooling.PackageDeployment.Powershell",
-                        "Microsoft.Xrm.Tooling.Testing",
-                        "MicrosoftPowerBIMgmt",
-                        "MicrosoftPowerBIMgmt.Data",
-                        "MicrosoftPowerBIMgmt.Profile",
-                        "MicrosoftPowerBIMgmt.Reports",
-                        "MicrosoftPowerBIMgmt.Workspaces",
-                        "MicrosoftStaffHub",
-                        "MicrosoftTeams",
-                        "MIMPAM",
-                        "mlSqlPs",
-                        "MMAgent",
-                        "MPIO",
-                        "MsDtc",
-                        "MSMQ",
-                        "MSOnline",
-                        "MSOnlineBackup",
-                        "WmsCmdlets",
-                        "WmsCmdlets3",
-                        "NanoServerImageGenerator",
-                        "NAVWebClientManagement",
-                        "NetAdapter",
-                        "NetConnection",
-                        "NetEventPacketCapture",
-                        "Netlbfo",
-                        "Netldpagent",
-                        "NetNat",
-                        "Netqos",
-                        "NetSecurity",
-                        "NetSwitchtTeam",
-                        "Nettcpip",
-                        "Netwnv",
-                        "NetworkConnectivity",
-                        "NetworkConnectivityStatus",
-                        "NetworkController",
-                        "NetworkControllerDiagnostics",
-                        "NetworkloadBalancingClusters",
-                        "NetworkSwitchManager",
-                        "NetworkTransition",
-                        "NFS",
-                        "NPS",
-                        "OfficeWebapps",
-                        "OperationsManager",
-                        "PackageManagement",
-                        "PartnerCenter",
-                        "pcsvdevice",
-                        "pef",
-                        "Pester",
-                        "pkiclient",
-                        "platformidentifier",
-                        "pnpdevice",
-                        "PowerShellEditorServices",
-                        "PowerShellGet",
-                        "powershellwebaccess",
-                        "printmanagement",
-                        "ProcessMitigations",
-                        "provisioning",
-                        "PSDesiredStateConfiguration",
-                        "PSDiagnostics",
-                        "PSReadLine",
-                        "PSScheduledJob",
-                        "PSScriptAnalyzer",
-                        "PSWorkflow",
-                        "PSWorkflowUtility",
-                        "RemoteAccess",
-                        "RemoteDesktop",
-                        "RemoteDesktopServices",
-                        "ScheduledTasks",
-                        "Secureboot",
-                        "ServerCore",
-                        "ServerManager",
-                        "ServerManagerTasks",
-                        "ServerMigrationcmdlets",
-                        "ServiceFabric",
-                        "Microsoft.Online.SharePoint.PowerShell",
-                        "shieldedvmdatafile",
-                        "shieldedvmprovisioning",
-                        "shieldedvmtemplate",
-                        "SkypeOnlineConnector",
-                        "SkypeForBusinessHybridHealth",
-                        "smbshare",
-                        "smbwitness",
-                        "smisconfig",
-                        "softwareinventorylogging",
-                        "SPFAdmin",
-                        "Microsoft.SharePoint.MigrationTool.PowerShell",
-                        "sqlps",
-                        "SqlServer",
-                        "StartLayout",
-                        "StartScreen",
-                        "Storage",
-                        "StorageDsc",
-                        "storageqos",
-                        "Storagereplica",
-                        "Storagespaces",
-                        "Syncshare",
-                        "System.Center.Service.Manager",
-                        "TLS",
-                        "TroubleshootingPack",
-                        "TrustedPlatformModule",
-                        "UEV",
-                        "UpdateServices",
-                        "UserAccessLogging",
-                        "vamt",
-                        "VirtualMachineManager",
-                        "vpnclient",
-                        "WasPSExt",
-                        "WDAC",
-                        "WDS",
-                        "WebAdministration",
-                        "WebAdministrationDsc",
-                        "WebApplicationProxy",
-                        "WebSites",
-                        "Whea",
-                        "WhiteboardAdmin",
-                        "WindowsDefender",
-                        "WindowsDefenderDsc",
-                        "WindowsDeveloperLicense",
-                        "WindowsDiagnosticData",
-                        "WindowsErrorReporting",
-                        "WindowServerRackup",
-                        "WindowsSearch",
-                        "WindowsServerBackup",
-                        "WindowsUpdate",
-                        "wsscmdlets",
-                        "wsssetup",
-                        "wsus",
-                        "xActiveDirectory",
-                        "xBitLocker",
-                        "xDefender",
-                        "xDhcpServer",
-                        "xDismFeature",
-                        "xDnsServer",
-                        "xHyper-V",
-                        "xHyper-VBackup",
-                        "xPSDesiredStateConfiguration",
-                        "xSmbShare",
-                        "xSqlPs",
-                        "xStorage",
-                        "xWebAdministration",
-                        "xWindowsUpdate",
-                    };
-
-                // use a hashset when looking for module names, it should be quicker than a string comparison
-                s_knownModuleTags = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-                    {
-                        "CrescendoBuilt",
-                    };
-
-                s_uniqueUserIdentifier = GetUniqueIdentifier().ToString();
+                // Respect the diagnostics and feedback setting in Windows.
+                CanSendTelemetry = WindowsDataCollectionSetting.CanCollectDiagnostics(PlatformDataCollectionLevel.Enhanced);
             }
-        }
+#endif
 
-        /// <summary>
-        /// Determine whether the environment variable is set and how.
-        /// </summary>
-        /// <param name="name">The name of the environment variable.</param>
-        /// <param name="defaultValue">If the environment variable is not set, use this as the default value.</param>
-        /// <returns>A boolean representing the value of the environment variable.</returns>
-        private static bool GetEnvironmentVariableAsBool(string name, bool defaultValue)
-        {
-            var str = Environment.GetEnvironmentVariable(name);
-            if (string.IsNullOrEmpty(str))
+            if (!CanSendTelemetry)
             {
-                return defaultValue;
+                // Avoid the initialization work if we can't send telemetry.
+                return;
             }
 
-            var boolStr = str.AsSpan();
+            s_sessionId = Guid.NewGuid().ToString();
+            TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
+            configuration.ConnectionString = "InstrumentationKey=" + _psCoreTelemetryKey;
 
-            if (boolStr.Length == 1)
-            {
-                if (boolStr[0] == '1')
-                {
-                    return true;
-                }
+            // Set this to true to reduce latency during development
+            configuration.TelemetryChannel.DeveloperMode = false;
 
-                if (boolStr[0] == '0')
-                {
-                    return false;
-                }
-            }
+            // Be sure to obscure any information about the client node name.
+            configuration.TelemetryInitializers.Add(new NameObscurerTelemetryInitializer());
 
-            if (boolStr.Length == 3 &&
-                (boolStr[0] == 'y' || boolStr[0] == 'Y') &&
-                (boolStr[1] == 'e' || boolStr[1] == 'E') &&
-                (boolStr[2] == 's' || boolStr[2] == 'S'))
-            {
-                return true;
-            }
+            s_telemetryClient = new TelemetryClient(configuration);
 
-            if (boolStr.Length == 2 &&
-                (boolStr[0] == 'n' || boolStr[0] == 'N') &&
-                (boolStr[1] == 'o' || boolStr[1] == 'O'))
+            // use a hashset when looking for module names, it should be quicker than a string comparison
+            s_knownModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
-                return false;
-            }
-
-            if (boolStr.Length == 4 &&
-                (boolStr[0] == 't' || boolStr[0] == 'T') &&
-                (boolStr[1] == 'r' || boolStr[1] == 'R') &&
-                (boolStr[2] == 'u' || boolStr[2] == 'U') &&
-                (boolStr[3] == 'e' || boolStr[3] == 'E'))
+                "AADRM",
+                "activedirectory",
+                "adcsadministration",
+                "adcsdeployment",
+                "addsadministration",
+                "addsdeployment",
+                "adfs",
+                "adrms",
+                "adrmsadmin",
+                "agpm",
+                "AIShell",
+                "appbackgroundtask",
+                "applocker",
+                "appv",
+                "appvclient",
+                "appvsequencer",
+                "appvserver",
+                "appx",
+                "assignedaccess",
+                "Az",
+                "Az.Accounts",
+                "Az.Advisor",
+                "Az.Aks",
+                "Az.AlertsManagement",
+                "Az.AnalysisServices",
+                "Az.ApiManagement",
+                "Az.ApplicationInsights",
+                "Az.Attestation",
+                "Az.Automation",
+                "Az.Batch",
+                "Az.Billing",
+                "Az.Blueprint",
+                "Az.Cdn",
+                "Az.CognitiveServices",
+                "Az.Compute",
+                "Az.ContainerInstance",
+                "Az.ContainerRegistry",
+                "Az.DataBox",
+                "Az.DataFactory",
+                "Az.DataLakeAnalytics",
+                "Az.DataLakeStore",
+                "Az.DataMigration",
+                "Az.DataShare",
+                "Az.DeploymentManager",
+                "Az.DeviceProvisioningServices",
+                "Az.DevSpaces",
+                "Az.DevTestLabs",
+                "Az.Dns",
+                "Az.EventGrid",
+                "Az.EventHub",
+                "Az.FrontDoor",
+                "Az.GuestConfiguration",
+                "Az.HDInsight",
+                "Az.HealthcareApis",
+                "Az.IotCentral",
+                "Az.IotHub",
+                "Az.KeyVault",
+                "Az.Kusto",
+                "Az.LogicApp",
+                "Az.MachineLearning",
+                "Az.ManagedServiceIdentity",
+                "Az.ManagedServices",
+                "Az.ManagementPartner",
+                "Az.Maps",
+                "Az.MarketplaceOrdering",
+                "Az.Media",
+                "Az.MixedReality",
+                "Az.Monitor",
+                "Az.NetAppFiles",
+                "Az.Network",
+                "Az.NotificationHubs",
+                "Az.OperationalInsights",
+                "Az.Peering",
+                "Az.PolicyInsights",
+                "Az.PowerBIEmbedded",
+                "Az.PrivateDns",
+                "Az.RecoveryServices",
+                "Az.RedisCache",
+                "Az.Relay",
+                "Az.Reservations",
+                "Az.ResourceGraph",
+                "Az.Resources",
+                "Az.Search",
+                "Az.Security",
+                "Az.ServiceBus",
+                "Az.ServiceFabric",
+                "Az.SignalR",
+                "Az.Sql",
+                "Az.Storage",
+                "Az.StorageSync",
+                "Az.StorageTable",
+                "Az.StreamAnalytics",
+                "Az.Subscription",
+                "Az.Tools.Predictor",
+                "Az.TrafficManager",
+                "Az.Websites",
+                "Azs.Azurebridge.Admin",
+                "Azs.Backup.Admin",
+                "Azs.Commerce.Admin",
+                "Azs.Compute.Admin",
+                "Azs.Fabric.Admin",
+                "Azs.Gallery.Admin",
+                "Azs.Infrastructureinsights.Admin",
+                "Azs.Keyvault.Admin",
+                "Azs.Network.Admin",
+                "Azs.Storage.Admin",
+                "Azs.Subscriptions",
+                "Azs.Subscriptions.Admin",
+                "Azs.Update.Admin",
+                "AzStorageTable",
+                "Azure",
+                "Azure.AnalysisServices",
+                "Azure.Storage",
+                "AzureAD",
+                "AzureInformationProtection",
+                "AzureRM.Aks",
+                "AzureRM.AnalysisServices",
+                "AzureRM.ApiManagement",
+                "AzureRM.ApplicationInsights",
+                "AzureRM.Automation",
+                "AzureRM.Backup",
+                "AzureRM.Batch",
+                "AzureRM.Billing",
+                "AzureRM.Cdn",
+                "AzureRM.CognitiveServices",
+                "AzureRm.Compute",
+                "AzureRM.Compute.ManagedService",
+                "AzureRM.Consumption",
+                "AzureRM.ContainerInstance",
+                "AzureRM.ContainerRegistry",
+                "AzureRM.DataFactories",
+                "AzureRM.DataFactoryV2",
+                "AzureRM.DataLakeAnalytics",
+                "AzureRM.DataLakeStore",
+                "AzureRM.DataMigration",
+                "AzureRM.DeploymentManager",
+                "AzureRM.DeviceProvisioningServices",
+                "AzureRM.DevSpaces",
+                "AzureRM.DevTestLabs",
+                "AzureRm.Dns",
+                "AzureRM.EventGrid",
+                "AzureRM.EventHub",
+                "AzureRM.FrontDoor",
+                "AzureRM.HDInsight",
+                "AzureRm.Insights",
+                "AzureRM.IotCentral",
+                "AzureRM.IotHub",
+                "AzureRm.Keyvault",
+                "AzureRM.LocationBasedServices",
+                "AzureRM.LogicApp",
+                "AzureRM.MachineLearning",
+                "AzureRM.MachineLearningCompute",
+                "AzureRM.ManagedServiceIdentity",
+                "AzureRM.ManagementPartner",
+                "AzureRM.Maps",
+                "AzureRM.MarketplaceOrdering",
+                "AzureRM.Media",
+                "AzureRM.Network",
+                "AzureRM.NotificationHubs",
+                "AzureRM.OperationalInsights",
+                "AzureRM.PolicyInsights",
+                "AzureRM.PowerBIEmbedded",
+                "AzureRM.Profile",
+                "AzureRM.RecoveryServices",
+                "AzureRM.RecoveryServices.Backup",
+                "AzureRM.RecoveryServices.SiteRecovery",
+                "AzureRM.RedisCache",
+                "AzureRM.Relay",
+                "AzureRM.Reservations",
+                "AzureRM.ResourceGraph",
+                "AzureRM.Resources",
+                "AzureRM.Scheduler",
+                "AzureRM.Search",
+                "AzureRM.Security",
+                "AzureRM.ServerManagement",
+                "AzureRM.ServiceBus",
+                "AzureRM.ServiceFabric",
+                "AzureRM.SignalR",
+                "AzureRM.SiteRecovery",
+                "AzureRM.Sql",
+                "AzureRm.Storage",
+                "AzureRM.StorageSync",
+                "AzureRM.StreamAnalytics",
+                "AzureRM.Subscription",
+                "AzureRM.Subscription.Preview",
+                "AzureRM.Tags",
+                "AzureRM.TrafficManager",
+                "AzureRm.UsageAggregates",
+                "AzureRm.Websites",
+                "AzureRmStorageTable",
+                "bestpractices",
+                "bitlocker",
+                "bitstransfer",
+                "booteventcollector",
+                "branchcache",
+                "CimCmdlets",
+                "clusterawareupdating",
+                "CompatPowerShellGet",
+                "configci",
+                "ConfigurationManager",
+                "CompletionPredictor",
+                "DataProtectionManager",
+                "dcbqos",
+                "deduplication",
+                "defender",
+                "devicehealthattestation",
+                "dfsn",
+                "dfsr",
+                "dhcpserver",
+                "directaccessclient",
+                "directaccessclientcomponent",
+                "directaccessclientcomponents",
+                "dism",
+                "dnsclient",
+                "dnsserver",
+                "ElasticDatabaseJobs",
+                "EventTracingManagement",
+                "failoverclusters",
+                "fileserverresourcemanager",
+                "FIMAutomation",
+                "GPRegistryPolicy",
+                "grouppolicy",
+                "hardwarecertification",
+                "hcs",
+                "hgsattestation",
+                "hgsclient",
+                "hgsdiagnostics",
+                "hgskeyprotection",
+                "hgsserver",
+                "hnvdiagnostics",
+                "hostcomputeservice",
+                "hpc",
+                "HPC.ACM",
+                "HPC.ACM.API.PS",
+                "HPCPack2016",
+                "hyper-v",
+                "IISAdministration",
+                "international",
+                "ipamserver",
+                "iscsi",
+                "iscsitarget",
+                "ISE",
+                "kds",
+                "Microsoft.MBAM",
+                "Microsoft.MEDV",
+                "MgmtSvcAdmin",
+                "MgmtSvcConfig",
+                "MgmtSvcMySql",
+                "MgmtSvcSqlServer",
+                "Microsoft.AzureStack.ReadinessChecker",
+                "Microsoft.Crm.PowerShell",
+                "Microsoft.DiagnosticDataViewer",
+                "Microsoft.DirectoryServices.MetadirectoryServices.Config",
+                "Microsoft.Dynamics.Nav.Apps.Management",
+                "Microsoft.Dynamics.Nav.Apps.Tools",
+                "Microsoft.Dynamics.Nav.Ide",
+                "Microsoft.Dynamics.Nav.Management",
+                "Microsoft.Dynamics.Nav.Model.Tools",
+                "Microsoft.Dynamics.Nav.Model.Tools.Crm",
+                "Microsoft.EnterpriseManagement.Warehouse.Cmdlets",
+                "Microsoft.Medv.Administration.Commands.WorkspacePackager",
+                "Microsoft.PowerApps.Checker.PowerShell",
+                "Microsoft.PowerShell.Archive",
+                "Microsoft.PowerShell.ConsoleGuiTools",
+                "Microsoft.PowerShell.Core",
+                "Microsoft.PowerShell.Crescendo",
+                "Microsoft.PowerShell.Diagnostics",
+                "Microsoft.PowerShell.Host",
+                "Microsoft.PowerShell.LocalAccounts",
+                "Microsoft.PowerShell.Management",
+                "Microsoft.PowerShell.ODataUtils",
+                "Microsoft.PowerShell.Operation.Validation",
+                "Microsoft.PowerShell.PSAdapter",
+                "Microsoft.PowerShell.PSResourceGet",
+                "Microsoft.PowerShell.RemotingTools",
+                "Microsoft.PowerShell.SecretManagement",
+                "Microsoft.PowerShell.SecretStore",
+                "Microsoft.PowerShell.Security",
+                "Microsoft.PowerShell.TextUtility",
+                "Microsoft.PowerShell.Utility",
+                "Microsoft.SharePoint.Powershell",
+                "Microsoft.SystemCenter.ServiceManagementAutomation",
+                "Microsoft.Windows.ServerManager.Migration",
+                "Microsoft.WSMan.Management",
+                "Microsoft.Xrm.OnlineManagementAPI",
+                "Microsoft.Xrm.Tooling.CrmConnector.PowerShell",
+                "Microsoft.Xrm.Tooling.PackageDeployment",
+                "Microsoft.Xrm.Tooling.PackageDeployment.Powershell",
+                "Microsoft.Xrm.Tooling.Testing",
+                "MicrosoftPowerBIMgmt",
+                "MicrosoftPowerBIMgmt.Data",
+                "MicrosoftPowerBIMgmt.Profile",
+                "MicrosoftPowerBIMgmt.Reports",
+                "MicrosoftPowerBIMgmt.Workspaces",
+                "MicrosoftStaffHub",
+                "MicrosoftTeams",
+                "MIMPAM",
+                "mlSqlPs",
+                "MMAgent",
+                "MPIO",
+                "MsDtc",
+                "MSMQ",
+                "MSOnline",
+                "MSOnlineBackup",
+                "WmsCmdlets",
+                "WmsCmdlets3",
+                "NanoServerImageGenerator",
+                "NAVWebClientManagement",
+                "NetAdapter",
+                "NetConnection",
+                "NetEventPacketCapture",
+                "Netlbfo",
+                "Netldpagent",
+                "NetNat",
+                "Netqos",
+                "NetSecurity",
+                "NetSwitchtTeam",
+                "Nettcpip",
+                "Netwnv",
+                "NetworkConnectivity",
+                "NetworkConnectivityStatus",
+                "NetworkController",
+                "NetworkControllerDiagnostics",
+                "NetworkloadBalancingClusters",
+                "NetworkSwitchManager",
+                "NetworkTransition",
+                "NFS",
+                "NPS",
+                "OfficeWebapps",
+                "OperationsManager",
+                "PackageManagement",
+                "PartnerCenter",
+                "pcsvdevice",
+                "pef",
+                "Pester",
+                "pkiclient",
+                "platformidentifier",
+                "pnpdevice",
+                "PowerShellEditorServices",
+                "PowerShellGet",
+                "powershellwebaccess",
+                "printmanagement",
+                "ProcessMitigations",
+                "provisioning",
+                "PSDesiredStateConfiguration",
+                "PSDiagnostics",
+                "PSReadLine",
+                "PSScheduledJob",
+                "PSScriptAnalyzer",
+                "PSWorkflow",
+                "PSWorkflowUtility",
+                "RemoteAccess",
+                "RemoteDesktop",
+                "RemoteDesktopServices",
+                "ScheduledTasks",
+                "Secureboot",
+                "ServerCore",
+                "ServerManager",
+                "ServerManagerTasks",
+                "ServerMigrationcmdlets",
+                "ServiceFabric",
+                "Microsoft.Online.SharePoint.PowerShell",
+                "shieldedvmdatafile",
+                "shieldedvmprovisioning",
+                "shieldedvmtemplate",
+                "SkypeOnlineConnector",
+                "SkypeForBusinessHybridHealth",
+                "smbshare",
+                "smbwitness",
+                "smisconfig",
+                "softwareinventorylogging",
+                "SPFAdmin",
+                "Microsoft.SharePoint.MigrationTool.PowerShell",
+                "sqlps",
+                "SqlServer",
+                "StartLayout",
+                "StartScreen",
+                "Storage",
+                "StorageDsc",
+                "storageqos",
+                "Storagereplica",
+                "Storagespaces",
+                "Syncshare",
+                "System.Center.Service.Manager",
+                "TLS",
+                "TroubleshootingPack",
+                "TrustedPlatformModule",
+                "UEV",
+                "UpdateServices",
+                "UserAccessLogging",
+                "vamt",
+                "VirtualMachineManager",
+                "vpnclient",
+                "WasPSExt",
+                "WDAC",
+                "WDS",
+                "WebAdministration",
+                "WebAdministrationDsc",
+                "WebApplicationProxy",
+                "WebSites",
+                "Whea",
+                "WhiteboardAdmin",
+                "WindowsDefender",
+                "WindowsDefenderDsc",
+                "WindowsDeveloperLicense",
+                "WindowsDiagnosticData",
+                "WindowsErrorReporting",
+                "WindowServerRackup",
+                "WindowsSearch",
+                "WindowsServerBackup",
+                "WindowsUpdate",
+                "WinGetCommandNotFound",
+                "wsscmdlets",
+                "wsssetup",
+                "wsus",
+                "xActiveDirectory",
+                "xBitLocker",
+                "xDefender",
+                "xDhcpServer",
+                "xDismFeature",
+                "xDnsServer",
+                "xHyper-V",
+                "xHyper-VBackup",
+                "xPSDesiredStateConfiguration",
+                "xSmbShare",
+                "xSqlPs",
+                "xStorage",
+                "xWebAdministration",
+                "xWindowsUpdate",
+            };
+
+            // use a hashset when looking for module names, it should be quicker than a string comparison
+            s_knownModuleTags = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
-                return true;
-            }
+                "CrescendoBuilt",
+            };
 
-            if (boolStr.Length == 5 &&
-                (boolStr[0] == 'f' || boolStr[0] == 'F') &&
-                (boolStr[1] == 'a' || boolStr[1] == 'A') &&
-                (boolStr[2] == 'l' || boolStr[2] == 'L') &&
-                (boolStr[3] == 's' || boolStr[3] == 'S') &&
-                (boolStr[4] == 'e' || boolStr[4] == 'E'))
+            s_uniqueUserIdentifier = GetUniqueIdentifier().ToString();
+            s_knownSubsystemNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
-                return false;
-            }
-
-            return defaultValue;
+                "Completion",
+                "General Feedback",
+                "Windows Package Manager - WinGet",
+                "Az Predictor"
+            };
         }
 
         /// <summary>
@@ -713,7 +682,7 @@ internal static void SendModuleTelemetryMetric(TelemetryType telemetryType, PSMo
 
                 s_telemetryClient.
                     GetMetric(new MetricIdentifier(string.Empty, telemetryType.ToString(), "uuid", "SessionId", "ModuleName", "Version", "Tag")).
-                    TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, allowedModuleName, allowedModuleVersion, allowedModuleTagString); 
+                    TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, allowedModuleName, allowedModuleVersion, allowedModuleTagString);
             }
             catch
             {
@@ -752,7 +721,8 @@ internal static void SendModuleTelemetryMetric(TelemetryType telemetryType, stri
         /// </summary>
         /// <param name="metricId">The type of telemetry that we'll be sending.</param>
         /// <param name="data">The specific details about the telemetry.</param>
-        internal static void SendTelemetryMetric(TelemetryType metricId, string data)
+        /// <param name="value">The count of instances for the telemetry payload.</param>
+        internal static void SendTelemetryMetric(TelemetryType metricId, string data, double value = 1.0)
         {
             if (!CanSendTelemetry)
             {
@@ -774,12 +744,13 @@ internal static void SendTelemetryMetric(TelemetryType metricId, string data)
                     case TelemetryType.ExperimentalEngineFeatureActivation:
                     case TelemetryType.ExperimentalEngineFeatureDeactivation:
                     case TelemetryType.ExperimentalFeatureUse:
-                        s_telemetryClient.GetMetric(metricName, "uuid", "SessionId", "Detail").TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, data);
+                    case TelemetryType.FeatureUse:
+                        s_telemetryClient.GetMetric(metricName, "uuid", "SessionId", "Detail").TrackValue(metricValue: value, s_uniqueUserIdentifier, s_sessionId, data);
                         break;
                     case TelemetryType.ExperimentalModuleFeatureActivation:
                     case TelemetryType.ExperimentalModuleFeatureDeactivation:
                         string experimentalFeatureName = GetExperimentalFeatureName(data);
-                        s_telemetryClient.GetMetric(metricName, "uuid", "SessionId", "Detail").TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, experimentalFeatureName);
+                        s_telemetryClient.GetMetric(metricName, "uuid", "SessionId", "Detail").TrackValue(metricValue: value, s_uniqueUserIdentifier, s_sessionId, experimentalFeatureName);
                         break;
                 }
             }
@@ -790,6 +761,35 @@ internal static void SendTelemetryMetric(TelemetryType metricId, string data)
             }
         }
 
+        /// <summary>
+        /// Send additional information about an feature as it is used.
+        /// </summary>
+        /// <param name="featureName">The name of the feature.</param>
+        /// <param name="detail">The details about the feature use.</param>
+        /// <param name="value">The value to report when sending the payload.</param>
+        internal static void SendUseTelemetry(string featureName, string detail, double value = 1.0)
+        {
+            if (!CanSendTelemetry)
+            {
+                return;
+            }
+
+            // keep payload small
+            if (featureName is null || detail is null || featureName.Length > 33 || detail.Length > 33)
+            {
+                return;
+            }
+
+            if (string.Compare(featureName, s_subsystemRegistration, true) == 0)
+            {
+                SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, GetSubsystemName(detail)), value);
+            }
+            else
+            {
+                SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, detail), value);
+            }
+        }
+
         /// <summary>
         /// Send additional information about an experimental feature as it is used.
         /// </summary>
@@ -802,7 +802,7 @@ internal static void SendExperimentalUseData(string featureName, string detail)
                 return;
             }
 
-            ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ExperimentalFeatureUse, string.Join(":", featureName, detail));
+            SendTelemetryMetric(TelemetryType.ExperimentalFeatureUse, string.Join(":", featureName, detail));
         }
 
         // Get the experimental feature name. If we can report it, we'll return the name of the feature, otherwise, we'll return "anonymous"
@@ -820,7 +820,18 @@ private static string GetExperimentalFeatureName(string featureNameToValidate)
             return Anonymous;
         }
 
-        // Get the module name. If we can report it, we'll return the name, otherwise, we'll return "anonymous"
+        // Get the module name. If we can report it, we'll return the name, otherwise, we'll return the string "anonymous"
+        private static string GetSubsystemName(string subsystemNameToValidate)
+        {
+            if (s_knownSubsystemNames.Contains(subsystemNameToValidate))
+            {
+                return subsystemNameToValidate;
+            }
+
+            return Anonymous;
+        }
+
+        // Get the module name. If we can report it, we'll return the name, otherwise, we'll return anonymous.
         private static string GetModuleName(string moduleNameToValidate)
         {
             if (s_knownModules.Contains(moduleNameToValidate))
@@ -987,8 +998,7 @@ private static Guid GetUniqueIdentifier()
             // Try to get the unique id. If this returns false, we'll
             // create/recreate the telemetry.uuid file to persist for next startup.
             Guid id = Guid.Empty;
-            string uuidPath = Path.Join(Platform.CacheDirectory, "telemetry.uuid");
-            if (TryGetIdentifier(uuidPath, out id))
+            if (TryGetIdentifier(s_uuidPath, out id))
             {
                 return id;
             }
@@ -1003,7 +1013,7 @@ private static Guid GetUniqueIdentifier()
                 m.WaitOne();
                 try
                 {
-                    return CreateUniqueIdentifierAndFile(uuidPath);
+                    return CreateUniqueIdentifierAndFile(s_uuidPath);
                 }
                 finally
                 {
diff --git a/src/System.Management.Automation/utils/Verbs.cs b/src/System.Management.Automation/utils/Verbs.cs
index e234609359a..72299ab3d84 100644
--- a/src/System.Management.Automation/utils/Verbs.cs
+++ b/src/System.Management.Automation/utils/Verbs.cs
@@ -1,10 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
+using System.Management.Automation.Language;
 using System.Reflection;
-
+using Microsoft.PowerShell.Commands;
 using Dbg = System.Management.Automation.Diagnostics;
 
 namespace System.Management.Automation
@@ -1157,10 +1160,7 @@ internal static class Verbs
     {
         static Verbs()
         {
-            Type[] verbTypes = new Type[] { typeof(VerbsCommon), typeof(VerbsCommunications), typeof(VerbsData),
-                typeof(VerbsDiagnostic), typeof(VerbsLifecycle), typeof(VerbsOther), typeof(VerbsSecurity) };
-
-            foreach (Type type in verbTypes)
+            foreach (Type type in VerbTypes)
             {
                 foreach (FieldInfo field in type.GetFields())
                 {
@@ -1311,6 +1311,277 @@ static Verbs()
 #endif
         }
 
+        /// <summary>
+        /// Gets all verb types.
+        /// </summary>
+        /// <value>List of all verb types.</value>
+        private static Type[] VerbTypes => new Type[] {
+            typeof(VerbsCommon),
+            typeof(VerbsCommunications),
+            typeof(VerbsData),
+            typeof(VerbsDiagnostic),
+            typeof(VerbsLifecycle),
+            typeof(VerbsOther),
+            typeof(VerbsSecurity)
+        };
+
+        /// <summary>
+        /// Gets verb group display name from type.
+        /// </summary>
+        /// <param name="verbType">The verb type.</param>
+        /// <returns>Verb group display name.</returns>
+        private static string GetVerbGroupDisplayName(Type verbType) => verbType.Name.Substring(5);
+
+        /// <summary>
+        /// Filters by verbs and groups.
+        /// </summary>
+        /// <param name="verbs">The array of verbs.</param>
+        /// <param name="groups">The array of groups.</param>
+        /// <returns>List of Verbs.</returns>
+        internal static IEnumerable<VerbInfo> FilterByVerbsAndGroups(string[] verbs, string[] groups)
+        {
+            if (groups is null || groups.Length == 0)
+            {
+                foreach (Type verbType in VerbTypes)
+                {
+                    foreach (VerbInfo verb in FilterVerbsByType(verbs, verbType))
+                    {
+                        yield return verb;
+                    }
+                }
+
+                yield break;
+            }
+
+            foreach (Type verbType in VerbTypes)
+            {
+                if (GroupsContainVerbType(groups, verbType))
+                {
+                    foreach (VerbInfo verb in FilterVerbsByType(verbs, verbType))
+                    {
+                        yield return verb;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Checks if verb type exists in list of groups.
+        /// </summary>
+        /// <param name="groups">The list of groups</param>
+        /// <param name="verbType">The verb type to check.</param>
+        /// <returns>True if verb type was found, False if not found.</returns>
+        private static bool GroupsContainVerbType(string[] groups, Type verbType)
+            => SessionStateUtilities.CollectionContainsValue(
+                groups,
+                GetVerbGroupDisplayName(verbType),
+                StringComparer.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Enumerates field names from a Verb Type.
+        /// </summary>
+        /// <param name="verbType">The verb type.</param>
+        /// <returns>List of field names.</returns>
+        private static IEnumerable<string> EnumerateFieldNamesFromVerbType(Type verbType)
+        {
+            foreach (FieldInfo field in verbType.GetFields())
+            {
+                if (field.IsLiteral)
+                {
+                    yield return field.Name;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Enumerates field names from all Verb Types.
+        /// </summary>
+        /// <returns>List of field names.</returns>
+        private static IEnumerable<string> EnumerateFieldNamesFromAllVerbTypes()
+        {
+            foreach (Type verbType in VerbTypes)
+            {
+                foreach (string fieldName in EnumerateFieldNamesFromVerbType(verbType))
+                {
+                    yield return fieldName;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Enumerates command verb names.
+        /// </summary>
+        /// <param name="commands">The collection of commands.</param>
+        /// <returns>List of command verb names.</returns>
+        private static IEnumerable<string> EnumerateCommandVerbNames(Collection<CmdletInfo> commands)
+        {
+            foreach (CmdletInfo command in commands)
+            {
+                yield return command.Verb;
+            }
+        }
+
+        /// <summary>
+        /// Filters verbs by type.
+        /// </summary>
+        /// <param name="verbs">The array of verbs.</param>
+        /// <param name="verbType">The verb type.</param>
+        /// <returns>List of Verbs.</returns>
+        private static IEnumerable<VerbInfo> FilterVerbsByType(string[] verbs, Type verbType)
+        {
+            if (verbs is null || verbs.Length == 0)
+            {
+                foreach (string fieldName in EnumerateFieldNamesFromVerbType(verbType))
+                {
+                    yield return CreateVerbFromField(fieldName, verbType);
+                }
+
+                yield break;
+            }
+
+            Collection<WildcardPattern> verbPatterns = SessionStateUtilities.CreateWildcardsFromStrings(
+                verbs,
+                WildcardOptions.IgnoreCase);
+
+            foreach (string fieldName in EnumerateFieldNamesFromVerbType(verbType))
+            {
+                if (SessionStateUtilities.MatchesAnyWildcardPattern(
+                        fieldName,
+                        verbPatterns,
+                        defaultValue: false))
+                {
+                    yield return CreateVerbFromField(fieldName, verbType);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates Verb info object from field info.
+        /// </summary>
+        /// <param name="fieldName">The field name.</param>
+        /// <param name="verbType">The verb type.</param>
+        /// <returns>VerbInfo object.</returns>
+        private static VerbInfo CreateVerbFromField(string fieldName, Type verbType) => new()
+        {
+            Verb = fieldName,
+            AliasPrefix = VerbAliasPrefixes.GetVerbAliasPrefix(fieldName),
+            Group = GetVerbGroupDisplayName(verbType),
+            Description = VerbDescriptions.GetVerbDescription(fieldName)
+        };
+
+        /// <summary>
+        /// Provides argument completion for Verb parameter.
+        /// </summary>
+        public class VerbArgumentCompleter : IArgumentCompleter
+        {
+            /// <summary>
+            /// Returns completion results for verb parameter.
+            /// </summary>
+            /// <param name="commandName">The command name.</param>
+            /// <param name="parameterName">The parameter name.</param>
+            /// <param name="wordToComplete">The word to complete.</param>
+            /// <param name="commandAst">The command AST.</param>
+            /// <param name="fakeBoundParameters">The fake bound parameters.</param>
+            /// <returns>List of Completion Results.</returns>
+            public IEnumerable<CompletionResult> CompleteArgument(
+                string commandName,
+                string parameterName,
+                string wordToComplete,
+                CommandAst commandAst,
+                IDictionary fakeBoundParameters)
+            {
+                // Completion: Get-Verb -Group <group> -Verb <wordToComplete>
+                if (commandName.Equals("Get-Verb", StringComparison.OrdinalIgnoreCase)
+                    && fakeBoundParameters.Contains("Group"))
+                {
+                    string[] groups = null;
+
+                    object groupParameterValue = fakeBoundParameters["Group"];
+                    Type groupParameterValueType = groupParameterValue.GetType();
+
+                    if (groupParameterValueType == typeof(string))
+                    {
+                        groups = new string[] { groupParameterValue.ToString() };
+                    }
+
+                    else if (groupParameterValueType.IsArray
+                             && groupParameterValueType.GetElementType() == typeof(object))
+                    {
+                        groups = Array.ConvertAll((object[])groupParameterValue, group => group.ToString());
+                    }
+
+                    return CompleteVerbWithGroups(wordToComplete, groups);
+                }
+
+                // Completion: Get-Command -Noun <noun> -Verb <wordToComplete>
+                else if (commandName.Equals("Get-Command", StringComparison.OrdinalIgnoreCase)
+                         && fakeBoundParameters.Contains("Noun"))
+                {
+                    using var ps = PowerShell.Create(RunspaceMode.CurrentRunspace);
+
+                    var commandInfo = new CmdletInfo("Get-Command", typeof(GetCommandCommand));
+
+                    ps.AddCommand(commandInfo);
+                    ps.AddParameter("Noun", fakeBoundParameters["Noun"]);
+
+                    if (fakeBoundParameters.Contains("Module"))
+                    {
+                        ps.AddParameter("Module", fakeBoundParameters["Module"]);
+                    }
+
+                    Collection<CmdletInfo> commands = ps.Invoke<CmdletInfo>();
+
+                    return CompleteVerbWithCommands(wordToComplete, commands);
+                }
+
+                // Complete all verbs by default if above cases not completed
+                return CompleteVerbForAllTypes(wordToComplete);
+            }
+
+            /// <summary>
+            /// Completes verb with list of groups.
+            /// </summary>
+            /// <param name="wordToComplete">The word to complete.</param>
+            /// <param name="groups">The list of groups.</param>
+            /// <returns>List of completions for verb.</returns>
+            private static IEnumerable<CompletionResult> CompleteVerbWithGroups(string wordToComplete, string[] groups)
+            {
+                foreach (Type verbType in VerbTypes)
+                {
+                    if (GroupsContainVerbType(groups, verbType))
+                    {
+                        foreach (CompletionResult result in CompletionHelpers.GetMatchingResults(
+                            wordToComplete,
+                            possibleCompletionValues: EnumerateFieldNamesFromVerbType(verbType)))
+                        {
+                            yield return result;
+                        }
+                    }
+                }
+            }
+
+            /// <summary>
+            /// Completes verb with list of commands.
+            /// </summary>
+            /// <param name="wordToComplete">The word to complete.</param>
+            /// <param name="commands">The list of commands.</param>
+            /// <returns>List of completions for verb.</returns>
+            private static IEnumerable<CompletionResult> CompleteVerbWithCommands(string wordToComplete, Collection<CmdletInfo> commands)
+                => CompletionHelpers.GetMatchingResults(
+                    wordToComplete,
+                    possibleCompletionValues: EnumerateCommandVerbNames(commands));
+
+            /// <summary>
+            /// Completes verb for all types.
+            /// </summary>
+            /// <param name="wordToComplete">The word to complete.</param>
+            /// <returns>List of completions for verb.</returns>
+            private static IEnumerable<CompletionResult> CompleteVerbForAllTypes(string wordToComplete)
+                => CompletionHelpers.GetMatchingResults(
+                    wordToComplete,
+                    possibleCompletionValues: EnumerateFieldNamesFromAllVerbTypes());
+        }
+
         private static readonly Dictionary<string, bool> s_validVerbs = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
         private static readonly Dictionary<string, string[]> s_recommendedAlternateVerbs = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase);
 
diff --git a/src/System.Management.Automation/utils/WindowsDataCollectionSetting.cs b/src/System.Management.Automation/utils/WindowsDataCollectionSetting.cs
new file mode 100644
index 00000000000..5f8b607550a
--- /dev/null
+++ b/src/System.Management.Automation/utils/WindowsDataCollectionSetting.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#if !UNIX
+
+using System;
+using System.Management.Automation.Internal;
+using System.Management.Automation.Tracing;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
+
+namespace Microsoft.PowerShell.Telemetry;
+
+internal enum PlatformDataCollectionLevel : int
+{
+    /// <summary>
+    /// Minimum — only security-related data. Enterprise/education editions only.
+    /// </summary>
+    Security = 0,
+
+    /// <summary>
+    /// Device info, capabilities, and basic reliability data.
+    /// </summary>
+    Basic = 1,
+
+    /// <summary>
+    /// More detailed usage and reliability data, including app/feature usage patterns.
+    /// Removed as a user-facing option in Windows 11 (collapsed into Full).
+    /// </summary>
+    Enhanced = 2,
+
+    /// <summary>
+    /// All of the above plus advanced diagnostics data that can help Microsoft fix problems.
+    /// </summary>
+    Full = 3,
+}
+
+/// <summary>
+/// Minimal projection of <c>IInspectable</c>, the base interface for all WinRT objects.
+/// Slots 3–5 in every WinRT interface vtable (after <c>IUnknown</c>'s QueryInterface/AddRef/Release).
+/// </summary>
+[GeneratedComInterface]
+[Guid("AF86E2E0-B12D-4C6A-9C5A-D7AA65101E90")]
+internal partial interface IInspectable
+{
+    void GetIids(out uint iidCount, out nint iids);
+
+    nint GetRuntimeClassName();
+
+    int GetTrustLevel();
+}
+
+/// <summary>
+/// Projection of the WinRT interface <c>Windows.System.Profile.IPlatformDiagnosticsAndUsageDataSettingsStatics</c>
+/// (IID B6E24C1B-7B1C-4B32-8C62-A66597CE723A).
+/// Vtable slots 6–9, following the three <c>IInspectable</c> slots.
+/// </summary>
+[GeneratedComInterface]
+[Guid("B6E24C1B-7B1C-4B32-8C62-A66597CE723A")]
+internal partial interface IPlatformDiagnosticsAndUsageDataSettingsStatics : IInspectable
+{
+    PlatformDataCollectionLevel GetCollectionLevel();
+
+    long AddCollectionLevelChanged(nint handler);
+
+    void RemoveCollectionLevelChanged(long token);
+
+    // WinRT marshals bool as a byte; use byte to avoid any MarshalAs ambiguity with the source generator.
+    byte CanCollectDiagnostics(PlatformDataCollectionLevel level);
+}
+
+/// <summary>
+/// Wraps <c>Windows.System.Profile.PlatformDiagnosticsAndUsageDataSettings</c> using compile-time COM interop
+/// and source-generated P/Invoke. No extra runtime DLLs are required.
+/// </summary>
+internal static partial class WindowsDataCollectionSetting
+{
+    /// <summary>
+    /// Returns <see langword="true"/> if the device's diagnostic data collection policy permits collecting at or above <paramref name="level"/>.
+    /// </summary>
+    /// <param name="level">The minimum <see cref="PlatformDataCollectionLevel"/> to test against.</param>
+    internal static bool CanCollectDiagnostics(PlatformDataCollectionLevel level)
+    {
+        const string ClassName = "Windows.System.Profile.PlatformDiagnosticsAndUsageDataSettings";
+
+        // When initializing WinRT on the calling thread, use the multi-threaded apartment (MTA).
+        // This is to cover the case where PowerShell gets used in a thread-pool thread.
+        // See the doc at https://learn.microsoft.com/windows/win32/api/roapi/ne-roapi-ro_init_type
+        const int RO_INIT_MULTITHREADED = 1;
+
+        // Return values for 'RoInitialize':
+        //  - S_OK (0)            - we successfully initialized; must call 'RoUninitialize'.
+        //  - S_FALSE (1)         - already initialized with the same apartment type; must still call 'RoUninitialize'.
+        //  - RPC_E_CHANGED_MODE  - already initialized with a different apartment type; WinRT still works, do NOT call 'RoUninitialize'.
+        const int RPC_E_CHANGED_MODE = unchecked((int)0x80010106);
+
+        int initHr = -1;
+        nint hstring = default;
+        nint factoryPtr = default;
+
+        try
+        {
+            // Initialize WinRT on the calling thread. 'RoGetActivationFactory' requires it.
+            initHr = RoInitialize(RO_INIT_MULTITHREADED);
+            if (initHr < 0 && initHr != RPC_E_CHANGED_MODE)
+            {
+                // The call to initialize the Windows Runtime failed.
+                // Throw an exception with the HRESULT error code to provide more context on the failure.
+                Marshal.ThrowExceptionForHR(initHr);
+            }
+
+            Marshal.ThrowExceptionForHR(
+                WindowsCreateString(ClassName, (uint)ClassName.Length, out hstring));
+
+            Guid iid = new("B6E24C1B-7B1C-4B32-8C62-A66597CE723A");
+            Marshal.ThrowExceptionForHR(
+                RoGetActivationFactory(hstring, ref iid, out factoryPtr));
+
+            var comWrappers = new StrategyBasedComWrappers();
+            var comObject = comWrappers.GetOrCreateObjectForComInstance(factoryPtr, CreateObjectFlags.None);
+            var platformSetting = (IPlatformDiagnosticsAndUsageDataSettingsStatics)comObject;
+
+            return platformSetting.CanCollectDiagnostics(level) != 0;
+        }
+        catch (Exception ex)
+        {
+            // Log any exceptions that occur during this process, but swallow them and return false to disable telemetry rather than crashing the product.
+            // This API is only used to gate telemetry collection, so failure should be non-fatal.
+            PSEtwLog.LogOperationalError(
+                PSEventId.Telemetry_Setting_Error,
+                PSOpcode.Exception,
+                PSTask.Telemetry,
+                PSKeyword.UseAlwaysOperational,
+                ex.GetType().FullName,
+                ex.Message,
+                ex.StackTrace);
+
+            return false;
+        }
+        finally
+        {
+            if (factoryPtr != default)
+            {
+                Marshal.Release(factoryPtr);
+            }
+
+            if (hstring != default)
+            {
+                _ = WindowsDeleteString(hstring);
+            }
+
+            // Per COM documentation: Each successful call to 'RoInitialize' (including S_FALSE)
+            // must be balanced by a corresponding call to 'RoUninitialize'.
+            if (initHr >= 0)
+            {
+                RoUninitialize();
+            }
+        }
+    }
+
+    [LibraryImport("api-ms-win-core-winrt-string-l1-1-0.dll", StringMarshalling = StringMarshalling.Utf16)]
+    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+    private static partial int WindowsCreateString(
+        string sourceString,
+        uint length,
+        out nint hstring);
+
+    [LibraryImport("api-ms-win-core-winrt-string-l1-1-0.dll")]
+    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+    private static partial int WindowsDeleteString(nint hstring);
+
+    [LibraryImport("api-ms-win-core-winrt-l1-1-0.dll")]
+    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+    private static partial int RoGetActivationFactory(nint activatableClassId, ref Guid iid, out nint factory);
+
+    [LibraryImport("api-ms-win-core-winrt-l1-1-0.dll")]
+    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+    private static partial int RoInitialize(int initType);
+
+    [LibraryImport("api-ms-win-core-winrt-l1-1-0.dll")]
+    [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
+    private static partial void RoUninitialize();
+}
+
+#endif
diff --git a/src/System.Management.Automation/utils/assert.cs b/src/System.Management.Automation/utils/assert.cs
index 14692e9fd38..e29f44ecab3 100644
--- a/src/System.Management.Automation/utils/assert.cs
+++ b/src/System.Management.Automation/utils/assert.cs
@@ -120,13 +120,7 @@ private Diagnostics() { }
         // not expecting these methods to exist.
         [System.Diagnostics.Conditional("DEBUG")]
         [System.Diagnostics.Conditional("ASSERTIONS_TRACE")]
-#if RESHARPER_ATTRIBUTES
-        [JetBrains.Annotations.AssertionMethod]
-#endif
         internal static void Assert(
-#if RESHARPER_ATTRIBUTES
-            [JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_TRUE)]
-#endif
             [DoesNotReturnIf(false)]
             bool condition,
             string whyThisShouldNeverHappen)
@@ -153,17 +147,11 @@ internal static void Assert(
         // not expecting these methods to exist.
         [System.Diagnostics.Conditional("DEBUG")]
         [System.Diagnostics.Conditional("ASSERTIONS_TRACE")]
-#if RESHARPER_ATTRIBUTES
-        [JetBrains.Annotations.AssertionMethod]
-#endif
-        internal static void
-        Assert(
-#if RESHARPER_ATTRIBUTES
-            [JetBrains.Annotations.AssertionCondition(JetBrains.Annotations.AssertionConditionType.IS_TRUE)]
-#endif
+        internal static void Assert(
             [DoesNotReturnIf(false)]
             bool condition,
-            string whyThisShouldNeverHappen, string detailMessage)
+            string whyThisShouldNeverHappen,
+            string detailMessage)
         {
             // Early out avoids some slower code below (mostly the locking done in ThrowInsteadOfAssert).
             if (condition)
diff --git a/src/System.Management.Automation/utils/perfCounters/CounterSetInstanceBase.cs b/src/System.Management.Automation/utils/perfCounters/CounterSetInstanceBase.cs
index fc3f048b828..995b41fcda1 100644
--- a/src/System.Management.Automation/utils/perfCounters/CounterSetInstanceBase.cs
+++ b/src/System.Management.Automation/utils/perfCounters/CounterSetInstanceBase.cs
@@ -74,7 +74,6 @@ protected CounterSetInstanceBase(CounterSetRegistrarBase counterSetRegistrarInst
         /// But, if isNumerator is false, then a check is made on the input
         /// counter's type to ensure that denominator is indeed value for such a counter.
         /// </summary>
-        [SuppressMessage("Microsoft.Usage", "CA2233:OperationsShouldNotOverflow", Justification = "countId is validated as known denominator before it is incremented.")]
         protected bool RetrieveTargetCounterIdIfValid(int counterId, bool isNumerator, out int targetCounterId)
         {
             targetCounterId = counterId;
diff --git a/src/System.Management.Automation/utils/perfCounters/CounterSetRegistrarBase.cs b/src/System.Management.Automation/utils/perfCounters/CounterSetRegistrarBase.cs
index f9a08b76a87..1ea57a16912 100644
--- a/src/System.Management.Automation/utils/perfCounters/CounterSetRegistrarBase.cs
+++ b/src/System.Management.Automation/utils/perfCounters/CounterSetRegistrarBase.cs
@@ -95,7 +95,6 @@ public abstract class CounterSetRegistrarBase
         /// based on Provider Id, counterSetId, counterSetInstanceType, a collection
         /// with counters information and an optional counterSetName.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         protected CounterSetRegistrarBase(
             Guid providerId,
             Guid counterSetId,
@@ -220,7 +219,6 @@ public class PSCounterSetRegistrar : CounterSetRegistrarBase
         /// <summary>
         /// Constructor that creates an instance of PSCounterSetRegistrar.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public PSCounterSetRegistrar(
             Guid providerId,
             Guid counterSetId,
diff --git a/src/System.Management.Automation/utils/perfCounters/PSPerfCountersMgr.cs b/src/System.Management.Automation/utils/perfCounters/PSPerfCountersMgr.cs
index 761de0c6360..7a49a5c6f9f 100644
--- a/src/System.Management.Automation/utils/perfCounters/PSPerfCountersMgr.cs
+++ b/src/System.Management.Automation/utils/perfCounters/PSPerfCountersMgr.cs
@@ -162,7 +162,6 @@ public bool AddCounterSetInstance(CounterSetRegistrarBase counterSetRegistrarIns
         /// by 'stepAmount'.
         /// Otherwise, updates the denominator component by 'stepAmount'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool UpdateCounterByValue(
             Guid counterSetId,
             int counterId,
@@ -193,7 +192,6 @@ public bool UpdateCounterByValue(
         /// by 'stepAmount'.
         /// Otherwise, updates the denominator component by 'stepAmount'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool UpdateCounterByValue(
             Guid counterSetId,
             string counterName,
@@ -224,7 +222,6 @@ public bool UpdateCounterByValue(
         /// by 'stepAmount'.
         /// Otherwise, updates the denominator component by 'stepAmount'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool UpdateCounterByValue(
             string counterSetName,
             int counterId,
@@ -264,7 +261,6 @@ public bool UpdateCounterByValue(
         /// by 'stepAmount'.
         /// Otherwise, updates the denominator component by 'stepAmount'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool UpdateCounterByValue(
             string counterSetName,
             string counterName,
@@ -303,7 +299,6 @@ public bool UpdateCounterByValue(
         /// to 'counterValue'.
         /// Otherwise, updates the denominator component to 'counterValue'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool SetCounterValue(
             Guid counterSetId,
             int counterId,
@@ -334,7 +329,6 @@ public bool SetCounterValue(
         /// to 'counterValue'.
         /// Otherwise, updates the denominator component to 'counterValue'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool SetCounterValue(
             Guid counterSetId,
             string counterName,
@@ -365,7 +359,6 @@ public bool SetCounterValue(
         /// to 'counterValue'.
         /// Otherwise, updates the denominator component to 'counterValue'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool SetCounterValue(
             string counterSetName,
             int counterId,
@@ -404,7 +397,6 @@ public bool SetCounterValue(
         /// to 'counterValue'.
         /// Otherwise, updates the denominator component to 'counterValue'.
         /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         public bool SetCounterValue(
             string counterSetName,
             string counterName,
diff --git a/src/System.Management.Automation/utils/tracing/EtwActivity.cs b/src/System.Management.Automation/utils/tracing/EtwActivity.cs
index 433d90297ee..e00fd33efe2 100644
--- a/src/System.Management.Automation/utils/tracing/EtwActivity.cs
+++ b/src/System.Management.Automation/utils/tracing/EtwActivity.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.Eventing;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Diagnostics.CodeAnalysis;
 
 namespace System.Management.Automation.Tracing
diff --git a/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs b/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs
index d9d082879a6..8bd2ae3e620 100644
--- a/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs
+++ b/src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs
@@ -21,7 +21,7 @@ internal class EtwActivityReverterMethodInvoker :
 
         public EtwActivityReverterMethodInvoker(IEtwEventCorrelator eventCorrelator)
         {
-            ArgumentNullException.ThrowIfNull(eventCorrelator); 
+            ArgumentNullException.ThrowIfNull(eventCorrelator);
 
             _eventCorrelator = eventCorrelator;
             _invoker = DoInvoke;
diff --git a/src/System.Management.Automation/utils/tracing/PSEtwLog.cs b/src/System.Management.Automation/utils/tracing/PSEtwLog.cs
index 6ec720566d5..45f8f39eea9 100644
--- a/src/System.Management.Automation/utils/tracing/PSEtwLog.cs
+++ b/src/System.Management.Automation/utils/tracing/PSEtwLog.cs
@@ -141,7 +141,7 @@ internal static void LogWDACQueryEvent(
             int querySuccess,
             int queryResult)
         {
-            provider.LogWDACQueryEvent(queryName, fileName, querySuccess, queryResult);
+            provider.LogWDACQueryEvent(queryName, fileName ?? string.Empty, querySuccess, queryResult);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs
index f90bd92c6ed..625ba88a23b 100755
--- a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs
+++ b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs
@@ -132,7 +132,7 @@ internal override void LogCommandLifecycleEvent(Func<LogContext> getLogContext,
                         }
                         else
                         {
-                            // When state is Start log the CommandLine which has arguments for completeness. 
+                            // When state is Start log the CommandLine which has arguments for completeness.
                             payload.AppendLine(StringUtil.Format(EtwLoggingStrings.CommandStateChange, logContext.CommandLine, newState.ToString()));
                         }
                     }
diff --git a/src/System.Management.Automation/utils/tracing/Tracing.cs b/src/System.Management.Automation/utils/tracing/Tracing.cs
index babbc5d9d63..1d4684de58a 100644
--- a/src/System.Management.Automation/utils/tracing/Tracing.cs
+++ b/src/System.Management.Automation/utils/tracing/Tracing.cs
@@ -10,7 +10,7 @@ namespace System.Management.Automation.Tracing
     /// <summary>
     /// Tracer.
     /// </summary>
-    public sealed partial class Tracer : System.Management.Automation.Tracing.EtwActivity
+    public sealed partial class Tracer : EtwActivity
     {
         /// <summary>
         /// DebugMessage.
diff --git a/src/System.Management.Automation/utils/tracing/TracingGen.cs b/src/System.Management.Automation/utils/tracing/TracingGen.cs
index 05f088b7f93..b7413d5a763 100644
--- a/src/System.Management.Automation/utils/tracing/TracingGen.cs
+++ b/src/System.Management.Automation/utils/tracing/TracingGen.cs
@@ -10,7 +10,7 @@ namespace System.Management.Automation.Tracing
     /// <summary>
     /// Tracer.
     /// </summary>
-    public sealed partial class Tracer : System.Management.Automation.Tracing.EtwActivity
+    public sealed partial class Tracer : EtwActivity
     {
         /// <summary>
         /// Critical level.
@@ -37,7 +37,6 @@ public sealed partial class Tracer : System.Management.Automation.Tracing.EtwAct
         /// </summary>
         public const long KeywordAll = 0xFFFFFFFF;
 
-        private static readonly Guid providerId = Guid.Parse("a0c1853b-5c40-4b15-8766-3cf1c58f985a");
         private static readonly EventDescriptor WriteTransferEventEvent;
         private static readonly EventDescriptor DebugMessageEvent;
         private static readonly EventDescriptor M3PAbortingWorkflowExecutionEvent;
@@ -218,17 +217,6 @@ static Tracer()
         /// </summary>
         public Tracer() : base() { }
 
-        /// <summary>
-        /// Provider Guid.
-        /// </summary>
-        protected override Guid ProviderId
-        {
-            get
-            {
-                return providerId;
-            }
-        }
-
         /// <summary>
         /// Transfer Event.
         /// </summary>
diff --git a/src/TypeCatalogGen/TypeCatalogGen.cs b/src/TypeCatalogGen/TypeCatalogGen.cs
index 05a47814568..b0e604ec12d 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.cs
+++ b/src/TypeCatalogGen/TypeCatalogGen.cs
@@ -235,9 +235,6 @@ private static string GetAssemblyStrongName(MetadataReader metadataReader)
                 case AssemblyHashAlgorithm.Sha1:
                     hashImpl = SHA1.Create();
                     break;
-                case AssemblyHashAlgorithm.MD5:
-                    hashImpl = MD5.Create();
-                    break;
                 case AssemblyHashAlgorithm.Sha256:
                     hashImpl = SHA256.Create();
                     break;
@@ -473,4 +470,3 @@ internal TypeMetadata(string assemblyName, bool isTypeObsolete)
         }
     }
 }
-
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index f475ae83345..83b21e178f5 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>net8.0</TargetFramework>
+    <TargetFramework>net11.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>TypeCatalogGen</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/src/powershell-unix/powershell-unix.csproj b/src/powershell-unix/powershell-unix.csproj
index 802acf05e3a..20c61247d24 100644
--- a/src/powershell-unix/powershell-unix.csproj
+++ b/src/powershell-unix/powershell-unix.csproj
@@ -37,6 +37,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
+    <Content Include="..\..\dsc\pwsh.profile.dsc.resource.json;..\..\dsc\pwsh.profile.resource.ps1">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/powershell-unix/runtimeconfig.template.json b/src/powershell-unix/runtimeconfig.template.json
index a3075303ad5..4a5e3e367ec 100644
--- a/src/powershell-unix/runtimeconfig.template.json
+++ b/src/powershell-unix/runtimeconfig.template.json
@@ -1,3 +1,4 @@
+// This is required to roll forward to supported minor.patch versions of the runtime.
 {
-  "rollForwardOnNoCandidateFx": 2
+  "rollForwardOnNoCandidateFx": 1
 }
diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
index 73c55497c5b..dddbb915eca 100644
--- a/src/powershell-win-core/powershell-win-core.csproj
+++ b/src/powershell-win-core/powershell-win-core.csproj
@@ -13,7 +13,6 @@
     <ApplicationManifest>..\..\assets\pwsh.manifest</ApplicationManifest>
     <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
     <TargetPlatformVersion>8.0</TargetPlatformVersion>
-    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
@@ -30,7 +29,11 @@
       <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\MicrosoftUpdate\RegisterMicrosoftUpdate.ps1;..\..\assets\GroupPolicy\PowerShellCoreExecutionPolicy.admx;..\..\assets\GroupPolicy\PowerShellCoreExecutionPolicy.adml;..\..\assets\GroupPolicy\InstallPSCorePolicyDefinitions.ps1">
+    <Content Include="..\..\dsc\*">
+      <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">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
diff --git a/src/powershell-win-core/runtimeconfig.template.json b/src/powershell-win-core/runtimeconfig.template.json
index a3075303ad5..4a5e3e367ec 100644
--- a/src/powershell-win-core/runtimeconfig.template.json
+++ b/src/powershell-win-core/runtimeconfig.template.json
@@ -1,3 +1,4 @@
+// This is required to roll forward to supported minor.patch versions of the runtime.
 {
-  "rollForwardOnNoCandidateFx": 2
+  "rollForwardOnNoCandidateFx": 1
 }
diff --git a/src/powershell/Program.cs b/src/powershell/Program.cs
index 70346a1d1ce..1de961674df 100644
--- a/src/powershell/Program.cs
+++ b/src/powershell/Program.cs
@@ -129,10 +129,7 @@ private static void AttemptExecPwshLogin(string[] args)
             // At this point, we are on macOS
 
             // Set up the mib array and the query for process maximum args size
-            Span<int> mib = stackalloc int[3];
-            int mibLength = 2;
-            mib[0] = MACOS_CTL_KERN;
-            mib[1] = MACOS_KERN_ARGMAX;
+            Span<int> mib = [MACOS_CTL_KERN, MACOS_KERN_ARGMAX];
             int size = IntPtr.Size / 2;
             int argmax = 0;
 
@@ -141,7 +138,7 @@ private static void AttemptExecPwshLogin(string[] args)
             {
                 fixed (int *mibptr = mib)
                 {
-                    ThrowOnFailure(nameof(argmax), SysCtl(mibptr, mibLength, &argmax, &size, IntPtr.Zero, 0));
+                    ThrowOnFailure(nameof(argmax), SysCtl(mibptr, mib.Length, &argmax, &size, IntPtr.Zero, 0));
                 }
             }
 
@@ -155,16 +152,13 @@ private static void AttemptExecPwshLogin(string[] args)
             IntPtr executablePathPtr = IntPtr.Zero;
             try
             {
-                mib[0] = MACOS_CTL_KERN;
-                mib[1] = MACOS_KERN_PROCARGS2;
-                mib[2] = pid;
-                mibLength = 3;
+                mib = new int[] { MACOS_CTL_KERN, MACOS_KERN_PROCARGS2, pid };
 
                 unsafe
                 {
                     fixed (int *mibptr = mib)
                     {
-                        ThrowOnFailure(nameof(procargs), SysCtl(mibptr, mibLength, procargs.ToPointer(), &argmax, IntPtr.Zero, 0));
+                        ThrowOnFailure(nameof(procargs), SysCtl(mibptr, mib.Length, procargs.ToPointer(), &argmax, IntPtr.Zero, 0));
                     }
 
                     // The memory block we're reading is a series of null-terminated strings
diff --git a/test/Test.Common.props b/test/Test.Common.props
index d59992b4774..8a5522e9eaa 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -6,8 +6,8 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFramework>net11.0</TargetFramework>
+    <LangVersion>preview</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/test/docker/networktest/DockerRemoting.Tests.ps1 b/test/docker/networktest/DockerRemoting.Tests.ps1
deleted file mode 100644
index 5f5a13c5b4c..00000000000
--- a/test/docker/networktest/DockerRemoting.Tests.ps1
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-$imageName = "remotetestimage"
-Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){
-    BeforeAll {
-        $Timeout = 600 # 10 minutes to run these tests
-        $dockerimage = docker images --format "{{ .Repository }}" $imageName
-        if ( $dockerimage -ne $imageName ) {
-            $pending = $true
-            Write-Warning "Docker image '$imageName' not found, not running tests"
-            return
-        }
-        else {
-            $pending = $false
-        }
-
-        # give the containers something to do, otherwise they will exit and be removed
-        Write-Verbose -Verbose "setting up docker container PowerShell server"
-        $server = docker run -d $imageName powershell -c Start-Sleep -Seconds $timeout
-        Write-Verbose -Verbose "setting up docker container PowerShell client"
-        $client = docker run -d $imageName powershell -c Start-Sleep -Seconds $timeout
-
-        # get fullpath to installed core powershell
-        Write-Verbose -Verbose "Getting path to PowerShell"
-        $powershellcorepath = docker exec $server powershell -c "(get-childitem 'c:\program files\powershell\*\pwsh.exe').fullname"
-        if ( ! $powershellcorepath )
-        {
-            $pending = $true
-            Write-Warning "Cannot find powershell executable, not running tests"
-            return
-        }
-        $powershellcoreversion = ($powershellcorepath -split "[\\/]")[-2]
-        # we will need the configuration of the core powershell endpoint
-        $powershellcoreConfiguration = "powershell.${powershellcoreversion}"
-
-        # capture the hostnames of the containers which will be used by the tests
-        Write-Verbose -Verbose "getting server hostname"
-        $serverhostname = docker exec $server hostname
-        Write-Verbose -Verbose "getting client hostname"
-        $clienthostname = docker exec $client hostname
-
-        # capture the versions of full and core PowerShell
-        Write-Verbose -Verbose "getting powershell full version"
-        $fullVersion = docker exec $client powershell -c "`$PSVersionTable.psversion.tostring()"
-        if ( ! $fullVersion )
-        {
-            $pending = $true
-            Write-Warning "Cannot determine PowerShell full version, not running tests"
-            return
-        }
-
-        Write-Verbose -Verbose "getting powershell version"
-        $coreVersion = docker exec $client "$powershellcorepath" -c "`$PSVersionTable.psversion.tostring()"
-        if ( ! $coreVersion )
-        {
-            $pending = $true
-            Write-Warning "Cannot determine PowerShell version, not running tests"
-            return
-        }
-    }
-
-    AfterAll {
-        # to debug, comment out the following
-        if ( $pending -eq $false ) {
-            docker rm -f $server
-            docker rm -f $client
-        }
-    }
-
-    It "Full powershell can get correct remote powershell version" -Pending:$pending {
-        $result = docker exec $client powershell -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -configurationname $powershellcoreConfiguration -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
-        $result | Should -Be $coreVersion
-    }
-
-    It "Full powershell can get correct remote powershell full version" -Pending:$pending {
-        $result = docker exec $client powershell -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
-        $result | Should -Be $fullVersion
-    }
-
-    It "Core powershell can get correct remote powershell version" -Pending:$pending {
-        $result = docker exec $client "$powershellcorepath" -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -configurationname $powershellcoreConfiguration -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
-        $result | Should -Be $coreVersion
-    }
-
-    It "Core powershell can get correct remote powershell full version" -Pending:$pending {
-        $result = docker exec $client "$powershellcorepath" -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
-        $result | Should -Be $fullVersion
-    }
-}
diff --git a/test/docker/networktest/Dockerfile b/test/docker/networktest/Dockerfile
deleted file mode 100644
index cac78654c86..00000000000
--- a/test/docker/networktest/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# escape=`
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
-
-SHELL ["pwsh.exe","-command"]
-
-# the source msi should change on a daily basis
-# the destination should not change
-ADD PSCore.msi /PSCore.msi
-
-# the msipath (PSCore.msi) below will need to change based on the daily package
-# set up for basic auth
-# install-powershellremoting will restart winrm service
-RUN new-LocalUser -Name testuser -password (ConvertTo-SecureString 11aa!!AA -asplaintext -force); `
-    add-localgroupmember -group administrators -member testuser; `
-    set-item wsman:/localhost/service/auth/basic $true; `
-    set-item WSMan:/localhost/client/trustedhosts "*" -force; `
-    set-item wsman:/localhost/service/AllowUnencrypted $true; `
-    set-item WSMan:/localhost/client/AllowUnencrypted $true; `
-    Start-Process -FilePath msiexec.exe -ArgumentList '-qn', `
-    '-i c:\PSCore.msi','-log c:\PSCore-install.log','-norestart' -wait ; `
-    $psexec = get-item -path ${ENV:ProgramFiles}/powershell/*/pwsh.exe; `
-    $corehome = $psexec.directory.fullname; `
-    & $psexec Install-PowerShellRemoting.ps1; `
-    remove-item -force c:\PSCore.msi
diff --git a/test/fuzzing/FuzzingApp/Program.cs b/test/fuzzing/FuzzingApp/Program.cs
new file mode 100644
index 00000000000..4e309ffc468
--- /dev/null
+++ b/test/fuzzing/FuzzingApp/Program.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using SharpFuzz;
+
+namespace FuzzTests
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            FuzzTargetMethod(args);
+        }
+
+        public static void FuzzTargetMethod(string[] args)
+        {
+            if (args == null)
+            {
+                Console.WriteLine("args was null");
+                args = Array.Empty<string>();
+            }
+
+            try
+            {
+                Fuzzer.LibFuzzer.Run(Target.ExtractToken);
+            }
+            catch (ArgumentNullException nex)
+            {
+                Console.WriteLine($"ArgumentNullException in main: {nex.Message}");
+                Console.WriteLine($"Stack Trace: {nex.StackTrace}");
+                Environment.Exit(1);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Exception in main: {ex.Message}");
+                Console.WriteLine($"Exception type: {ex.GetType()}");
+                Console.WriteLine($"Stack Trace: {ex.StackTrace}");
+                Environment.Exit(1);
+            }
+        }
+    }
+}
diff --git a/test/fuzzing/FuzzingApp/Target.cs b/test/fuzzing/FuzzingApp/Target.cs
new file mode 100644
index 00000000000..d82e17e8702
--- /dev/null
+++ b/test/fuzzing/FuzzingApp/Target.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Management.Automation.Remoting;
+
+namespace FuzzTests
+{
+    public static class Target
+    {
+        public static void ExtractToken(ReadOnlySpan<byte> tokenResponse)
+        {
+            RemoteSessionHyperVSocketClient.ExtractToken(tokenResponse);
+        }
+    }
+}
diff --git a/test/fuzzing/FuzzingApp/powershell-fuzz-tests.csproj b/test/fuzzing/FuzzingApp/powershell-fuzz-tests.csproj
new file mode 100644
index 00000000000..7ee82c34cae
--- /dev/null
+++ b/test/fuzzing/FuzzingApp/powershell-fuzz-tests.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\Test.Common.props"/>
+
+  <PropertyGroup>
+    <Description>PowerShell Fuzzing</Description>
+    <AssemblyName>powershell-fuzz-tests</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>../../../src/signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../../src/System.Management.Automation/System.Management.Automation.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SharpFuzz" Version="2.2.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/fuzzing/inputs/maxinput b/test/fuzzing/inputs/maxinput
new file mode 100644
index 00000000000..6773a896b3c
--- /dev/null
+++ b/test/fuzzing/inputs/maxinput
@@ -0,0 +1 @@
+TOKEN abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=
\ No newline at end of file
diff --git a/test/fuzzing/inputs/mininput b/test/fuzzing/inputs/mininput
new file mode 100644
index 00000000000..c9b91c737c2
--- /dev/null
+++ b/test/fuzzing/inputs/mininput
@@ -0,0 +1 @@
+TOKEN TQ
\ No newline at end of file
diff --git a/test/fuzzing/runFuzzer.ps1 b/test/fuzzing/runFuzzer.ps1
new file mode 100644
index 00000000000..5cb63393c4c
--- /dev/null
+++ b/test/fuzzing/runFuzzer.ps1
@@ -0,0 +1,65 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+<#
+1. libfuzzer-dotnet-windows.exe can be installed from https://github.com/Metalnem/libfuzzer-dotnet/releases
+
+2. sharpfuzz can be installed with dotnet-tool:
+   > dotnet tool install --global SharpFuzz.CommandLine --version 2.2.0
+
+Usage: sharpfuzz [path-to-assembly] [prefix ...]
+
+path-to-assembly:
+  The path to an assembly .dll file to instrument.
+
+prefix:
+  The class or the namespace to instrument.
+  If not present, all types in the assembly will be instrumented.
+  At least one prefix is required when instrumenting System.Private.CoreLib.
+
+Examples:
+  sharpfuzz Newtonsoft.Json.dll
+  sharpfuzz System.Private.CoreLib.dll System.Number
+  sharpfuzz System.Private.CoreLib.dll System.DateTimeFormat System.DateTimeParse
+#>
+
+param (
+    [string]$libFuzzer = "$PSScriptRoot\libfuzzer-dotnet-windows.exe",
+    [string]$project = "$PSScriptRoot\FuzzingApp\powershell-fuzz-tests.csproj",
+    [string]$corpus = "$PSScriptRoot\inputs",
+    [string]$command = "sharpfuzz.exe"
+)
+
+Set-StrictMode -Version Latest
+
+$outputDir = "$PSScriptRoot\out"
+
+if (Test-Path $outputDir) {
+    Remove-Item -Recurse -Force $outputDir
+}
+
+Write-Host "dotnet publish $project -c Debug -o $outputDir"
+dotnet publish $project -c Debug -o $outputDir
+Write-Host "build completed"
+
+$projectName = (Get-Item $project).BaseName
+$projectDll = "$projectName.dll"
+$project = Join-Path $outputDir $projectDll
+$smaDllPath = Join-Path $outputDir "System.Management.Automation.dll"
+
+## Instrument the specific class within the test assembly.
+Write-Host "instrumenting: $project"
+## !NOTE! If you instrument the class that defines "Main", it will fail.
+& $command $project "FuzzTests.Target"
+Write-Host "done instrumenting $project"
+
+## Instrument any other assemblies that need to be tested.
+Write-Host "instrumenting: $smaDllPath"
+& $command $smaDllPath "System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient"
+Write-Host "done instrumenting: $smaDllPath"
+
+$outputPath = Join-Path $outputDir "output.txt"
+
+Write-Host "launching fuzzer on $project"
+Write-Host "$libFuzzer --target_path=dotnet --target_arg=$project $corpus"
+& $libFuzzer --target_path=dotnet --target_arg=$project $corpus -max_len=1024 2>&1 | Tee-Object -FilePath $outputPath
diff --git a/test/hosting/NuGet.Config b/test/hosting/NuGet.Config
deleted file mode 100644
index 765346e5343..00000000000
--- a/test/hosting/NuGet.Config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>
diff --git a/test/hosting/hosting.tests.csproj b/test/hosting/hosting.tests.csproj
index cb72e0a90ef..1c40094c7ff 100644
--- a/test/hosting/hosting.tests.csproj
+++ b/test/hosting/hosting.tests.csproj
@@ -21,6 +21,12 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.3" NoWarn="NU1605" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.10.3" NoWarn="NU1605" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.3" NoWarn="NU1605" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.3" NoWarn="NU1605" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.10.3" NoWarn="NU1605" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.10.3" NoWarn="NU1605" />
   </ItemGroup>
 
 </Project>
diff --git a/test/infrastructure/ciModule.Tests.ps1 b/test/infrastructure/ciModule.Tests.ps1
new file mode 100644
index 00000000000..b7320ff49b7
--- /dev/null
+++ b/test/infrastructure/ciModule.Tests.ps1
@@ -0,0 +1,246 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# NOTE: This test file tests the Test-MergeConflictMarker function which detects Git merge conflict markers.
+# IMPORTANT: Do NOT use here-strings or literal conflict markers (e.g., "<<<<<<<", "=======", ">>>>>>>")
+# in this file, as they will trigger conflict marker detection in CI pipelines.
+# Instead, use string multiplication (e.g., '<' * 7) to dynamically generate these markers at runtime.
+
+Describe "Test-MergeConflictMarker" {
+    BeforeAll {
+        # Import the module
+        Import-Module "$PSScriptRoot/../../tools/ci.psm1" -Force
+
+        # Create a temporary test workspace
+        $script:testWorkspace = Join-Path $TestDrive "workspace"
+        New-Item -ItemType Directory -Path $script:testWorkspace -Force | Out-Null
+
+        # Create temporary output files
+        $script:testOutputPath = Join-Path $TestDrive "outputs.txt"
+        $script:testSummaryPath = Join-Path $TestDrive "summary.md"
+    }
+
+    AfterEach {
+        # Clean up test files after each test
+        if (Test-Path $script:testWorkspace) {
+            Get-ChildItem $script:testWorkspace -File -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue
+        }
+        Remove-Item $script:testOutputPath -Force -ErrorAction SilentlyContinue
+        Remove-Item $script:testSummaryPath -Force -ErrorAction SilentlyContinue
+    }
+
+    Context "When no files are provided" {
+        It "Should handle empty file array gracefully" {
+            # The function now accepts empty arrays to handle cases like delete-only PRs
+            $emptyArray = @()
+            Test-MergeConflictMarker -File $emptyArray -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+            
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "files-checked=0"
+            $outputs | Should -Contain "conflicts-found=0"
+            
+            $summary = Get-Content $script:testSummaryPath -Raw
+            $summary | Should -Match "No Files to Check"
+        }
+    }
+
+    Context "When files have no conflicts" {
+        It "Should pass for clean files" {
+            $testFile = Join-Path $script:testWorkspace "clean.txt"
+            "This is a clean file" | Out-File $testFile -Encoding utf8
+
+            Test-MergeConflictMarker -File @("clean.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "files-checked=1"
+            $outputs | Should -Contain "conflicts-found=0"
+
+            $summary = Get-Content $script:testSummaryPath -Raw
+            $summary | Should -Match "No Conflicts Found"
+        }
+    }
+
+    Context "When files have conflict markers" {
+        It "Should detect <<<<<<< marker" {
+            $testFile = Join-Path $script:testWorkspace "conflict1.txt"
+            "Some content`n" + ('<' * 7) + " HEAD`nConflicting content" | Out-File $testFile -Encoding utf8
+
+            { Test-MergeConflictMarker -File @("conflict1.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath } | Should -Throw
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "files-checked=1"
+            $outputs | Should -Contain "conflicts-found=1"
+        }
+
+        It "Should detect ======= marker" {
+            $testFile = Join-Path $script:testWorkspace "conflict2.txt"
+            "Some content`n" + ('=' * 7) + "`nMore content" | Out-File $testFile -Encoding utf8
+
+            { Test-MergeConflictMarker -File @("conflict2.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath } | Should -Throw
+        }
+
+        It "Should detect >>>>>>> marker" {
+            $testFile = Join-Path $script:testWorkspace "conflict3.txt"
+            "Some content`n" + ('>' * 7) + " branch-name`nMore content" | Out-File $testFile -Encoding utf8
+
+            { Test-MergeConflictMarker -File @("conflict3.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath } | Should -Throw
+        }
+
+        It "Should detect multiple markers in one file" {
+            $testFile = Join-Path $script:testWorkspace "conflict4.txt"
+            $content = "Some content`n" + ('<' * 7) + " HEAD`nContent A`n" + ('=' * 7) + "`nContent B`n" + ('>' * 7) + " branch`nMore content"
+            $content | Out-File $testFile -Encoding utf8
+
+            { Test-MergeConflictMarker -File @("conflict4.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath } | Should -Throw
+
+            $summary = Get-Content $script:testSummaryPath -Raw
+            $summary | Should -Match "Conflicts Detected"
+            $summary | Should -Match "conflict4.txt"
+        }
+
+        It "Should detect conflicts in multiple files" {
+            $testFile1 = Join-Path $script:testWorkspace "conflict5.txt"
+            ('<' * 7) + " HEAD" | Out-File $testFile1 -Encoding utf8
+
+            $testFile2 = Join-Path $script:testWorkspace "conflict6.txt"
+            ('=' * 7) | Out-File $testFile2 -Encoding utf8
+
+            { Test-MergeConflictMarker -File @("conflict5.txt", "conflict6.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath } | Should -Throw
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "files-checked=2"
+            $outputs | Should -Contain "conflicts-found=2"
+        }
+    }
+
+    Context "When markers are not at line start" {
+        It "Should not detect markers in middle of line" {
+            $testFile = Join-Path $script:testWorkspace "notconflict.txt"
+            "This line has <<<<<<< in the middle" | Out-File $testFile -Encoding utf8
+
+            Test-MergeConflictMarker -File @("notconflict.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "conflicts-found=0"
+        }
+
+        It "Should not detect markers with wrong number of characters" {
+            $testFile = Join-Path $script:testWorkspace "wrongcount.txt"
+            ('<' * 6) + " Only 6`n" + ('<' * 8) + " 8 characters" | Out-File $testFile -Encoding utf8
+
+            Test-MergeConflictMarker -File @("wrongcount.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "conflicts-found=0"
+        }
+    }
+
+    Context "When handling special file scenarios" {
+        It "Should skip non-existent files" {
+            Test-MergeConflictMarker -File @("nonexistent.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "files-checked=0"
+        }
+
+        It "Should handle absolute paths" {
+            $testFile = Join-Path $script:testWorkspace "absolute.txt"
+            "Clean content" | Out-File $testFile -Encoding utf8
+
+            Test-MergeConflictMarker -File @($testFile) -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "conflicts-found=0"
+        }
+
+        It "Should handle mixed relative and absolute paths" {
+            $testFile1 = Join-Path $script:testWorkspace "relative.txt"
+            "Clean" | Out-File $testFile1 -Encoding utf8
+
+            $testFile2 = Join-Path $script:testWorkspace "absolute.txt"
+            "Clean" | Out-File $testFile2 -Encoding utf8
+
+            Test-MergeConflictMarker -File @("relative.txt", $testFile2) -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Should -Contain "files-checked=2"
+            $outputs | Should -Contain "conflicts-found=0"
+        }
+    }
+
+    Context "When summary and output generation" {
+        It "Should generate proper GitHub Actions outputs format" {
+            $testFile = Join-Path $script:testWorkspace "test.txt"
+            "Clean file" | Out-File $testFile -Encoding utf8
+
+            Test-MergeConflictMarker -File @("test.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath
+
+            $outputs = Get-Content $script:testOutputPath
+            $outputs | Where-Object {$_ -match "^files-checked=\d+$"} | Should -Not -BeNullOrEmpty
+            $outputs | Where-Object {$_ -match "^conflicts-found=\d+$"} | Should -Not -BeNullOrEmpty
+        }
+
+        It "Should generate markdown summary with conflict details" {
+            $testFile = Join-Path $script:testWorkspace "marked.txt"
+            $content = "Line 1`n" + ('<' * 7) + " HEAD`nLine 3`n" + ('=' * 7) + "`nLine 5"
+            $content | Out-File $testFile -Encoding utf8
+
+            { Test-MergeConflictMarker -File @("marked.txt") -WorkspacePath $script:testWorkspace -OutputPath $script:testOutputPath -SummaryPath $script:testSummaryPath } | Should -Throw
+
+            $summary = Get-Content $script:testSummaryPath -Raw
+            $summary | Should -Match "# Merge Conflict Marker Check Results"
+            $summary | Should -Match "marked.txt"
+            $summary | Should -Match "\| Line \| Marker \|"
+        }
+    }
+}
+
+Describe "Install-CIPester" {
+    BeforeAll {
+        # Import the module
+        Import-Module "$PSScriptRoot/../../tools/ci.psm1" -Force
+    }
+
+    Context "When checking function exists" {
+        It "Should export Install-CIPester function" {
+            $function = Get-Command Install-CIPester -ErrorAction SilentlyContinue
+            $function | Should -Not -BeNullOrEmpty
+            $function.ModuleName | Should -Be 'ci'
+        }
+
+        It "Should have expected parameters" {
+            $function = Get-Command Install-CIPester
+            $function.Parameters.Keys | Should -Contain 'MinimumVersion'
+            $function.Parameters.Keys | Should -Contain 'MaximumVersion'
+            $function.Parameters.Keys | Should -Contain 'Force'
+        }
+
+        It "Should accept version parameters" {
+            $function = Get-Command Install-CIPester
+            $function.Parameters['MinimumVersion'].ParameterType.Name | Should -Be 'String'
+            $function.Parameters['MaximumVersion'].ParameterType.Name | Should -Be 'String'
+            $function.Parameters['Force'].ParameterType.Name | Should -Be 'SwitchParameter'
+        }
+    }
+
+    Context "When validating real execution" {
+        # These tests only run in CI where we can safely install/test Pester
+
+        It "Should successfully run without errors when Pester exists" {
+            if (!$env:CI) {
+                Set-ItResult -Skipped -Because "Test requires CI environment to safely install Pester"
+            }
+
+            { Install-CIPester -ErrorAction Stop } | Should -Not -Throw
+        }
+
+        It "Should accept custom version parameters" {
+            if (!$env:CI) {
+                Set-ItResult -Skipped -Because "Test requires CI environment to safely install Pester"
+            }
+
+            { Install-CIPester -MinimumVersion '4.0.0' -MaximumVersion '5.99.99' -ErrorAction Stop } | Should -Not -Throw
+        }
+    }
+}
+
diff --git a/test/packaging/linux/package-validation.tests.ps1 b/test/packaging/linux/package-validation.tests.ps1
new file mode 100644
index 00000000000..594a729fa77
--- /dev/null
+++ b/test/packaging/linux/package-validation.tests.ps1
@@ -0,0 +1,117 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Linux Package Name Validation" {
+    BeforeAll {
+        # Determine artifacts directory (GitHub Actions or Azure DevOps)
+        $artifactsDir = if ($env:GITHUB_ACTIONS -eq 'true') {
+            "$env:GITHUB_WORKSPACE/../packages"
+        } else {
+            $env:SYSTEM_ARTIFACTSDIRECTORY
+        }
+        
+        if (-not $artifactsDir) {
+            throw "Artifacts directory not found. GITHUB_WORKSPACE or SYSTEM_ARTIFACTSDIRECTORY must be set."
+        }
+        
+        Write-Verbose "Artifacts directory: $artifactsDir" -Verbose
+    }
+    
+    Context "RPM Package Names" {
+        It "Should have valid RPM package names" {
+            $rpmPackages = Get-ChildItem -Path $artifactsDir -Recurse -Filter *.rpm -ErrorAction SilentlyContinue
+            
+            $rpmPackages.Count | Should -BeGreaterThan 0 -Because "At least one RPM package should exist in the artifacts directory"
+            
+            $invalidPackages = @()
+            # Regex pattern for valid RPM package names.
+            # Breakdown:
+            # ^powershell\-           : Starts with 'powershell-'
+            # (preview-|lts-)?        : Optionally 'preview-' or 'lts-'
+            # \d+\.\d+\.\d+           : Version number (e.g., 7.6.0)
+            # (_[a-z]*\.\d+)?         : Optional underscore, letters, dot, and digits (e.g., _alpha.1)
+            # -1\.                    : Literal '-1.'
+            # (preview\.\d+\.)?       : Optional 'preview.' and digits, followed by a dot
+            # (rh|cm)\.               : Either 'rh.' or 'cm.'
+            # (x86_64|aarch64)\.rpm$  : Architecture and file extension
+            $rpmPackageNamePattern = 'powershell\-(preview-|lts-)?\d+\.\d+\.\d+(_[a-z]*\.\d+)?-1\.(preview\.\d+\.)?(rh|cm)\.(x86_64|aarch64)\.rpm'
+
+            foreach ($package in $rpmPackages) {
+                if ($package.Name -notmatch $rpmPackageNamePattern) {
+                    $invalidPackages += "$($package.Name) is not a valid RPM package name"
+                    Write-Warning "$($package.Name) is not a valid RPM package name"
+                }
+            }
+            
+            if ($invalidPackages.Count -gt 0) {
+                throw ($invalidPackages | Out-String)
+            }
+        }
+    }
+    
+    Context "DEB Package Names" {
+        It "Should have valid DEB package names" {
+            $debPackages = Get-ChildItem -Path $artifactsDir -Recurse -Filter *.deb -ErrorAction SilentlyContinue
+            
+            $debPackages.Count | Should -BeGreaterThan 0 -Because "At least one DEB package should exist in the artifacts directory"
+            
+            $invalidPackages = @()
+            # Regex pattern for valid DEB package names.
+            # Valid examples:
+            # - powershell-preview_7.6.0-preview.6-1.deb_amd64.deb
+            # - powershell-lts_7.4.13-1.deb_amd64.deb
+            # - powershell_7.4.13-1.deb_amd64.deb
+            # Breakdown:
+            # ^powershell            : Starts with 'powershell'
+            # (-preview|-lts)?       : Optionally '-preview' or '-lts'
+            # _\d+\.\d+\.\d+         : Underscore followed by version number (e.g., _7.6.0)
+            # (-[a-z]+\.\d+)?        : Optional dash, letters, dot, and digits (e.g., -preview.6)
+            # -1                     : Literal '-1'
+            # \.deb_                 : Literal '.deb_'
+            # (amd64|arm64)          : Architecture
+            # \.deb$                 : File extension
+            $debPackageNamePattern = '^powershell(-preview|-lts)?_\d+\.\d+\.\d+(-[a-z]+\.\d+)?-1\.deb_(amd64|arm64)\.deb$'
+
+            foreach ($package in $debPackages) {
+                if ($package.Name -notmatch $debPackageNamePattern) {
+                    $invalidPackages += "$($package.Name) is not a valid DEB package name"
+                    Write-Warning "$($package.Name) is not a valid DEB package name"
+                }
+            }
+            
+            if ($invalidPackages.Count -gt 0) {
+                throw ($invalidPackages | Out-String)
+            }
+        }
+    }
+    
+    Context "Tar.Gz Package Names" {
+        It "Should have valid tar.gz package names" {
+            $tarPackages = Get-ChildItem -Path $artifactsDir -Recurse -Filter *.tar.gz -ErrorAction SilentlyContinue
+            
+            $tarPackages.Count | Should -BeGreaterThan 0 -Because "At least one tar.gz package should exist in the artifacts directory"
+            
+            $invalidPackages = @()
+            foreach ($package in $tarPackages) {
+                # Pattern matches: powershell-7.6.0-preview.6-linux-x64.tar.gz or powershell-7.6.0-linux-x64.tar.gz
+                # Also matches various runtime configurations
+                if ($package.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?(linux|osx|linux-musl)+\-(x64\-fxdependent|x64|arm32|arm64|x64\-musl-noopt\-fxdependent)\.(tar\.gz)') {
+                    $invalidPackages += "$($package.Name) is not a valid tar.gz package name"
+                    Write-Warning "$($package.Name) is not a valid tar.gz package name"
+                }
+            }
+            
+            if ($invalidPackages.Count -gt 0) {
+                throw ($invalidPackages | Out-String)
+            }
+        }
+    }
+    
+    Context "Package Existence" {
+        It "Should find at least one package in artifacts directory" {
+            $allPackages = Get-ChildItem -Path $artifactsDir -Recurse -Include *.rpm, *.tar.gz, *.deb -ErrorAction SilentlyContinue
+            
+            $allPackages.Count | Should -BeGreaterThan 0 -Because "At least one package should exist in the artifacts directory"
+        }
+    }
+}
diff --git a/test/packaging/macos/package-validation.tests.ps1 b/test/packaging/macos/package-validation.tests.ps1
new file mode 100644
index 00000000000..945ffea6f7a
--- /dev/null
+++ b/test/packaging/macos/package-validation.tests.ps1
@@ -0,0 +1,186 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Verify macOS Package" {
+    BeforeAll {
+        Write-Verbose "In Describe BeforeAll" -Verbose
+        Import-Module $PSScriptRoot/../../../build.psm1
+
+        # Find the macOS package
+        $packagePath = $env:PACKAGE_FOLDER
+        if (-not $packagePath) {
+            $packagePath = Get-Location
+        }
+
+        Write-Verbose "Looking for package in: $packagePath" -Verbose
+        $package = Get-ChildItem -Path $packagePath -Filter "*.pkg" -ErrorAction SilentlyContinue | Select-Object -First 1
+
+        if (-not $package) {
+            Write-Warning "No .pkg file found in $packagePath"
+        } else {
+            Write-Verbose "Found package: $($package.FullName)" -Verbose
+        }
+
+        # Set up test directories
+        $script:package = $package
+        $script:expandDir = $null
+        $script:payloadDir = $null
+        $script:extractedFiles = @()
+
+        if ($package) {
+            # Use TestDrive for temporary directories - pkgutil will create the expand directory
+            $script:expandDir = Join-Path "TestDrive:" -ChildPath "package-contents-test"
+            $expandDirResolved = (Resolve-Path "TestDrive:").ProviderPath
+            $script:expandDir = Join-Path $expandDirResolved -ChildPath "package-contents-test"
+
+            Write-Verbose "Expanding package to: $($script:expandDir)" -Verbose
+            # pkgutil will create the directory itself, so don't pre-create it
+            Start-NativeExecution {
+                pkgutil --expand $package.FullName $script:expandDir
+            }
+
+            # Extract the payload to verify files
+            $script:payloadDir = Join-Path "TestDrive:" -ChildPath "package-payload-test"
+            $payloadDirResolved = (Resolve-Path "TestDrive:").ProviderPath
+            $script:payloadDir = Join-Path $payloadDirResolved -ChildPath "package-payload-test"
+
+            # Create payload directory since cpio needs it
+            if (-not (Test-Path $script:payloadDir)) {
+                $null = New-Item -ItemType Directory -Path $script:payloadDir -Force
+            }
+
+            $componentPkg = Get-ChildItem -Path $script:expandDir -Filter "*.pkg" -Recurse | Select-Object -First 1
+            if ($componentPkg) {
+                Write-Verbose "Extracting payload from: $($componentPkg.FullName)" -Verbose
+                Push-Location $script:payloadDir
+                try {
+                    $payloadFile = Join-Path $componentPkg.FullName "Payload"
+                    Get-Content -Path $payloadFile -Raw -AsByteStream | & cpio -i 2>&1 | Out-Null
+                } finally {
+                    Pop-Location
+                }
+            }
+
+            # Get all extracted files for verification
+            $script:extractedFiles = Get-ChildItem -Path $script:payloadDir -Recurse -ErrorAction SilentlyContinue
+            Write-Verbose "Extracted $($script:extractedFiles.Count) files" -Verbose
+        }
+    }
+
+    AfterAll {
+        # TestDrive automatically cleans up, but we can ensure cleanup happens
+        # No manual cleanup needed as TestDrive handles it
+    }
+
+    Context "Package existence and structure" {
+        It "Package file should exist" {
+            $script:package | Should -Not -BeNullOrEmpty -Because "A .pkg file should be created"
+            $script:package.Extension | Should -Be ".pkg"
+        }
+
+        It "Package name should follow correct naming convention" {
+            $script:package | Should -Not -BeNullOrEmpty
+
+            # Regex pattern for valid macOS PKG package names.
+            # This pattern matches the validation used in release-validate-packagenames.yml
+            # Valid examples:
+            # - powershell-7.4.13-osx-x64.pkg (Stable release)
+            # - powershell-7.6.0-preview.6-osx-x64.pkg (Preview version string)
+            # - powershell-7.4.13-rebuild.5-osx-arm64.pkg (Rebuild version)
+            # - powershell-lts-7.4.13-osx-arm64.pkg (LTS package)
+            $pkgPackageNamePattern = '^powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx\-(x64|arm64)\.pkg$'
+
+            $script:package.Name | Should -Match $pkgPackageNamePattern -Because "Package name should follow the standard naming convention"
+        }
+
+        It "Package name should NOT use x86_64 with underscores" {
+            $script:package | Should -Not -BeNullOrEmpty
+
+            $script:package.Name | Should -Not -Match 'x86_64' -Because "Package should use 'x64' not 'x86_64' (with underscores) for compatibility"
+        }
+
+        It "Package should expand successfully" {
+            $script:expandDir | Should -Exist
+            Get-ChildItem -Path $script:expandDir | Should -Not -BeNullOrEmpty
+        }
+
+        It "Package should have a component package" {
+            $componentPkg = Get-ChildItem -Path $script:expandDir -Filter "*.pkg" -Recurse -ErrorAction SilentlyContinue
+            $componentPkg | Should -Not -BeNullOrEmpty -Because "Package should contain a component.pkg"
+        }
+
+        It "Payload should extract successfully" {
+            $script:payloadDir | Should -Exist
+            $script:extractedFiles | Should -Not -BeNullOrEmpty -Because "Package payload should contain files"
+        }
+    }
+
+    Context "Required files in package" {
+        BeforeAll {
+            $expectedFilePatterns = @{
+                "PowerShell executable" = "usr/local/microsoft/powershell/*/pwsh"
+                "PowerShell symlink in /usr/local/bin" = "usr/local/bin/pwsh*"
+                "Man page" = "usr/local/share/man/man1/pwsh*.gz"
+                "Launcher application plist" = "Applications/PowerShell*.app/Contents/Info.plist"
+            }
+
+            $testCases = @()
+            foreach ($key in $expectedFilePatterns.Keys) {
+                $testCases += @{
+                    Description = $key
+                    Pattern = $expectedFilePatterns[$key]
+                }
+            }
+
+            $script:testCases = $testCases
+        }
+
+        It "Should contain <Description>" -TestCases $script:testCases {
+            param($Description, $Pattern)
+
+            $found = $script:extractedFiles | Where-Object { $_.FullName -like "*$Pattern*" }
+            $found | Should -Not -BeNullOrEmpty -Because "$Description should exist in the package at path matching '$Pattern'"
+        }
+    }
+
+    Context "PowerShell binary verification" {
+        It "PowerShell executable should be executable" {
+            $pwshBinary = $script:extractedFiles | Where-Object { $_.FullName -like "*/pwsh" -and $_.FullName -like "*/microsoft/powershell/*" }
+            $pwshBinary | Should -Not -BeNullOrEmpty
+
+            # Check if file has executable permissions (on Unix-like systems)
+            if ($IsLinux -or $IsMacOS) {
+                $permissions = (Get-Item $pwshBinary[0].FullName).UnixFileMode
+                # Executable bit should be set
+                $permissions.ToString() | Should -Match 'x' -Because "pwsh binary should have execute permissions"
+            }
+        }
+    }
+
+    Context "Launcher application" {
+        It "Launcher app should have proper bundle structure" {
+            $plistFile = $script:extractedFiles | Where-Object { $_.FullName -like "*PowerShell*.app/Contents/Info.plist" }
+            $plistFile | Should -Not -BeNullOrEmpty
+
+            # Verify the bundle has required components
+            $appPath = Split-Path (Split-Path $plistFile[0].FullName -Parent) -Parent
+            $macOSDir = Join-Path $appPath "Contents/MacOS"
+            $resourcesDir = Join-Path $appPath "Contents/Resources"
+
+            Test-Path $macOSDir | Should -Be $true -Because "App bundle should have Contents/MacOS directory"
+            Test-Path $resourcesDir | Should -Be $true -Because "App bundle should have Contents/Resources directory"
+        }
+
+        It "Launcher script should exist and be executable" {
+            $launcherScript = $script:extractedFiles | Where-Object {
+                $_.FullName -like "*PowerShell*.app/Contents/MacOS/PowerShell.sh"
+            }
+            $launcherScript | Should -Not -BeNullOrEmpty -Because "Launcher script should exist"
+
+            if ($IsLinux -or $IsMacOS) {
+                $permissions = (Get-Item $launcherScript[0].FullName).UnixFileMode
+                $permissions.ToString() | Should -Match 'x' -Because "Launcher script should have execute permissions"
+            }
+        }
+    }
+}
diff --git a/test/packaging/packaging.tests.ps1 b/test/packaging/packaging.tests.ps1
new file mode 100644
index 00000000000..a7d322205bc
--- /dev/null
+++ b/test/packaging/packaging.tests.ps1
@@ -0,0 +1,64 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Packaging Module Functions" {
+    BeforeAll {
+        Import-Module $PSScriptRoot/../../build.psm1 -Force
+        Import-Module $PSScriptRoot/../../tools/packaging/packaging.psm1 -Force
+    }
+
+    Context "Test-IsPreview function" {
+        It "Should return True for preview versions" {
+            Test-IsPreview -Version "7.6.0-preview.6" | Should -Be $true
+            Test-IsPreview -Version "7.5.0-rc.1" | Should -Be $true
+        }
+
+        It "Should return False for stable versions" {
+            Test-IsPreview -Version "7.6.0" | Should -Be $false
+            Test-IsPreview -Version "7.5.0" | Should -Be $false
+        }
+
+        It "Should return False for LTS builds regardless of version string" {
+            Test-IsPreview -Version "7.6.0-preview.6" -IsLTS | Should -Be $false
+            Test-IsPreview -Version "7.5.0" -IsLTS | Should -Be $false
+        }
+    }
+
+    Context "Get-MacOSPackageIdentifierInfo function (New-MacOSPackage logic)" {
+        It "Should detect preview builds and return preview identifier" {
+            $result = Get-MacOSPackageIdentifierInfo -Version "7.6.0-preview.6" -LTS:$false
+            
+            $result.IsPreview | Should -Be $true
+            $result.PackageIdentifier | Should -Be "com.microsoft.powershell-preview"
+        }
+
+        It "Should detect stable builds and return stable identifier" {
+            $result = Get-MacOSPackageIdentifierInfo -Version "7.6.0" -LTS:$false
+            
+            $result.IsPreview | Should -Be $false
+            $result.PackageIdentifier | Should -Be "com.microsoft.powershell"
+        }
+
+        It "Should treat LTS builds as stable even with preview version string" {
+            $result = Get-MacOSPackageIdentifierInfo -Version "7.4.0-preview.1" -LTS:$true
+            
+            $result.IsPreview | Should -Be $false
+            $result.PackageIdentifier | Should -Be "com.microsoft.powershell"
+        }
+
+        It "Should NOT use package name for preview detection (bug fix verification) - <Name>" -TestCases @(
+            @{ Version = "7.6.0-preview.6"; Name = "Preview" }
+            @{ Version = "7.6.0-rc.1"; Name = "RC" }
+        ) {
+            # This test verifies the fix for issue #26673
+            # The bug was using ($Name -like '*-preview') which always returned false
+            # because preview builds use Name="powershell" not "powershell-preview"
+            param($Version)
+
+            # The CORRECT logic (the fix): uses version string
+            $result = Get-MacOSPackageIdentifierInfo -Version $Version -LTS:$false
+            $result.IsPreview | Should -Be $true -Because "Version string correctly identifies preview"
+            $result.PackageIdentifier | Should -Be "com.microsoft.powershell-preview"
+        }
+    }
+}
diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1
index 93a56821003..14dc40a6ff2 100644
--- a/test/packaging/windows/msi.tests.ps1
+++ b/test/packaging/windows/msi.tests.ps1
@@ -115,6 +115,27 @@ Describe -Name "Windows MSI" -Fixture {
         $runtime = $env:PSMsiRuntime
         $muEnabled = Test-IsMuEnabled
 
+        if ($runtime -like '*x86*') {
+            $propertiesRegKeyParent = "HKLM:\SOFTWARE\Wow6432Node\Microsoft\PowerShellCore"
+        } else {
+            $propertiesRegKeyParent = "HKLM:\SOFTWARE\Microsoft\PowerShellCore"
+        }
+
+        if ($channel -eq "preview") {
+            $propertiesRegKeyName = "PreviewInstallerProperties"
+        } else {
+            $propertiesRegKeyName = "InstallerProperties"
+        }
+
+        # Rename the registry key that contains the saved installer
+        # properties so that the tests don't overwrite them.
+        $propertiesRegKeyPath = Join-Path -Path $propertiesRegKeyParent -ChildPath $propertiesRegKeyName
+        $propertiesBackupRegKeyName = "BackupInstallerProperties"
+        $propertiesBackupRegKeyPath = Join-Path -Path $propertiesRegKeyParent -ChildPath $propertiesBackupRegKeyName
+        if (Test-Path -Path $propertiesRegKeyPath) {
+            Rename-Item -Path $propertiesRegKeyPath -NewName $propertiesBackupRegKeyName
+        }
+
         # Get any existing powershell in the path
         $beforePath = @(([System.Environment]::GetEnvironmentVariable('PATH', 'MACHINE')) -split ';' |
                 Where-Object {$_ -like '*files\powershell*'})
@@ -133,10 +154,17 @@ Describe -Name "Windows MSI" -Fixture {
 
     AfterAll {
         Set-StrictMode -Version 3.0
+
+        # Restore the original saved installer properties registry key.
+        Remove-Item -Path $propertiesRegKeyPath -ErrorAction SilentlyContinue
+        if (Test-Path -Path $propertiesBackupRegKeyPath) {
+            Rename-Item -Path $propertiesBackupRegKeyPath -NewName $propertiesRegKeyName
+        }
     }
 
     BeforeEach {
         $error.Clear()
+        Remove-Item -Path $propertiesRegKeyPath -ErrorAction SilentlyContinue
     }
 
     Context "Upgrade code" {
diff --git a/test/perf/benchmarks/Engine.Compiler.cs b/test/perf/benchmarks/Engine.Compiler.cs
index 4f9dbab88a9..68385847f5b 100644
--- a/test/perf/benchmarks/Engine.Compiler.cs
+++ b/test/perf/benchmarks/Engine.Compiler.cs
@@ -61,7 +61,7 @@ public void GlobalSetup()
             // believe that there is no need to run many ops in each iteration. 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
             CompileFunction();
         }
diff --git a/test/perf/benchmarks/assets/compiler.test.ps1 b/test/perf/benchmarks/assets/compiler.test.ps1
index 5105ae9b408..be731373036 100644
--- a/test/perf/benchmarks/assets/compiler.test.ps1
+++ b/test/perf/benchmarks/assets/compiler.test.ps1
@@ -2238,26 +2238,6 @@ function Start-PSPackage {
                     }
                 }
             }
-            "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
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
index 2a398dad179..92c3f13d290 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.9" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.9" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/CommandLineOptions.cs b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/CommandLineOptions.cs
index aa60c7cc2e6..48856632317 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/CommandLineOptions.cs
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/CommandLineOptions.cs
@@ -37,7 +37,7 @@ public static List<string> ParseAndRemoveStringsParameter(List<string> argsList,
 
             if (parameterIndex + 1 < argsList.Count)
             {
-                while (parameterIndex + 1 < argsList.Count && !argsList[parameterIndex + 1].StartsWith("-"))
+                while (parameterIndex + 1 < argsList.Count && !argsList[parameterIndex + 1].StartsWith('-'))
                 {
                     // remove each filter string and stop when we get to the next argument flag
                     parameterValue.Add(argsList[parameterIndex + 1]);
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/Extensions.cs b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/Extensions.cs
index 7d0631b896b..9bc477bc4fe 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/Extensions.cs
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/Extensions.cs
@@ -13,7 +13,7 @@ public static class SummaryExtensions
         public static int ToExitCode(this IEnumerable<Summary> summaries)
         {
             // an empty summary means that initial filtering and validation did not allow to run
-            if (!summaries.Any()) 
+            if (!summaries.Any())
                 return 1;
 
             // if anything has failed, it's an error
@@ -23,4 +23,4 @@ public static int ToExitCode(this IEnumerable<Summary> summaries)
             return 0;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/MandatoryCategoryValidator.cs b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/MandatoryCategoryValidator.cs
index 7b3b2d38f3b..6f84b3f5767 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/MandatoryCategoryValidator.cs
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/MandatoryCategoryValidator.cs
@@ -32,4 +32,4 @@ public IEnumerable<ValidationError> Validate(ValidationParameters validationPara
                         $"{benchmarkId} does not belong to one of the mandatory categories: {string.Join(", ", _mandatoryCategories)}. Use [BenchmarkCategory(Categories.$)]")
                 );
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/PartitionFilter.cs b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/PartitionFilter.cs
index 16ae22f3167..d7089f6f5a8 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/PartitionFilter.cs
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/PartitionFilter.cs
@@ -10,13 +10,13 @@ public class PartitionFilter : IFilter
     private readonly int? _partitionsCount;
     private readonly int? _partitionIndex; // indexed from 0
     private int _counter = 0;
- 
+
     public PartitionFilter(int? partitionCount, int? partitionIndex)
     {
         _partitionsCount = partitionCount;
         _partitionIndex = partitionIndex;
     }
- 
+
     public bool Predicate(BenchmarkCase benchmarkCase)
     {
         if (!_partitionsCount.HasValue || !_partitionIndex.HasValue)
@@ -24,4 +24,4 @@ public bool Predicate(BenchmarkCase benchmarkCase)
 
         return _counter++ % _partitionsCount.Value == _partitionIndex.Value; // will return true only for benchmarks that belong to it’s partition
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/TooManyTestCasesValidator.cs b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/TooManyTestCasesValidator.cs
index b001f603dcb..cd9c3a424ce 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/TooManyTestCasesValidator.cs
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/TooManyTestCasesValidator.cs
@@ -14,9 +14,9 @@ namespace BenchmarkDotNet.Extensions
     public class TooManyTestCasesValidator : IValidator
     {
         private const int Limit = 16;
-        
+
         public static readonly IValidator FailOnError = new TooManyTestCasesValidator();
-        
+
         public bool TreatsWarningsAsErrors => true;
 
         public IEnumerable<ValidationError> Validate(ValidationParameters validationParameters)
@@ -30,4 +30,4 @@ public IEnumerable<ValidationError> Validate(ValidationParameters validationPara
                     benchmarkCase: group.First()));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/UniqueArgumentsValidator.cs b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/UniqueArgumentsValidator.cs
index 7bfab8445cb..0309e1e9065 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/UniqueArgumentsValidator.cs
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/UniqueArgumentsValidator.cs
@@ -30,7 +30,7 @@ private class BenchmarkArgumentsComparer : IEqualityComparer<BenchmarkCase>
         {
             public bool Equals(BenchmarkCase x, BenchmarkCase y)
                 => Enumerable.SequenceEqual(
-                    x.Parameters.Items.Select(argument => argument.Value), 
+                    x.Parameters.Items.Select(argument => argument.Value),
                     y.Parameters.Items.Select(argument => argument.Value));
 
             public int GetHashCode(BenchmarkCase obj)
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/ValuesGenerator.cs b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/ValuesGenerator.cs
index 87bf6d82d8d..85f5d98af59 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/ValuesGenerator.cs
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/ValuesGenerator.cs
@@ -33,7 +33,7 @@ public static T[] ArrayOfUniqueValues<T>(int count)
             // of random-sized memory by BDN engine
             T[] result = new T[count];
 
-            var random = new Random(Seed); 
+            var random = new Random(Seed);
 
             var uniqueValues = new HashSet<T>();
 
@@ -49,12 +49,12 @@ public static T[] ArrayOfUniqueValues<T>(int count)
 
             return result;
         }
-        
+
         public static T[] Array<T>(int count)
         {
             var result = new T[count];
 
-            var random = new Random(Seed); 
+            var random = new Random(Seed);
 
             if (typeof(T) == typeof(byte) || typeof(T) == typeof(sbyte))
             {
@@ -145,4 +145,4 @@ private static Guid GenerateRandomGuid(Random random)
             return new Guid(bytes);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/Reporting/Counter.cs b/test/perf/dotnet-tools/Reporting/Counter.cs
index 3952369c312..f97f0771b99 100644
--- a/test/perf/dotnet-tools/Reporting/Counter.cs
+++ b/test/perf/dotnet-tools/Reporting/Counter.cs
@@ -20,4 +20,4 @@ public class Counter
 
         public IList<double> Results { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/Reporting/Os.cs b/test/perf/dotnet-tools/Reporting/Os.cs
index 692a75ee7c5..760142d3137 100644
--- a/test/perf/dotnet-tools/Reporting/Os.cs
+++ b/test/perf/dotnet-tools/Reporting/Os.cs
@@ -12,4 +12,4 @@ public class Os
 
         public string Name { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/Reporting/Reporter.cs b/test/perf/dotnet-tools/Reporting/Reporter.cs
index 9291d6f36eb..d99ecfaf47c 100644
--- a/test/perf/dotnet-tools/Reporting/Reporter.cs
+++ b/test/perf/dotnet-tools/Reporting/Reporter.cs
@@ -44,7 +44,7 @@ public static Reporter CreateReporter(IEnvironment environment = null)
             {
                 ret.Init();
             }
-                        
+
             return ret;
         }
 
@@ -66,7 +66,7 @@ private void Init()
                 {
                     var split = kvp.Split('=');
                     run.Configurations.Add(split[0], split[1]);
-                } 
+                }
             }
 
             os = new Os()
@@ -91,7 +91,7 @@ private void Init()
         public string GetJson()
         {
             if (!InLab)
-            { 
+            {
                 return null;
             }
             var jsonobj = new
@@ -122,7 +122,7 @@ public string WriteResultTable()
                 ret.AppendLine($"{LeftJustify("Metric", counterWidth)}|{LeftJustify("Average",resultWidth)}|{LeftJustify("Min", resultWidth)}|{LeftJustify("Max",resultWidth)}");
                 ret.AppendLine($"{new String('-', counterWidth)}|{new String('-', resultWidth)}|{new String('-', resultWidth)}|{new String('-', resultWidth)}");
 
-           
+
                 ret.AppendLine(Print(defaultCounter, counterWidth, resultWidth));
                 foreach(var counter in topCounters)
                 {
diff --git a/test/perf/dotnet-tools/Reporting/Reporting.csproj b/test/perf/dotnet-tools/Reporting/Reporting.csproj
index 70447cf5d73..b11b5e36ec4 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="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
   </ItemGroup>
 
diff --git a/test/perf/dotnet-tools/ResultsComparer/CommandLineOptions.cs b/test/perf/dotnet-tools/ResultsComparer/CommandLineOptions.cs
index d3ad01be95b..90a439f66cc 100644
--- a/test/perf/dotnet-tools/ResultsComparer/CommandLineOptions.cs
+++ b/test/perf/dotnet-tools/ResultsComparer/CommandLineOptions.cs
@@ -51,4 +51,4 @@ public static IEnumerable<Example> Examples
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/ResultsComparer/DataTransferContracts.cs b/test/perf/dotnet-tools/ResultsComparer/DataTransferContracts.cs
index c3399ea4333..94511488efd 100644
--- a/test/perf/dotnet-tools/ResultsComparer/DataTransferContracts.cs
+++ b/test/perf/dotnet-tools/ResultsComparer/DataTransferContracts.cs
@@ -130,4 +130,4 @@ public class BdnResult
         public HostEnvironmentInfo HostEnvironmentInfo { get; set; }
         public List<Benchmark> Benchmarks { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/test/perf/dotnet-tools/ResultsComparer/Program.cs b/test/perf/dotnet-tools/ResultsComparer/Program.cs
index 68615f61c78..a0c14e0057a 100644
--- a/test/perf/dotnet-tools/ResultsComparer/Program.cs
+++ b/test/perf/dotnet-tools/ResultsComparer/Program.cs
@@ -191,7 +191,7 @@ private static void ExportToCsv((string id, Benchmark baseResult, Benchmark diff
         private static void ExportToXml((string id, Benchmark baseResult, Benchmark diffResult, EquivalenceTestConclusion conclusion)[] notSame, FileInfo xmlPath)
         {
             if (xmlPath == null)
-            {  
+            {
                 Console.WriteLine("No file given");
                 return;
             }
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index a8b48dde151..ff3f14d5a0d 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -3,13 +3,13 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFrameworks>
     <TargetFramework Condition="'$(TargetFrameworks)' == ''">net5.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
-    <PackageReference Include="Perfolizer" Version="0.3.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
+    <PackageReference Include="Perfolizer" Version="0.7.1" />
   </ItemGroup>
 </Project>
diff --git a/test/perf/nuget.config b/test/perf/nuget.config
deleted file mode 100644
index e8b7ac6770f..00000000000
--- a/test/perf/nuget.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
-  </packageSources>
-</configuration>
diff --git a/test/powershell/Host/Base-Directory.Tests.ps1 b/test/powershell/Host/Base-Directory.Tests.ps1
index a55af971f09..203d214e937 100644
--- a/test/powershell/Host/Base-Directory.Tests.ps1
+++ b/test/powershell/Host/Base-Directory.Tests.ps1
@@ -44,7 +44,7 @@ Describe "Configuration file locations" -tags "CI","Slow" {
         }
 
         It @ItArgs "PSModulePath should contain the correct path" {
-            $env:PSModulePath = ""
+            $env:PSModulePath = $null
             $actual = & $powershell -noprofile -c `$env:PSModulePath
             $actual | Should -Match ([regex]::Escape($expectedModule))
         }
@@ -94,7 +94,7 @@ Describe "Configuration file locations" -tags "CI","Slow" {
         }
 
         It @ItArgs "PSModulePath should respect XDG_DATA_HOME" {
-            $env:PSModulePath = ""
+            $env:PSModulePath = $null
             $env:XDG_DATA_HOME = $TestDrive
             $expected = [IO.Path]::Combine($TestDrive, "powershell", "Modules")
             $actual = & $powershell -noprofile -c `$env:PSModulePath
diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
index 9a546302906..534cce2d356 100644
--- a/test/powershell/Host/ConsoleHost.Tests.ps1
+++ b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -386,6 +386,33 @@ export $envVarName='$guid'
         }
     }
 
+    Context "-SettingsFile Commandline switch set 'PSModulePath'" {
+
+        BeforeAll {
+            $CustomSettingsFile = Join-Path -Path $TestDrive -ChildPath 'powershell.test.json'
+            $mPath1 = Join-Path $PSHOME 'Modules'
+            $mPath2 = Join-Path $TestDrive 'NonExist'
+            $pathSep = [System.IO.Path]::PathSeparator
+
+            ## Use multiple paths in the setting.
+            $ModulePath = "${mPath1}${pathSep}${mPath2}".Replace('\', "\\")
+            Set-Content -Path $CustomSettingsfile -Value "{`"Microsoft.PowerShell:ExecutionPolicy`":`"Unrestricted`", `"PSModulePath`": `"$ModulePath`" }" -ErrorAction Stop
+        }
+
+        It "Verify PowerShell PSModulePath should contain paths from config file" {
+            $psModulePath = & $powershell -NoProfile -SettingsFile $CustomSettingsFile -Command '$env:PSModulePath'
+
+            ## $mPath1 already exists in the value of env PSModulePath, so it won't be added again.
+            $index = $psModulePath.IndexOf("${mPath1}${pathSep}", [System.StringComparison]::OrdinalIgnoreCase)
+            $index | Should -BeGreaterThan 0
+            $index += $mPath1.Length
+            $psModulePath.IndexOf($mPath1, $index, [System.StringComparison]::OrdinalIgnoreCase) | Should -BeExactly -1
+
+            ## $mPath2 should be added at the index position 0.
+            $psModulePath.StartsWith("${mPath2}${pathSep}", [System.StringComparison]::OrdinalIgnoreCase) | Should -BeTrue
+        }
+    }
+
     Context "Pipe to/from powershell" {
         BeforeAll {
             if ($null -ne $PSStyle) {
@@ -435,6 +462,27 @@ export $envVarName='$guid'
             $out = $out.Split([Environment]::NewLine)[0]
             [System.Management.Automation.Internal.StringDecorated]::new($out).ToString("PlainText") | Should -BeExactly "Exception: boom"
         }
+
+        It "Progress is not emitted when stdout is redirected" {
+            $ps = [powershell]::Create()
+            $null = $ps.AddScript('$a = & ([Environment]::ProcessPath) -Command "Write-Progress -Activity progress"; $a')
+            $actual = $ps.Invoke()
+
+            $ps.HadErrors | Should -BeFalse
+            $actual | Should -BeNullOrEmpty
+            $ps.Streams.Progress | Should -BeNullOrEmpty
+        }
+
+        It "Progress is still emitted with redireciton with XML output" {
+            $ps = [powershell]::Create()
+            $null = $ps.AddScript('$a = & ([Environment]::ProcessPath) -OutputFormat xml -Command "Write-Progress -Activity progress"; $a')
+            $actual = $ps.Invoke()
+
+            $ps.HadErrors | Should -BeFalse
+            $actual | Should -BeNullOrEmpty
+            $ps.Streams.Progress.Count | Should -Be 1
+            $ps.Streams.Progress[0].Activity | Should -Be progress
+        }
     }
 
     Context "Redirected standard output" {
@@ -964,7 +1012,12 @@ public static WINDOWPLACEMENT GetPlacement(IntPtr hwnd)
 {
     WINDOWPLACEMENT placement = new WINDOWPLACEMENT();
     placement.length = Marshal.SizeOf(placement);
-    GetWindowPlacement(hwnd, ref placement);
+
+    if (!GetWindowPlacement(hwnd, ref placement))
+    {
+        throw new System.ComponentModel.Win32Exception();
+    }
+
     return placement;
 }
 
@@ -1000,7 +1053,7 @@ public enum ShowWindowCommands : int
         $global:PSDefaultParameterValues = $defaultParamValues
     }
 
-    It "-WindowStyle <WindowStyle> should work on Windows" -TestCases @(
+    It "-WindowStyle <WindowStyle> should work on Windows" -Pending -TestCases @(
             @{WindowStyle="Normal"},
             @{WindowStyle="Minimized"},
             @{WindowStyle="Maximized"}  # hidden doesn't work in CI/Server Core
@@ -1182,4 +1235,19 @@ Describe 'TERM env var' -Tag CI {
             $env:NO_COLOR = $null
         }
     }
+
+    It 'No_COLOR should be respected for redirected output' {
+        $psi =  [System.Diagnostics.ProcessStartInfo] @{
+            FileName  = 'pwsh'
+            # Pass a command that succeeds and normally produces colored output, and one that produces error output.
+            Arguments = '-NoProfile -Command Get-Item .; Get-Content \nosuch123'
+            # Redirect (capture) both stdout and stderr.
+            RedirectStandardOutput = $true
+            RedirectStandardError = $true
+          }
+        $psi.Environment.Add('NO_COLOR', 1)
+        ($ps = [System.Diagnostics.Process]::Start($psi)).WaitForExit()
+        $ps.StandardOutput.ReadToEnd() | Should -Not -Contain '\e'
+        $ps.StandardError.ReadToEnd() | Should -Not -Contain '\e'
+    }
 }
diff --git a/test/powershell/Host/HostUtilities.Tests.ps1 b/test/powershell/Host/HostUtilities.Tests.ps1
index da65dc81624..e151a2cfc2b 100644
--- a/test/powershell/Host/HostUtilities.Tests.ps1
+++ b/test/powershell/Host/HostUtilities.Tests.ps1
@@ -81,3 +81,18 @@ Describe 'PromptForCredential' -Tags "CI" {
         $out.UserName | Should -BeExactly 'myDomain\myUser'
     }
 }
+
+Describe 'PushRunspaceLocalFailure' -Tags 'CI' {
+    It 'Should throw an exception when pushing a local runspace' {
+        $runspace = [RunspaceFactory]::CreateRunspace()
+        try {
+            $runspace.Open()
+            $exc = { $Host.PushRunspace($runspace) } | Should -Throw -PassThru
+            $exc.Exception.InnerException | Should -BeOfType ([System.ArgumentException])
+            [string]$exc | Should -BeLike "*PushRunspace can only push a remote runspace. (Parameter 'runspace')*"
+        }
+        finally {
+            $runspace.Dispose()
+        }
+    }
+}
diff --git a/test/powershell/Host/Logging.Tests.ps1 b/test/powershell/Host/Logging.Tests.ps1
index a3c7b78745e..53798dc1c3c 100644
--- a/test/powershell/Host/Logging.Tests.ps1
+++ b/test/powershell/Host/Logging.Tests.ps1
@@ -43,6 +43,29 @@ enum LogKeyword
     ManagedPlugin = 0x100
 }
 
+# mac log command can emit json, so just use that
+# we need to deconstruct the eventmessage to get the event id
+# we also need to filter out the non-default messages
+function Get-MacOsSyslogItems {
+    param ([int]$processId, [string]$logId)
+    $logArgs = "show", "--process", "$processId", "--style", "json"
+    log $logArgs |
+        ConvertFrom-Json |
+        Where-Object { $_.category -eq "$logId" -and $_.messageType -eq "Default" } |
+        ForEach-Object {
+            $s = $_.eventMessage.IndexOf('[') + 1
+            $e = $_.EventMessage.IndexOf(']')
+            $l = $e - $s
+            if ($l -gt 0) {
+                $eventId = $_.eventMessage.SubString($s, $l)
+            }
+            else {
+                $eventId = "unknown"
+            }
+            $_ | Add-Member -MemberType NoteProperty -Name EventId -Value $eventId -PassThru
+        }
+}
+
 <#
 .SYNOPSIS
    Creates a powershell.config.json file with syslog settings
@@ -317,26 +340,19 @@ Path:.*
         }
     }
 
-    It 'Verifies basic logging with no customizations' -Skip:(!$IsSupportedEnvironment) {
+    It 'Verifies basic logging with no customizations' -Skip:(!$IsMacOS) {
         try {
+            $timeString = [DateTime]::Now.ToString('yyyy-MM-dd HH:mm:ss')
             $configFile = WriteLogSettings -LogId $logId
+            copy-item $configFile /tmp/pwshtest.config.json
             $testPid = & $powershell -NoProfile -SettingsFile $configFile -Command '$PID'
-
-            Export-PSOsLog -After $after -LogPid $testPid -TimeoutInMilliseconds 30000 -IntervalInMilliseconds 3000 -MinimumCount 3 |
-                Set-Content -Path $contentFile
-            $items = @(Get-PSOsLog -Path $contentFile -Id $logId -After $after -TotalCount 3 -Verbose)
+            $items = Get-MacOsSyslogItems -processId $testPid -logId $logId
 
             $items | Should -Not -Be $null
             $items.Count | Should -BeGreaterThan 2
-            $items[0].EventId | Should -BeExactly 'Perftrack_ConsoleStartupStart:PowershellConsoleStartup.WinStart.Informational'
-            $items[1].EventId | Should -BeExactly 'NamedPipeIPC_ServerListenerStarted:NamedPipe.Open.Informational'
-            $items[2].EventId | Should -BeExactly 'Perftrack_ConsoleStartupStop:PowershellConsoleStartup.WinStop.Informational'
-            # if there are more items than expected...
-            if ($items.Count -gt 3)
-            {
-                # Force reporting of the first unexpected item to help diagnosis
-                $items[3] | Should -Be $null
-            }
+            $items.EventId | Should -Contain 'Perftrack_ConsoleStartupStart:PowershellConsoleStartup.WinStart.Informational'
+            $items.EventId | Should -Contain 'NamedPipeIPC_ServerListenerStarted:NamedPipe.Open.Informational'
+            $items.EventId | Should -Contain 'Perftrack_ConsoleStartupStop:PowershellConsoleStartup.WinStop.Informational'
         }
         catch {
             if (Test-Path $contentFile) {
@@ -346,7 +362,7 @@ Path:.*
         }
     }
 
-    It 'Verifies scriptblock logging' -Skip:(!$IsSupportedEnvironment) {
+    It 'Verifies scriptblock logging' -Skip:(!$IsMacOS) {
         try {
             $script = @'
 $PID
@@ -357,24 +373,23 @@ $PID
             $testScriptPath = Join-Path -Path $TestDrive -ChildPath $testFileName
             $script | Out-File -FilePath $testScriptPath -Force
             $testPid = & $powershell -NoProfile -SettingsFile $configFile -Command $testScriptPath
-
-            Export-PSOsLog -After $after -LogPid $testPid -TimeoutInMilliseconds 30000 -IntervalInMilliseconds 3000 -MinimumCount 17 |
-                Set-Content -Path $contentFile
-            $items = @(Get-PSOsLog -Path $contentFile -Id $logId -After $after -Verbose)
+            $items = Get-MacOsSyslogItems -processId $testPid -logId $logId
 
             $items | Should -Not -Be $null
             $items.Count | Should -BeGreaterThan 2
             $createdEvents = $items | Where-Object {$_.EventId -eq 'ScriptBlock_Compile_Detail:ExecuteCommand.Create.Verbose'}
             $createdEvents.Count | Should -BeGreaterOrEqual 3
 
+            $createdEvents | ConvertTo-Json | set-content /tmp/createdEvents.json
+
             # Verify we log that we are executing a file
-            $createdEvents[0].Message | Should -Match ($scriptBlockCreatedRegExTemplate -f ".*/$testFileName")
+            $createdEvents[0].EventMessage | Should -Match $testFileName
 
             # Verify we log that we are the script to create the scriptblock
-            $createdEvents[1].Message | Should -Match ($scriptBlockCreatedRegExTemplate -f (Get-RegEx -SimpleMatch $Script))
+            $createdEvents[1].EventMessage | Should -Match (Get-RegEx -SimpleMatch $Script)
 
             # Verify we log that we are executing the created scriptblock
-            $createdEvents[2].Message | Should -Match ($scriptBlockCreatedRegExTemplate -f "Write\-Verbose 'testheader123' ;Write\-verbose 'after'")
+            $createdEvents[2].EventMessage | Should -Match "Write-Verbose 'testheader123' ;Write-verbose 'after'"
         }
         catch {
             if (Test-Path $contentFile) {
@@ -384,35 +399,28 @@ $PID
         }
     }
 
-    It 'Verifies scriptblock logging with null character' -Skip:(!$IsSupportedEnvironment) {
+    It 'Verifies scriptblock logging with null character' -Skip:(!$IsMacOS) {
         try {
             $script = @'
 $PID
 & ([scriptblock]::create("Write-Verbose 'testheader123$([char]0x0000)' ;Write-verbose 'after'"))
 '@
             $configFile = WriteLogSettings -ScriptBlockLogging -LogId $logId -LogLevel Verbose
-            $testFileName = 'test01.ps1'
+            $testFileName = 'test02.ps1'
             $testScriptPath = Join-Path -Path $TestDrive -ChildPath $testFileName
             $script | Out-File -FilePath $testScriptPath -Force
-            $testPid = & $powershell -NoProfile -SettingsFile $configFile -Command $testScriptPath
+            $testPid = & $powershell -NoProfile -SettingsFile $configFile -Command $testScriptPath | Select-Object -First 1
 
-            Export-PSOsLog -After $after -LogPid $testPid -TimeoutInMilliseconds 30000 -IntervalInMilliseconds 3000 -MinimumCount 17 |
-                Set-Content -Path $contentFile
-            $items = @(Get-PSOsLog -Path $contentFile -Id $logId -After $after -Verbose)
+            $items = Get-MacOsSyslogItems -processId $testPid -logId $logId
+            $items | convertto-json | set-content /tmp/items.json
 
-            $items | Should -Not -Be $null
-            $items.Count | Should -BeGreaterThan 2
             $createdEvents = $items | Where-Object {$_.EventId -eq 'ScriptBlock_Compile_Detail:ExecuteCommand.Create.Verbose'}
-            $createdEvents.Count | Should -BeGreaterOrEqual 3
 
             # Verify we log that we are executing a file
-            $createdEvents[0].Message | Should -Match ($scriptBlockCreatedRegExTemplate -f ".*/$testFileName")
-
-            # Verify we log that we are the script to create the scriptblock
-            $createdEvents[1].Message | Should -Match ($scriptBlockCreatedRegExTemplate -f (Get-RegEx -SimpleMatch $Script))
+            $createdEvents[0].EventMessage | Should -Match $testFileName
 
-            # Verify we log that we are executing the created scriptblock
-            $createdEvents[2].Message | Should -Match ($scriptBlockCreatedRegExTemplate -f "Write\-Verbose 'testheader123␀' ;Write\-verbose 'after'")
+            # Verify we log the null in the message
+            $createdEvents[1].EventMessage | Should -Match "Write-Verbose 'testheader123\`$\(\[char\]0x0000\)' ;Write-verbose 'after'"
         }
         catch {
             if (Test-Path $contentFile) {
@@ -422,25 +430,13 @@ $PID
         }
     }
 
-    # This is pending because it results in false postitives (-Skip:(!$IsSupportedEnvironment) )
-    It 'Verifies logging level filtering works' -Pending {
-        try {
-            $configFile = WriteLogSettings -LogId $logId -LogLevel Warning
-            $testPid = & $powershell -NoLogo -NoProfile -SettingsFile $configFile -Command '$PID'
-
-            Export-PSOsLog -After $after -LogPid $testPid |
-                Set-Content -Path $contentFile
-            # by default, powershell startup should only logs informational events.
-            # With Level = Warning, nothing should be logged.
-            $items = Get-PSOsLog -Path $contentFile -Id $logId -After $after -TotalCount 3
-            $items | Should -Be $null
-        }
-        catch {
-            if (Test-Path $contentFile) {
-                Send-VstsLogFile -Path $contentFile
-            }
-            throw
-        }
+    # this is now specific to MacOS
+    It 'Verifies logging level filtering works' -skip:(!$IsMacOs) {
+        $configFile = WriteLogSettings -LogId $logId -LogLevel Warning
+        $testPid = & $powershell -NoLogo -NoProfile -SettingsFile $configFile -Command '$PID'
+
+        $items = Get-MacOsSyslogItems -processId $testPid -logId $logId
+        $items | Should -Be $null -Because ("{0} Warning event logs were found" -f @($items).Count)
     }
 }
 
diff --git a/test/powershell/Host/ScreenReader.Tests.ps1 b/test/powershell/Host/ScreenReader.Tests.ps1
deleted file mode 100644
index 1b11a0e3ffa..00000000000
--- a/test/powershell/Host/ScreenReader.Tests.ps1
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-Describe "Validate start of console host" -Tag CI {
-    BeforeAll {
-        if (-not $IsWindows) {
-            return
-        }
-
-        $csharp_source = @'
-            using System;
-            using System.Runtime.InteropServices;
-
-            public class ScreenReaderTestUtility {
-                private const uint SPI_SETSCREENREADER = 0x0047;
-
-                [DllImport("user32.dll", SetLastError = true)]
-                [return: MarshalAs(UnmanagedType.Bool)]
-                private static extern bool SystemParametersInfo(uint uiAction, uint uiParam, IntPtr pvParam, uint fWinIni);
-
-                public static bool ActivateScreenReader() {
-                    return SystemParametersInfo(SPI_SETSCREENREADER, 1u, IntPtr.Zero, 0);
-                }
-
-                public static bool DeactivateScreenReader() {
-                    return SystemParametersInfo(SPI_SETSCREENREADER, 0u, IntPtr.Zero, 0);
-                }
-            }
-'@
-        $utilType = "ScreenReaderTestUtility" -as [type]
-        if (-not $utilType) {
-            $utilType = Add-Type -TypeDefinition $csharp_source -PassThru
-        }
-
-        ## Make the screen reader status active.
-        $utilType::ActivateScreenReader()
-    }
-
-    AfterAll {
-        if ($IsWindows) {
-            ## Make the screen reader status in-active.
-            $utilType::DeactivateScreenReader()
-        }
-    }
-
-    It "PSReadLine should not be auto-loaded when screen reader status is active" -Skip:(-not $IsWindows) {
-        if (Test-IsWindowsArm64) {
-            Set-ItResult -Pending -Because "Needs investigation, PSReadline loads on ARM64"
-        }
-
-        $output = & "$PSHOME/pwsh" -noprofile -noexit -c "Get-Module PSReadLine; exit"
-        $output.Length | Should -BeExactly 2 -Because "There should be two lines of output but we got: $output"
-
-        ## The warning message about screen reader should be returned, but the PSReadLine module should not be loaded.
-        $output[0] | Should -BeLike "Warning:*'Import-Module PSReadLine'."
-        $output[1] | Should -BeExactly ([string]::Empty)
-    }
-}
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index c8df4fe8017..35c22fefe58 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -33,6 +33,7 @@ Describe "Validate start of console host" -Tag CI {
             'System.Net.Mail.dll'
             'System.Net.NetworkInformation.dll'
             'System.Net.Primitives.dll'
+            'System.Numerics.Vectors.dll'
             'System.ObjectModel.dll'
             'System.Private.CoreLib.dll'
             'System.Private.Uri.dll'
@@ -70,6 +71,7 @@ Describe "Validate start of console host" -Tag CI {
         }
         else {
             $allowedAssemblies += @(
+                'System.Diagnostics.DiagnosticSource.dll'
                 'System.Net.Sockets.dll'
             )
         }
diff --git a/test/powershell/Host/TabCompletion/BugFix.Tests.ps1 b/test/powershell/Host/TabCompletion/BugFix.Tests.ps1
index e0ec96aa87b..a7191d06e9b 100644
--- a/test/powershell/Host/TabCompletion/BugFix.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/BugFix.Tests.ps1
@@ -43,6 +43,28 @@ Describe "Tab completion bug fix" -Tags "CI" {
         $result[0].CompletionText | Should -BeExactly '$ErrorActionPreference'
     }
 
+    It "Issue#24756 - Wildcard completions should not return early due to missing results in one container" -Skip:(!$IsWindows) {
+        try
+        {
+            $keys = New-Item -Path @(
+                'HKCU:\AB1'
+                'HKCU:\AB2'
+                'HKCU:\AB2\Test'
+            )
+
+            $res = TabExpansion2 -inputScript 'Get-ChildItem -Path HKCU:\AB?\'
+            $res.CompletionMatches.Count | Should -Be 1
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly "HKCU:\AB2\Test"
+        }
+        finally
+        {
+            if ($keys)
+            {
+                Remove-Item -Path HKCU:\AB? -Recurse -ErrorAction SilentlyContinue
+            }
+        }
+    }
+
     Context "Issue#3416 - 'Select-Object'" {
         BeforeAll {
             $DatetimeProperties = @((Get-Date).psobject.baseobject.psobject.properties) | Sort-Object -Property Name
@@ -104,4 +126,27 @@ Describe "Tab completion bug fix" -Tags "CI" {
             $Runspace.Dispose()
         }
     }
+
+    It "Issue#26277 - [CompletionCompleters]::CompleteFilename('') should work" {
+        $testDir = Join-Path $TestDrive "TempTestDir"
+        $file1 = Join-Path $testDir "abc.ps1"
+        $file2 = Join-Path $testDir "def.py"
+
+        New-Item -ItemType Directory -Path $testDir > $null
+        New-Item -ItemType File -Path $file1 > $null
+        New-Item -ItemType File -Path $file2 > $null
+
+        try {
+            Push-Location -Path $testDir
+            $result = [System.Management.Automation.CompletionCompleters]::CompleteFilename("")
+            $result | Should -Not -Be $null
+            $result | Measure-Object | ForEach-Object -MemberName Count | Should -Be 2
+
+            $item1, $item2 = @($result)
+            $item1.ListItemText | Should -BeExactly 'abc.ps1'
+            $item2.ListItemText | Should -BeExactly 'def.py'
+        } finally {
+            Pop-Location
+        }
+    }
 }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 4d4aea1f0aa..f8762a63929 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -23,11 +23,77 @@ Describe "TabCompletion" -Tags CI {
         $res | Should -BeExactly 'Test-AbbreviatedFunctionExpansion'
     }
 
+    It 'Should complete module by shortname' {
+        $res = TabExpansion2 -inputScript 'Get-Module -ListAvailable -Name Host'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Microsoft.PowerShell.Host'
+    }
+
     It 'Should complete native exe' -Skip:(!$IsWindows) {
         $res = TabExpansion2 -inputScript 'notep' -cursorColumn 'notep'.Length
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'notepad.exe'
     }
 
+    It 'Should not include duplicate command results' {
+        $OldModulePath = $env:PSModulePath
+        $tempDir = Join-Path -Path $TestDrive -ChildPath "TempPsModuleDir"
+        $ModuleDirs = @(
+            Join-Path $tempDir "TestModule1\1.0"
+            Join-Path $tempDir "TestModule1\1.1"
+            Join-Path $tempDir "TestModule2\1.0"
+        )
+        try
+        {
+            foreach ($Dir in $ModuleDirs)
+            {
+                $NewDir = New-Item -Path $Dir -ItemType Directory -Force
+                $ModuleName = $NewDir.Parent.Name
+                Set-Content -Value 'MyTestFunction{}' -LiteralPath "$($NewDir.FullName)\$ModuleName.psm1"
+                New-ModuleManifest -Path "$($NewDir.FullName)\$ModuleName.psd1" -RootModule "$ModuleName.psm1" -FunctionsToExport "MyTestFunction" -ModuleVersion $NewDir.Name
+            }
+
+            $env:PSModulePath += [System.IO.Path]::PathSeparator + $tempDir            
+            $Res = TabExpansion2 -inputScript MyTestFunction
+            $Res.CompletionMatches.Count | Should -Be 2
+            $SortedMatches = $Res.CompletionMatches.CompletionText | Sort-Object
+            $SortedMatches[0] | Should -Be "TestModule1\MyTestFunction"
+            $SortedMatches[1] | Should -Be "TestModule2\MyTestFunction"
+        }
+        finally
+        {
+            $env:PSModulePath = $OldModulePath
+            Remove-Item -LiteralPath $ModuleDirs -Recurse -Force
+        }
+    }
+
+    It 'Should not include duplicate module results' {
+        $OldModulePath = $env:PSModulePath
+        $tempDir = Join-Path -Path $TestDrive -ChildPath "TempPsModuleDir"
+        try
+        {
+            $ModuleDirs = @(
+                Join-Path $tempDir "TestModule1\1.0"
+                Join-Path $tempDir "TestModule1\1.1"
+            )
+            foreach ($Dir in $ModuleDirs)
+            {
+                $NewDir = New-Item -Path $Dir -ItemType Directory -Force
+                $ModuleName = $NewDir.Parent.Name
+                Set-Content -Value 'MyTestFunction{}' -LiteralPath "$($NewDir.FullName)\$ModuleName.psm1"
+                New-ModuleManifest -Path "$($NewDir.FullName)\$ModuleName.psd1" -RootModule "$ModuleName.psm1" -FunctionsToExport "MyTestFunction" -ModuleVersion $NewDir.Name
+            }
+
+            $env:PSModulePath += [System.IO.Path]::PathSeparator + $tempDir            
+            $Res = TabExpansion2 -inputScript 'Import-Module -Name TestModule'
+            $Res.CompletionMatches.Count | Should -Be 1
+            $Res.CompletionMatches[0].CompletionText | Should -Be TestModule1
+        }
+        finally
+        {
+            $env:PSModulePath = $OldModulePath
+            Remove-Item -LiteralPath $ModuleDirs -Recurse -Force
+        }
+    }
+
     It 'Should complete dotnet method' {
         $res = TabExpansion2 -inputScript '(1).ToSt' -cursorColumn '(1).ToSt'.Length
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'ToString('
@@ -79,6 +145,100 @@ Describe "TabCompletion" -Tags CI {
         $res.CompletionMatches[0].CompletionText | Should -BeExactly '$CurrentItem'
     }
 
+    It 'Should complete variables set with an attribute' {
+        $res = TabExpansion2 -inputScript '[ValidateNotNull()]$Var1 = 1; $Var'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$Var1'
+    }
+
+    It 'Should use the first type constraint in a variable assignment in the tooltip' {
+        $res = TabExpansion2 -inputScript '[int] [string] $Var1 = 1; $Var'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$Var1'
+        $res.CompletionMatches[0].ToolTip | Should -BeExactly '[int]$Var1'
+    }
+
+    It 'Should not complete parameter name' {
+        $res = TabExpansion2 -inputScript 'param($P'
+        $res.CompletionMatches.Count | Should -Be 0
+    }
+
+    It 'Should complete variable in default value of a parameter' {
+        $res = TabExpansion2 -inputScript 'param($PS = $P'
+        $res.CompletionMatches.Count | Should -BeGreaterThan 0
+    }
+    
+    It 'Should complete variable with description and value <Value>' -TestCases @(
+        @{ Value = 1; Expected = '[int]$VariableWithDescription - Variable description' }
+        @{ Value = 'string'; Expected = '[string]$VariableWithDescription - Variable description' }
+        @{ Value = $null; Expected = 'VariableWithDescription - Variable description' }
+    ) {
+        param ($Value, $Expected)
+        
+        New-Variable -Name VariableWithDescription -Value $Value -Description 'Variable description' -Force
+        $res = TabExpansion2 -inputScript '$VariableWithDescription'
+        $res.CompletionMatches.Count | Should -Be 1
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$VariableWithDescription'
+        $res.CompletionMatches[0].ToolTip | Should -BeExactly $Expected
+    }
+    
+    It 'Should complete environment variable' {
+        try {
+            $env:PWSH_TEST_1 = 'value 1'
+            $env:PWSH_TEST_2 = 'value 2'
+
+            $res = TabExpansion2 -inputScript '$env:PWSH_TEST_'
+            $res.CompletionMatches.Count | Should -Be 2
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly '$env:PWSH_TEST_1'
+            $res.CompletionMatches[0].ListItemText | Should -BeExactly 'PWSH_TEST_1'
+            $res.CompletionMatches[0].ToolTip | Should -BeExactly 'PWSH_TEST_1'
+            $res.CompletionMatches[1].CompletionText | Should -BeExactly '$env:PWSH_TEST_2'
+            $res.CompletionMatches[1].ListItemText | Should -BeExactly 'PWSH_TEST_2'
+            $res.CompletionMatches[1].ToolTip | Should -BeExactly 'PWSH_TEST_2'
+        }
+        finally {
+            $env:PWSH_TEST_1 = $null
+            $env:PWSH_TEST_2 = $null
+        }
+    }
+
+    It 'Should complete function variable' {
+        try {
+            Function Test-PwshTest1 {}
+            Function Test-PwshTest2 {}
+
+            $res = TabExpansion2 -inputScript '${function:Test-PwshTest'
+            $res.CompletionMatches.Count | Should -Be 2
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly '${function:Test-PwshTest1}'
+            $res.CompletionMatches[0].ListItemText | Should -BeExactly 'Test-PwshTest1'
+            $res.CompletionMatches[0].ToolTip | Should -BeExactly 'Test-PwshTest1'
+            $res.CompletionMatches[1].CompletionText | Should -BeExactly '${function:Test-PwshTest2}'
+            $res.CompletionMatches[1].ListItemText | Should -BeExactly 'Test-PwshTest2'
+            $res.CompletionMatches[1].ToolTip | Should -BeExactly 'Test-PwshTest2'
+        }
+        finally {
+            Remove-Item function:Test-PwshTest1 -ErrorAction SilentlyContinue
+            Remove-Item function:Test-PwshTest1 -ErrorAction SilentlyContinue
+        }
+    }
+
+    It 'Should complete scoped variable with description and value <Value>' -TestCases @(
+        @{ Value = 1; Expected = '[int]$VariableWithDescription - Variable description' }
+        @{ Value = 'string'; Expected = '[string]$VariableWithDescription - Variable description' }
+        @{ Value = $null; Expected = 'VariableWithDescription - Variable description' }
+    ) {
+        param ($Value, $Expected)
+        
+        New-Variable -Name VariableWithDescription -Value $Value -Description 'Variable description' -Force
+        $res = TabExpansion2 -inputScript '$local:VariableWithDescription'
+        $res.CompletionMatches.Count | Should -Be 1
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$local:VariableWithDescription'
+        $res.CompletionMatches[0].ToolTip | Should -BeExactly $Expected
+    }
+
+    It 'Should not complete property name in class definition' {
+        $res = TabExpansion2 -inputScript 'class X {$P'
+        $res.CompletionMatches.Count | Should -Be 0
+    }
+
     foreach ($Operator in [System.Management.Automation.CompletionCompleters]::CompleteOperator(""))
     {
         It "Should complete $($Operator.CompletionText)" {
@@ -87,6 +247,122 @@ Describe "TabCompletion" -Tags CI {
         }
     }
 
+    context CustomProviderTests {
+        BeforeAll {
+            $testModulePath = Join-Path $TestDrive "ReproModule"
+            New-Item -Path $testModulePath -ItemType Directory > $null
+
+            New-ModuleManifest -Path "$testModulePath/ReproModule.psd1" -RootModule 'testmodule.dll'
+
+            $testBinaryModulePath = Join-Path $testModulePath "testmodule.dll"
+            $binaryModule = @'
+using System;
+using System.Linq;
+using System.Management.Automation;
+using System.Management.Automation.Provider;
+
+namespace BugRepro
+{
+    public class IntItemInfo
+    {
+        public string Name;
+        public IntItemInfo(string name) => Name = name;
+    }
+
+    [CmdletProvider("Int", ProviderCapabilities.None)]
+    public class IntProvider : NavigationCmdletProvider
+    {
+        public static string[] ToChunks(string path) => path.Split("/", StringSplitOptions.RemoveEmptyEntries);
+
+        protected string _ChildName(string path)
+        {
+            var name = ToChunks(path).LastOrDefault();
+            return name ?? string.Empty;
+        }
+
+        protected string Normalize(string path) => string.Join("/", ToChunks(path));
+
+        protected override string GetChildName(string path)
+        {
+            var name = _ChildName(path);
+            // if (!IsItemContainer(path)) { return string.Empty; }
+            return name;
+        }
+
+        protected override bool IsValidPath(string path) => int.TryParse(GetChildName(path), out int _);
+
+        protected override bool IsItemContainer(string path)
+        {
+            var name = _ChildName(path);
+            if (!int.TryParse(name, out int value))
+            {
+                return false;
+            }
+            if (ToChunks(path).Count() > 3)
+            {
+                return false;
+            }
+            return value % 2 == 0;
+        }
+
+        protected override bool ItemExists(string path)
+        {
+            foreach (var chunk in ToChunks(path))
+            {
+                if (!int.TryParse(chunk, out int value))
+                {
+                    return false;
+                }
+                if (value < 0 || value > 9)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        protected override void GetItem(string path)
+        {
+            var name = GetChildName(path);
+            if (!int.TryParse(name, out int _))
+            {
+                return;
+            }
+            WriteItemObject(new IntItemInfo(name), path, IsItemContainer(path));
+        }
+        protected override bool HasChildItems(string path) => IsItemContainer(path);
+
+        protected override void GetChildItems(string path, bool recurse)
+        {
+            if (!IsItemContainer(path)) { GetItem(path); return; }
+
+            for (var i = 0; i <= 9; i++)
+            {
+                var _path = $"{Normalize(path)}/{i}";
+                if (recurse)
+                {
+                    GetChildItems(_path, recurse);
+                }
+                else
+                {
+                    GetItem(_path);
+                }
+            }
+        }
+    }
+}
+'@
+            Add-Type -OutputAssembly $testBinaryModulePath -TypeDefinition $binaryModule
+
+            $pwsh = "$PSHOME\pwsh"
+        }
+
+        It "Should not complete invalid items when a provider path returns itself instead of its children" {
+            $result = & $pwsh -NoProfile -Command "Import-Module -Name $testModulePath; (TabExpansion2 'Get-ChildItem Int::/2/3/').CompletionMatches.Count"
+            $result | Should -BeExactly "0"
+        }
+    }
+
     It 'should complete index expression for <Intent>' -TestCases @(
         @{
             Intent = 'Hashtable with no user input'
@@ -289,6 +565,21 @@ switch ($x)
         $res.CompletionMatches.Count | Should -Be 0
     }
 
+    It 'Should complete variable assigned in command redirection to variable' {
+        $res = TabExpansion2 -inputScript 'New-Guid 1>variable:Redir1 2>variable:Redir2 3>variable:Redir3 4>variable:Redir4 5>variable:Redir5 6>variable:Redir6; $Redir'
+        $res.CompletionMatches[0].CompletionText | Should -Be '$Redir1'
+        $res.CompletionMatches[1].CompletionText | Should -Be '$Redir2'
+        $res.CompletionMatches[1].ToolTip | Should -Be '[ErrorRecord]$Redir2'
+        $res.CompletionMatches[2].CompletionText | Should -Be '$Redir3'
+        $res.CompletionMatches[2].ToolTip | Should -Be '[WarningRecord]$Redir3'
+        $res.CompletionMatches[3].CompletionText | Should -Be '$Redir4'
+        $res.CompletionMatches[3].ToolTip | Should -Be '[VerboseRecord]$Redir4'
+        $res.CompletionMatches[4].CompletionText | Should -Be '$Redir5'
+        $res.CompletionMatches[4].ToolTip | Should -Be '[DebugRecord]$Redir5'
+        $res.CompletionMatches[5].CompletionText | Should -Be '$Redir6'
+        $res.CompletionMatches[5].ToolTip | Should -Be '[InformationRecord]$Redir6'
+    }
+
     context TypeConstructionWithHashtable {
         BeforeAll {
             class RandomTestType {
@@ -458,6 +749,21 @@ using `
         $res.CompletionMatches[0].CompletionText | Should -Be '"Classic"'
     }
 
+    It 'Should work for variable assignment of enum type with type inference' {
+        $res = TabExpansion2 -inputScript '[System.Management.Automation.ProgressView]$MyUnassignedVar = $psstyle.Progress.View; $MyUnassignedVar = "Class'
+        $res.CompletionMatches[0].CompletionText | Should -Be '"Classic"'
+    }
+
+    It 'Should work for property assignment of enum type with type inference with PowerShell class' {
+        $res = TabExpansion2 -inputScript 'enum Animals{Cat= 0;Dog= 1};class AnimalTestClass{[Animals] $Prop1};$Test1 = [AnimalTestClass]::new();$Test1.Prop1 = "C'
+        $res.CompletionMatches[0].CompletionText | Should -Be '"Cat"'
+    }
+
+    It 'Should work for variable assignment with type inference of PowerShell Enum' {
+        $res = TabExpansion2 -inputScript 'enum Animals{Cat= 0;Dog= 1}; [Animals]$TestVar1 = "D'
+        $res.CompletionMatches[0].CompletionText | Should -Be '"Dog"'
+    }
+
     It 'Should work for variable assignment of enum type: <inputStr>' -TestCases @(
         @{ inputStr = '$ErrorActionPreference = '; filter = ''; doubleQuotes = $false }
         @{ inputStr = '$ErrorActionPreference='; filter = ''; doubleQuotes = $false }
@@ -601,6 +907,11 @@ using `
         $res.CompletionMatches.CompletionText | Should -Contain "GetType"
     }
 
+    It 'Should complete variable member inferred from command inside scriptblock' {
+        $res = TabExpansion2 -inputScript '& {(New-Guid).'
+        $res.CompletionMatches.Count | Should -BeGreaterThan 0
+    }
+
     It 'Should not complete void instance members' {
         $res = TabExpansion2 -inputScript '([void]("")).'
         $res.CompletionMatches | Should -BeNullOrEmpty
@@ -613,6 +924,20 @@ using `
         $completionText -join ' ' | Should -BeExactly 'Equals( new( ReferenceEquals('
     }
 
+    It 'Should complete variables assigned inside do while loop' {
+        $TestString =  'do{$Var1 = 1; $Var^ }while ($true)'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$Var1'
+    }
+
+    It 'Should complete variables assigned inside do until loop' {
+        $TestString =  'do{$Var1 = 1; $Var^ }until ($null = Get-ChildItem)'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$Var1'
+    }
+
     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
@@ -646,6 +971,36 @@ ConstructorTestClass(int i, bool b)
         $diffs | Should -BeNullOrEmpty
     }
 
+    It 'Should complete attribute argument in incomplete param block' {
+        $res = TabExpansion2 -inputScript 'param([ValidatePattern('
+        $Expected = ([ValidatePattern].GetProperties() | Where-Object {$_.CanWrite}).Name -join ','
+        $res.CompletionMatches.CompletionText -join ',' | Should -BeExactly $Expected
+    }
+
+    It 'Should complete attribute argument in incomplete param block on new line' {
+        $TestString =  @'
+param([ValidatePattern(
+^)])
+'@
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+        $Expected = ([ValidatePattern].GetProperties() | Where-Object {$_.CanWrite}).Name -join ','
+        $res.CompletionMatches.CompletionText -join ',' | Should -BeExactly $Expected
+    }
+
+    It 'Should complete attribute argument with partially written name in incomplete param block' {
+        $TestString =  'param([ValidatePattern(op^)]'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Options'
+    }
+
+    It 'Should complete attribute argument for incomplete standalone attribute' {
+        $res = TabExpansion2 -inputScript '[ValidatePattern('
+        $Expected = ([ValidatePattern].GetProperties() | Where-Object {$_.CanWrite}).Name -join ','
+        $res.CompletionMatches.CompletionText -join ',' | Should -BeExactly $Expected
+    }
+
     It 'Should complete argument for second parameter' {
         $res = TabExpansion2 -inputScript 'Get-ChildItem -Path $HOME -ErrorAction '
         $res.CompletionMatches[0].CompletionText | Should -BeExactly Break
@@ -657,12 +1012,27 @@ ConstructorTestClass(int i, bool b)
         $res.CompletionMatches[0].CompletionText | Should -BeExactly Cat
     }
 
+    It 'Should complete cim ETS member added by shortname' -Skip:(!$IsWindows -or (Test-IsWinServer2012R2) -or (Test-IsWindows2016)) {
+        $res = TabExpansion2 -inputScript '(Get-NetFirewallRule).Nam'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Name'
+    }
+
     It 'Should complete variable assigned with Data statement' {
         $TestString = 'data MyDataVar {"Hello"};$MyDatav'
         $res = TabExpansion2 -inputScript $TestString
         $res.CompletionMatches[0].CompletionText | Should -BeExactly '$MyDataVar'
     }
 
+    It 'Should complete global variable without scope' {
+        $res = TabExpansion2 -inputScript '$Global:MyTestVar = "Hello";$MyTestV'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$MyTestVar'
+    }
+
+    It 'Should complete previously assigned variable in using: scope' {
+        $res = TabExpansion2 -inputScript '$MyTestVar = "Hello";$Using:MyTestv'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$Using:MyTestVar'
+    }
+
     it 'Should complete "Value" parameter value in "Where-Object" for Enum property with no input' {
         $res = TabExpansion2 -inputScript 'Get-Command | where-Object CommandType -eq '
         $res.CompletionMatches[0].CompletionText | Should -BeExactly Alias
@@ -744,21 +1114,367 @@ ConstructorTestClass(int i, bool b)
         $res.CompletionMatches[0].CompletionText | Should -BeExactly '$TestVar1'
     }
 
+    It 'Should complete variable assigned in ParenExpression' {
+        $res = TabExpansion2 -inputScript '($ParenVar) = 1; $ParenVa'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$ParenVar'
+    }
+
+    It 'Should complete variable assigned in ArrayLiteral' {
+        $res = TabExpansion2 -inputScript '$DemoVar1, $DemoVar2 = 1..10; $DemoVar'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '$DemoVar1'
+        $res.CompletionMatches[1].CompletionText | Should -BeExactly '$DemoVar2'
+    }
+
+    It 'Should include parameter help message in tool tip - SingleMatch <SingleMatch>' -TestCases @(
+        @{ SingleMatch = $true }
+        @{ SingleMatch = $false }
+    ) {
+        param ($SingleMatch)
+
+        Function Test-Function {
+            param (
+                [Parameter(HelpMessage = 'Some help message')]
+                $ParamWithHelp,
+
+                $ParamWithoutHelp
+            )
+        }
+
+        $expected = '[Object] ParamWithHelp - Some help message'
+
+        if ($SingleMatch) {
+            $Script = 'Test-Function -ParamWithHelp'
+            $res = (TabExpansion2 -inputScript $Script).CompletionMatches
+        }
+        else {
+            $Script = 'Test-Function -'
+            $res = (TabExpansion2 -inputScript $Script).CompletionMatches | Where-Object CompletionText -eq '-ParamWithHelp'
+        }
+
+        $res.Count | Should -Be 1
+        $res.CompletionText | Should -BeExactly '-ParamWithHelp'
+        $res.ToolTip | Should -BeExactly $expected
+    }
+
+    It 'Should include parameter help resource message in tool tip - SingleMatch <SingleMatch>' -TestCases @(
+        @{ SingleMatch = $true }
+        @{ SingleMatch = $false }
+    ) {
+        param ($SingleMatch)
+
+        $expected = '`[string`] Activity - *'
+
+        if ($SingleMatch) {
+            $Script = 'Write-Progress -Activity'
+            $res = (TabExpansion2 -inputScript $Script).CompletionMatches
+        }
+        else {
+            $Script = 'Write-Progress -'
+            $res = (TabExpansion2 -inputScript $Script).CompletionMatches | Where-Object CompletionText -eq '-Activity'
+        }
+
+        $res.Count | Should -Be 1
+        $res.CompletionText | Should -BeExactly '-Activity'
+        $res.ToolTip | Should -BeLikeExactly $expected
+    }
+
+    It 'Should skip empty parameter HelpMessage with multiple parameters - SingleMatch <SingleMatch>' -TestCases @(
+        @{ SingleMatch = $true }
+        @{ SingleMatch = $false }
+    ) {
+        param ($SingleMatch)
+
+        Function Test-Function {
+            [CmdletBinding(DefaultParameterSetName = 'SetWithoutHelp')]
+            param (
+                [Parameter(ParameterSetName = 'SetWithHelp', HelpMessage = 'Help Message')]
+                [Parameter(ParameterSetName = 'SetWithoutHelp')]
+                [string]
+                $ParamWithHelp,
+                
+                [Parameter(ParameterSetName = 'SetWithHelp')]
+                [switch]
+                $ParamWithoutHelp
+            )
+        }
+
+        $expected = '[string] ParamWithHelp - Help Message'
+
+        if ($SingleMatch) {
+            $Script = 'Test-Function -ParamWithHelp'
+            $res = (TabExpansion2 -inputScript $Script).CompletionMatches
+        }
+        else {
+            $Script = 'Test-Function -'
+            $res = (TabExpansion2 -inputScript $Script).CompletionMatches | Where-Object CompletionText -eq '-ParamWithHelp'
+        }
+
+        $res.Count | Should -Be 1
+        $res.CompletionText | Should -BeExactly '-ParamWithHelp'
+        $res.ToolTip | Should -BeExactly $expected
+    }
+
+    It 'Should retrieve help message from dynamic parameter' {
+        Function Test-Function {
+            [CmdletBinding()]
+            param ()
+            dynamicparam {
+                $attr = [System.Management.Automation.ParameterAttribute]@{
+                    HelpMessage = "Howdy partner"
+                }
+                $attrCollection = [System.Collections.ObjectModel.Collection[System.Attribute]]::new()
+                $attrCollection.Add($attr)
+
+                $dynParam = [System.Management.Automation.RuntimeDefinedParameter]::new('DynamicParam', [string], $attrCollection)
+
+                $paramDictionary = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
+                $paramDictionary.Add('DynamicParam', $dynParam)
+                $paramDictionary
+            }
+
+            end {}
+        }
+
+        $expected = '[string] DynamicParam - Howdy partner'
+        $Script = 'Test-Function -'
+        $res = (TabExpansion2 -inputScript $Script).CompletionMatches | Where-Object CompletionText -eq '-DynamicParam'
+        $res.Count | Should -Be 1
+        $res.CompletionText | Should -BeExactly '-DynamicParam'
+        $res.ToolTip | Should -BeExactly $expected
+    }
+
+    It 'Should have type and name for parameter without help message' {
+        Function Test-Function {
+            param (
+                [Parameter()]
+                $WithParamAttribute,
+
+                $WithoutParamAttribute
+            )
+        }
+
+        $Script = 'Test-Function -'
+        $res = (TabExpansion2 -inputScript $Script).CompletionMatches |
+            Where-Object CompletionText -in '-WithParamAttribute', '-WithoutParamAttribute' |
+            Sort-Object CompletionText
+        $res.Count | Should -Be 2
+
+        $res.CompletionText[0] | Should -BeExactly '-WithoutParamAttribute'
+        $res.ToolTip[0] | Should -BeExactly '[Object] WithoutParamAttribute'
+
+        $res.CompletionText[1] | Should -BeExactly '-WithParamAttribute'
+        $res.ToolTip[1] | Should -BeExactly '[Object] WithParamAttribute'
+    }
+
+    It 'Should ignore errors when faling to get HelpMessage resource' {
+        Function Test-Function {
+            param (
+                [Parameter(HelpMessageBaseName="invalid", HelpMessageResourceId="SomeId")]
+                $InvalidHelpParam
+            )
+        }
+
+        $expected = '[Object] InvalidHelpParam'
+        $Script = 'Test-Function -InvalidHelpParam'
+        $res = (TabExpansion2 -inputScript $Script).CompletionMatches
+        $res.Count | Should -Be 1
+        $res.CompletionText | Should -BeExactly '-InvalidHelpParam'
+        $res.ToolTip | Should -BeExactly $expected
+    }
+
+    Context 'Start-Process -Verb parameter completion' {
+        BeforeAll {
+            function GetProcessInfoVerbs([string]$path, [switch]$singleQuote, [switch]$doubleQuote) {
+                $verbs = (New-Object -TypeName System.Diagnostics.ProcessStartInfo -ArgumentList $path).Verbs
+
+                if ($singleQuote) {
+                    return ($verbs | ForEach-Object { "'$_'" })
+                }
+                elseif ($doubleQuote) {
+                    return ($verbs | ForEach-Object { """$_""" })
+                }
+
+                return $verbs
+            }
+
+            $cmdPath = Join-Path -Path $TestDrive -ChildPath 'test.cmd'
+            $cmdVerbs = GetProcessInfoVerbs -Path $cmdPath
+            $cmdVerbsSingleQuote = GetProcessInfoVerbs -Path $cmdPath -SingleQuote
+            $cmdVerbsDoubleQuote = GetProcessInfoVerbs -Path $cmdPath -DoubleQuote
+            $exePath = Join-Path -Path $TestDrive -ChildPath 'test.exe'
+            $exeVerbs = GetProcessInfoVerbs -Path $exePath
+            $exeVerbsStartingWithRun = $exeVerbs | Where-Object { $_ -like 'run*' }
+            $exeVerbsSingleQuote = GetProcessInfoVerbs -Path $exePath -SingleQuote
+            $exeVerbsStartingWithRunSingleQuote = $exeVerbsSingleQuote | Where-Object { $_ -like "'run*" }
+            $exeVerbsDoubleQuote = GetProcessInfoVerbs -Path $exePath -DoubleQuote
+            $exeVerbsStartingWithRunDoubleQuote = $exeVerbsDoubleQuote | Where-Object { $_ -like """run*" }
+            $powerShellExeWithNoExtension = 'powershell'
+            $txtPath = Join-Path -Path $TestDrive -ChildPath 'test.txt'
+            $txtVerbs = GetProcessInfoVerbs -Path $txtPath
+            $wavPath = Join-Path -Path $TestDrive -ChildPath 'test.wav'
+            $wavVerbs = GetProcessInfoVerbs -Path $wavPath
+            $docxPath = Join-Path -Path $TestDrive -ChildPath 'test.docx'
+            $docxVerbs = GetProcessInfoVerbs -Path $docxPath
+            $fileWithNoExtensionPath = Join-Path -Path $TestDrive -ChildPath 'test'
+            $fileWithNoExtensionVerbs = GetProcessInfoVerbs -Path $fileWithNoExtensionPath
+        }
+
+        It "Should complete Verb parameter for '<TextInput>'" -Skip:(!([System.Management.Automation.Platform]::IsWindowsDesktop)) -TestCases @(
+            @{ TextInput = 'Start-Process -Verb '; ExpectedVerbs = '' }
+            @{ TextInput = "Start-Process -FilePath $cmdPath -Verb "; ExpectedVerbs =  $cmdVerbs -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $cmdPath -Verb '"; ExpectedVerbs =  $cmdVerbsSingleQuote -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $cmdPath -Verb """; ExpectedVerbs =   $cmdVerbsDoubleQuote -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $exePath -Verb "; ExpectedVerbs = $exeVerbs -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $exePath -Verb run"; ExpectedVerbs = $exeVerbsStartingWithRun -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $exePath -Verb 'run"; ExpectedVerbs = $exeVerbsStartingWithRunSingleQuote -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $exePath -Verb ""run"; ExpectedVerbs = $exeVerbsStartingWithRunDoubleQuote -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $powerShellExeWithNoExtension -Verb "; ExpectedVerbs = $exeVerbs -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $txtPath -Verb "; ExpectedVerbs = $txtVerbs -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $wavPath -Verb "; ExpectedVerbs = $wavVerbs -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $docxPath -Verb "; ExpectedVerbs = $docxVerbs -join ' ' }
+            @{ TextInput = "Start-Process -FilePath $fileWithNoExtensionPath -Verb "; ExpectedVerbs = $fileWithNoExtensionVerbs -join ' ' }
+        ) {
+            param($TextInput, $ExpectedVerbs)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText | Sort-Object
+            $completionText -join ' ' | Should -BeExactly $ExpectedVerbs
+        }
+    }
+
+    Context 'Scope parameter completion' {
+        BeforeAll {
+            $allScopes = 'Global Local Script'
+            $allScopesSingleQuote = "'Global' 'Local' 'Script'"
+            $allScopesDoubleQuote = """Global"" ""Local"" ""Script"""
+            $globalScope = 'Global'
+            $globalScopeSingleQuote = "'Global'"
+            $globalScopeDoubleQuote = """Global"""
+            $localScope = 'Local'
+            $localScopeSingleQuote = "'Local'"
+            $localScopeDoubleQuote = """Local"""
+            $scriptScope = 'Script'
+            $scriptScopeSingleQuote = "'Script'"
+            $scriptScopeDoubleQuote = """Script"""
+            $allScopeCommands = 'Clear-Variable', 'Export-Alias', 'Get-Alias', 'Get-PSDrive', 'Get-Variable', 'Import-Alias', 'New-Alias', 'New-PSDrive', 'New-Variable', 'Remove-Alias', 'Remove-PSDrive', 'Remove-Variable', 'Set-Alias', 'Set-Variable'
+        }
+
+        It "Should complete '<ParameterInput>' for '<Commands>'" -TestCases @(
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope "; ExpectedScopes = $allScopes }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope '"; ExpectedScopes = $allScopesSingleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope """; ExpectedScopes = $allScopesDoubleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope G"; ExpectedScopes = $globalScope }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope 'G"; ExpectedScopes = $globalScopeSingleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope ""G"; ExpectedScopes = $globalScopeDoubleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope Lo"; ExpectedScopes = $localScope }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope 'Lo"; ExpectedScopes = $localScopeSingleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope ""Lo"; ExpectedScopes = $localScopeDoubleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope Scr"; ExpectedScopes = $scriptScope }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope 'Scr"; ExpectedScopes = $scriptScopeSingleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope ""Scr"; ExpectedScopes = $scriptScopeDoubleQuote }
+            @{ Commands = $allScopeCommands; ParameterInput = "-Scope NonExistentScope"; ExpectedScopes = '' }
+        ) {
+            param($Commands, $ParameterInput, $ExpectedScopes)
+            foreach ($command in $Commands) {
+                $joinedCommand = "$command $ParameterInput"
+                $res = TabExpansion2 -inputScript $joinedCommand -cursorColumn $joinedCommand.Length
+                $completionText = $res.CompletionMatches.CompletionText | Sort-Object
+                $completionText -join ' ' | Should -BeExactly $ExpectedScopes
+            }
+        }
+    }
+
+    Context 'Get-Verb & Get-Command -Verb parameter completion' {
+        BeforeAll {
+            $allVerbs = 'Add Approve Assert Backup Block Build Checkpoint Clear Close Compare Complete Compress Confirm Connect Convert ConvertFrom ConvertTo Copy Debug Deny Deploy Disable Disconnect Dismount Edit Enable Enter Exit Expand Export Find Format Get Grant Group Hide Import Initialize Install Invoke Join Limit Lock Measure Merge Mount Move New Open Optimize Out Ping Pop Protect Publish Push Read Receive Redo Register Remove Rename Repair Request Reset Resize Resolve Restart Restore Resume Revoke Save Search Select Send Set Show Skip Split Start Step Stop Submit Suspend Switch Sync Test Trace Unblock Undo Uninstall Unlock Unprotect Unpublish Unregister Update Use Wait Watch Write'
+            $allVerbsSingleQuote = "'Add' 'Approve' 'Assert' 'Backup' 'Block' 'Build' 'Checkpoint' 'Clear' 'Close' 'Compare' 'Complete' 'Compress' 'Confirm' 'Connect' 'Convert' 'ConvertFrom' 'ConvertTo' 'Copy' 'Debug' 'Deny' 'Deploy' 'Disable' 'Disconnect' 'Dismount' 'Edit' 'Enable' 'Enter' 'Exit' 'Expand' 'Export' 'Find' 'Format' 'Get' 'Grant' 'Group' 'Hide' 'Import' 'Initialize' 'Install' 'Invoke' 'Join' 'Limit' 'Lock' 'Measure' 'Merge' 'Mount' 'Move' 'New' 'Open' 'Optimize' 'Out' 'Ping' 'Pop' 'Protect' 'Publish' 'Push' 'Read' 'Receive' 'Redo' 'Register' 'Remove' 'Rename' 'Repair' 'Request' 'Reset' 'Resize' 'Resolve' 'Restart' 'Restore' 'Resume' 'Revoke' 'Save' 'Search' 'Select' 'Send' 'Set' 'Show' 'Skip' 'Split' 'Start' 'Step' 'Stop' 'Submit' 'Suspend' 'Switch' 'Sync' 'Test' 'Trace' 'Unblock' 'Undo' 'Uninstall' 'Unlock' 'Unprotect' 'Unpublish' 'Unregister' 'Update' 'Use' 'Wait' 'Watch' 'Write'"
+            $allVerbsDoubleQuote = """Add"" ""Approve"" ""Assert"" ""Backup"" ""Block"" ""Build"" ""Checkpoint"" ""Clear"" ""Close"" ""Compare"" ""Complete"" ""Compress"" ""Confirm"" ""Connect"" ""Convert"" ""ConvertFrom"" ""ConvertTo"" ""Copy"" ""Debug"" ""Deny"" ""Deploy"" ""Disable"" ""Disconnect"" ""Dismount"" ""Edit"" ""Enable"" ""Enter"" ""Exit"" ""Expand"" ""Export"" ""Find"" ""Format"" ""Get"" ""Grant"" ""Group"" ""Hide"" ""Import"" ""Initialize"" ""Install"" ""Invoke"" ""Join"" ""Limit"" ""Lock"" ""Measure"" ""Merge"" ""Mount"" ""Move"" ""New"" ""Open"" ""Optimize"" ""Out"" ""Ping"" ""Pop"" ""Protect"" ""Publish"" ""Push"" ""Read"" ""Receive"" ""Redo"" ""Register"" ""Remove"" ""Rename"" ""Repair"" ""Request"" ""Reset"" ""Resize"" ""Resolve"" ""Restart"" ""Restore"" ""Resume"" ""Revoke"" ""Save"" ""Search"" ""Select"" ""Send"" ""Set"" ""Show"" ""Skip"" ""Split"" ""Start"" ""Step"" ""Stop"" ""Submit"" ""Suspend"" ""Switch"" ""Sync"" ""Test"" ""Trace"" ""Unblock"" ""Undo"" ""Uninstall"" ""Unlock"" ""Unprotect"" ""Unpublish"" ""Unregister"" ""Update"" ""Use"" ""Wait"" ""Watch"" ""Write"""
+            $verbsStartingWithRe = 'Read Receive Redo Register Remove Rename Repair Request Reset Resize Resolve Restart Restore Resume Revoke'
+            $verbsStartingWithEx = 'Exit Expand Export'
+            $verbsStartingWithConv = 'Convert ConvertFrom ConvertTo'
+            $lifeCycleVerbsStartingWithRe = 'Register Request Restart Resume'
+            $lifeCycleVerbsStartingWithReSingleQuote = "'Register' 'Request' 'Restart' 'Resume'"
+            $lifeCycleVerbsStartingWithReDoubleQuote = """Register"" ""Request"" ""Restart"" ""Resume"""
+            $dataVerbsStartingwithEx = 'Expand Export'
+            $lifeCycleAndCommmonVerbsStartingWithRe = 'Redo Register Remove Rename Request Reset Resize Restart Resume'
+            $allLifeCycleAndCommonVerbs = 'Add Approve Assert Build Clear Close Complete Confirm Copy Deny Deploy Disable Enable Enter Exit Find Format Get Hide Install Invoke Join Lock Move New Open Optimize Pop Push Redo Register Remove Rename Request Reset Resize Restart Resume Search Select Set Show Skip Split Start Step Stop Submit Suspend Switch Undo Uninstall Unlock Unregister Wait Watch'
+            $allJsonVerbs = 'ConvertFrom ConvertTo Test'
+            $jsonVerbsStartingWithConv = 'ConvertFrom ConvertTo'
+            $jsonVerbsStartingWithConvSingleQuote = "'ConvertFrom' 'ConvertTo'"
+            $jsonVerbsStartingWithConvDoubleQuote = """ConvertFrom"" ""ConvertTo"""
+            $allJsonAndJobVerbs = 'ConvertFrom ConvertTo Debug Get Receive Remove Start Stop Test Wait'
+            $jsonAndJobVerbsStartingWithSt = 'Start Stop'
+            $allObjectVerbs = 'Compare ForEach Group Measure New Select Sort Tee Where'
+            $utilityModuleObjectVerbs = 'Compare Group Measure New Select Sort Tee'
+            $utilityModuleObjectVerbsStartingWithS = 'Select Sort'
+            $utilityModuleObjectVerbsStartingWithSSingleQuote = "'Select' 'Sort'"
+            $utilityModuleObjectVerbsStartingWithSDoubleQuote = """Select"" ""Sort"""
+            $utilityModuleObjectVerbsStartingWithS
+            $coreModuleObjectVerbs = 'ForEach Where'
+        }
+
+        It "Should complete Verb parameter for '<TextInput>'" -TestCases @(
+            @{ TextInput = 'Get-Verb -Verb '; ExpectedVerbs = $allVerbs }
+            @{ TextInput = "Get-Verb -Verb '"; ExpectedVerbs = $allVerbsSingleQuote }
+            @{ TextInput = "Get-Verb -Verb """; ExpectedVerbs = $allVerbsDoubleQuote }
+            @{ TextInput = 'Get-Verb -Group Lifecycle, Common -Verb '; ExpectedVerbs = $allLifeCycleAndCommonVerbs }
+            @{ TextInput = 'Get-Verb -Verb Re'; ExpectedVerbs = $verbsStartingWithRe }
+            @{ TextInput = 'Get-Verb -Group Lifecycle -Verb Re'; ExpectedVerbs = $lifeCycleVerbsStartingWithRe }
+            @{ TextInput = "Get-Verb -Group Lifecycle -Verb 'Re"; ExpectedVerbs = $lifeCycleVerbsStartingWithReSingleQuote }
+            @{ TextInput = "Get-Verb -Group Lifecycle -Verb ""Re"; ExpectedVerbs = $lifeCycleVerbsStartingWithReDoubleQuote }
+            @{ TextInput = 'Get-Verb -Group Lifecycle -Verb Re'; ExpectedVerbs = $lifeCycleVerbsStartingWithRe }
+            @{ TextInput = 'Get-Verb -Group Lifecycle, Common -Verb Re'; ExpectedVerbs = $lifeCycleAndCommmonVerbsStartingWithRe }
+            @{ TextInput = 'Get-Verb -Verb Ex'; ExpectedVerbs = $verbsStartingWithEx }
+            @{ TextInput = 'Get-Verb -Group Data -Verb Ex'; ExpectedVerbs = $dataVerbsStartingwithEx }
+            @{ TextInput = 'Get-Verb -Group NonExistentGroup -Verb '; ExpectedVerbs = '' }
+            @{ TextInput = 'Get-Verb -Verb Conv'; ExpectedVerbs = $verbsStartingWithConv }
+            @{ TextInput = 'Get-Command -Verb '; ExpectedVerbs = $allVerbs }
+            @{ TextInput = 'Get-Command -Verb Re'; ExpectedVerbs = $verbsStartingWithRe }
+            @{ TextInput = 'Get-Command -Verb Ex'; ExpectedVerbs = $verbsStartingWithEx }
+            @{ TextInput = 'Get-Command -Verb Conv'; ExpectedVerbs = $verbsStartingWithConv }
+            @{ TextInput = 'Get-Command -Noun Json -Verb '; ExpectedVerbs = $allJsonVerbs }
+            @{ TextInput = 'Get-Command -Noun Json -Verb Conv'; ExpectedVerbs = $jsonVerbsStartingWithConv }
+            @{ TextInput = "Get-Command -Noun Json -Verb 'Conv"; ExpectedVerbs = $jsonVerbsStartingWithConvSingleQuote }
+            @{ TextInput = "Get-Command -Noun Json -Verb ""Conv"; ExpectedVerbs = $jsonVerbsStartingWithConvDoubleQuote }
+            @{ TextInput = 'Get-Command -Noun Json, Job -Verb '; ExpectedVerbs = $allJsonAndJobVerbs }
+            @{ TextInput = 'Get-Command -Noun Json, Job -Verb St'; ExpectedVerbs = $jsonAndJobVerbsStartingWithSt }
+            @{ TextInput = 'Get-Command -Noun NonExistentNoun -Verb '; ExpectedVerbs = '' }
+            @{ TextInput = 'Get-Command -Noun Object -Module Microsoft.PowerShell.Utility,Microsoft.PowerShell.Core -Verb '; ExpectedVerbs = $allObjectVerbs }
+            @{ TextInput = 'Get-Command -Noun Object -Module Microsoft.PowerShell.Utility -Verb '; ExpectedVerbs = $utilityModuleObjectVerbs }
+            @{ TextInput = 'Get-Command -Noun Object -Module Microsoft.PowerShell.Utility -Verb S'; ExpectedVerbs = $utilityModuleObjectVerbsStartingWithS }
+            @{ TextInput = "Get-Command -Noun Object -Module Microsoft.PowerShell.Utility -Verb 'S"; ExpectedVerbs = $utilityModuleObjectVerbsStartingWithSSingleQuote }
+            @{ TextInput = "Get-Command -Noun Object -Module Microsoft.PowerShell.Utility -Verb ""S"; ExpectedVerbs = $utilityModuleObjectVerbsStartingWithSDoubleQuote }
+            @{ TextInput = 'Get-Command -Noun Object -Module Microsoft.PowerShell.Core -Verb '; ExpectedVerbs = $coreModuleObjectVerbs }
+        ) {
+            param($TextInput, $ExpectedVerbs)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText | Sort-Object
+            $completionText -join ' ' | Should -BeExactly $ExpectedVerbs
+        }
+    }
+
     Context 'StrictMode Version parameter completion' {
         BeforeAll {
             $allStrictModeVersions = '1.0 2.0 3.0 Latest'
+            $allStrictModeVersionsSingleQuote = "'1.0' '2.0' '3.0' 'Latest'"
+            $allStrictModeVersionsDoubleQuote = """1.0"" ""2.0"" ""3.0"" ""Latest"""
             $versionOne = '1.0'
             $versionTwo = '2.0'
             $versionThree = '3.0'
             $latestVersion = 'Latest'
+            $latestVersionSingleQuote = "'Latest'"
+            $latestVersionDoubleQuote = """Latest"""
         }
 
         It "Should complete Version for '<TextInput>'" -TestCases @(
             @{ TextInput = "Set-StrictMode -Version "; ExpectedVersions = $allStrictModeVersions }
+            @{ TextInput = "Set-StrictMode -Version '"; ExpectedVersions = $allStrictModeVersionsSingleQuote }
+            @{ TextInput = "Set-StrictMode -Version """; ExpectedVersions = $allStrictModeVersionsDoubleQuote }
             @{ TextInput = "Set-StrictMode -Version 1"; ExpectedVersions = $versionOne }
             @{ TextInput = "Set-StrictMode -Version 2"; ExpectedVersions = $versionTwo }
             @{ TextInput = "Set-StrictMode -Version 3"; ExpectedVersions = $versionThree }
             @{ TextInput = "Set-StrictMode -Version Lat"; ExpectedVersions = $latestVersion }
+            @{ TextInput = "Set-StrictMode -Version 'Lat"; ExpectedVersions = $latestVersionSingleQuote }
+            @{ TextInput = "Set-StrictMode -Version ""Lat"; ExpectedVersions = $latestVersionDoubleQuote }
             @{ TextInput = "Set-StrictMode -Version NonExistentVersion"; ExpectedVersions = '' }
         ) {
             param($TextInput, $ExpectedVersions)
@@ -768,6 +1484,344 @@ ConstructorTestClass(int i, bool b)
         }
     }
 
+    Context 'Help Module parameter completion' {
+        BeforeAll {
+            $utilityModule = 'Microsoft.PowerShell.Utility'
+            $managementModule = 'Microsoft.PowerShell.Management'
+            $allMicrosoftPowerShellModules = (Get-Module -Name Microsoft.PowerShell* -ListAvailable).Name
+            Import-Module -Name $allMicrosoftPowerShellModules -ErrorAction SilentlyContinue
+            $allMicrosoftPowerShellModules = ($allMicrosoftPowerShellModules | Sort-Object -Unique) -join ' '
+        }
+
+        It "Should complete Module for '<TextInput>'" -TestCases @(
+            @{ TextInput = "Save-Help -Module Microsoft.PowerShell.U"; ExpectedModules = $utilityModule }
+            @{ TextInput = "Update-Help -Module Microsoft.PowerShell.U"; ExpectedModules = $utilityModule }
+            @{ TextInput = "Save-Help -Module Microsoft.PowerShell.Man"; ExpectedModules = $managementModule }
+            @{ TextInput = "Update-Help -Module Microsoft.PowerShell.Man"; ExpectedModules = $managementModule }
+            @{ TextInput = "Save-Help -Module Microsoft.Powershell"; ExpectedModules = $allMicrosoftPowerShellModules }
+            @{ TextInput = "Update-Help -Module Microsoft.PowerShell"; ExpectedModules = $allMicrosoftPowerShellModules }
+            @{ TextInput = "Save-Help -Module NonExistentModulePrefix"; ExpectedModules = '' }
+            @{ TextInput = "Update-Help -Module NonExistentModulePrefix"; ExpectedModules = '' }
+        ) {
+            param($TextInput, $ExpectedModules)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText | Sort-Object -Unique
+            $completionText -join ' ' | Should -BeExactly $ExpectedModules
+        }
+    }
+
+    Context 'New-ItemProperty -PropertyType parameter completion' {
+        BeforeAll {
+            if ($IsWindows) {
+                $allRegistryValueKinds = 'String ExpandString Binary DWord MultiString QWord Unknown'
+                $allRegistryValueKindsWithQuotes = "'String' 'ExpandString' 'Binary' 'DWord' 'MultiString' 'QWord' 'Unknown'"
+                $dwordValueKind = 'DWord'
+                $qwordValueKind = 'QWord'
+                $binaryValueKind = 'Binary'
+                $multiStringValueKind = 'MultiString'
+                $registryPath = "HKCU:\test1\sub"
+                New-Item -Path $registryPath -Force
+                $registryLiteralPath = "HKCU:\test2\*\sub"
+                New-Item -Path $registryLiteralPath -Force
+                $fileSystemPath = "TestDrive:\test1.txt"
+                New-Item -Path $fileSystemPath -Force
+                $fileSystemLiteralPathDir = "TestDrive:\[]"
+                $fileSystemLiteralPath = "$fileSystemLiteralPathDir\test2.txt"
+                New-Item -Path $fileSystemLiteralPath -Force
+            }
+        }
+
+        It "Should complete Property Type for '<TextInput>'" -Skip:(!$IsWindows) -TestCases @(
+            # -Path completions
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType "; ExpectedPropertyTypes = $allRegistryValueKinds }
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType d"; ExpectedPropertyTypes = $dwordValueKind }
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType q"; ExpectedPropertyTypes = $qwordValueKind }
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType bin"; ExpectedPropertyTypes = $binaryValueKind }
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType multi"; ExpectedPropertyTypes = $multiStringValueKind }
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType invalidproptype"; ExpectedPropertyTypes = '' }
+            @{ TextInput = "New-ItemProperty -Path $fileSystemPath -PropertyType "; ExpectedPropertyTypes = '' }
+
+            # -LiteralPath completions
+            @{ TextInput = "New-ItemProperty -LiteralPath $registryLiteralPath -PropertyType "; ExpectedPropertyTypes = $allRegistryValueKinds }
+            @{ TextInput = "New-ItemProperty -LiteralPath $registryLiteralPath -PropertyType d"; ExpectedPropertyTypes = $dwordValueKind }
+            @{ TextInput = "New-ItemProperty -LiteralPath $registryLiteralPath -PropertyType q"; ExpectedPropertyTypes = $qwordValueKind }
+            @{ TextInput = "New-ItemProperty -LiteralPath $registryLiteralPath -PropertyType bin"; ExpectedPropertyTypes = $binaryValueKind }
+            @{ TextInput = "New-ItemProperty -LiteralPath $registryLiteralPath -PropertyType multi"; ExpectedPropertyTypes = $multiStringValueKind }
+            @{ TextInput = "New-ItemProperty -LiteralPath $registryLiteralPath -PropertyType invalidproptype"; ExpectedPropertyTypes = '' }
+            @{ TextInput = "New-ItemProperty -LiteralPath $fileSystemLiteralPath -PropertyType "; ExpectedPropertyTypes = '' }
+
+            # All of these should return no completion since they don't specify -Path/-LiteralPath
+            @{ TextInput = "New-ItemProperty -PropertyType "; ExpectedPropertyTypes = '' }
+            @{ TextInput = "New-ItemProperty -PropertyType d"; ExpectedPropertyTypes = '' }
+            @{ TextInput = "New-ItemProperty -PropertyType q"; ExpectedPropertyTypes = '' }
+            @{ TextInput = "New-ItemProperty -PropertyType bin"; ExpectedPropertyTypes = '' }
+            @{ TextInput = "New-ItemProperty -PropertyType multi"; ExpectedPropertyTypes = '' }
+            @{ TextInput = "New-ItemProperty -PropertyType invalidproptype"; ExpectedPropertyTypes = '' }
+
+            # All of these should return completion even with quotes included
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType '"; ExpectedPropertyTypes = $allRegistryValueKindsWithQuotes }
+            @{ TextInput = "New-ItemProperty -Path $registryPath -PropertyType 'bin"; ExpectedPropertyTypes = "'$binaryValueKind'" }
+        ) {
+            param($TextInput, $ExpectedPropertyTypes)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText
+            $completionText -join ' ' | Should -BeExactly $ExpectedPropertyTypes
+
+            foreach ($match in $res.CompletionMatches) {
+                $completionText = $match.CompletionText.Replace("""", "").Replace("'", "")
+                $listItemText = $match.ListItemText
+                $completionText | Should -BeExactly $listItemText
+                $match.ToolTip | Should -Not -BeNullOrEmpty
+            }
+        }
+
+        It "Test fallback to provider of current location if no path specified" -Skip:(!$IsWindows) {
+            try {
+                Push-Location HKCU:\
+                $textInput = "New-ItemProperty -PropertyType "
+                $res = TabExpansion2 -inputScript $textInput -cursorColumn $textInput.Length
+                $completionText = $res.CompletionMatches.CompletionText
+                $completionText -join ' ' | Should -BeExactly $allRegistryValueKinds
+            }
+            finally {
+                Pop-Location
+            }
+        }
+
+        AfterAll {
+            if ($IsWindows) {
+                Remove-Item -Path $registryPath -Force
+                Remove-Item -LiteralPath $registryLiteralPath -Force
+                Remove-Item -Path $fileSystemPath -Force
+                Remove-Item -LiteralPath $fileSystemLiteralPathDir -Recurse -Force
+            }
+        }
+    }
+
+    Context 'Get-Command -Noun parameter completion' {
+        BeforeAll {
+            function GetModuleCommandNouns(
+                [string]$Module,
+                [string]$Verb,
+                [switch]$SingleQuote,
+                [switch]$DoubleQuote)
+            {
+
+                $commandParams = @{}
+
+                if ($PSBoundParameters.ContainsKey('Module')) {
+                    $commandParams['Module'] = $Module
+                }
+
+                if ($PSBoundParameters.ContainsKey('Verb')) {
+                    $commandParams['Verb'] = $Verb
+                }
+
+                $nouns = (Get-Command @commandParams).Noun
+
+                if ($SingleQuote) {
+                    return ($nouns | ForEach-Object { "'$_'" })
+                }
+                elseif ($DoubleQuote) {
+                    return ($nouns | ForEach-Object { """$_""" })
+                }
+
+                return $nouns
+            }
+
+            $utilityModuleName = 'Microsoft.PowerShell.Utility'
+
+            $allUtilityCommandNouns = GetModuleCommandNouns -Module $utilityModuleName
+            $allUtilityCommandNounsSingleQuote = GetModuleCommandNouns -Module $utilityModuleName -SingleQuote
+            $allUtilityCommandNounsDoubleQuote = GetModuleCommandNouns -Module $utilityModuleName -DoubleQuote
+            $utilityCommandNounsStartingWithF = $allUtilityCommandNouns | Where-Object { $_ -like 'F*'}
+            $utilityCommandNounsStartingWithFSingleQuote = $allUtilityCommandNounsSingleQuote | Where-Object { $_ -like "'F*"}
+            $utilityCommandNounsStartingWithFDoubleQuote = $allUtilityCommandNounsDoubleQuote | Where-Object { $_ -like """F*"}
+
+            $allUtilityCommandNounsWithConvertToVerb = GetModuleCommandNouns -Module $utilityModuleName -Verb 'ConvertTo'
+            $allUtilityCommandNounsWithConvertToVerbSingleQuote = GetModuleCommandNouns -Module $utilityModuleName -SingleQuote -Verb 'ConvertTo'
+            $allUtilityCommandNounsWithConvertToVerbDoubleQuote = GetModuleCommandNouns -Module $utilityModuleName -DoubleQuote -Verb 'ConvertTo'
+            $utilityCommandNounsWithConvertToVerb = $allUtilityCommandNounsWithConvertToVerb | Where-Object { $_ -in 'CliXml', 'Csv', 'Html', 'Json', 'Xml' }
+            $utilityCommandNounsWithConvertToVerbSingleQuote = $allUtilityCommandNounsWithConvertToVerbSingleQuote | Where-Object { $_ -in "'CliXml'", "'Csv'", "'Html'", "'Json'", "'Xml'" }
+            $utilityCommandNounsWithConvertToVerbDoubleQuote = $allUtilityCommandNounsWithConvertToVerbDoubleQuote | Where-Object { $_ -in """CliXml""", """Csv""", """Html""", """Json""", """Xml""" }
+            $utilityCommandNounsWithConvertToVerbStartingWithC = $allUtilityCommandNounsWithConvertToVerb | Where-Object { $_ -in 'CliXml', 'Csv' }
+            $utilityCommandNounsWithConvertToVerbStartingWithCSingleQuote = $allUtilityCommandNounsWithConvertToVerbSingleQuote | Where-Object { $_ -in "'CliXml'", "'Csv'" }
+            $utilityCommandNounsWithConvertToVerbStartingWithCDoubleQuote = $allUtilityCommandNounsWithConvertToVerbDoubleQuote | Where-Object { $_ -in """CliXml""", """Csv""" }
+        }
+
+        It "Should complete Noun for '<TextInput>'" -TestCases @(
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Noun "; ExpectedNouns = $allUtilityCommandNouns }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Noun '"; ExpectedNouns = $allUtilityCommandNounsSingleQuote }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Noun """; ExpectedNouns = $allUtilityCommandNounsDoubleQuote }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Noun F"; ExpectedNouns = $utilityCommandNounsStartingWithF  }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Noun 'F"; ExpectedNouns = $utilityCommandNounsStartingWithFSingleQuote }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Noun ""F"; ExpectedNouns = $utilityCommandNounsStartingWithFDoubleQuote }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Verb ConvertTo -Noun "; ExpectedNouns = $utilityCommandNounsWithConvertToVerb  }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Verb ConvertTo -Noun '"; ExpectedNouns = $utilityCommandNounsWithConvertToVerbSingleQuote }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Verb ConvertTo -Noun """; ExpectedNouns = $utilityCommandNounsWithConvertToVerbDoubleQuote }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Verb ConvertTo -Noun C"; ExpectedNouns = $utilityCommandNounsWithConvertToVerbStartingWithC  }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Verb ConvertTo -Noun 'C"; ExpectedNouns = $utilityCommandNounsWithConvertToVerbStartingWithCSingleQuote }
+            @{ TextInput = "Get-Command -Module $utilityModuleName -Verb ConvertTo -Noun ""C"; ExpectedNouns = $utilityCommandNounsWithConvertToVerbStartingWithCDoubleQuote }
+        ) {
+            param($TextInput, $ExpectedNouns)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText
+
+            # Avoid using Sort-Object -Unique because it generates different order than SortedSet on MacOS/Linux
+            $sortedSetExpectedNouns = [System.Collections.Generic.SortedSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
+            foreach ($noun in $ExpectedNouns)
+            {
+                $sortedSetExpectedNouns.Add($noun) | Out-Null
+            }
+
+            $completionText -join ' ' | Should -BeExactly ($sortedSetExpectedNouns -join ' ')
+        }
+    }
+
+    Context "Get-ExperimentalFeature -Name parameter completion" {
+        BeforeAll {
+            function GetExperimentalFeatureNames([switch]$SingleQuote, [switch]$DoubleQuote) {
+                $features = (Get-ExperimentalFeature).Name
+
+                if ($SingleQuote) {
+                    return ($features | ForEach-Object { "'$_'" })
+                }
+                elseif ($DoubleQuote) {
+                    return ($features | ForEach-Object { """$_""" })
+                }
+
+                return $features
+            }
+
+            $allExperimentalFeatures = GetExperimentalFeatureNames
+            $allExperimentalFeaturesSingleQuote = GetExperimentalFeatureNames -SingleQuote
+            $allExperimentalFeaturesDoubleQuote = GetExperimentalFeatureNames -DoubleQuote
+            $experimentalFeaturesStartingWithPS = $allExperimentalFeatures | Where-Object { $_ -like 'PS*'}
+            $experimentalFeaturesStartingWithPSSingleQuote = $allExperimentalFeaturesSingleQuote | Where-Object { $_ -like "'PS*" }
+            $experimentalFeaturesStartingWithPSDoubleQuote = $allExperimentalFeaturesDoubleQuote | Where-Object { $_ -like """PS*" }
+        }
+
+        It "Should complete Name for '<TextInput>'" -TestCases @(
+            @{ TextInput = "Get-ExperimentalFeature -Name "; ExpectedExperimentalFeatureNames = $allExperimentalFeatures }
+            @{ TextInput = "Get-ExperimentalFeature -Name '"; ExpectedExperimentalFeatureNames = $allExperimentalFeaturesSingleQuote }
+            @{ TextInput = "Get-ExperimentalFeature -Name """; ExpectedExperimentalFeatureNames = $allExperimentalFeaturesDoubleQuote }
+            @{ TextInput = "Get-ExperimentalFeature -Name PS"; ExpectedExperimentalFeatureNames = $experimentalFeaturesStartingWithPS }
+            @{ TextInput = "Get-ExperimentalFeature -Name 'PS"; ExpectedExperimentalFeatureNames = $experimentalFeaturesStartingWithPSSingleQuote }
+            @{ TextInput = "Get-ExperimentalFeature -Name ""PS"; ExpectedExperimentalFeatureNames = $experimentalFeaturesStartingWithPSDoubleQuote }
+        ) {
+            param($TextInput, $ExpectedExperimentalFeatureNames)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText
+            $completionText -join ' ' | Should -BeExactly (($ExpectedExperimentalFeatureNames | Sort-Object -Unique) -join ' ')
+        }
+    }
+
+    Context "Join-String -Separator & -FormatString parameter completion" {
+        BeforeAll {
+            if ($IsWindows) {
+                $allSeparators = "',' ', ' ';' '; ' ""``r``n"" '-' ' '"
+                $allFormatStrings = "'[{0}]' '{0:N2}' ""``r``n    ```${0}"" ""``r``n    [string] ```${0}"""
+                $newlineSeparator = """``r``n"""
+                $newlineFormatStrings = """``r``n    ```${0}"" ""``r``n    [string] ```${0}"""
+            }
+            else {
+                $allSeparators = "',' ', ' ';' '; ' ""``n"" '-' ' '"
+                $allFormatStrings = "'[{0}]' '{0:N2}' ""``n    ```${0}"" ""``n    [string] ```${0}"""
+                $newlineSeparator = """``n"""
+                $newlineFormatStrings = """``n    ```${0}"" ""``n    [string] ```${0}"""
+            }
+
+            $commaSeparators = "',' ', '"
+            $semiColonSeparators = "';' '; '"
+            
+            $squareBracketFormatString = "'[{0}]'"
+            $curlyBraceFormatString = "'{0:N2}'"
+        }
+
+        It "Should complete for '<TextInput>'" -TestCases @(
+            @{ TextInput = "Join-String -Separator "; Expected = $allSeparators }
+            @{ TextInput = "Join-String -Separator '"; Expected = $allSeparators }
+            @{ TextInput = "Join-String -Separator """; Expected = $allSeparators.Replace("'", """") }
+            @{ TextInput = "Join-String -Separator ',"; Expected = $commaSeparators }
+            @{ TextInput = "Join-String -Separator "","; Expected = $commaSeparators.Replace("'", """") }
+            @{ TextInput = "Join-String -Separator ';"; Expected = $semiColonSeparators }
+            @{ TextInput = "Join-String -Separator "";"; Expected = $semiColonSeparators.Replace("'", """") }
+            @{ TextInput = "Join-String -FormatString "; Expected = $allFormatStrings }
+            @{ TextInput = "Join-String -FormatString '"; Expected = $allFormatStrings }
+            @{ TextInput = "Join-String -FormatString """; Expected = $allFormatStrings.Replace("'", """") }
+            @{ TextInput = "Join-String -FormatString ["; Expected = $squareBracketFormatString }
+            @{ TextInput = "Join-String -FormatString '["; Expected = $squareBracketFormatString }
+            @{ TextInput = "Join-String -FormatString ""["; Expected = $squareBracketFormatString.Replace("'", """") }
+            @{ TextInput = "Join-String -FormatString '{"; Expected = $curlyBraceFormatString }
+            @{ TextInput = "Join-String -FormatString ""{"; Expected = $curlyBraceFormatString.Replace("'", """") }
+        ) {
+            param($TextInput, $Expected)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText
+            $completionText -join ' ' | Should -BeExactly $Expected
+
+            foreach ($match in $res.CompletionMatches) {
+                $toolTip = $match.ToolTip.Replace("""", "").Replace("'", "")
+                $completionText = $match.CompletionText.Replace("""", "").Replace("'", "")
+                $listItemText = $match.ListItemText
+                $toolTip.StartsWith($completionText) | Should -BeTrue
+                $toolTip.EndsWith($listItemText) | Should -BeTrue
+            }
+        }
+
+        It "Should complete for '<TextInput>'" -Skip:(!$IsWindows) -TestCases @(
+            @{ TextInput = "Join-String -Separator '``"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator ""``"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator '``r"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator ""``r"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator '``r``"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator ""``r``"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -FormatString '``"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString ""``"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString '``r"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString ""``r"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString '``r``"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString ""``r``"; Expected = $newlineFormatStrings }
+        ) {
+            param($TextInput, $Expected)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText
+            $completionText -join ' ' | Should -BeExactly $Expected
+
+            foreach ($match in $res.CompletionMatches) {
+                $toolTip = $match.ToolTip.Replace("""", "").Replace("'", "")
+                $completionText = $match.CompletionText.Replace("""", "").Replace("'", "")
+                $listItemText = $match.ListItemText
+                $toolTip.StartsWith($completionText) | Should -BeTrue
+                $toolTip.EndsWith($listItemText) | Should -BeTrue
+            }
+        }
+
+        It "Should complete for '<TextInput>'" -Skip:($IsWindows) -TestCases @(
+            @{ TextInput = "Join-String -Separator '``"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator ""``"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator '``n"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -Separator ""``n"; Expected = $newlineSeparator }
+            @{ TextInput = "Join-String -FormatString '``"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString ""``"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString '``n"; Expected = $newlineFormatStrings }
+            @{ TextInput = "Join-String -FormatString ""``n"; Expected = $newlineFormatStrings }
+        ) {
+            param($TextInput, $Expected)
+            $res = TabExpansion2 -inputScript $TextInput -cursorColumn $TextInput.Length
+            $completionText = $res.CompletionMatches.CompletionText
+            $completionText -join ' ' | Should -BeExactly $Expected
+
+            foreach ($match in $res.CompletionMatches) {
+                $toolTip = $match.ToolTip.Replace("""", "").Replace("'", "")
+                $completionText = $match.CompletionText.Replace("""", "").Replace("'", "")
+                $listItemText = $match.ListItemText
+                $toolTip.StartsWith($completionText) | Should -BeTrue
+                $toolTip.EndsWith($listItemText) | Should -BeTrue
+            }
+        }
+    }
+
     Context "Format cmdlet's View paramter completion" {
         BeforeAll {
             $viewDefinition = @'
@@ -875,8 +1929,12 @@ ConstructorTestClass(int i, bool b)
 
     Context NativeCommand {
         BeforeAll {
-            $nativeCommand = (Get-Command -CommandType Application -TotalCount 1).Name
+            ## Find a native command that is not 'pwsh'. We will use 'pwsh' for fallback completer tests later.
+            $nativeCommand = Get-Command -CommandType Application -TotalCount 2 |
+                Where-Object Name -NotLike pwsh* |
+                Select-Object -First 1
         }
+
         It 'Completes native commands with -' {
             Register-ArgumentCompleter -Native -CommandName $nativeCommand -ScriptBlock {
                 param($wordToComplete, $ast, $cursorColumn)
@@ -940,6 +1998,52 @@ ConstructorTestClass(int i, bool b)
             $res.CompletionMatches | Should -HaveCount 1
             $res.CompletionMatches.CompletionText | Should -BeExactly "-option"
         }
+
+        It 'Covers an arbitrary unbound native command with -t' {
+            ## Register a completer for $nativeCommand.
+            Register-ArgumentCompleter -Native -CommandName $nativeCommand -ScriptBlock {
+                param($wordToComplete, $ast, $cursorColumn)
+                if ($wordToComplete -eq '-t') {
+                    return "-terminal"
+                }
+            }
+
+            ## Register a fallback native command completer.
+            Register-ArgumentCompleter -NativeFallback -ScriptBlock {
+                param($wordToComplete, $ast, $cursorColumn)
+                if ($wordToComplete -eq '-t') {
+                    return "-testing"
+                }
+            }
+
+            ## The specific completer will be used if it exists.
+            $line = "$nativeCommand -t"
+            $res = TabExpansion2 -inputScript $line -cursorColumn $line.Length
+            $res.CompletionMatches | Should -HaveCount 1
+            $res.CompletionMatches.CompletionText | Should -BeExactly "-terminal"
+
+            ## Otherwise, the fallback completer will kick in.
+            $line = "pwsh -t"
+            $res = TabExpansion2 -inputScript $line -cursorColumn $line.Length
+            $res.CompletionMatches | Should -HaveCount 1
+            $res.CompletionMatches.CompletionText | Should -BeExactly "-testing"
+
+            ## Remove the completer for $nativeCommand.
+            Register-ArgumentCompleter -Native -CommandName $nativeCommand -ScriptBlock $null
+
+            ## The fallback completer will be used for $nativeCommand.
+            $line = "$nativeCommand -t"
+            $res = TabExpansion2 -inputScript $line -cursorColumn $line.Length
+            $res.CompletionMatches | Should -HaveCount 1
+            $res.CompletionMatches.CompletionText | Should -BeExactly "-testing"
+
+            ## Remove the fallback completer for $nativeCommand.
+            Register-ArgumentCompleter -NativeFallback -ScriptBlock $null
+
+            ## The fallback completer will be used for $nativeCommand.
+            $res = TabExpansion2 -inputScript $line -cursorColumn $line.Length
+            $res.CompletionMatches | Should -HaveCount 0
+        }
     }
 
     It 'Should complete "Export-Counter -FileFormat" with available output formats' -Pending {
@@ -1080,6 +2184,36 @@ class InheritedClassTest : System.Attribute
         }
     }
 
+    Context "Script parameter completion" {
+        BeforeAll {
+            Setup -File -Path 'ModuleReqTest.ps1' -Content @'
+#requires -Modules ThisModuleDoesNotExist
+param ($Param1)
+'@
+            Setup -File -Path 'AdminReqTest.ps1' -Content @'
+#requires -RunAsAdministrator
+param ($Param1)
+'@
+            Push-Location ${TestDrive}\
+        }
+
+        AfterAll {
+            Pop-Location
+        }
+
+        It "Input should successfully complete script parameter for script with failed script requirements" {
+            $res = TabExpansion2 -inputScript '.\ModuleReqTest.ps1 -'
+            $res.CompletionMatches.Count | Should -BeGreaterThan 0
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly '-Param1'
+        }
+
+        It "Input should successfully complete script parameter for admin script while not elevated" {
+            $res = TabExpansion2 -inputScript '.\AdminReqTest.ps1 -'
+            $res.CompletionMatches.Count | Should -BeGreaterThan 0
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly '-Param1'
+        }
+    }
+
     Context "File name completion" {
         BeforeAll {
             $tempDir = Join-Path -Path $TestDrive -ChildPath "baseDir"
@@ -1251,12 +2385,44 @@ class InheritedClassTest : System.Attribute
             $res.CompletionMatches[0].CompletionText | Should -Be "`"$expectedPath`""
         }
 
-        It "Should keep '~' in completiontext when it's used to refer to home in input" {
+        It "Relative path completion for using <UsingKind> statement when AST extent has file identity" -TestCases @(
+            @{UsingKind = "module";  ExpectedFileName = 'UsingFileCompletionModuleTest.psm1'}
+            @{UsingKind = "assembly";ExpectedFileName = 'UsingFileCompletionAssemblyTest.dll'}
+        ) -test {
+            param($UsingKind, $ExpectedFileName)
+            $scriptText = "using $UsingKind .\UsingFileCompletion"
+            $tokens = $null
+            $scriptAst = [System.Management.Automation.Language.Parser]::ParseInput(
+                $scriptText,
+                (Join-Path -Path $tempDir -ChildPath ScriptInEditor.ps1),
+                [ref] $tokens,
+                [ref] $null)
+
+            $cursorPosition = $scriptAst.Extent.StartScriptPosition.
+                GetType().
+                GetMethod('CloneWithNewOffset', [System.Reflection.BindingFlags]'NonPublic, Instance').
+                Invoke($scriptAst.Extent.StartScriptPosition, @($scriptText.Length - 1))
+
+            Push-Location -LiteralPath $PSHOME
+            $TestFile = Join-Path -Path $tempDir -ChildPath $ExpectedFileName
+            $null = New-Item -Path $TestFile
+            $res = TabExpansion2 -ast $scriptAst -tokens $tokens -positionOfCursor $cursorPosition
+            Pop-Location
+                        
+            $ExpectedPath = Join-Path -Path '.\' -ChildPath $ExpectedFileName
+            $res.CompletionMatches.CompletionText | Where-Object {$_ -Like "*$ExpectedFileName"} | Should -Be $ExpectedPath
+        }
+
+        It "Should handle '~' in completiontext when it's used to refer to home in input" {
             $res = TabExpansion2 -inputScript "~$separator"
             # select the first answer which does not have a space in the completion (those completions look like & '3D Objects')
             $observedResult = $res.CompletionMatches.Where({$_.CompletionText.IndexOf("&") -eq -1})[0].CompletionText
             $completedText = $res.CompletionMatches.CompletionText -join ","
-            $observedResult | Should -BeLike "~$separator*" -Because "$completedText"
+            if ($IsWindows) {
+                $observedResult | Should -BeLike "$home$separator*" -Because "$completedText"
+            } else {
+                $observedResult | Should -BeLike "~$separator*" -Because "$completedText"
+            }
         }
 
         It "Should use '~' as relative filter text when not followed by separator" {
@@ -1298,6 +2464,42 @@ class InheritedClassTest : System.Attribute
 
             Remove-Item -LiteralPath $LiteralPath
         }
+
+        It "Should add single quotes if there are double quotes in bare word file path" {
+			$BadQuote = [char]8220
+		    $TestFile1 = Join-Path -Path $TestDrive -ChildPath "Test1${BadQuote}File"
+            $null = New-Item -Path $TestFile1 -Force
+            $res = TabExpansion2 -inputScript "Get-ChildItem -Path $TestDrive\"
+            ($res.CompletionMatches | Where-Object ListItemText -Like "Test1?File").CompletionText | Should -Be "'$TestFile1'"
+            Remove-Item -LiteralPath $TestFile1 -Force
+        }
+
+        It "Should escape double quote if the input string uses double quotes" {
+			$BadQuote = [char]8220
+		    $TestFile1 = Join-Path -Path $TestDrive -ChildPath "Test1${BadQuote}File"
+            $null = New-Item -Path $TestFile1 -Force
+            $res = TabExpansion2 -inputScript "Get-ChildItem -Path `"$TestDrive\"
+            $Expected = "`"$($TestFile1.Insert($TestFile1.LastIndexOf($BadQuote), '`'))`""
+            ($res.CompletionMatches | Where-Object ListItemText -Like "Test1?File").CompletionText | Should -Be $Expected
+            Remove-Item -LiteralPath $TestFile1 -Force
+        }
+
+        It "Should escape single quotes in file paths" {
+			$SingleQuote = "'"
+		    $TestFile1 = Join-Path -Path $TestDrive -ChildPath "Test1${SingleQuote}File"
+            $null = New-Item -Path $TestFile1 -Force
+            # Regardless if the input string was singlequoted or not, we expect to add surrounding single quotes and
+            # escape the single quote in the file path with another singlequote.
+            $Expected = "'$($TestFile1.Insert($TestFile1.LastIndexOf($SingleQuote), "'"))'"
+
+            $res = TabExpansion2 -inputScript "Get-ChildItem -Path '$TestDrive\"
+            ($res.CompletionMatches | Where-Object ListItemText -Like "Test1?File").CompletionText | Should -Be $Expected
+
+            $res = TabExpansion2 -inputScript "Get-ChildItem -Path $TestDrive\"
+            ($res.CompletionMatches | Where-Object ListItemText -Like "Test1?File").CompletionText | Should -Be $Expected
+
+            Remove-Item -LiteralPath $TestFile1 -Force
+        }
     }
 
     It 'Should correct slashes in UNC path completion' -Skip:(!$IsWindows) {
@@ -1321,7 +2523,7 @@ class InheritedClassTest : System.Attribute
     Context "Cmdlet name completion" {
         BeforeAll {
             $testCases = @(
-                @{ inputStr = "get-c*item"; expected = "Get-ChildItem" }
+                @{ inputStr = "get-ch*item"; expected = "Get-ChildItem" }
                 @{ inputStr = "set-alia?"; expected = "Set-Alias" }
                 @{ inputStr = "s*-alias"; expected = "Set-Alias" }
                 @{ inputStr = "se*-alias"; expected = "Set-Alias" }
@@ -1421,6 +2623,7 @@ class InheritedClassTest : System.Attribute
                 @{ inputStr = 'gmo Microsoft.PowerShell.U'; expected = 'Microsoft.PowerShell.Utility'; setup = $null }
                 @{ inputStr = 'rmo Microsoft.PowerShell.U'; expected = 'Microsoft.PowerShell.Utility'; setup = $null }
                 @{ inputStr = 'gcm -Module Microsoft.PowerShell.U'; expected = 'Microsoft.PowerShell.Utility'; setup = $null }
+                @{ inputStr = 'gcm -ExcludeModule Microsoft.PowerShell.U'; expected = 'Microsoft.PowerShell.Utility'; setup = $null }
                 @{ inputStr = 'gmo -list PackageM'; expected = 'PackageManagement'; setup = $null }
                 @{ inputStr = 'gcm -Module PackageManagement Find-Pac'; expected = 'Find-Package'; setup = $null }
                 @{ inputStr = 'ipmo PackageM'; expected = 'PackageManagement'; setup = $null }
@@ -1487,6 +2690,10 @@ class InheritedClassTest : System.Attribute
             $res.CompletionMatches[0].CompletionText | Should -BeExactly $afterTab
         }
 
+        It "Tab completion UNC path with filesystem provider" -Skip:(!$IsWindows) {
+            $res = TabExpansion2 -inputScript 'Filesystem::\\localhost\admin'
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Filesystem::\\localhost\ADMIN$'
+        }
 
         It "Tab completion for registry" -Skip:(!$IsWindows) {
             $beforeTab = 'registry::HKEY_l'
@@ -1717,6 +2924,11 @@ class InheritedClassTest : System.Attribute
             $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Black' # 0 = NonPositive
         }
 
+        It 'Tab completion of $_ inside incomplete switch condition' {
+            $res = TabExpansion2 -inputScript 'Get-PSDrive | Sort-Object -Property {switch ($_.nam'
+            $res.CompletionMatches[0].CompletionText | Should -Be 'Name'
+        }
+
         It "Test [CommandCompletion]::GetNextResult" {
             $inputStr = "Get-Command -Type Alias,c"
             $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
@@ -1782,7 +2994,7 @@ class InheritedClassTest : System.Attribute
         }
 
         It "Test hashtable key completion in #requires statement for modules" {
-            $res = TabExpansion2 -inputScript "#requires -Modules @{" -cursorColumn 21
+            $res = TabExpansion2 -inputScript "#requires -Modules @{"
             $res.CompletionMatches.Count | Should -BeGreaterThan 0
             $res.CompletionMatches[0].CompletionText | Should -BeExactly "GUID"
         }
@@ -2012,7 +3224,7 @@ dir -Recurse `
         }
 
         It "Test complete module file name" {
-            $inputStr = "using module test"
+            $inputStr = "using module testm"
             $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
             $res.CompletionMatches | Should -HaveCount 1
             $res.CompletionMatches[0].CompletionText | Should -BeExactly ".${separator}testModule.psm1"
@@ -2333,15 +3545,18 @@ dir -Recurse `
     Context "Module cmdlet completion tests" {
         It "ArugmentCompleter for PSEdition should work for '<cmd>'" -TestCases @(
             @{cmd = "Get-Module -PSEdition "; expected = "Desktop", "Core"}
+            @{cmd = "Get-Module -PSEdition '"; expected = "'Desktop'", "'Core'"}
+            @{cmd = "Get-Module -PSEdition """; expected = """Desktop""", """Core"""}
+            @{cmd = "Get-Module -PSEdition 'Desk"; expected = "'Desktop'"}
+            @{cmd = "Get-Module -PSEdition ""Desk"; expected = """Desktop"""}
+            @{cmd = "Get-Module -PSEdition Co"; expected = "Core"}
+            @{cmd = "Get-Module -PSEdition 'Co"; expected = "'Core'"}
+            @{cmd = "Get-Module -PSEdition ""Co"; expected = """Core"""}
         ) {
             param($cmd, $expected)
             $res = TabExpansion2 -inputScript $cmd -cursorColumn $cmd.Length
-            $res.CompletionMatches | Should -HaveCount $expected.Count
-            $completionOptions = ""
-            foreach ($completion in $res.CompletionMatches) {
-                $completionOptions += $completion.ListItemText
-            }
-            $completionOptions | Should -BeExactly ([string]::Join("", $expected))
+            $completionText = $res.CompletionMatches.CompletionText
+            $completionText -join ' ' | Should -BeExactly ($expected -join ' ')
         }
     }
 
@@ -2448,23 +3663,23 @@ dir -Recurse `
         }
         It '<Intent>' -TestCases @(
             @{
-                Intent = 'Complete help keywords with minimum input'
+                Intent = 'Complete help keywords with minimal input'
                 Expected = @(
-                    'COMPONENT'
-                    'DESCRIPTION'
-                    'EXAMPLE'
-                    'EXTERNALHELP'
-                    'FORWARDHELPCATEGORY'
-                    'FORWARDHELPTARGETNAME'
-                    'FUNCTIONALITY'
-                    'INPUTS'
-                    'LINK'
-                    'NOTES'
-                    'OUTPUTS'
-                    'PARAMETER'
-                    'REMOTEHELPRUNSPACE'
-                    'ROLE'
-                    'SYNOPSIS'
+                    "COMPONENT",
+                    "DESCRIPTION",
+                    "EXAMPLE",
+                    "EXTERNALHELP",
+                    "FORWARDHELPCATEGORY",
+                    "FORWARDHELPTARGETNAME",
+                    "FUNCTIONALITY",
+                    "INPUTS",
+                    "LINK",
+                    "NOTES",
+                    "OUTPUTS",
+                    "PARAMETER",
+                    "REMOTEHELPRUNSPACE",
+                    "ROLE",
+                    "SYNOPSIS"
                 )
                 TestString = @'
 <#
@@ -2654,6 +3869,7 @@ function MyFunction ($param1, $param2)
     It 'Should complete module specification keys in using module statement' {
         $res = TabExpansion2 -inputScript 'using module @{'
         $res.CompletionMatches.CompletionText -join ' ' | Should -BeExactly "GUID MaximumVersion ModuleName ModuleVersion RequiredVersion"
+        $res.CompletionMatches[0].ToolTip | Should -Not -Be $res.CompletionMatches[0].CompletionText
     }
 
     It 'Should not fallback to file completion when completing typenames' {
@@ -2663,6 +3879,18 @@ function MyFunction ($param1, $param2)
     }
 }
 
+Describe "TabCompletion elevated tests" -Tags CI, RequireAdminOnWindows {
+    It "Tab completion UNC path with spaces" -Skip:(!$IsWindows) {
+        $Share = New-SmbShare -Temporary -ReadAccess (whoami.exe) -Path C:\ -Name "Test Share"
+        $res = TabExpansion2 -inputScript '\\localhost\test'
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly "& '\\localhost\Test Share'"
+        if ($null -ne $Share)
+        {
+            Remove-SmbShare -InputObject $Share -Force -Confirm:$false
+        }
+    }
+}
+
 Describe "Tab completion tests with remote Runspace" -Tags Feature,RequireAdminOnWindows {
     BeforeAll {
         $skipTest = -not $IsWindows
@@ -2784,4 +4012,185 @@ Describe "WSMan Config Provider tab complete tests" -Tags Feature,RequireAdminOn
         # https://github.com/PowerShell/PowerShell/issues/4744
         # TODO: move to test cases above once working
     }
+
+    Context "Tab completion for switch cases on `$PSBoundParameters.Keys" {
+        It "Should complete parameter names in switch case for `$PSBoundParameters.Keys" {
+            $inputScript = @"
+function Test-Func {
+    param(
+        [string]`$Param1,
+        [string]`$Param2,
+        [int]`$Count
+    )
+    switch (`$PSBoundParameters.Keys) {
+        P
+    }
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("P", $inputScript.IndexOf("Keys)")) + 1
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 2
+            $completionTexts = $res.CompletionMatches.CompletionText | Sort-Object
+            $completionTexts[0] | Should -BeExactly "Param1"
+            $completionTexts[1] | Should -BeExactly "Param2"
+        }
+
+        It "Should complete all parameter names when prefix matches single param" {
+            $inputScript = @"
+function Test-Func {
+    param(
+        [string]`$Name,
+        [int]`$Value
+    )
+    switch (`$PSBoundParameters.Keys) {
+        N
+    }
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("N", $inputScript.IndexOf("Keys)")) + 1
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 1
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly "Name"
+        }
+
+        It "Should complete parameter names in scriptblock param" {
+            $inputScript = @"
+`$sb = {
+    param(
+        [string]`$ScriptParam1,
+        [string]`$ScriptParam2
+    )
+    switch (`$PSBoundParameters.Keys) {
+        S
+    }
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("S", $inputScript.IndexOf("Keys)")) + 1
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 2
+            $completionTexts = $res.CompletionMatches.CompletionText | Sort-Object
+            $completionTexts[0] | Should -BeExactly "ScriptParam1"
+            $completionTexts[1] | Should -BeExactly "ScriptParam2"
+        }
+    }
+
+    Context "Tab completion for `$PSBoundParameters access patterns" {
+        It "Should complete parameter names for ContainsKey method" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1, [string]`$Param2, [int]`$Count)
+    if (`$PSBoundParameters.ContainsKey('P')) { }
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("'P'") + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 2
+            $completionTexts = $res.CompletionMatches.CompletionText | Sort-Object
+            $completionTexts[0] | Should -BeExactly "'Param1'"
+            $completionTexts[1] | Should -BeExactly "'Param2'"
+        }
+
+        It "Should complete parameter names for indexer access" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1, [string]`$Param2, [int]`$Count)
+    `$value = `$PSBoundParameters['P']
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("'P'") + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 2
+            $completionTexts = $res.CompletionMatches.CompletionText | Sort-Object
+            $completionTexts[0] | Should -BeExactly "'Param1'"
+            $completionTexts[1] | Should -BeExactly "'Param2'"
+        }
+
+        It "Should complete parameter names for Remove method" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1, [string]`$Param2, [int]`$Count)
+    `$PSBoundParameters.Remove('C')
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("'C'") + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 1
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly "'Count'"
+        }
+
+        It "Should complete with double quotes when using double-quoted string" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1, [string]`$Param2)
+    if (`$PSBoundParameters.ContainsKey("P")) { }
+}
+"@
+            $cursorPosition = $inputScript.IndexOf('"P"') + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 2
+            $completionTexts = $res.CompletionMatches.CompletionText | Sort-Object
+            $completionTexts[0] | Should -BeExactly '"Param1"'
+            $completionTexts[1] | Should -BeExactly '"Param2"'
+        }
+
+        It "Should not complete for non-PSBoundParameters variable with indexer" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1)
+    `$hash = @{}
+    `$value = `$hash['P']
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("'P'") + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            # Should not return Param1 as completion
+            $paramCompletion = $res.CompletionMatches | Where-Object { $_.CompletionText -eq "'Param1'" }
+            $paramCompletion | Should -BeNullOrEmpty
+        }
+
+        It "Should not complete for non-PSBoundParameters variable with ContainsKey" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1)
+    `$hash = @{}
+    if (`$hash.ContainsKey('P')) { }
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("'P'") + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            # Should not return Param1 as completion
+            $paramCompletion = $res.CompletionMatches | Where-Object { $_.CompletionText -eq "'Param1'" }
+            $paramCompletion | Should -BeNullOrEmpty
+        }
+
+        It "Should not complete for non-PSBoundParameters variable with Remove" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1)
+    `$hash = @{}
+    `$hash.Remove('P')
+}
+"@
+            $cursorPosition = $inputScript.IndexOf("'P'") + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            # Should not return Param1 as completion
+            $paramCompletion = $res.CompletionMatches | Where-Object { $_.CompletionText -eq "'Param1'" }
+            $paramCompletion | Should -BeNullOrEmpty
+        }
+
+        It "Should not complete for non-PSBoundParameters variable with double quotes" {
+            $inputScript = @"
+function Test-Func {
+    param([string]`$Param1)
+    `$hash = @{}
+    if (`$hash.ContainsKey("P")) { }
+}
+"@
+            $cursorPosition = $inputScript.IndexOf('"P"') + 2
+            $res = TabExpansion2 -inputScript $inputScript -cursorColumn $cursorPosition
+            # Should not return Param1 as completion
+            $paramCompletion = $res.CompletionMatches | Where-Object { $_.CompletionText -eq '"Param1"' }
+            $paramCompletion | Should -BeNullOrEmpty
+        }
+    }
 }
diff --git a/test/powershell/Installer/WindowsInstaller.Tests.ps1 b/test/powershell/Installer/WindowsInstaller.Tests.ps1
deleted file mode 100644
index 66bd08e74f5..00000000000
--- a/test/powershell/Installer/WindowsInstaller.Tests.ps1
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-Describe "Windows Installer" -Tags "Scenario" {
-
-    BeforeAll {
-        $skipTest = -not $IsWindows
-        $preRequisitesLink =  'https://aka.ms/pscore6-prereq'
-        $linkCheckTestCases = @(
-            @{ Name = "Universal C Runtime"; Url = $preRequisitesLink }
-            @{ Name = "WMF 4.0"; Url = "https://www.microsoft.com/download/details.aspx?id=40855" }
-            @{ Name = "WMF 5.0"; Url = "https://www.microsoft.com/download/details.aspx?id=50395" }
-            @{ Name = "WMF 5.1"; Url = "https://www.microsoft.com/download/details.aspx?id=54616" }
-        )
-    }
-
-    It "WiX (Windows Installer XML) file contains pre-requisites link $preRequisitesLink" -Skip:$skipTest {
-        $wixProductFile = Join-Path -Path $PSScriptRoot -ChildPath "..\..\..\assets\wix\Product.wxs"
-        (Get-Content $wixProductFile -Raw).Contains($preRequisitesLink) | Should -BeTrue
-    }
-
-    ## Running 'Invoke-WebRequest' with WMF download URLs has been failing intermittently,
-    ## because sometimes the URLs lead to a 'this download is no longer available' page.
-    ## We use a retry logic here. Retry for 5 times with 1 second interval.
-    # It "Pre-Requisistes link for '<Name>' is reachable: <url>" -TestCases $linkCheckTestCases -Skip:$skipTest {
-    It "Pre-Requisistes link for '<Name>' is reachable: <url>" -TestCases $linkCheckTestCases -Pending {
-        param ($Url)
-
-        foreach ($i in 1..5) {
-            try {
-                $result = Invoke-WebRequest $Url -UseBasicParsing
-                break;
-            } catch {
-                Start-Sleep -Seconds 1
-            }
-        }
-
-        $result | Should -Not -Be $null
-    }
-}
diff --git a/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1 b/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
index 4e5668071d7..6674697ca2f 100644
--- a/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
+++ b/test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
@@ -833,7 +833,7 @@ class Derived : Base
 [Derived]::new().foo()
 '@)
 
-        $iss = [System.Management.Automation.Runspaces.initialsessionstate]::CreateDefault2()
+        $iss = [initialsessionstate]::CreateDefault2()
         $iss.Commands.Add($ssfe)
 
         $ps = [powershell]::Create($iss)
@@ -929,7 +929,7 @@ class A : Foo.Bar
 return [A]::new()
 '@)
 
-        $iss = [System.Management.Automation.Runspaces.initialsessionstate]::CreateDefault()
+        $iss = [initialsessionstate]::CreateDefault()
         $iss.Commands.Add($ssfe)
 
         $ps = [powershell]::Create($iss)
diff --git a/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1 b/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
index cf304d5918e..6b24b8b6ce0 100644
--- a/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
+++ b/test/powershell/Language/Classes/scripting.Classes.inheritance.tests.ps1
@@ -80,6 +80,49 @@ Describe 'Classes inheritance syntax' -Tags "CI" {
         $getter.Attributes -band [System.Reflection.MethodAttributes]::Virtual | Should -Be ([System.Reflection.MethodAttributes]::Virtual)
     }
 
+    It 'can implement .NET interface static properties' {
+        Add-Type -TypeDefinition @'
+public interface IInterfaceWithStaticAbstractProperty
+{
+    static abstract int Getter { get; }
+    static abstract int Setter { get; set; }
+}
+
+public static class InterfaceStaticAbstractPropertyTest
+{
+    public static int GetGetter<T>() where T : IInterfaceWithStaticAbstractProperty
+        => T.Getter;
+
+    public static int GetSetter<T>() where T : IInterfaceWithStaticAbstractProperty
+        => T.Setter;
+
+    public static int SetSetter<T>(int value) where T : IInterfaceWithStaticAbstractProperty
+        => T.Setter = value;
+}
+'@
+
+        $C1 = Invoke-Expression @'
+class ClassWithStaticAbstractInterface : IInterfaceWithStaticAbstractProperty {
+    static [int]$Getter = 1
+    static [int]$Setter = 2
+}
+
+[ClassWithStaticAbstractInterface]
+'@
+
+        $C1::Getter | Should -Be 1
+        $C1::Getter | Should -BeOfType ([int])
+        $C1::Setter | Should -Be 2
+        $C1::Setter | Should -BeOfType ([int])
+        $C1::Setter = 3
+        $C1::Setter | Should -Be 3
+
+        [InterfaceStaticAbstractPropertyTest]::GetGetter[ClassWithStaticAbstractInterface]() | Should -Be 1
+        [InterfaceStaticAbstractPropertyTest]::GetSetter[ClassWithStaticAbstractInterface]() | Should -Be 3
+        [InterfaceStaticAbstractPropertyTest]::SetSetter[ClassWithStaticAbstractInterface](4)
+        [InterfaceStaticAbstractPropertyTest]::GetSetter[ClassWithStaticAbstractInterface]() | Should -Be 4
+    }
+
     It 'allows use of defined later type as a property type' {
         class A { static [B]$b }
         class B : A {}
@@ -628,3 +671,253 @@ class Derived : Base
         $sb.Invoke() | Should -Be 200
     }
 }
+
+Describe 'Base type has abstract properties' -Tags "CI" {
+    It 'can derive from `FileSystemInfo`' {
+        ## FileSystemInfo has 3 abstract members that a derived type needs to implement
+        ##  - public abstract bool Exists { get; }
+        ##  - public abstract string Name { get; }
+        ##  - public abstract void Delete ();
+
+        class myFileSystemInfo : System.IO.FileSystemInfo
+        {
+            [string] $Name
+            [bool] $Exists
+
+            myFileSystemInfo([string]$path)
+            {
+                # ctor
+                $this.Name = $path
+                $this.Exists = $true
+            }
+
+            [void] Delete()
+            {
+            }
+        }
+
+        $myFile = [myFileSystemInfo]::new('Hello')
+        $myFile.Name | Should -Be 'Hello'
+        $myFile.Exists | Should -BeTrue
+    }
+
+    It 'deriving from `FileSystemInfo` will fail when the abstract property `Exists` is not implemented' {
+        $script = [scriptblock]::Create('class WillFail : System.IO.FileSystemInfo { [string] $Name }')
+        $failure = $null
+        try {
+            & $script
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.FullyQualifiedErrorId | Should -BeExactly "TypeCreationError"
+        $failure.Exception.Message | Should -BeLike "*'get_Exists'*"
+    }
+}
+
+Describe 'Classes inheritance with protected and protected internal members in base class' -Tags 'CI' {
+
+    BeforeAll {
+        Set-StrictMode -Version 3
+        $c1DefinitionProtectedInternal = @'
+            public class C1ProtectedInternal
+            {
+                protected internal string InstanceField = "C1_InstanceField";
+                protected internal string InstanceProperty { get; set; } = "C1_InstanceProperty";
+                protected internal string InstanceMethod() { return "C1_InstanceMethod"; }
+
+                protected internal virtual string VirtualProperty1 { get; set; } = "C1_VirtualProperty1";
+                protected internal virtual string VirtualProperty2 { get; set; } = "C1_VirtualProperty2";
+                protected internal virtual string VirtualMethod1() { return "C1_VirtualMethod1"; }
+                protected internal virtual string VirtualMethod2() { return "C1_VirtualMethod2"; }
+
+                public string CtorUsed {  get; set; }
+                public C1ProtectedInternal() { CtorUsed = "default ctor"; }
+                protected internal C1ProtectedInternal(string p1) { CtorUsed = "C1_ctor_1args:" + p1; }
+            }
+'@
+        $c2DefinitionProtectedInternal = @'
+            class C2ProtectedInternal : C1ProtectedInternal {
+                C2ProtectedInternal() : base() { $this.VirtualProperty2 = 'C2_VirtualProperty2' }
+                C2ProtectedInternal([string]$p1) : base($p1) { $this.VirtualProperty2 = 'C2_VirtualProperty2' }
+
+                [string]GetInstanceField() { return $this.InstanceField }
+                [string]SetInstanceField([string]$value) { $this.InstanceField = $value; return $this.InstanceField }
+                [string]GetInstanceProperty() { return $this.InstanceProperty }
+                [string]SetInstanceProperty([string]$value) { $this.InstanceProperty = $value; return $this.InstanceProperty }
+                [string]CallInstanceMethod() { return $this.InstanceMethod() }
+
+                [string]GetVirtualProperty1() { return $this.VirtualProperty1 }
+                [string]SetVirtualProperty1([string]$value) { $this.VirtualProperty1 = $value; return $this.VirtualProperty1 }
+                [string]CallVirtualMethod1() { return $this.VirtualMethod1() }
+
+                [string]$VirtualProperty2
+                [string]VirtualMethod2() { return 'C2_VirtualMethod2' }
+                # Note: Overriding a virtual property in a derived PowerShell class prevents access to the
+                #       base property via simple typecast ([base]$this).VirtualProperty2.
+                [string]GetVirtualProperty2() { return $this.VirtualProperty2 }
+                [string]SetVirtualProperty2([string]$value) { $this.VirtualProperty2 = $value; return $this.VirtualProperty2 }
+                [string]CallVirtualMethod2Base() { return ([C1ProtectedInternal]$this).VirtualMethod2() }
+                [string]CallVirtualMethod2Derived() { return $this.VirtualMethod2() }
+
+                [string]GetInstanceMemberDynamic([string]$name) { return $this.$name }
+                [string]SetInstanceMemberDynamic([string]$name, [string]$value) { $this.$name = $value; return $this.$name }
+                [string]CallInstanceMemberDynamic([string]$name) { return $this.$name() }
+            }
+
+            [C2ProtectedInternal]
+'@
+
+        Add-Type -TypeDefinition $c1DefinitionProtectedInternal
+        Add-Type -TypeDefinition (($c1DefinitionProtectedInternal -creplace 'C1ProtectedInternal', 'C1Protected') -creplace 'protected internal', 'protected')
+
+        $testCases = @(
+            @{ accessType = 'protected'; derivedType = Invoke-Expression ($c2DefinitionProtectedInternal -creplace 'ProtectedInternal', 'Protected') }
+            @{ accessType = 'protected internal'; derivedType = Invoke-Expression $c2DefinitionProtectedInternal }
+        )
+    }
+
+    AfterAll {
+        Set-StrictMode -Off
+    }
+
+    Context 'Derived class can access instance base class members' {
+
+        It 'can call protected internal .NET method Object.MemberwiseClone()' {
+            class CNetMethod {
+                [string]$Foo
+                [object]CloneIt() { return $this.MemberwiseClone() }
+            }
+            $c1 = [CNetMethod]::new()
+            $c1.Foo = 'bar'
+            $c2 = $c1.CloneIt()
+            $c2.Foo | Should -Be 'bar'
+        }
+
+        It 'can call <accessType> base ctor' -TestCases $testCases {
+            param($derivedType)
+            $derivedType::new('foo').CtorUsed | Should -Be 'C1_ctor_1args:foo'
+        }
+
+        It 'can access <accessType> base field' -TestCases $testCases {
+            param($derivedType)
+            $c2 = $derivedType::new()
+            $c2.GetInstanceField() | Should -Be 'C1_InstanceField'
+            $c2.SetInstanceField('foo_InstanceField') | Should -Be 'foo_InstanceField'
+        }
+
+        It 'can access <accessType> base property' -TestCases $testCases {
+            param($derivedType)
+            $c2 = $derivedType::new()
+            $c2.GetInstanceProperty() | Should -Be 'C1_InstanceProperty'
+            $c2.SetInstanceProperty('foo_InstanceProperty') | Should -Be 'foo_InstanceProperty'
+        }
+
+        It 'can call <accessType> base method' -TestCases $testCases {
+            param($derivedType)
+            $derivedType::new().CallInstanceMethod() | Should -Be 'C1_InstanceMethod'
+        }
+
+        It 'can access <accessType> virtual base property' -TestCases $testCases {
+            param($derivedType)
+            $c2 = $derivedType::new()
+            $c2.GetVirtualProperty1() | Should -Be 'C1_VirtualProperty1'
+            $c2.SetVirtualProperty1('foo_VirtualProperty1') | Should -Be 'foo_VirtualProperty1'
+        }
+
+        It 'can call <accessType> virtual base method' -TestCases $testCases {
+            param($derivedType)
+            $derivedType::new().CallVirtualMethod1() | Should -Be 'C1_VirtualMethod1'
+        }
+    }
+
+    Context 'Derived class can override virtual base class members' {
+
+        It 'can override <accessType> virtual base property' -TestCases $testCases {
+            param($derivedType)
+            $c2 = $derivedType::new()
+            $c2.GetVirtualProperty2() | Should -Be 'C2_VirtualProperty2'
+            $c2.SetVirtualProperty2('foo_VirtualProperty2') | Should -Be 'foo_VirtualProperty2'
+        }
+
+        It 'can override <accessType> virtual base method' -TestCases $testCases {
+            param($derivedType)
+            $c2 = $derivedType::new()
+            $c2.CallVirtualMethod2Base() | Should -Be 'C1_VirtualMethod2'
+            $c2.CallVirtualMethod2Derived() | Should -Be 'C2_VirtualMethod2'
+        }
+    }
+
+    Context 'Derived class can access instance base class members dynamically' {
+
+        It 'can access <accessType> base fields and properties' -TestCases $testCases {
+            param($derivedType)
+            $c2 = $derivedType::new()
+            $c2.GetInstanceMemberDynamic('InstanceField') | Should -Be 'C1_InstanceField'
+            $c2.GetInstanceMemberDynamic('InstanceProperty') | Should -Be 'C1_InstanceProperty'
+            $c2.GetInstanceMemberDynamic('VirtualProperty1') | Should -Be 'C1_VirtualProperty1'
+            $c2.SetInstanceMemberDynamic('InstanceField', 'foo1') | Should -Be 'foo1'
+            $c2.SetInstanceMemberDynamic('InstanceProperty', 'foo2') | Should -Be 'foo2'
+            $c2.SetInstanceMemberDynamic('VirtualProperty1', 'foo3') | Should -Be 'foo3'
+        }
+
+        It 'can call <accessType> base methods' -TestCases $testCases {
+            param($derivedType)
+            $c2 = $derivedType::new()
+            $c2.CallInstanceMemberDynamic('InstanceMethod') | Should -Be 'C1_InstanceMethod'
+            $c2.CallInstanceMemberDynamic('VirtualMethod1') | Should -Be 'C1_VirtualMethod1'
+        }
+    }
+
+    Context 'Base class members are not accessible outside class scope' {
+
+        BeforeAll {
+            $instanceTest = {
+                $c2 = $derivedType::new()
+                { $null = $c2.InstanceField } | Should -Throw -ErrorId 'PropertyNotFoundStrict'
+                { $null = $c2.InstanceProperty } | Should -Throw -ErrorId 'PropertyNotFoundStrict'
+                { $null = $c2.VirtualProperty1 } | Should -Throw -ErrorId 'PropertyNotFoundStrict'
+                { $c2.InstanceField = 'foo' } | Should -Throw -ErrorId 'PropertyAssignmentException'
+                { $c2.InstanceProperty = 'foo' } | Should -Throw -ErrorId 'PropertyAssignmentException'
+                { $c2.VirtualProperty1 = 'foo' } | Should -Throw -ErrorId 'PropertyAssignmentException'
+                { $derivedType::new().InstanceMethod() } | Should -Throw -ErrorId 'MethodNotFound'
+                { $derivedType::new().VirtualMethod1() } | Should -Throw -ErrorId 'MethodNotFound'
+                foreach ($name in @('InstanceField', 'InstanceProperty', 'VirtualProperty1')) {
+                    { $null = $c2.$name } | Should -Throw -ErrorId 'PropertyNotFoundStrict'
+                    { $c2.$name = 'foo' } | Should -Throw -ErrorId 'PropertyAssignmentException'
+                }
+                foreach ($name in @('InstanceMethod', 'VirtualMethod1')) {
+                    { $c2.$name() } | Should -Throw -ErrorId 'MethodNotFound'
+                }
+            }
+            $c3UnrelatedType = Invoke-Expression @"
+                class C3Unrelated {
+                    [void]RunInstanceTest([type]`$derivedType) { $instanceTest }
+                }
+                [C3Unrelated]
+"@
+            $negativeTestCases = $testCases.ForEach({
+                    $item = $_.Clone()
+                    $item['scopeType'] = 'null scope'
+                    $item['classScope'] = $null
+                    $item
+                    $item = $_.Clone()
+                    $item['scopeType'] = 'unrelated class scope'
+                    $item['classScope'] = $c3UnrelatedType
+                    $item
+                })
+        }
+
+        It 'cannot access <accessType> instance base members in <scopeType>' -TestCases $negativeTestCases {
+            param($derivedType, $classScope)
+            if ($null -eq $classScope) {
+                $instanceTest.Invoke()
+            }
+            else {
+                $c3 = $classScope::new()
+                $c3.RunInstanceTest($derivedType)
+            }
+        }
+    }
+}
diff --git a/test/powershell/Language/Classes/scripting.Classes.using.tests.ps1 b/test/powershell/Language/Classes/scripting.Classes.using.tests.ps1
index fb3778463da..d4e86e341b1 100644
--- a/test/powershell/Language/Classes/scripting.Classes.using.tests.ps1
+++ b/test/powershell/Language/Classes/scripting.Classes.using.tests.ps1
@@ -417,7 +417,7 @@ function foo()
 '@
             # resolve name to absolute path
             $scriptToProcessPath = (Get-ChildItem $scriptToProcessPath).FullName
-            $iss = [System.Management.Automation.Runspaces.initialsessionstate]::CreateDefault()
+            $iss = [initialsessionstate]::CreateDefault()
             $iss.StartupScripts.Add($scriptToProcessPath)
 
             $ps = [powershell]::Create($iss)
diff --git a/test/powershell/Language/Operators/ComparisonOperator.Tests.ps1 b/test/powershell/Language/Operators/ComparisonOperator.Tests.ps1
index 76069143327..ddc6498eb6d 100644
--- a/test/powershell/Language/Operators/ComparisonOperator.Tests.ps1
+++ b/test/powershell/Language/Operators/ComparisonOperator.Tests.ps1
@@ -82,6 +82,21 @@ Describe "ComparisonOperator" -Tag "CI" {
         param($lhs, $operator, $rhs)
         Invoke-Expression "$lhs $operator $rhs" | Should -BeFalse
     }
+
+    It "Should be <result> for backtick comparison <lhs> <operator> <rhs>" -TestCases @(
+        @{ lhs = 'abc`def'; operator = '-like'; rhs = 'abc`def'; result = $false }
+        @{ lhs = 'abc`def'; operator = '-like'; rhs = 'abc``def'; result = $true }
+        @{ lhs = 'abc`def'; operator = '-like'; rhs = 'abc````def'; result = $false }
+        @{ lhs = 'abc``def'; operator = '-like'; rhs = 'abc````def'; result = $true }
+        @{ lhs = 'abc`def'; operator = '-like'; rhs = [WildcardPattern]::Escape('abc`def'); result = $true }
+        @{ lhs = 'abc`def'; operator = '-like'; rhs = [WildcardPattern]::Escape('abc``def'); result = $false }
+        @{ lhs = 'abc``def'; operator = '-like'; rhs = [WildcardPattern]::Escape('abc``def'); result = $true }
+        @{ lhs = 'abc``def'; operator = '-like'; rhs = [WildcardPattern]::Escape('abc````def'); result = $false }
+    ) {
+        param($lhs, $operator, $rhs, $result)
+        $expression = "'$lhs' $operator '$rhs'"
+        Invoke-Expression $expression | Should -Be $result
+    }
 }
 
 Describe "Bytewise Operator" -Tag "CI" {
diff --git a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
index ca4db39bd66..a9641951473 100644
--- a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
+++ b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
@@ -238,7 +238,7 @@ Describe 'Generic Method invocation' -Tags 'CI' {
             }
         )
 
-        $result.GetType().Name | Should -BeExactly 'SelectListIterator`2'
+        $result.GetType().Name | Should -BeExactly 'ListSelectIterator`2'
         $typeArgs = $result.GetType().GenericTypeArguments
         $typeArgs[0] | Should -Be ([int])
         $typeArgs[1] | Should -Be ([float])
diff --git a/test/powershell/Language/Parser/Parsing.Tests.ps1 b/test/powershell/Language/Parser/Parsing.Tests.ps1
index 2bd717becda..b85ef72c43e 100644
--- a/test/powershell/Language/Parser/Parsing.Tests.ps1
+++ b/test/powershell/Language/Parser/Parsing.Tests.ps1
@@ -665,19 +665,79 @@ Describe "Parsing using statement with alias and linebreak and comma" -Tag CI {
     }
 }
 
-It "Should correctly parse array literals for index expressions in method calls" {
-    $tks = $null
-    $ers = $null
-    $Script = '[string]::join(" ", (0, 1, 2)[0, 1])'
-    $result = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
-    $result.EndBlock.Statements[0].PipelineElements[0].Expression.Arguments[1].Index.Elements.Count | Should -Be 2
-    $ers.Count | Should -Be 0
-}
+Describe "Additional tests" -Tag CI {
+    It "Should correctly parse array literals for index expressions in method calls" {
+        $tks = $null
+        $ers = $null
+        $Script = '[string]::join(" ", (0, 1, 2)[0, 1])'
+        $result = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $result.EndBlock.Statements[0].PipelineElements[0].Expression.Arguments[1].Index.Elements.Count | Should -Be 2
+        $ers.Count | Should -Be 0
+    }
+
+    It "Should correctly parse array types that are used as arguments without brackets in generic type" {
+        $tks = $null
+        $ers = $null
+        $Script = '[System.Tuple[System.String[],System.Int32[]]]'
+        $result = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $result.EndBlock.Statements[0].PipelineElements[0].Expression.TypeName.FullName | Should -Be 'System.Tuple[System.String[],System.Int32[]]'
+    }
 
-It "Should correctly parse array types that are used as arguments without brackets in generic type" {
-    $tks = $null
-    $ers = $null
-    $Script = '[System.Tuple[System.String[],System.Int32[]]]'
-    $result = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
-    $result.EndBlock.Statements[0].PipelineElements[0].Expression.TypeName.FullName | Should -Be 'System.Tuple[System.String[],System.Int32[]]'
+    It "Should correctly set the cached type for 'GenericTypeName.TypeName' as needed when the generic type is found in cache" {
+        $tks = $null
+        $ers = $null
+        $Script = '[System.Collections.Generic.List[string]]'
+
+        ## See https://github.com/PowerShell/PowerShell/issues/24982 for details about the issue.
+        $result = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $typeExpr = $result.EndBlock.Statements[0].PipelineElements[0].Expression
+        $typeExpr.TypeName.FullName | Should -Be 'System.Collections.Generic.List[string]'
+        $typeExpr.TypeName.TypeName.FullName | Should -Be 'System.Collections.Generic.List'
+        $typeExpr.TypeName.TypeName.GetReflectionType() | Should -Not -BeNullOrEmpty
+        $typeExpr.TypeName.TypeName.GetReflectionType().FullName | Should -Be 'System.Collections.Generic.List`1'
+
+        $result2 = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $typeExpr2 = $result2.EndBlock.Statements[0].PipelineElements[0].Expression
+        $typeExpr2.TypeName.FullName | Should -Be 'System.Collections.Generic.List[string]'
+        $typeExpr2.TypeName.TypeName.FullName | Should -Be 'System.Collections.Generic.List'
+        $typeExpr2.TypeName.TypeName.GetReflectionType() | Should -Not -BeNullOrEmpty
+        $typeExpr2.TypeName.TypeName.GetReflectionType().FullName | Should -Be 'System.Collections.Generic.List`1'
+
+        $Script = '[System.Tuple[System.String[],System.Int32[]]]'
+        $result3 = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $result3.EndBlock.Statements[0].PipelineElements[0].Expression.TypeName.TypeName.GetReflectionType().FullName | Should -Be 'System.Tuple'
+
+        ## Generic type with assembly name can be resolved.
+        [System.Collections.Generic.List[string], System.Private.CoreLib].FullName | Should -BeLike 'System.Collections.Generic.List``1`[`[System.String, *`]`]'
+
+        $Script = '[System.Collections.Generic.List[string], System.Private.CoreLib]'
+        $result4 = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $typeExpr4 = $result4.EndBlock.Statements[0].PipelineElements[0].Expression
+        $typeExpr4.TypeName.FullName | Should -Be 'System.Collections.Generic.List[string],System.Private.CoreLib'
+        $typeExpr4.TypeName.TypeName.FullName | Should -Be 'System.Collections.Generic.List,System.Private.CoreLib'
+        $typeExpr4.TypeName.TypeName.GetReflectionType() | Should -Not -BeNullOrEmpty
+        $typeExpr4.TypeName.TypeName.GetReflectionType().FullName | Should -Be 'System.Collections.Generic.List`1'
+
+        ## Generic type with '`<n>' in name can be resolved.
+        [System.Collections.Generic.List`1[string]].FullName | Should -BeLike 'System.Collections.Generic.List``1`[`[System.String, *`]`]'
+
+        $Script = '[System.Collections.Generic.List`1[string]]'
+        $result5 = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $typeExpr5 = $result5.EndBlock.Statements[0].PipelineElements[0].Expression
+        $typeExpr5.TypeName.FullName | Should -Be 'System.Collections.Generic.List`1[string]'
+        $typeExpr5.TypeName.TypeName.FullName | Should -Be 'System.Collections.Generic.List`1'
+        $typeExpr5.TypeName.TypeName.GetReflectionType() | Should -Not -BeNullOrEmpty
+        $typeExpr5.TypeName.TypeName.GetReflectionType().FullName | Should -Be 'System.Collections.Generic.List`1'
+    }
+
+    It "Should get correct offsets for number constant parsing error" {
+        $tks = $null
+        $ers = $null
+        $Script = '$n = 0x10000000000000000'
+        $null = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$tks, [ref]$ers)
+        $ers.Length | Should -BeExactly 1
+        $ers[0].Extent.StartOffset | Should -BeExactly 5
+        $ers[0].Extent.EndOffset | Should -BeExactly 24
+        $ers[0].Extent.Text | Should -BeExactly '0x10000000000000000'
+    }
 }
diff --git a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1
index 0c9ef0f0b92..140d92fae88 100644
--- a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1
+++ b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1
@@ -123,3 +123,119 @@ Describe "File redirection should have 'DoComplete' called on the underlying pip
         $errorContent | Should -Match "CommandNotFoundException,Microsoft.PowerShell.Commands.GetCommandCommand"
     }
 }
+
+Describe "Redirection and Set-Variable -append tests" -tags CI {
+    Context "variable redirection should work" {
+        BeforeAll {
+            $testCases = @{ Name = "Variable should be created"; scriptBlock = { 1..3>variable:a }; Validation = { ($a -join "") | Should -Be ((1..3) -join "") } },
+                @{ Name = "variable should be appended"; scriptBlock = {1..3>variable:a; 4..6>>variable:a}; Validation = { ($a -join "") | Should -Be ((1..6) -join "")}},
+                @{ Name = "variable should maintain type"; scriptBlock = {@{one=1}>variable:a};Validation = {$a | Should -BeOfType [hashtable]}},
+                @{
+                    Name = "variable should maintain type for multiple objects"
+                    scriptBlock = {@{one=1}>variable:a;@{two=2}>>variable:a;1>>variable:a;"string">>variable:a}
+                    Validation = {
+                        $a.count | Should -Be 4
+                        ,$a | Should -BeOfType [array]
+                        $a[0] | Should -BeOfType [hashtable]
+                        $a[1] | Should -BeOfType [hashtable]
+                        $a[2] | Should -BeOfType [int]
+                        $a[3] | Should -BeOfType [string]
+                        $a[0].one | Should -Be 1
+                        $a[1].two | Should -Be 2
+                        $a[2] | Should -Be 1
+                        $a[3] | Should -Be "string"
+                        }
+                    },
+                 @{ Name = "Error stream should be redirectable"
+                     scriptBlock = { write-error bad 2>variable:a}
+                     validation = {
+                        $a |Should -BeOfType [System.Management.Automation.ErrorRecord]
+                        $a.Exception.Message | Should -BeExactly "bad"
+                        }
+                     },
+                 @{ Name = "Warning stream should be redirectable"
+                     scriptBlock = { write-warning warn 3>variable:a}
+                     validation = {
+                        $a |Should -BeOfType [System.Management.Automation.WarningRecord]
+                        $a.Message | Should -BeExactly "warn"
+                        }
+                     },
+                 @{ Name = "Verbose stream should be redirectable"
+                     scriptBlock = { write-verbose -verbose verb 4>variable:a}
+                     validation = {
+                        $a |Should -BeOfType [System.Management.Automation.VerboseRecord]
+                        $a.Message | Should -BeExactly "verb"
+                        }
+                     },
+                 @{ Name = "Debug stream should be redirectable"
+                     scriptBlock = { write-debug -debug deb 5>variable:a}
+                     validation = {
+                        $a |Should -BeOfType [System.Management.Automation.DebugRecord]
+                        $a.Message | Should -BeExactly "deb"
+                        }
+                     },
+                 @{ Name = "Information stream should be redirectable"
+                     scriptBlock = { write-information info 6>variable:a}
+                     validation = {
+                         $a |Should -BeOfType [System.Management.Automation.InformationRecord]
+                         $a.MessageData | Should -BeExactly "info"
+                         }
+                     },
+                 @{ Name = "Complex redirection should be supported"
+                     scriptBlock = {
+                        . {
+                            write-error bad
+                            write-information info
+                            } *>variable:a
+                        }
+                    validation = {
+                        $a.Count | Should -Be 2
+                        $a[0] | Should -BeOfType [System.Management.Automation.ErrorRecord]
+                        $a[0].Exception.Message | Should -Be "bad"
+                        $a[1] |Should -BeOfType [System.Management.Automation.InformationRecord]
+                        $a[1].MessageData | Should -BeExactly "info"
+                        }
+                    },
+                  @{
+                    Name = "multiple redirections should work"
+                     scriptBlock = {
+                        . {
+                            write-error bad
+                            write-information info
+                            } 2>variable:e 6>variable:i
+                        }
+                     validation = {
+                        $e | Should -BeOfType [System.Management.Automation.ErrorRecord]
+                        $e.Exception.Message | Should -Be "bad"
+                        $i | Should -BeOfType [System.Management.Automation.InformationRecord]
+                        $i.MessageData | Should -BeExactly "info"
+                     }
+                 }
+
+
+        }
+        It "<name>" -TestCases $testCases {
+            param ( $scriptBlock, $validation )
+            . $scriptBlock
+            . $validation
+        }
+
+        It 'Redirection of a native application is correct' {
+            $expected = @('Arg 0 is <hi>','Arg 1 is <bye>')
+            testexe -echoargs hi bye > variable:observed
+            $observed | Should -Be $expected
+        }
+
+        It 'Redirection while in variable provider is correct' {
+            $expected = @('Arg 0 is <hi>','Arg 1 is <bye>')
+            try {
+                Push-Location variable:
+                testexe -echoargs hi bye > observed
+            }
+            finally {
+                Pop-Location
+            }
+            $observed | Should -Be $expected
+        }
+    }
+}
diff --git a/test/powershell/Language/Parser/UsingAssembly.Tests.ps1 b/test/powershell/Language/Parser/UsingAssembly.Tests.ps1
index caf7af1551f..6ff7896041e 100644
--- a/test/powershell/Language/Parser/UsingAssembly.Tests.ps1
+++ b/test/powershell/Language/Parser/UsingAssembly.Tests.ps1
@@ -44,24 +44,15 @@ public class ABC {}
             $err[0].ErrorId | Should -Be CannotLoadAssemblyWithUriSchema
         }
 
-        It "parse does not load the assembly" -Pending {
+        It "parse does not load the assembly '<Script>'" -TestCases @{ Script = "using assembly UsingAssemblyTest$guid.dll"; Expected = $false },
+                                                      @{ Script = "using assembly '$(Join-Path -Path $PSScriptRoot -ChildPath UsingAssemblyTest$guid.dll)'"; Expected = $false },
+                                                      @{ Script = "using assembly `"$(Join-Path -Path $PSScriptRoot -ChildPath UsingAssemblyTest$guid.dll)`""; Expected = $false } {
+            param ($script)
             $assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
             $assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
 
             $err = $null
-            $ast = [System.Management.Automation.Language.Parser]::ParseInput("using assembly .\UsingAssemblyTest$guid.dll", [ref]$null, [ref]$err)
-
-            $assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
-            $assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
-            $err.Count | Should -Be 0
-
-            $ast = [System.Management.Automation.Language.Parser]::ParseInput("using assembly '$PSScriptRoot\UsingAssemblyTest$guid.dll'", [ref]$null, [ref]$err)
-
-            $assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
-            $assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
-            $err.Count | Should -Be 0
-
-            $ast = [System.Management.Automation.Language.Parser]::ParseInput("using assembly `"$PSScriptRoot\UsingAssemblyTest$guid.dll`"", [ref]$null, [ref]$err)
+            $ast = [System.Management.Automation.Language.Parser]::ParseInput($script, [ref]$null, [ref]$err)
 
             $assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
             $assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
@@ -69,39 +60,42 @@ public class ABC {}
         }
 
         It "reports runtime error about non-existing assembly with relative path" {
-            $e = { [scriptblock]::Create("using assembly .\NonExistingAssembly.dll") } | Should -Throw -ErrorId 'ParseException' -PassThru
+            $script = "using assembly {0}" -f (Join-Path "." "NonExistingAssembly.dll")
+            $e = { [scriptblock]::Create($script) } | Should -Throw -ErrorId 'ParseException' -PassThru
             $e.Exception.InnerException.ErrorRecord.FullyQualifiedErrorId | Should -Be 'ErrorLoadingAssembly'
         }
 #>
-        It "Assembly loaded at runtime" -Pending {
-            $assemblies = & "$PSHOME/pwsh" -noprofile -command @"
-    using assembly .\UsingAssemblyTest$guid.dll
-    [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
-"@
-            $assemblies -contains "UsingAssemblyTest$guid" | Should -BeTrue
-
-            $assemblies = & "$PSHOME/pwsh" -noprofile -command @"
-    using assembly $PSScriptRoot\UsingAssemblyTest$guid.dll
-    [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
-"@
-            $assemblies -contains "UsingAssemblyTest$guid" | Should -BeTrue
-
-            $assemblies = & "$PSHOME/pwsh" -noprofile -command @"
-    using assembly System.Drawing
-    [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
-"@
-            $assemblies -contains "System.Drawing" | Should -BeTrue
-
-            $assemblies = & "$PSHOME/pwsh" -noprofile -command @"
-    using assembly 'System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
-    [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
-"@
-            $assemblies -contains "System.Drawing" | Should -BeTrue
+        Context "Runtime loading of assemblies" {
+            BeforeAll {
+                copy-item "UsingAssemblyTest$guid.dll" $TestDrive
+                $assemblyPath = Join-Path $TestDrive "UsingAssemblyTest$guid.dll"
+
+                function InvokeScript ([string]$pathToScript) {
+                    $result = & "$PSHOME/pwsh" -noprofile -file $pathToScript
+                    return $result
+                }
+            }
+
+            It "Assembly loaded at runtime" {
+                $testFile = Join-Path $TestDrive "TestFile1.ps1"
+                $script = "using assembly UsingAssemblyTest$guid.dll`n[ABC].Assembly.Location"
+                Set-Content -Path $testFile -Value $script
+                $assembly = InvokeScript $testFile
+                $assembly | Should -Be $assemblyPath
+            }
+
+            It "Assembly loaded at runtime with fully qualified name" {
+                $script = "using assembly $assemblyPath`n[ABC].Assembly.Location"
+                $testFile = Join-Path $TestDrive "TestFile2.ps1"
+                Set-Content -Path $testFile -Value $script
+                $assembly = InvokeScript $testFile
+                $assembly | Should -Be $assemblyPath
+            }
         }
     }
     finally
     {
-        Remove-Item .\UsingAssemblyTest$guid.dll
+        Remove-Item -ErrorAction Ignore .\UsingAssemblyTest$guid.dll
         Pop-Location
     }
 }
diff --git a/test/powershell/Language/Parser/UsingNamespace.Tests.ps1 b/test/powershell/Language/Parser/UsingNamespace.Tests.ps1
index 58d9b8738cc..0370a8c5e1d 100644
--- a/test/powershell/Language/Parser/UsingNamespace.Tests.ps1
+++ b/test/powershell/Language/Parser/UsingNamespace.Tests.ps1
@@ -128,7 +128,10 @@ Describe "Using Namespace" -Tags "CI" {
 
     ShouldBeParseError "1; using namespace System" UsingMustBeAtStartOfScript 3
     ShouldBeParseError "using namespace Foo = System" UsingStatementNotSupported 0
+    ShouldBeParseError "using namespace ''" InvalidNamespaceValue 16
+    ShouldBeParseError "using namespace [System]" InvalidNamespaceValue 16
+    ShouldBeParseError "using namespace ',System'" InvalidNamespaceValue 16
+    ShouldBeParseError "using namespace ']System'" InvalidNamespaceValue 16
     # TODO: add diagnostic (low pri)
     # ShouldBeParseError "using namespace System; using namespace System" UsingNamespaceAlreadySpecified 24
 }
-
diff --git a/test/powershell/Language/Scripting/CommonParameters.Tests.ps1 b/test/powershell/Language/Scripting/CommonParameters.Tests.ps1
index 6f9d80e1677..4b6eda1ef95 100644
--- a/test/powershell/Language/Scripting/CommonParameters.Tests.ps1
+++ b/test/powershell/Language/Scripting/CommonParameters.Tests.ps1
@@ -147,6 +147,44 @@ Describe "Common parameters support for script cmdlets" -Tags "CI" {
         }
     }
 
+    Context "ProgressAction" {
+        It "Ignores progress actions on advanced script function with no variables" {
+            $ps.AddScript(
+@'
+function test-function {
+    [CmdletBinding()]param()
+
+    Write-Progress "progress foo"
+}
+test-function -ProgressAction Ignore
+'@).Invoke()
+
+            $ps.Streams.Progress.Count | Should -Be 0
+            $ps.Streams.Error | ForEach-Object {
+                Write-Error -ErrorRecord $_ -ErrorAction Stop
+            }
+        }
+
+        It "Ignores progress actions on advanced script function with variables" {
+            $ps.AddScript(
+@'
+function test-function {
+    [CmdletBinding()]param([string]$path)
+
+    switch($false) { default { "echo $path" } }
+
+    Write-Progress "progress foo"
+}
+test-function -ProgressAction Ignore
+'@).Invoke()
+
+            $ps.Streams.Progress.Count | Should -Be 0
+            $ps.Streams.Error | ForEach-Object {
+                Write-Error -ErrorRecord $_ -ErrorAction Stop
+            }
+        }
+    }
+
     Context "SupportShouldprocess" {
         $script = '
                 function get-foo
diff --git a/test/powershell/Language/Scripting/I18n.Tests.ps1 b/test/powershell/Language/Scripting/I18n.Tests.ps1
deleted file mode 100644
index 41855bffab9..00000000000
--- a/test/powershell/Language/Scripting/I18n.Tests.ps1
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-Describe 'Testing of script internationalization' -Tags "CI" {
-    BeforeAll {
-        $dir=$PSScriptRoot
-        $defaultParamValues = $PSDefaultParameterValues.Clone()
-        #This works only for en-US or fr-FR
-        if ($PSUICulture -ne 'en-US' -and $PSUICulture -ne 'fr-FR')
-        {
-            $PSDefaultParameterValues["It:Skip"] = $true
-        }
-    }
-    AfterAll {
-        $global:PSDefaultParameterValues = $defaultParamValues
-    }
-
-    It 'convertFromString-Data should work with data statement.' {
-
-        data mydata
-        {
-            ConvertFrom-StringData @'
-        string1=string1
-        string2=string2
-'@
-        }
-
-        $mydata.string1 | Should -BeExactly 'string1'
-        $mydata.string2 | Should -BeExactly 'string2'
-    }
-
-    It 'Import default culture is done correctly' {
-
-        Import-LocalizedData mydata;
-
-        $mydata.string1 | Should -BeExactly 'string1 for en-US'
-        $mydata.string2 | Should -BeExactly 'string2 for en-US'
-    }
-
-    It 'Import specific culture(en-US)' {
-
-        Import-LocalizedData mydata -UICulture en-US
-
-        $mydata.string1 | Should -BeExactly 'string1 for en-US'
-        $mydata.string2 | Should -BeExactly 'string2 for en-US'
-
-        Import-LocalizedData mydata -UICulture fr-FR
-
-        $mydata.string1 | Should -BeExactly 'string1 for fr-FR'
-        $mydata.string2 | Should -BeExactly 'string2 for fr-FR'
-    }
-
-    It 'Import non existing culture is done correctly' {
-
-        Import-LocalizedData mydata -UICulture nl-NL -ErrorAction SilentlyContinue -ErrorVariable ev
-
-        $ev | Should -Not -BeNullOrEmpty
-        $ev[0].Exception | Should -BeOfType System.Management.Automation.PSInvalidOperationException
-    }
-
-    It 'Import different file name is done correctly' {
-
-        Import-LocalizedData mydata -FileName foo
-
-        $mydata.string1 | Should -BeExactly 'string1 from foo in en-US'
-        $mydata.string2 | Should -BeExactly 'string2 from foo in en-US'
-
-        Import-LocalizedData mydata -FileName foo -UICulture fr-FR
-
-        $mydata.string1 | Should -BeExactly 'string1 from foo in fr-FR'
-        $mydata.string2 | Should -BeExactly 'string2 from foo in fr-FR'
-    }
-
-    It 'Import different file base is done correctly' {
-
-        Import-LocalizedData mydata -BaseDirectory "${dir}\newbase"
-
-        $mydata.string1 | Should -BeExactly 'string1 for en-US under newbase'
-        $mydata.string2 | Should -BeExactly 'string2 for en-US under newbase'
-
-        Import-LocalizedData mydata -BaseDirectory "${dir}\newbase" -UICulture fr-FR
-
-        $mydata.string1 | Should -BeExactly 'string1 for fr-FR under newbase'
-        $mydata.string2 | Should -BeExactly 'string2 for fr-FR under newbase'
-    }
-
-    It 'Import different file base and file name' {
-
-        Import-LocalizedData mydata -BaseDirectory "${dir}\newbase" -FileName foo
-
-        $mydata.string1 | Should -BeExactly 'string1 for en-US from foo under newbase'
-        $mydata.string2 | Should -BeExactly 'string2 for en-US from foo under newbase'
-
-        Import-LocalizedData mydata -BaseDirectory "${dir}\newbase" -FileName foo -UICulture fr-FR
-
-        $mydata.string1 | Should -BeExactly 'string1 for fr-FR from foo under newbase'
-        $mydata.string2 | Should -BeExactly 'string2 for fr-FR from foo under newbase'
-        }
-
-    It "Import variable that doesn't exist" {
-
-        Import-LocalizedData mydata2
-
-        $mydata2.string1 | Should -BeExactly 'string1 for en-US'
-        $mydata2.string2 | Should -BeExactly 'string2 for en-US'
-    }
-
-    It 'Import bad psd1 file - tests the use of disallowed variables' {
-
-        $script:exception = $null
-        & {
-            trap {$script:exception = $_ ; continue }
-            Import-LocalizedData mydata -FileName bad
-          }
-
-        $script:exception.exception | Should -Not -BeNullOrEmpty
-        $script:exception.exception | Should -BeOfType System.management.automation.psinvalidoperationexception
-        }
-
-    It 'Import if psd1 file is done correctly' {
-
-        Import-LocalizedData mydata -FileName if
-
-        if ($PSCulture -eq 'en-US')
-        {
-            $mydata.string1 | Should -BeExactly 'string1 for en-US in if'
-            $mydata.string2 | Should -BeExactly 'string2 for en-US in if'
-        }
-        else
-        {
-            $mydata | Should -BeNullOrEmpty
-        }
-    }
-
-    $testData = @(
-        @{cmd = 'data d { @{ x=$(get-command)} }';Expected='get-command'},
-        @{cmd = 'data d { if ($(get-command)) {} }';Expected='get-command'},
-        @{cmd = 'data d { @(get-command) }';Expected='get-command'}
-        )
-
-    It 'Allowed cmdlets checked properly' -TestCase:$testData {
-        param ($cmd, $Expected)
-
-        $script:exception = $null
-        & {
-            trap {$script:exception = $_.Exception ; continue }
-            Invoke-Expression $cmd
-        }
-
-        $exception | Should -Match $Expected
-    }
-
-    It 'Check alternate syntax that also supports complex variable names' {
-
-       & {
-            $script:mydata = data { 123 }
-         }
-        $mydata | Should -Be 123
-
-        $mydata = data { 456 }
-        & {
-            # This import should not clobber the one at script scope
-            Import-LocalizedData mydata -UICulture en-US
-        }
-        $mydata | Should -Be 456
-
-        & {
-            # This import should clobber the one at script scope
-            Import-LocalizedData script:mydata -UICulture en-US
-        }
-        $script:mydata.string1 | Should -BeExactly 'string1 for en-US'
-    }
-
-    It 'Check fallback to current directory plus -SupportedCommand parameter is done correctly' {
-
-        New-Alias MyConvertFrom-StringData ConvertFrom-StringData
-
-        Import-LocalizedData local:mydata -UICulture fr-ca -FileName I18n.Tests_fallback.psd1 -SupportedCommand MyConvertFrom-StringData
-        $mydata[0].string1 | Should -BeExactly 'fallback string1 for en-US'
-        $mydata[1] | Should -Be 42
-    }
-}
diff --git a/test/powershell/Language/Scripting/I18n.Tests_fallback.psd1 b/test/powershell/Language/Scripting/I18n.Tests_fallback.psd1
deleted file mode 100644
index f0a856fbd3a..00000000000
--- a/test/powershell/Language/Scripting/I18n.Tests_fallback.psd1
+++ /dev/null
@@ -1,5 +0,0 @@
-MyConvertFrom-StringData @'
-string1=fallback string1 for en-US
-string2=fallback string2 for en-US
-'@
-42
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/I18n/I18n.Tests.ps1 b/test/powershell/Language/Scripting/I18n/I18n.Tests.ps1
new file mode 100644
index 00000000000..2e617b7a7e9
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/I18n.Tests.ps1
@@ -0,0 +1,204 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+Describe 'Testing of script internationalization' -Tags 'CI' {
+    BeforeAll {
+        $testCultures = @(
+            @{ UICulture = 'en-US' }
+            @{ UICulture = 'fr-FR' }
+        )
+
+        $currentCulture = $PSUICulture
+        [System.Globalization.CultureInfo]::CurrentUICulture = 'en-US'
+
+        $defaultParams = @{
+            BindingVariable = 'data'
+        }
+    }
+
+    BeforeEach {
+        Get-Variable -Name data -Scope Local -ErrorAction Ignore | Remove-Variable
+    }
+
+    AfterAll {
+        [System.Globalization.CultureInfo]::CurrentUICulture = $currentCulture
+    }
+
+    Context 'Data section' {
+        It 'ConvertFrom-StringData is permitted in a Data section' {
+            data dataVariable
+            {
+                ConvertFrom-StringData @'
+string1=string1
+string2=string2
+'@
+            }
+
+            $dataVariable.string1 | Should -BeExactly 'string1'
+            $dataVariable.string2 | Should -BeExactly 'string2'
+        }
+
+        It 'Throws an error if the data section contains a command which is not allowed' -TestCases @(
+            @{ Script = 'data d { @{ x=$(Get-Command)} }'; }
+            @{ Script = 'data d { if ($(Get-Command)) {} }' }
+            @{ Script = 'data d { @(Get-Command) }' }
+        ) {
+            param ( $Script )
+
+            { Invoke-Expression $Script } | Should -Throw -ErrorId 'CmdletNotInAllowedListForDataSection,Microsoft.PowerShell.Commands.InvokeExpressionCommand'
+        }
+    }
+
+    Context 'BindingVariable parameter' {
+        It 'BindingVariable binds positionally' {
+            Import-LocalizedData data
+
+            $data.string1 | Should -BeExactly 'string1 en-US'
+            $data.string2 | Should -BeExactly 'string2 en-US'
+        }
+
+        It 'Imports data into the BindingVariable based on the current UICulture' {
+            Import-LocalizedData @defaultParams
+
+            $data.string1 | Should -BeExactly 'string1 en-US'
+            $data.string2 | Should -BeExactly 'string2 en-US'
+        }
+
+        It 'Does not clobber existing variables in a parent scope' {
+            $data = data { 456 }
+            & {
+                 Import-LocalizedData @defaultParams
+             }
+             $data | Should -Be 456
+        }
+
+        It 'Replaces a BindingVariable in a parent scope if a scope modifier is specified' {
+            $Script:bindingVariable = data { 456 }
+
+            $Script:bindingVariable | Should -Be 456
+
+            & {
+                Import-LocalizedData -BindingVariable Script:bindingVariable
+            }
+
+            $Script:bindingVariable.string1 | Should -BeExactly 'string1 en-US'
+        }
+    }
+
+    Context 'UICulture parameter' {
+        It 'Imports specific culture (<UICulture>) defined by the UICulture parameter' -TestCases $testCultures {
+            param ( $UICulture )
+
+            [System.Globalization.CultureInfo]::CurrentUICulture = $UICulture
+
+            Import-LocalizedData @defaultParams -UICulture $UICulture
+
+            $data.string1 | Should -BeExactly ('string1 {0}' -f $UICulture)
+            $data.string2 | Should -BeExactly ('string2 {0}' -f $UICulture)
+        }
+
+        It 'Throws an error if the specified UICulture does not exist' -Skip:(-not $IsWindows) {
+            { Import-LocalizedData @defaultParams -UICulture none-none -ErrorAction Stop } |
+                Should -Throw -ExceptionType 'System.Management.Automation.PSArgumentException'
+        }
+    }
+
+    Context 'UICulture fallback' {
+        It 'When the UICulture parameter is specified, searches parent culture and current directory' -TestCases @(
+            @{ UICulture = 'en-US'; ExpectedString = 'en-US' }
+            @{ UICulture = 'en-GB'; ExpectedString = 'en' }
+            @{ UICulture = 'no-NL'; ExpectedString = 'fallback' }
+        ) {
+            param ( $UICulture, $ExpectedString )
+
+            if ($UICulture -eq 'no-NL' -and (Test-IsWinServer2012R2))
+            {
+                Set-ItResult -Skipped -Because 'no-NL culture is not available on Windows Server 2012 R2'
+                return
+            }
+
+            [System.Globalization.CultureInfo]::CurrentUICulture = $UICulture
+
+            $data = Import-LocalizedData -UICulture $UICulture
+
+            $data.string1 | Should -Be ('string1 {0}' -f $ExpectedString)
+            $data.string2 | Should -Be ('string2 {0}' -f $ExpectedString)
+        }
+
+        It 'When the UICulture parameter is not specified and no files exist falls back on en-US and parent cultures' -TestCases @(
+            @{ UICulture = 'no-NL'; ExpectedString = 'en-US' }
+        ) {
+            param ( $UICulture, $ExpectedString )
+
+            if ($UICulture -eq 'no-NL' -and (Test-IsWinServer2012R2))
+            {
+                Set-ItResult -Skipped -Because 'no-NL culture is not available on Windows Server 2012 R2'
+                return
+            }
+
+            [System.Globalization.CultureInfo]::CurrentUICulture = $UICulture
+
+            $data = Import-LocalizedData -FileName 'I18n_altfilename'
+
+            $data.string1 | Should -Be ('string1 {0} I18n_altfilename' -f $ExpectedString)
+            $data.string2 | Should -Be ('string2 {0} I18n_altfilename' -f $ExpectedString)
+        }
+    }
+
+    Context 'FileName and BaseDirectory parameters' {
+        BeforeAll {
+            $fileName = @{ FileName = 'I18n_altfilename' }
+            $baseDirectory = @{ BaseDirectory = Join-Path -Path $PSScriptRoot -ChildPath 'I18n_altbase' }
+        }
+
+        It 'Imports from the "foo" file name when then FileName parameter is specified (<UICulture>)' -TestCases $testCultures {
+            param ( $UICulture )
+
+            [System.Globalization.CultureInfo]::CurrentUICulture = $UICulture
+
+            Import-LocalizedData @defaultParams @fileName -UICulture $UICulture
+
+            $data.string1 | Should -BeExactly ('string1 {0} I18n_altfilename' -f $UICulture)
+            $data.string2 | Should -BeExactly ('string2 {0} I18n_altfilename' -f $UICulture)
+        }
+
+        It 'Imports from the "I18n_altfilename" directory when the BaseDirectory parameter is specified (<UICulture>)' -TestCases $testCultures {
+            param ( $UICulture )
+
+            [System.Globalization.CultureInfo]::CurrentUICulture = $UICulture
+
+            Import-LocalizedData @defaultParams @baseDirectory -UICulture $UICulture
+
+            $data.string1 | Should -BeExactly ('string1 {0} I18n_altbase' -f $UICulture)
+            $data.string2 | Should -BeExactly ('string2 {0} I18n_altbase' -f $UICulture)
+        }
+
+        It 'Imports from the "I18n_altfilename" file name and "I18n_altbase" directory when both FileName and BaseDirectory are specified (<UICulture>)' -TestCases $testCultures {
+            param ( $UICulture )
+
+            [System.Globalization.CultureInfo]::CurrentUICulture = $UICulture
+
+            Import-LocalizedData @defaultParams @fileName @baseDirectory -UICulture $UICulture
+
+            $data.string1 | Should -BeExactly ('string1 {0} I18n_altbase I18n_altfilename' -f $UICulture)
+            $data.string2 | Should -BeExactly ('string2 {0} I18n_altbase I18n_altfilename' -f $UICulture)
+        }
+
+        It 'Throws an error if the specified FileName does not exist in any path' {
+            { Import-LocalizedData @defaultParams -FileName doesNotExist -ErrorAction Stop } |
+                Should -Throw -ExceptionType 'System.Management.Automation.PSInvalidOperationException'
+        }
+
+        It 'Throws an error if the specified BaseDirectory does not exist' {
+            { Import-LocalizedData @defaultParams -BaseDirectory "$PSScriptRoot\doesNotExist" -ErrorAction Stop } |
+                Should -Throw -ExceptionType 'System.Management.Automation.PSInvalidOperationException'
+        }
+    }
+
+    Context 'SupportedCommand parameter' {
+        It 'Allows non-standard commands to be used in a data file' {
+            $data = Import-LocalizedData -FileName I18n_supportedcommands -SupportedCommand Get-Command
+
+            $data.Name | Should -Be 'Import-LocalizedData'
+        }
+    }
+}
diff --git a/test/powershell/Language/Scripting/I18n/I18n.Tests.psd1 b/test/powershell/Language/Scripting/I18n/I18n.Tests.psd1
new file mode 100644
index 00000000000..13b8ef6b913
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/I18n.Tests.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 fallback
+string2=string2 fallback
+'@
diff --git a/test/powershell/Language/Scripting/I18n/I18n_altbase/en-US/I18n.Tests.psd1 b/test/powershell/Language/Scripting/I18n/I18n_altbase/en-US/I18n.Tests.psd1
new file mode 100644
index 00000000000..64cfd8519f3
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/I18n_altbase/en-US/I18n.Tests.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 en-US I18n_altbase
+string2=string2 en-US I18n_altbase
+'@
diff --git a/test/powershell/Language/Scripting/I18n/I18n_altbase/en-US/I18n_altfilename.psd1 b/test/powershell/Language/Scripting/I18n/I18n_altbase/en-US/I18n_altfilename.psd1
new file mode 100644
index 00000000000..cd128b07c6b
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/I18n_altbase/en-US/I18n_altfilename.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 en-US I18n_altbase I18n_altfilename
+string2=string2 en-US I18n_altbase I18n_altfilename
+'@
diff --git a/test/powershell/Language/Scripting/I18n/I18n_altbase/fr-FR/I18n.Tests.psd1 b/test/powershell/Language/Scripting/I18n/I18n_altbase/fr-FR/I18n.Tests.psd1
new file mode 100644
index 00000000000..8fdb5e82517
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/I18n_altbase/fr-FR/I18n.Tests.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 fr-FR I18n_altbase
+string2=string2 fr-FR I18n_altbase
+'@
diff --git a/test/powershell/Language/Scripting/I18n/I18n_altbase/fr-FR/I18n_altfilename.psd1 b/test/powershell/Language/Scripting/I18n/I18n_altbase/fr-FR/I18n_altfilename.psd1
new file mode 100644
index 00000000000..b2df79cfc7a
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/I18n_altbase/fr-FR/I18n_altfilename.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 fr-FR I18n_altbase I18n_altfilename
+string2=string2 fr-FR I18n_altbase I18n_altfilename
+'@
diff --git a/test/powershell/Language/Scripting/I18n/I18n_supportedcommands.psd1 b/test/powershell/Language/Scripting/I18n/I18n_supportedcommands.psd1
new file mode 100644
index 00000000000..f0340702379
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/I18n_supportedcommands.psd1
@@ -0,0 +1 @@
+Get-Command Import-LocalizedData
diff --git a/test/powershell/Language/Scripting/en-US/I18n.Tests.psd1 b/test/powershell/Language/Scripting/I18n/en-US/I18n.Tests.psd1
similarity index 53%
rename from test/powershell/Language/Scripting/en-US/I18n.Tests.psd1
rename to test/powershell/Language/Scripting/I18n/en-US/I18n.Tests.psd1
index eca73623408..653cf133f78 100644
--- a/test/powershell/Language/Scripting/en-US/I18n.Tests.psd1
+++ b/test/powershell/Language/Scripting/I18n/en-US/I18n.Tests.psd1
@@ -1,4 +1,4 @@
 ConvertFrom-StringData @'
-string1=string1 for en-US
-string2=string2 for en-US
+string1=string1 en-US
+string2=string2 en-US
 '@  # SIG # Begin signature block
diff --git a/test/powershell/Language/Scripting/I18n/en-US/I18n_altfilename.psd1 b/test/powershell/Language/Scripting/I18n/en-US/I18n_altfilename.psd1
new file mode 100644
index 00000000000..0ffd5791cfb
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/en-US/I18n_altfilename.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 en-US I18n_altfilename
+string2=string2 en-US I18n_altfilename
+'@
diff --git a/test/powershell/Language/Scripting/I18n/en/I18n.Tests.psd1 b/test/powershell/Language/Scripting/I18n/en/I18n.Tests.psd1
new file mode 100644
index 00000000000..860bcf865ab
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/en/I18n.Tests.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 en
+string2=string2 en
+'@  # SIG # Begin signature block
diff --git a/test/powershell/Language/Scripting/I18n/fr-FR/I18n.Tests.psd1 b/test/powershell/Language/Scripting/I18n/fr-FR/I18n.Tests.psd1
new file mode 100644
index 00000000000..c223067ac0e
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/fr-FR/I18n.Tests.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 fr-FR
+string2=string2 fr-FR
+'@
diff --git a/test/powershell/Language/Scripting/I18n/fr-FR/I18n_altfilename.psd1 b/test/powershell/Language/Scripting/I18n/fr-FR/I18n_altfilename.psd1
new file mode 100644
index 00000000000..1f7c446a725
--- /dev/null
+++ b/test/powershell/Language/Scripting/I18n/fr-FR/I18n_altfilename.psd1
@@ -0,0 +1,4 @@
+ConvertFrom-StringData @'
+string1=string1 fr-FR I18n_altfilename
+string2=string2 fr-FR I18n_altfilename
+'@
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
index 8e09df9b699..ead0fb39efb 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
@@ -5,12 +5,7 @@ param()
 
 Describe "Behavior is specific for each platform" -tags "CI" {
     It "PSNativeCommandArgumentPassing is set to 'Windows' on Windows systems" -skip:(-not $IsWindows) {
-        if ([Version]::TryParse($PSVersiontable.PSVersion.ToString(), [ref]$null)) {
-            $PSNativeCommandArgumentPassing | Should -BeExactly "Legacy"
-        }
-        else {
-            $PSNativeCommandArgumentPassing | Should -BeExactly "Windows"
-        }
+        $PSNativeCommandArgumentPassing | Should -BeExactly "Windows"
     }
     It "PSNativeCommandArgumentPassing is set to 'Standard' on non-Windows systems" -skip:($IsWindows) {
         $PSNativeCommandArgumentPassing | Should -Be "Standard"
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandPathUpdate.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandPathUpdate.Tests.ps1
new file mode 100644
index 00000000000..ff90500ac83
--- /dev/null
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandPathUpdate.Tests.ps1
@@ -0,0 +1,373 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+## The "Path Update" feature is only available on Windows.
+## Skip the test suite on Unix platforms.
+if (-not $IsWindows) {
+    return;
+}
+
+function GetEnvPathLiteralValue {
+    param(
+        [System.EnvironmentVariableTarget] $Target
+    )
+
+    if ($Target -eq 'User') {
+        $regKey = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey('Environment')
+    } elseif ($Target -eq 'Machine') {
+        $regKey = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey('SYSTEM\CurrentControlSet\Control\Session Manager\Environment')
+    } else {
+        return [PSCustomObject]@{ Kind = $null; Value = $env:Path }
+    }
+
+    try {
+        $kind = $regKey.GetValueKind('Path')
+        $value = $regKey.GetValue('Path', $null, [Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames)
+
+        return [PSCustomObject]@{
+            Kind = $kind
+            Value = $value
+        }
+    }
+    finally {
+        ${regKey}?.Dispose()
+    }
+}
+
+function RestoreEnvPath {
+    param(
+        [System.EnvironmentVariableTarget] $Target,
+        [Microsoft.Win32.RegistryValueKind] $ValueKind,
+        [string] $LiteralValue
+    )
+
+    ## Open the registry key with 'write' access.
+    if ($Target -eq 'User') {
+        $regKey = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey('Environment', $true)
+    } elseif ($Target -eq 'Machine') {
+        $regKey = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey('SYSTEM\CurrentControlSet\Control\Session Manager\Environment', $true)
+    } else {
+        ## Ignore value kind when restoring the in-proc env Path.
+        $env:Path = $LiteralValue
+        return
+    }
+
+    try {
+        $regKey.SetValue('Path', $LiteralValue, $ValueKind)
+    } finally {
+        ${regKey}?.Dispose()
+    }
+}
+
+function UpdatePackageManager {
+    param(
+        [Parameter(ParameterSetName = 'Add')]
+        [switch] $Add,
+
+        [Parameter(ParameterSetName = 'Remove')]
+        [switch] $Remove,
+
+        [string] $Name
+    )
+
+    $regKeyPath = 'HKLM:\Software\Microsoft\Command Processor\KnownPackageManagers'
+    $keyExists = Test-Path -Path $regKeyPath
+    if (-not $keyExists) {
+        Write-Host -ForegroundColor Cyan "The registry key 'KnownPackageManagers' doesn't exist."
+    }
+
+    $subKeyPath = "$regKeyPath\$Name"
+    if ($Add) {
+        $null = New-Item $subKeyPath -Force -ErrorAction Stop
+    }
+    elseif ($Remove -and $keyExists) {
+        Remove-Item $subKeyPath -Recurse -Force -ErrorAction Stop
+    }
+}
+
+Describe "Path update for package managers" -tags @('CI', 'RequireAdminOnWindows') {
+
+    It "Path update is off for an executable that is not registered" {
+        try {
+            $oldUserPath = GetEnvPathLiteralValue -Target 'User'
+            $oldSysPath = GetEnvPathLiteralValue -Target 'Machine'
+            $oldProcPath = $env:Path
+
+            testexe -updateuserandsystempath
+
+            $newUserPath = GetEnvPathLiteralValue -Target 'User'
+            $newUserPath.Kind | Should -Be $oldUserPath.Kind -Because "Value kind should not be changed"
+            $newUserPath.Value | Should -BeLike "$($oldUserPath.Value)*X:\not-exist-user-path" -Because "'testexe -updateuserandsystempath' should append 'X:\not-exist-user-path' to the User Path."
+
+            $newSysPath = GetEnvPathLiteralValue -Target 'Machine'
+            $newSysPath.Kind | Should -Be $oldSysPath.Kind -Because "Value kind should not be changed"
+            $newSysPath.Value | Should -BeLike "X:\not-exist-sys-path*$($oldSysPath.Value)" -Because "'testexe -updateuserandsystempath' should prepend 'X:\not-exist-sys-path' to the System Path."
+
+            $newProcPath = $env:Path
+            $newProcPath | Should -Be $oldProcPath -Because "'testexe -updateuserpath' doesn't change the Process Path and the executable 'testexe' is not in the package manager list."
+        }
+        finally {
+            if ($oldUserPath -ne $null) {
+                RestoreEnvPath -Target 'User' -ValueKind $oldUserPath.Kind -LiteralValue $oldUserPath.Value
+            }
+
+            if ($oldSysPath -ne $null) {
+                RestoreEnvPath -Target 'Machine' -ValueKind $oldSysPath.Kind -LiteralValue $oldSysPath.Value
+            }
+        }
+    }
+
+    ## Add the executable name without extension to the list of package managers.
+    Context "Add 'testexe' to the list and test 'Path Update'" {
+        BeforeAll {
+            UpdatePackageManager -Add -Name 'testexe'
+        }
+
+        AfterAll {
+            UpdatePackageManager -Remove -Name 'testexe'
+        }
+
+        It "Test when only User Path is changed" {
+            try {
+                $oldUserPath = GetEnvPathLiteralValue -Target 'User'
+
+                $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                    $oldPath = $env:Path
+
+                    ## New item 'X:\not-exist-user-path' will be appended to User Path.
+                    testexe -updateuserpath
+
+                    $newPath = $env:Path
+                    $oldPath, $newPath
+                }
+
+                $newProcPath.Length | Should -BeGreaterThan $oldProcPath.Length -Because "Path should be updated. The new path item added to 'User Path' should be appended to 'Process Path'."
+                $newProcPath.IndexOf($oldProcPath) | Should -Be 0 -Because "Path should be updated. The new path item added to 'User Path' should be appended to 'Process Path'."
+
+                $newItem = $newProcPath.SubString($oldProcPath.Length)
+                if ($oldProcPath.EndsWith(';')) {
+                    $newItem | Should -Be 'X:\not-exist-user-path'
+                }
+                else {
+                    $newItem | Should -Be ';X:\not-exist-user-path'
+                }
+            }
+            finally {
+                if ($oldUserPath -ne $null) {
+                    RestoreEnvPath -Target 'User' -ValueKind $oldUserPath.Kind -LiteralValue $oldUserPath.Value
+                }
+            }
+        }
+
+        It "Test when only System Path is changed" {
+            try {
+                $oldSysPath = GetEnvPathLiteralValue -Target 'Machine'
+
+                $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                    $oldPath = $env:Path
+
+                    ## New item 'X:\not-exist-sys-path' will be prepended to System Path.
+                    testexe -updatesystempath > $null
+
+                    $newPath = $env:Path
+                    $oldPath, $newPath
+                }
+
+                $newProcPath.Length | Should -BeGreaterThan $oldProcPath.Length -Because "Path should be updated. The new path item added to 'System Path' should be appended to 'Process Path'."
+                $newProcPath.IndexOf($oldProcPath) | Should -Be 0 -Because "Path should be updated. The new path item added to 'System Path' should be appended to 'Process Path'."
+
+                $newItem = $newProcPath.SubString($oldProcPath.Length)
+                if ($oldProcPath.EndsWith(';')) {
+                    $newItem | Should -Be 'X:\not-exist-sys-path'
+                }
+                else {
+                    $newItem | Should -Be ';X:\not-exist-sys-path'
+                }
+            }
+            finally {
+                if ($oldSysPath -ne $null) {
+                    RestoreEnvPath -Target 'Machine' -ValueKind $oldSysPath.Kind -LiteralValue $oldSysPath.Value
+                }
+            }
+        }
+
+        It "Test when both User and System Paths are changed" {
+            try {
+                $oldUserPath = GetEnvPathLiteralValue -Target 'User'
+                $oldSysPath = GetEnvPathLiteralValue -Target 'Machine'
+
+                $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                    $oldPath = $env:Path
+
+                    ## New item 'X:\not-exist-user-path' will be appended to User Path.
+                    ## New item 'X:\not-exist-sys-path' will be prepended to System Path.
+                    $null = testexe -updateuserandsystempath
+
+                    $newPath = $env:Path
+                    $oldPath, $newPath
+                }
+
+                $newProcPath.Length | Should -BeGreaterThan $oldProcPath.Length -Because "Path should be updated. The new path items should be appended to 'Process Path'."
+                $newProcPath.IndexOf($oldProcPath) | Should -Be 0 -Because "Path should be updated. The new path items should be appended to 'Process Path'."
+
+                $newItem = $newProcPath.SubString($oldProcPath.Length)
+                if ($oldProcPath.EndsWith(';')) {
+                    $newItem | Should -Be 'X:\not-exist-user-path;X:\not-exist-sys-path'
+                }
+                else {
+                    $newItem | Should -Be ';X:\not-exist-user-path;X:\not-exist-sys-path'
+                }
+            }
+            finally {
+                if ($oldUserPath -ne $null) {
+                    RestoreEnvPath -Target 'User' -ValueKind $oldUserPath.Kind -LiteralValue $oldUserPath.Value
+                }
+
+                if ($oldSysPath -ne $null) {
+                    RestoreEnvPath -Target 'Machine' -ValueKind $oldSysPath.Kind -LiteralValue $oldSysPath.Value
+                }
+            }
+        }
+
+        It "Test when neither User nor System Path is changed" {
+            $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                $oldPath = $env:Path
+
+                ## Print help message and exit.
+                testexe -h > $null
+
+                $newPath = $env:Path
+                $oldPath, $newPath
+            }
+
+            $newProcPath | Should -Be $oldProcPath -Because "'testexe -h' doesn't change the env Path."
+        }
+    }
+
+    ## Add the executable name with extension to the list of package managers.
+    Context "Add 'testexe.exe' to the list and test 'Path Update'" {
+        BeforeAll {
+            UpdatePackageManager -Add -Name 'testexe.exe'
+        }
+
+        AfterAll {
+            UpdatePackageManager -Remove -Name 'testexe.exe'
+        }
+
+        It "Test when only User Path is changed" {
+            try {
+                $oldUserPath = GetEnvPathLiteralValue -Target 'User'
+
+                $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                    $oldPath = $env:Path
+
+                    ## New item 'X:\not-exist-user-path' will be appended to User Path.
+                    testexe -updateuserpath
+
+                    $newPath = $env:Path
+                    $oldPath, $newPath
+                }
+
+                $newProcPath.Length | Should -BeGreaterThan $oldProcPath.Length -Because "Path should be updated. The new path item added to 'User Path' should be appended to 'Process Path'."
+                $newProcPath.IndexOf($oldProcPath) | Should -Be 0 -Because "Path should be updated. The new path item added to 'User Path' should be appended to 'Process Path'."
+
+                $newItem = $newProcPath.SubString($oldProcPath.Length)
+                if ($oldProcPath.EndsWith(';')) {
+                    $newItem | Should -Be 'X:\not-exist-user-path'
+                }
+                else {
+                    $newItem | Should -Be ';X:\not-exist-user-path'
+                }
+            }
+            finally {
+                if ($oldUserPath -ne $null) {
+                    RestoreEnvPath -Target 'User' -ValueKind $oldUserPath.Kind -LiteralValue $oldUserPath.Value
+                }
+            }
+        }
+
+        It "Test when only System Path is changed" {
+            try {
+                $oldSysPath = GetEnvPathLiteralValue -Target 'Machine'
+
+                $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                    $oldPath = $env:Path
+
+                    ## New item 'X:\not-exist-sys-path' will be prepended to System Path.
+                    testexe -updatesystempath > $null
+
+                    $newPath = $env:Path
+                    $oldPath, $newPath
+                }
+
+                $newProcPath.Length | Should -BeGreaterThan $oldProcPath.Length -Because "Path should be updated. The new path item added to 'System Path' should be appended to 'Process Path'."
+                $newProcPath.IndexOf($oldProcPath) | Should -Be 0 -Because "Path should be updated. The new path item added to 'System Path' should be appended to 'Process Path'."
+
+                $newItem = $newProcPath.SubString($oldProcPath.Length)
+                if ($oldProcPath.EndsWith(';')) {
+                    $newItem | Should -Be 'X:\not-exist-sys-path'
+                }
+                else {
+                    $newItem | Should -Be ';X:\not-exist-sys-path'
+                }
+            }
+            finally {
+                if ($oldSysPath -ne $null) {
+                    RestoreEnvPath -Target 'Machine' -ValueKind $oldSysPath.Kind -LiteralValue $oldSysPath.Value
+                }
+            }
+        }
+
+        It "Test when both User and System Paths are changed" {
+            try {
+                $oldUserPath = GetEnvPathLiteralValue -Target 'User'
+                $oldSysPath = GetEnvPathLiteralValue -Target 'Machine'
+
+                $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                    $oldPath = $env:Path
+
+                    ## New item 'X:\not-exist-user-path' will be appended to User Path.
+                    ## New item 'X:\not-exist-sys-path' will be prepended to System Path.
+                    $null = testexe -updateuserandsystempath
+
+                    $newPath = $env:Path
+                    $oldPath, $newPath
+                }
+
+                $newProcPath.Length | Should -BeGreaterThan $oldProcPath.Length -Because "Path should be updated. The new path items should be appended to 'Process Path'."
+                $newProcPath.IndexOf($oldProcPath) | Should -Be 0 -Because "Path should be updated. The new path items should be appended to 'Process Path'."
+
+                $newItem = $newProcPath.SubString($oldProcPath.Length)
+                if ($oldProcPath.EndsWith(';')) {
+                    $newItem | Should -Be 'X:\not-exist-user-path;X:\not-exist-sys-path'
+                }
+                else {
+                    $newItem | Should -Be ';X:\not-exist-user-path;X:\not-exist-sys-path'
+                }
+            }
+            finally {
+                if ($oldUserPath -ne $null) {
+                    RestoreEnvPath -Target 'User' -ValueKind $oldUserPath.Kind -LiteralValue $oldUserPath.Value
+                }
+
+                if ($oldSysPath -ne $null) {
+                    RestoreEnvPath -Target 'Machine' -ValueKind $oldSysPath.Kind -LiteralValue $oldSysPath.Value
+                }
+            }
+        }
+
+        It "Test when neither User nor System Path is changed" {
+            $oldProcPath, $newProcPath = pwsh -noprofile -c {
+                $oldPath = $env:Path
+
+                ## Print help message and exit.
+                testexe -h > $null
+
+                $newPath = $env:Path
+                $oldPath, $newPath
+            }
+
+            $newProcPath | Should -Be $oldProcPath -Because "'testexe -h' doesn't change the env Path."
+        }
+    }
+}
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
index d166ca265c7..542f1724303 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
@@ -213,6 +213,12 @@ Describe "Native Command Processor" -tags "Feature" {
         Wait-UntilTrue -sb { (Get-Process mmc).Count -gt 0 } -TimeoutInMilliseconds 5000 -IntervalInMilliseconds 1000 | Should -BeTrue
         Get-Process mmc | Stop-Process
     }
+
+    It 'Can redirect stdout and stderr to different files' {
+        testexe -stderrandout testing > $TestDrive/stdout.txt 2> $TestDrive/stderr.txt
+        Get-Content $TestDrive/stdout.txt | Should -Be testing
+        Get-Content $TestDrive/stderr.txt | Should -Be gnitset
+    }
 }
 
 Describe "Open a text file with NativeCommandProcessor" -tags @("Feature", "RequireAdminOnWindows") {
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeWindowsTildeExpansion.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeWindowsTildeExpansion.Tests.ps1
new file mode 100644
index 00000000000..3a478607c08
--- /dev/null
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeWindowsTildeExpansion.Tests.ps1
@@ -0,0 +1,32 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Native Windows tilde expansion tests' -tags "CI" {
+    BeforeAll {
+        $originalDefaultParams = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:skip"] = -Not $IsWindows
+    }
+
+    AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParams
+    }
+
+    # Test ~ expansion
+    It 'Tilde should be replaced by the filesystem provider home directory' {
+        cmd /c echo ~ | Should -BeExactly ($ExecutionContext.SessionState.Provider.Get("FileSystem").Home)
+    }
+    # Test ~ expansion with a path fragment (e.g. ~/foo)
+    It '~/foo should be replaced by the <filesystem provider home directory>/foo' {
+        cmd /c echo ~/foo | Should -BeExactly "$($ExecutionContext.SessionState.Provider.Get("FileSystem").Home)/foo"
+        cmd /c echo ~\foo | Should -BeExactly "$($ExecutionContext.SessionState.Provider.Get("FileSystem").Home)\foo"
+    }
+
+    It '~ should not be replaced when quoted' {
+        cmd /c echo '~' | Should -BeExactly '~'
+        cmd /c echo "~" | Should -BeExactly '~'
+        cmd /c echo '~/foo' | Should -BeExactly '~/foo'
+        cmd /c echo "~/foo" | Should -BeExactly '~/foo'
+        cmd /c echo '~\foo' | Should -BeExactly '~\foo'
+        cmd /c echo "~\foo" | Should -BeExactly '~\foo'
+    }
+}
diff --git a/test/powershell/Language/Scripting/PipelineStoppedToken.Tests.ps1 b/test/powershell/Language/Scripting/PipelineStoppedToken.Tests.ps1
new file mode 100644
index 00000000000..54d1510a20d
--- /dev/null
+++ b/test/powershell/Language/Scripting/PipelineStoppedToken.Tests.ps1
@@ -0,0 +1,97 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'PipelineStopToken tests' -Tags 'CI' {
+
+    BeforeAll {
+        Function Invoke-WithStop {
+            [CmdletBinding()]
+            param (
+                [Parameter(Mandatory)]
+                [ScriptBlock]
+                $ScriptBlock,
+
+                [Parameter(ValueFromRemainingArguments)]
+                [object[]]
+                $ArgumentList
+            )
+
+            $ps = [PowerShell]::Create()
+            $null = $ps.AddScript("'start'`n" + $ScriptBlock.ToString())
+            foreach ($arg in $ArgumentList) {
+                $null = $ps.AddArgument($arg)
+            }
+
+            $inPipe = [System.Management.Automation.PSDataCollection[object]]::new()
+            $inPipe.Complete()
+            $outPipe = [System.Management.Automation.PSDataCollection[object]]::new()
+
+            # Use an event to make sure Stop is called once the pipeline has started
+            # and not before.
+            $eventId = [Guid]::NewGuid().ToString()
+            Register-ObjectEvent -InputObject $outPipe -EventName DataAdded -SourceIdentifier $eventId
+            try {
+                $task = $ps.BeginInvoke($inPipe, $outPipe)
+                Wait-Event -SourceIdentifier $eventId | Remove-Event
+            }
+            finally {
+                Remove-Event -SourceIdentifier $eventId -ErrorAction SilentlyContinue
+                Unregister-Event -SourceIdentifier $eventId
+            }
+
+            $ps.Stop()
+            $ps.Streams.Error | Write-Error
+            { $ps.EndInvoke($task) } | Should -Throw -ErrorId PipelineStoppedException
+        }
+    }
+
+    It 'Signal advanced function to stop' {
+        $start = Get-Date
+
+        Invoke-WithStop -ScriptBlock {
+            Function Test-FunctionWithStop {
+                [CmdletBinding()]
+                param ([Parameter()][int]$Timeout)
+
+                [System.Threading.Tasks.Task]::Delay($Timeout * 1000, $PSCmdlet.PipelineStopToken).GetAwaiter().GetResult()
+            }
+
+            Test-FunctionWithStop -Timeout 10
+        }
+
+        $end = (Get-Date) - $start
+        $end.TotalSeconds | Should -BeLessThan 10
+    }
+
+    It 'Signals compiled cmdlet to stop' {
+        $binaryAssembly = Add-Type @'
+using System;
+using System.Management.Automation;
+using System.Threading.Tasks;
+
+namespace PipelineStoppedToken.Tests;
+
+[Cmdlet(VerbsDiagnostic.Test, "CmdletWithStop")]
+public sealed class TestCmdletWithStop : Cmdlet
+{
+    [Parameter]
+    public int Timeout { get; set; }
+
+    protected override void EndProcessing()
+    {
+        Task.Delay(Timeout * 1000, PipelineStopToken).GetAwaiter().GetResult();
+    }
+}
+'@ -PassThru | ForEach-Object Assembly | Select-Object -First 1
+
+        $start = Get-Date
+        Invoke-WithStop -ScriptBlock {
+            Import-Module -Assembly $args[0]
+
+            Test-CmdletWithStop -Timeout 10
+         } -ArgumentList $binaryAssembly
+
+        $end = (Get-Date) - $start
+        $end.TotalSeconds | Should -BeLessThan 10
+    }
+}
diff --git a/test/powershell/Language/Scripting/Requires.Tests.ps1 b/test/powershell/Language/Scripting/Requires.Tests.ps1
index 30a600fe4b7..b5cbb397325 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", "7.3", "7.4", "7.5"
+            $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", "7.4", "7.5", "7.6", "7.7"
             $latestVersion = [version]($powerShellVersions | Sort-Object -Descending -Top 1)
             $nonExistingMinor = "$($latestVersion.Major).$($latestVersion.Minor + 1)"
             $nonExistingMajor = "$($latestVersion.Major + 1).0"
diff --git a/test/powershell/Language/Scripting/ScriptHelp.NotesFormatting.Tests.ps1 b/test/powershell/Language/Scripting/ScriptHelp.NotesFormatting.Tests.ps1
new file mode 100644
index 00000000000..77c0c65b1af
--- /dev/null
+++ b/test/powershell/Language/Scripting/ScriptHelp.NotesFormatting.Tests.ps1
@@ -0,0 +1,27 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Comment-based help NOTES section formatting' -Tags "CI", "Feature" {
+    It 'NOTES section should have single blank line after header and 4-space indentation' {
+        $helpText = Get-Help Remove-PSSession -Full | Out-String
+        $lines = $helpText -split "`r?`n"
+
+        # Find NOTES section
+        $notesIndex = -1
+        for ($i = 0; $i -lt $lines.Count; $i++) {
+            if ($lines[$i] -match '^NOTES\s*$') {
+                $notesIndex = $i
+                break
+            }
+        }
+
+        $notesIndex | Should -BeGreaterThan -1 -Because "NOTES section should exist"
+
+        # The line after NOTES header should be blank
+        $lines[$notesIndex + 1] | Should -Match '^\s*$' -Because "There should be a blank line after NOTES header"
+
+        # The second line after NOTES header should have content with 4-space indentation
+        $contentLine = $lines[$notesIndex + 2]
+        $contentLine | Should -Match '^[ ]{4}\S' -Because "Content should have exactly 4-space indentation"
+    }
+}
diff --git a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1 b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
index fff4993ffec..56bc16b2710 100644
--- a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
+++ b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
@@ -81,28 +81,6 @@ Describe "Scripting.Followup.Tests" -Tags "CI" {
         $result | Should -BeOfType 'System.Collections.Specialized.OrderedDictionary'
     }
 
-    It "Don't preserve result when no need to do so in case of flow-control exception" {
-        function TestFunc1([switch]$p) {
-            ## No need to preserve and flush the results from the IF statement to the outer
-            ## pipeline, because the results are supposed to be assigned to a variable.
-            if ($p) {
-                $null = if ($true) { "one"; return "two" }
-            } else {
-                $a = foreach ($a in 1) { "one"; return; }
-            }
-        }
-
-        function TestFunc2 {
-            ## The results from the sub-expression need to be preserved and flushed to the outer pipeline.
-            $("1";return "2")
-        }
-
-        TestFunc1 | Should -Be $null
-        TestFunc1 -p | Should -Be $null
-
-        TestFunc2 | Should -Be @("1", "2")
-    }
-
     It "'[NullString]::Value' should be treated as string type when resolving .NET method" {
         $testType = 'NullStringTest' -as [type]
         if (-not $testType) {
@@ -146,4 +124,27 @@ public class NullStringTest {
         $result = & $powershell -noprofile -c '[System.Text.Encoding]::GetEncoding("IBM437").WebName'
         $result | Should -BeExactly "ibm437"
     }
+
+    It 'Return statement on the right side of an assignment should write the retrun value to outer pipe' {
+        function TestFunc1 {
+            ## The return value are not assigned to the variable but should be written to the outer pipe.
+            $Global:mylhsvar = if ($true) { return "one" }
+        }
+
+        function TestFunc2 {
+            ## The results from the sub-expression need to be preserved and flushed to the outer pipeline.
+            $("1";return "2")
+        }
+
+        try {
+            $Global:mylhsvar = $null
+            TestFunc1 | Should -BeExactly "one"
+            TestFunc2 | Should -Be @("1", "2")
+
+            $Global:mylhsvar | Should -Be $null
+        }
+        finally {
+            Remove-Variable -Name mylhsvar -Scope Global
+        }
+    }
 }
diff --git a/test/powershell/Language/Scripting/en-US/bad.psd1 b/test/powershell/Language/Scripting/en-US/bad.psd1
deleted file mode 100644
index b5e653ec66c..00000000000
--- a/test/powershell/Language/Scripting/en-US/bad.psd1
+++ /dev/null
@@ -1,7 +0,0 @@
-if($a -eq 'en-US')
-{
-    ConvertFrom-StringData @'
-        string1=string1 from foo in en-US
-        string2=string2 from foo in en-US
-'@
-}
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/en-US/foo.psd1 b/test/powershell/Language/Scripting/en-US/foo.psd1
deleted file mode 100644
index 6a82b0d1cb4..00000000000
--- a/test/powershell/Language/Scripting/en-US/foo.psd1
+++ /dev/null
@@ -1,4 +0,0 @@
-ConvertFrom-StringData @'
-string1=string1 from foo in en-US
-string2=string2 from foo in en-US
-'@
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/en-US/if.psd1 b/test/powershell/Language/Scripting/en-US/if.psd1
deleted file mode 100644
index 1f139ae0e69..00000000000
--- a/test/powershell/Language/Scripting/en-US/if.psd1
+++ /dev/null
@@ -1,7 +0,0 @@
-if($psculture -eq 'en-US')
-{
-    ConvertFrom-StringData @'
-        string1=string1 for en-US in if
-        string2=string2 for en-US in if
-'@
-}
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/fr-FR/I18n.Tests.psd1 b/test/powershell/Language/Scripting/fr-FR/I18n.Tests.psd1
deleted file mode 100644
index 02c8a35512f..00000000000
--- a/test/powershell/Language/Scripting/fr-FR/I18n.Tests.psd1
+++ /dev/null
@@ -1,4 +0,0 @@
-ConvertFrom-StringData @'
-string1=string1 for fr-FR
-string2=string2 for fr-FR
-'@
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/fr-FR/foo.psd1 b/test/powershell/Language/Scripting/fr-FR/foo.psd1
deleted file mode 100644
index ba1c90d3e66..00000000000
--- a/test/powershell/Language/Scripting/fr-FR/foo.psd1
+++ /dev/null
@@ -1,4 +0,0 @@
-ConvertFrom-StringData @'
-string1=string1 from foo in fr-FR
-string2=string2 from foo in fr-FR
-'@
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/newbase/en-US/I18n.Tests.psd1 b/test/powershell/Language/Scripting/newbase/en-US/I18n.Tests.psd1
deleted file mode 100644
index 39611f8a0db..00000000000
--- a/test/powershell/Language/Scripting/newbase/en-US/I18n.Tests.psd1
+++ /dev/null
@@ -1,4 +0,0 @@
-ConvertFrom-StringData @'
-string1=string1 for en-US under newbase
-string2=string2 for en-US under newbase
-'@
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/newbase/en-US/foo.psd1 b/test/powershell/Language/Scripting/newbase/en-US/foo.psd1
deleted file mode 100644
index c3ee32d9d9a..00000000000
--- a/test/powershell/Language/Scripting/newbase/en-US/foo.psd1
+++ /dev/null
@@ -1,4 +0,0 @@
-ConvertFrom-StringData @'
-string1=string1 for en-US from foo under newbase
-string2=string2 for en-US from foo under newbase
-'@
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/newbase/fr-FR/I18n.Tests.psd1 b/test/powershell/Language/Scripting/newbase/fr-FR/I18n.Tests.psd1
deleted file mode 100644
index 2c4387d2e5f..00000000000
--- a/test/powershell/Language/Scripting/newbase/fr-FR/I18n.Tests.psd1
+++ /dev/null
@@ -1,4 +0,0 @@
-ConvertFrom-StringData @'
-string1=string1 for fr-FR under newbase
-string2=string2 for fr-FR under newbase
-'@
\ No newline at end of file
diff --git a/test/powershell/Language/Scripting/newbase/fr-FR/foo.psd1 b/test/powershell/Language/Scripting/newbase/fr-FR/foo.psd1
deleted file mode 100644
index 2ddf5a07751..00000000000
--- a/test/powershell/Language/Scripting/newbase/fr-FR/foo.psd1
+++ /dev/null
@@ -1,4 +0,0 @@
-ConvertFrom-StringData @'
-string1=string1 for fr-FR from foo under newbase
-string2=string2 for fr-FR from foo under newbase
-'@
\ No newline at end of file
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 d4423b034b9..54120201690 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
@@ -683,7 +683,7 @@ Describe "Additional tests for Import-Module with WinCompat" -Tag "Feature" {
 @"
 {"Microsoft.PowerShell:ExecutionPolicy": "RemoteSigned", "WindowsPowerShellCompatibilityNoClobberModuleList": ["$desktopModuleToUse"]}
 "@ | Out-File -Force $ConfigPath
-            $env:PSModulePath = ''
+            $env:PSModulePath = $null
 
             ## 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
@@ -1479,7 +1479,7 @@ Describe "WinCompat importing should check availablity of built-in modules" -Tag
         $_.Exception.Message
     }}
 '@
-        $env:PSModulePath = ''
+        $env:PSModulePath = $null
         $script = $template -f $Command
         $scriptBlock = [scriptblock]::Create($script)
 
@@ -1507,7 +1507,7 @@ Describe "WinCompat importing should check availablity of built-in modules" -Tag
         `$_.Exception.Message
     }
 "@
-        $env:PSModulePath = ''
+        $env:PSModulePath = $null
         $scriptBlock = [scriptblock]::Create($script)
         $result = & "$pwshDir\pwsh.exe" -NoProfile -NonInteractive -c $scriptBlock
         $result | Should -HaveCount 2
@@ -1516,7 +1516,7 @@ Describe "WinCompat importing should check availablity of built-in modules" -Tag
     }
 
     It "When built-in modules are available but not in `$PSHOME module path, things should work" {
-        $env:PSModulePath = ''
+        $env:PSModulePath = $null
         $result = & "$pwshDir\pwsh.exe" -NoProfile -NonInteractive -c @"
             `$env:PSModulePath += ';$moduleDir'
             Import-Module Microsoft.PowerShell.Utility -UseWindowsPowerShell -WarningAction Ignore
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Get-Command.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Get-Command.Tests.ps1
index 600d04cef6f..1fa33efbf0d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Get-Command.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Get-Command.Tests.ps1
@@ -269,4 +269,9 @@ Describe "Get-Command Tests" -Tags "CI" {
         $result.Count | Should -Be 2
         $result.Name | Should -Be "Add-Content","Get-Content"
     }
+
+    It "Excluding modules works" {
+        $result = Get-Command -Name Get-Command -ExcludeModule Microsoft.PowerShell.Core
+        $result | Should -Be $null
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Get-Error.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Get-Error.Tests.ps1
new file mode 100644
index 00000000000..9bec24f302e
--- /dev/null
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Get-Error.Tests.ps1
@@ -0,0 +1,107 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Get-Error" -Tags "CI" {
+    It "Does not hang when serializing exception with array with type instances" {
+        $ps = [PowerShell]::Create()
+        $null = $ps.AddScript(@'
+            class GetErrorWithTypeArray : Exception {
+                [type[]]$Values
+                [type]$Type
+
+                GetErrorWithTypeArray ([string]$Message) : base($Message) {
+                    $this.Values = [type[]]@([string], [int])
+                    $this.Type = [bool]
+                }
+            }
+            try { throw [GetErrorWithTypeArray]::new("") } catch {}
+            Get-Error | Out-String
+'@)
+
+        $task = $ps.BeginInvoke()
+        if (-not $task.AsyncWaitHandle.WaitOne(5000)) {
+            $null = $ps.BeginStop($null, $null)
+            throw "Timed out waiting for Get-Error to serialize"
+        }
+
+        $result = $ps.EndInvoke($task)
+        $result.Count | Should -Be 1
+        $result[0] | Should -BeOfType ([string])
+
+        $formattedError = (@(
+            $result[0] -split "\r?\n" | ForEach-Object {
+                $_.TrimEnd()
+            }
+        ) -join ([Environment]::NewLine)).Trim()
+
+        $formattedError | Should -Be @'
+Exception        :
+    Values  :
+              [System.String]
+              [System.Int32]
+    Type    : [System.Boolean]
+    HResult : -2146233088
+CategoryInfo     : OperationStopped: (:) [], GetErrorWithTypeArray
+InvocationInfo   :
+    ScriptLineNumber : 10
+    OffsetInLine     : 19
+    HistoryId        : 1
+    Line             : try { throw [GetErrorWithTypeArray]::new("") } catch {}
+
+    Statement        : throw [GetErrorWithTypeArray]::new("")
+    PositionMessage  : At line:10 char:19
+                       +             try { throw [GetErrorWithTypeArray]::new("") } catch {}
+                       +                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    CommandOrigin    : Internal
+ScriptStackTrace : at <ScriptBlock>, <No file>: line 10
+'@.Trim()
+    }
+
+    It "Formats strings and primitive types in an array" {
+        $ps = [PowerShell]::Create()
+        $null = $ps.AddScript(@'
+            class GetErrorPrimitiveArray : Exception {
+                [object[]]$Values
+
+                GetErrorPrimitiveArray ([string]$Message) : base($Message) {
+                    $this.Values = @(1, "alpha", 0.5)
+                }
+            }
+            try { throw [GetErrorPrimitiveArray]::new("") } catch {}
+            Get-Error | Out-String
+'@)
+
+        $result = $ps.Invoke()
+        $result.Count | Should -Be 1
+        $result[0] | Should -BeOfType ([string])
+
+        $formattedError = (@(
+            $result[0] -split "\r?\n" | ForEach-Object {
+                $_.TrimEnd()
+            }
+        ) -join ([Environment]::NewLine)).Trim()
+
+        $formattedError | Should -Be @'
+Exception        :
+    Type    : GetErrorPrimitiveArray
+    Values  :
+              1
+              alpha
+              0.5
+    HResult : -2146233088
+CategoryInfo     : OperationStopped: (:) [], GetErrorPrimitiveArray
+InvocationInfo   :
+    ScriptLineNumber : 8
+    OffsetInLine     : 19
+    HistoryId        : 1
+    Line             : try { throw [GetErrorPrimitiveArray]::new("") } catch {}
+
+    Statement        : throw [GetErrorPrimitiveArray]::new("")
+    PositionMessage  : At line:8 char:19
+                       +             try { throw [GetErrorPrimitiveArray]::new("") } catch {}
+                       +                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    CommandOrigin    : Internal
+ScriptStackTrace : at <ScriptBlock>, <No file>: line 8
+'@.Trim()
+    }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1
index d7216720dd7..19dc80caf28 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Import-Module.Tests.ps1
@@ -56,6 +56,19 @@ Describe "Import-Module" -Tags "CI" {
         Import-Module TestModule -RequiredVersion 1.1
         (Get-Module TestModule).Version | Should -BeIn "1.1"
     }
+
+    It 'ProcessorArchitecture should work' {
+        $currentProcessorArchitecture = switch ([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) {
+            'X86' { 'x86' }
+            'X64' { 'amd64' }
+            'Arm64' { 'arm' }
+            'Arm' { 'arm' }
+            default { throw "Unknown processor architecture" }
+        }
+        New-ModuleManifest -Path "$TestDrive\TestModule.psd1" -ProcessorArchitecture $currentProcessorArchitecture
+        $module = Import-Module -Name "$TestDrive\TestModule.psd1" -PassThru
+        $module.ProcessorArchitecture | Should -Be $currentProcessorArchitecture
+    }
 }
 
 Describe "Import-Module with ScriptsToProcess" -Tags "CI" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Set-PSDebug.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Set-PSDebug.Tests.ps1
index 1bf610dd1f1..297e494d4d2 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Set-PSDebug.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Set-PSDebug.Tests.ps1
@@ -15,5 +15,16 @@ Describe "Set-PSDebug" -Tags "CI" {
         It "Should be able to set strict" {
             { Set-PSDebug -Strict } | Should -Not -Throw
         }
+        
+        It "Should skip magic extents created by pwsh" {
+            class ClassWithDefaultCtor {
+                MyMethod() { }
+            }
+            
+            { 
+                Set-PSDebug -Trace 1
+                [ClassWithDefaultCtor]::new()
+            } | Should -Not -Throw
+        }
     }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Where-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Where-Object.Tests.ps1
index c12a1bdb516..eae7d9951a3 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Where-Object.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Where-Object.Tests.ps1
@@ -142,4 +142,242 @@ Describe "Where-Object" -Tags "CI" {
         $Result[0] | Should -Be $dynObj
         $Result[1] | Should -Be $dynObj
     }
+
+    Context "Switch parameter explicit `$false handling" {
+        BeforeAll {
+            $testData = @(
+                [PSCustomObject]@{ Name = 'Alice'; Age = 25; City = 'New York' }
+                [PSCustomObject]@{ Name = 'Bob'; Age = 30; City = 'Boston' }
+                [PSCustomObject]@{ Name = 'Charlie'; Age = 35; City = 'Chicago' }
+            )
+        }
+
+        It "-EQ:`$false should behave like default boolean evaluation" {
+            # With -EQ:$false, the parameter is not specified, so default boolean evaluation applies
+            # "... | Where-Object Name" is equivalent to "... | Where-Object {$true -eq $_.Name}"
+            # Non-empty strings are truthy
+            $result = $testData | Where-Object Name -EQ:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-GT:`$false should behave like default boolean evaluation" {
+            # With -GT:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -GT:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-LT:`$false should behave like default boolean evaluation" {
+            # With -LT:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -LT:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-NE:`$false should behave like default boolean evaluation" {
+            # With -NE:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -NE:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-GE:`$false should behave like default boolean evaluation" {
+            # With -GE:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -GE:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-LE:`$false should behave like default boolean evaluation" {
+            # With -LE:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -LE:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-NotLike:`$false should behave like default boolean evaluation" {
+            # With -NotLike:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object City -NotLike:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-NotMatch:`$false should behave like default boolean evaluation" {
+            # With -NotMatch:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -NotMatch:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-NotContains:`$false should behave like default boolean evaluation" {
+            # With -NotContains:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -NotContains:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-NotIn:`$false should behave like default boolean evaluation" {
+            # With -NotIn:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -NotIn:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-IsNot:`$false should behave like default boolean evaluation" {
+            # With -IsNot:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -IsNot:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-Like:`$false should behave like default boolean evaluation" {
+            # With -Like:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object City -Like:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-Match:`$false should behave like default boolean evaluation" {
+            # With -Match:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -Match:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-Contains:`$false should behave like default boolean evaluation" {
+            # With -Contains:$false, the parameter is not specified, so default boolean evaluation applies
+            # "... | Where-Object Name" checks if Name property is truthy
+            $result = $testData | Where-Object Name -Contains:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-In:`$false should behave like default boolean evaluation" {
+            # With -In:$false, the parameter is not specified, so default boolean evaluation applies
+            # "... | Where-Object Name" checks if Name property is truthy
+            $result = $testData | Where-Object Name -In:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-Is:`$false should behave like default boolean evaluation" {
+            # With -Is:$false, the parameter is not specified, so default boolean evaluation applies
+            # "... | Where-Object Name" checks if Name property is truthy
+            $result = $testData | Where-Object Name -Is:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-Not:`$false should behave like default boolean evaluation" {
+            $testData2 = @(
+                [PSCustomObject]@{ Name = ''; Value = 1 }
+                [PSCustomObject]@{ Name = 'Test'; Value = 2 }
+            )
+            # With -Not:$false, the parameter is not specified, so default boolean evaluation applies
+            # "... | Where-Object Name" returns objects where Name is truthy (non-empty)
+            $result = $testData2 | Where-Object Name -Not:$false
+            $result | Should -HaveCount 1
+            $result.Name | Should -Be 'Test'
+        }
+
+        It "-GT:`$false with -Value should throw an error requiring an operator" {
+            # When a switch parameter is set to $false with -Value specified,
+            # it should throw an error because no valid operator is active
+            { $testData | Where-Object Age -GT:$false -Value 25 } | Should -Throw -ErrorId 'OperatorNotSpecified,Microsoft.PowerShell.Commands.WhereObjectCommand'
+        }
+
+        It "-EQ:`$false with -Value should throw an error requiring an operator" {
+            # Similar behavior for -EQ:$false with -Value
+            { $testData | Where-Object Name -EQ:$false -Value 'Alice' } | Should -Throw -ErrorId 'OperatorNotSpecified,Microsoft.PowerShell.Commands.WhereObjectCommand'
+        }
+
+        It "-Like:`$false with -Value should throw an error requiring an operator" {
+            # Similar behavior for -Like:$false with -Value
+            { $testData | Where-Object Name -Like:$false -Value 'A*' } | Should -Throw -ErrorId 'OperatorNotSpecified,Microsoft.PowerShell.Commands.WhereObjectCommand'
+        }
+
+        It "-CEQ:`$false should behave like default boolean evaluation" {
+            # With -CEQ:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CEQ:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CNE:`$false should behave like default boolean evaluation" {
+            # With -CNE:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CNE:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CGT:`$false should behave like default boolean evaluation" {
+            # With -CGT:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -CGT:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CLT:`$false should behave like default boolean evaluation" {
+            # With -CLT:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -CLT:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CGE:`$false should behave like default boolean evaluation" {
+            # With -CGE:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -CGE:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CLE:`$false should behave like default boolean evaluation" {
+            # With -CLE:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Age -CLE:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CLike:`$false should behave like default boolean evaluation" {
+            # With -CLike:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object City -CLike:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CNotLike:`$false should behave like default boolean evaluation" {
+            # With -CNotLike:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object City -CNotLike:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CMatch:`$false should behave like default boolean evaluation" {
+            # With -CMatch:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CMatch:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CNotMatch:`$false should behave like default boolean evaluation" {
+            # With -CNotMatch:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CNotMatch:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CContains:`$false should behave like default boolean evaluation" {
+            # With -CContains:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CContains:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CNotContains:`$false should behave like default boolean evaluation" {
+            # With -CNotContains:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CNotContains:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CIn:`$false should behave like default boolean evaluation" {
+            # With -CIn:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CIn:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CNotIn:`$false should behave like default boolean evaluation" {
+            # With -CNotIn:$false, the parameter is not specified, so default boolean evaluation applies
+            $result = $testData | Where-Object Name -CNotIn:$false
+            $result | Should -HaveCount 3
+        }
+
+        It "-CEQ:`$false with -Value should throw an error requiring an operator" {
+            # Similar behavior for -CEQ:$false with -Value
+            { $testData | Where-Object Name -CEQ:$false -Value 'Alice' } | Should -Throw -ErrorId 'OperatorNotSpecified,Microsoft.PowerShell.Commands.WhereObjectCommand'
+        }
+
+        It "-CGT:`$false with -Value should throw an error requiring an operator" {
+            # Similar behavior for -CGT:$false with -Value
+            { $testData | Where-Object Age -CGT:$false -Value 25 } | Should -Throw -ErrorId 'OperatorNotSpecified,Microsoft.PowerShell.Commands.WhereObjectCommand'
+        }
+
+        It "-CLike:`$false with -Value should throw an error requiring an operator" {
+            # Similar behavior for -CLike:$false with -Value
+            { $testData | Where-Object Name -CLike:$false -Value 'A*' } | Should -Throw -ErrorId 'OperatorNotSpecified,Microsoft.PowerShell.Commands.WhereObjectCommand'
+        }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.LocalAccounts/Pester.Command.Cmdlets.LocalAccounts.LocalUser.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.LocalAccounts/Pester.Command.Cmdlets.LocalAccounts.LocalUser.Tests.ps1
index e6e5ebb8d4f..2e56df87256 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.LocalAccounts/Pester.Command.Cmdlets.LocalAccounts.LocalUser.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.LocalAccounts/Pester.Command.Cmdlets.LocalAccounts.LocalUser.Tests.ps1
@@ -4,6 +4,9 @@
 # Module removed due to #4272
 # disabling tests
 
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 return
 
 Set-Variable dateInFuture -Option Constant -Value "12/12/2036 09:00"
@@ -1557,4 +1560,3 @@ try {
 finally {
     $global:PSDefaultParameterValues = $originalDefaultParameterValues
 }
-
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Clipboard.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Clipboard.Tests.ps1
index 7cd4f492bfa..62f8d77a44c 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Clipboard.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Clipboard.Tests.ps1
@@ -36,6 +36,13 @@ Describe 'Clipboard cmdlet tests' -Tag CI {
             Get-Clipboard -Raw | Should -BeExactly "1$([Environment]::NewLine)2"
         }
 
+        It 'Get-Clipboard -Delimiter should return items based on the delimiter' {
+            Set-Clipboard -Value "Line1`r`nLine2`nLine3"
+            $result = Get-Clipboard -Delimiter "`r`n", "`n"
+            $result.Count | Should -Be 3
+            $result | ForEach-Object -Process {$_.Length | Should -Be "LineX".Length}
+        }
+
         It 'Set-Clipboard -Append will add text' {
             'hello' | Set-Clipboard
             'world' | Set-Clipboard -Append
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Convert-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Convert-Path.Tests.ps1
index 1cc88b36bb7..7de1d97dd20 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Convert-Path.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Convert-Path.Tests.ps1
@@ -1,6 +1,27 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 Describe "Convert-Path tests" -Tag CI {
+    BeforeAll {
+        $hiddenFilePrefix = ($IsLinux -or $IsMacOS) ? '.' : ''
+
+        $hiddenFilePath1 = Join-Path -Path $TestDrive -ChildPath "$($hiddenFilePrefix)test1.txt"
+        $hiddenFilePath2 = Join-Path -Path $TestDrive -ChildPath "$($hiddenFilePrefix)test2.txt"
+
+        $hiddenFile1 = New-Item -Path $hiddenFilePath1 -ItemType File
+        $hiddenFile2 = New-Item -Path $hiddenFilePath2 -ItemType File
+
+        $relativeHiddenFilePath1 = ".$([System.IO.Path]::DirectorySeparatorChar)$($hiddenFilePrefix)test1.txt"
+        $relativeHiddenFilePath2 = ".$([System.IO.Path]::DirectorySeparatorChar)$($hiddenFilePrefix)test2.txt"
+
+        if ($IsWindows) {
+            $hiddenFile1.Attributes = "Hidden"
+            $hiddenFile2.Attributes = "Hidden"
+        }
+
+        $hiddenFileWildcardPath = Join-Path -Path $TestDrive -ChildPath "$($hiddenFilePrefix)test*.txt"
+        $relativeHiddenFileWildcardPath = ".$([System.IO.Path]::DirectorySeparatorChar)$($hiddenFilePrefix)test*.txt"
+    }
+
     It "Convert-Path should handle provider qualified paths" {
         Convert-Path -Path "FileSystem::${TestDrive}" | Should -BeExactly "${TestDrive}"
     }
@@ -41,4 +62,52 @@ Describe "Convert-Path tests" -Tag CI {
     It "Convert-Path should return something which exists" {
         Convert-Path -Path $TestDrive | Should -Exist
     }
+
+    It "Convert-Path -Path '<Path>' -Force:<Force> should return '<ExpectedResult>'" -TestCases @(
+        @{
+            Path           = $relativeHiddenFilePath1
+            BasePath       = $TestDrive
+            Force          = $false
+            ExpectedResult = $hiddenFilePath1
+        }
+        @{
+            Path           = $relativeHiddenFilePath2
+            BasePath       = $TestDrive
+            Force          = $false
+            ExpectedResult = $hiddenFilePath2
+        }
+        @{
+            Path           = $relativeHiddenFileWildcardPath
+            BasePath       = $TestDrive
+            Force          = $false
+            ExpectedResult = $null
+        }
+        @{
+            Path           = $relativeHiddenFilePath1
+            BasePath       = $TestDrive
+            Force          = $true
+            ExpectedResult = $hiddenFilePath1
+        }
+        @{
+            Path           = $relativeHiddenFilePath2
+            BasePath       = $TestDrive
+            Force          = $true
+            ExpectedResult = $hiddenFilePath2
+        }
+        @{
+            Path           = $relativeHiddenFileWildcardPath
+            BasePath       = $TestDrive
+            Force          = $true
+            ExpectedResult = @($hiddenFilePath1, $hiddenFilePath2)
+        }
+    ) {
+        param($Path, $BasePath, $Force, $ExpectedResult)
+        try {
+            Push-Location -Path $BasePath
+            Convert-Path -Path $Path -Force:$Force | Should -BeExactly $ExpectedResult
+        }
+        finally {
+            Pop-Location
+        }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
index f7c069f2453..3899ace7e3b 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
@@ -1,5 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+Import-Module HelpersCommon
+
 Describe "Basic FileSystem Provider Tests" -Tags "CI" {
     BeforeAll {
         $testDir = "TestDir"
@@ -201,6 +204,25 @@ Describe "Basic FileSystem Provider Tests" -Tags "CI" {
             { Move-Item -Path $src -Destination $dest -ErrorAction Stop } | Should -Throw -ErrorId 'MoveItemArgumentError,Microsoft.PowerShell.Commands.MoveItemCommand'
         }
 
+        It 'Verify Move-Item fails when destination is same as source w/wo directory separator: <source>' -TestCases @(
+            @{ source = './Empty/' }
+            @{ source = './Empty' }
+            @{ source = '.\Empty\' }
+            @{ source = '.\Empty' }
+        ) {
+            param($source)
+
+            try {
+                Push-Location $TestDrive
+                New-Item -ItemType Directory -Path 'Empty'
+                { Move-Item -Path $source -ErrorAction Stop } | Should -Throw -ErrorId 'MoveItemArgumentError,Microsoft.PowerShell.Commands.MoveItemCommand'
+            }
+            finally {
+                Pop-Location
+                Remove-Item 'Empty' -Force
+            }
+        }
+
         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'
         }
@@ -583,11 +605,12 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
             }
         }
 
-        $realFile = Join-Path $TestPath "file.txt"
+        # Ensure that the file link can still be successfully created when the target file/directory name contains wildcards.
+        $realFile = Join-Path $TestPath "[file].txt"
         $nonFile = Join-Path $TestPath "not-a-file"
         $fileContent = "some text"
-        $realDir = Join-Path $TestPath "subdir"
-        $realDir2 = Join-Path $TestPath "second-subdir"
+        $realDir = Join-Path $TestPath "[subdir]"
+        $realDir2 = Join-Path $TestPath "[second-subdir]"
         $nonDir = Join-Path $TestPath "not-a-dir"
         $hardLinkToFile = Join-Path $TestPath "hard-to-file.txt"
         $symLinkToFile = Join-Path $TestPath "sym-link-to-file.txt"
@@ -602,6 +625,11 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
     }
 
     Context "New-Item and hard/symbolic links" {
+        AfterEach {
+            # clean up created links after each test
+            Remove-Item -Exclude (Split-Path -Leaf ([WildcardPattern]::Escape($realFile)), ([WildcardPattern]::Escape($realDir)), ([WildcardPattern]::Escape($realDir2))) -Recurse $TestPath/*
+        }
+
         It "New-Item can create a hard link to a file" {
             New-Item -ItemType HardLink -Path $hardLinkToFile -Value $realFile > $null
             Test-Path $hardLinkToFile | Should -BeTrue
@@ -612,7 +640,7 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
         It "New-Item can create symbolic link to file" {
             New-Item -ItemType SymbolicLink -Path $symLinkToFile -Value $realFile > $null
             Test-Path $symLinkToFile | Should -BeTrue
-            $real = Get-Item -Path $realFile
+            $real = Get-Item -LiteralPath $realFile
             $link = Get-Item -Path $symLinkToFile
             $link.LinkType | Should -BeExactly "SymbolicLink"
             $link.Target | Should -BeExactly $real.ToString()
@@ -631,7 +659,7 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
         It "New-Item can create a symbolic link to a directory" -Skip:($IsWindows) {
             New-Item -ItemType SymbolicLink -Path $symLinkToDir -Value $realDir > $null
             Test-Path $symLinkToDir | Should -BeTrue
-            $real = Get-Item -Path $realDir
+            $real = Get-Item -LiteralPath $realDir
             $link = Get-Item -Path $symLinkToDir
             $link.LinkType | Should -BeExactly "SymbolicLink"
             $link.Target | Should -BeExactly $real.ToString()
@@ -639,12 +667,37 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
         It "New-Item can create a directory symbolic link to a directory" -Skip:(-Not $IsWindows) {
             New-Item -ItemType SymbolicLink -Path $symLinkToDir -Value $realDir > $null
             Test-Path $symLinkToDir | Should -BeTrue
-            $real = Get-Item -Path $realDir
+            $real = Get-Item -LiteralPath $realDir
             $link = Get-Item -Path $symLinkToDir
             $link | Should -BeOfType System.IO.DirectoryInfo
             $link.LinkType | Should -BeExactly "SymbolicLink"
             $link.Target | Should -BeExactly $real.ToString()
         }
+
+        It "New-Item can create a directory symbolic link to a directory using a relative path" -Skip:(-Not $IsWindows) {
+            $target = Split-Path -Leaf $realDir
+            New-Item -ItemType SymbolicLink -Path $symLinkToDir -Value $target > $null
+            Test-Path $symLinkToDir | Should -BeTrue
+            $real = Get-Item -LiteralPath $realDir
+            $link = Get-Item -Path $symLinkToDir
+            $link | Should -BeOfType System.IO.DirectoryInfo
+            $link.LinkType | Should -BeExactly "SymbolicLink"
+            $link.ResolvedTarget | Should -BeExactly $real.ToString()
+            $link.Target | Should -BeExactly $target
+        }
+
+        It "New-Item can create a directory symbolic link to a directory using a relative path with .\" -Skip:(-Not $IsWindows) {
+            $target = ".\$(Split-Path -Leaf $realDir)"
+            New-Item -ItemType SymbolicLink -Path $symLinkToDir -Value $target > $null
+            Test-Path $symLinkToDir | Should -BeTrue
+            $real = Get-Item -LiteralPath $realDir
+            $link = Get-Item -Path $symLinkToDir
+            $link | Should -BeOfType System.IO.DirectoryInfo
+            $link.LinkType | Should -BeExactly "SymbolicLink"
+            $link.ResolvedTarget | Should -BeExactly $real.ToString()
+            $link.Target | Should -BeExactly $target
+        }
+
         It "New-Item can create a directory junction to a directory" -Skip:(-Not $IsWindows) {
             New-Item -ItemType Junction -Path $junctionToDir -Value $realDir > $null
             Test-Path $junctionToDir | Should -BeTrue
@@ -680,8 +733,8 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
         }
 
         It "New-Item -Force can overwrite a junction" -Skip:(-Not $IsWindows){
-            $rd2 = Get-Item -Path $realDir2
-            New-Item -Name testfile.txt -ItemType file -Path $realDir
+            $rd2 = Get-Item -LiteralPath $realDir2
+            New-Item -Name testfile.txt -ItemType file -Path ([WildcardPattern]::Escape($realDir))
             New-Item -ItemType Junction -Path $junctionToDir -Value $realDir > $null
             Test-Path $junctionToDir | Should -BeTrue
             { New-Item -ItemType Junction -Path $junctionToDir -Value $realDir -ErrorAction Stop > $null } | Should -Throw -ErrorId "DirectoryNotEmpty,Microsoft.PowerShell.Commands.NewItemCommand"
@@ -827,7 +880,7 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
 
                 Remove-Item -Path $Link -ErrorAction SilentlyContinue > $null
                 Test-Path -Path $Link | Should -BeFalse
-                Test-Path -Path $Target | Should -BeTrue
+                Test-Path -LiteralPath $Target | Should -BeTrue
             }
         }
 
@@ -1153,6 +1206,20 @@ Describe "Extended FileSystem Item/Content Cmdlet Provider Tests" -Tags "Feature
             $result.Name | Should -BeExactly $testDir
         }
 
+        It "Verify Directory creation when path relative to current PSDrive is empty" {
+            try {
+                $rootDir = New-Item "NewDirectory" -ItemType Directory -Force
+                $rootPath = $rootDir.FullName
+                $newPSDrive = New-PSDrive -Name "NewPSDrive" -PSProvider FileSystem -Root $rootPath
+
+                $result = New-Item -Path "NewPSDrive:\" -ItemType Directory -Force
+                $result.FullName.TrimEnd("/\") | Should -BeExactly $newPSDrive.Root
+            }
+            finally {
+                Remove-PSDrive -Name "NewPSDrive" -Force -ErrorAction SilentlyContinue
+            }
+        }
+
         It "Verify File + Value" {
             $result = New-Item -Path . -ItemType File -Name $testFile -Value "Some String"
             $content = Get-Content -Path $testFile
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
index 5e8e258b85a..02b6f79fbc4 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
@@ -283,6 +283,16 @@ Describe "Get-Content" -Tags "CI" {
         Get-Content -Path $testPath -Tail 0 | Should -BeNullOrEmpty
     }
 
+    It "Should wait for content when using -Tail 0 and -Wait" {
+        $testValues = @(1,2,3)
+        $Job = Start-Job -ScriptBlock {Get-Content -Path $using:testPath -Tail 0 -Wait}
+        Start-Sleep -Seconds 3
+        Add-Content -Value $testValues -Path $testPath
+        Start-Sleep -Seconds 3
+        Compare-Object -ReferenceObject $testValues -DifferenceObject ($Job | Receive-Job) | Should -BeNullOrEmpty
+        $Job | Remove-Job -Force
+    }
+
     It "Should throw TailAndHeadCannotCoexist when both -Tail and -TotalCount are used" {
         {
         Get-Content -Path $testPath -Tail 1 -TotalCount 1 -ErrorAction Stop
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 bb701855058..4ddceaa6836 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
@@ -111,7 +111,7 @@ Describe "Get-Item" -Tags "CI" {
             {
                 return
             }
-            $altStreamPath = "$TESTDRIVE/altStream.txt"
+            $altStreamPath = "$TESTDRIVE\altStream.txt"
             $altStreamDirectory = "$TESTDRIVE/altstreamdir"
             $noAltStreamDirectory = "$TESTDRIVE/noaltstreamdir"
             $stringData = "test data"
@@ -144,6 +144,10 @@ Describe "Get-Item" -Tags "CI" {
             $result = Get-Item $noAltStreamDirectory -Stream * -ErrorAction Stop
             $result | Should -BeExactly $null
         }
+        It "Should return filename property correctly" -Skip:$skipNotWindows {
+            $result = (Get-Item -Path $altStreamPath -Stream $streamName).FileName
+            $result | Should -BeExactly $altStreamPath
+        }
     }
 
     Context "Registry Provider" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1
index f2684773a15..4ad46de7cbb 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1
@@ -66,7 +66,7 @@ Describe "Temp: drive" -Tag Feature {
     }
 }
 
-Describe "Get-PSDrive for network path" -Tags "Feature","RequireAdminOnWindows" {
+Describe "Get-PSDrive for network path" -Tags "CI","RequireAdminOnWindows" {
 
     It 'Check P/Invoke GetDosDevice/QueryDosDevice' -Skip:(-not $IsWindows) {
         $UsedDrives  = Get-PSDrive | Select-Object -ExpandProperty Name
@@ -78,4 +78,39 @@ Describe "Get-PSDrive for network path" -Tags "Feature","RequireAdminOnWindows"
         $drive.DisplayRoot | Should -BeExactly '\\localhost\c$\Windows'
         subst "$($PSDriveName):" /D
     }
+
+    It 'Check P/Invoke for WNetGetConnection with small buffer: <SmallBuffer>' -Skip:(-not $IsWindows) -TestCases @(
+        @{ SmallBuffer = $false }
+        @{ SmallBuffer = $true }
+    ) {
+        param ($SmallBuffer)
+
+        $UsedDrives  = Get-PSDrive | Select-Object -ExpandProperty Name
+        $PSDriveName = 'D'..'Z' | Where-Object -FilterScript {$_ -notin $UsedDrives} | Get-Random
+
+        $drive = New-PSDrive -Name $PSDriveName -PSProvider FileSystem -Root \\localhost\c$\Windows -Persist
+        try {
+            if ($SmallBuffer) {
+                [System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('WNetGetConnectionBufferSize', 4)
+            }
+
+            # The result is cached in the current instance, use a new
+            # PowerShell instance to test out WNetGetConnection code.
+            $ps = [PowerShell]::Create()
+            $actual = $ps.AddCommand('Get-PSDrive').AddParameter('Name', $PSDriveName).Invoke()
+            if ($ps.HadErrors) {
+                throw $ps.Streams.Error[0]
+            }
+
+            $actual.Name | Should -BeExactly $PSDriveName
+            $actual.DisplayRoot | Should -BeExactly '\\localhost\c$\Windows'
+        }
+        finally {
+            $drive | Remove-PSDrive
+
+            if ($SmallBuffer) {
+                [System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('WNetGetConnectionBufferSize', -1)
+            }
+        }
+    }
 }
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 90e20a2c479..29a53ee196c 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1
@@ -1,10 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 Describe "Get-Process for admin" -Tags @('CI', 'RequireAdminOnWindows') {
-    It "Should support -IncludeUserName" {
-        (Get-Process -Id $PID -IncludeUserName).UserName | Should -Match $env:USERNAME
-    }
-
     It "Should support -Module" -Pending:$IsMacOS {
         $modules = Get-Process -Id $PID -Module
         $modules.GetType() | Should -BeExactly "System.Object[]"
@@ -78,12 +74,8 @@ Describe "Get-Process" -Tags "CI" {
         (Get-Process -Id $PID).Id | Should -BeExactly $PID
     }
 
-    It "Should fail to run Get-Process with -IncludeUserName without admin" -Skip:(!$IsWindows) {
-        if (Test-IsElevated) {
-            Set-ItResult -Skipped -Because "must NOT be run as admin"
-        }
-
-        { Get-Process -IncludeUserName } | Should -Throw -ErrorId "IncludeUserNameRequiresElevation,Microsoft.PowerShell.Commands.GetProcessCommand"
+    It "Should support -IncludeUserName" {
+        (Get-Process -Id $PID -IncludeUserName).UserName | Should -Match $env:USERNAME
     }
 
     It "Should fail to run Get-Process with -Module without admin" -Skip:(!$IsWindows) {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Service.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Service.Tests.ps1
index 9429229c537..04882a1aaf7 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Service.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Service.Tests.ps1
@@ -82,3 +82,60 @@ Describe "Get-Service cmdlet tests" -Tags "CI" {
     { & $script } | Should -Throw -ErrorId $errorid
   }
 }
+
+Describe 'Get-Service Admin tests' -Tag CI,RequireAdminOnWindows {
+  BeforeAll {
+    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+    if ( -not $IsWindows ) {
+        $PSDefaultParameterValues["it:skip"] = $true
+    }
+  }
+  AfterAll {
+      $global:PSDefaultParameterValues = $originalDefaultParameterValues
+  }
+
+  BeforeEach {
+    $serviceParams = @{
+      Name = "PowerShellTest-$([Guid]::NewGuid().Guid)"
+      BinaryPathName = "$env:SystemRoot\System32\cmd.exe"
+      StartupType = 'Manual'
+    }
+    $service = New-Service @serviceParams
+  }
+  AfterEach {
+    $service | Remove-Service
+  }
+
+  It "Ignores invalid description MUI entry" {
+    $serviceRegPath = "HKLM:\SYSTEM\CurrentControlSet\Services\$($service.Name)"
+    Set-ItemProperty -LiteralPath $serviceRegPath -Name Description -Value '@Fake.dll,-0'
+    $actual = Get-Service -Name $service.Name -ErrorAction Stop
+
+    $actual.Name | Should -Be $service.Name
+    $actual.Status | Should -Be Stopped
+    $actual.Description | Should -BeNullOrEmpty
+    $actual.UserName | Should -Be LocalSystem
+    $actual.StartupType | Should -Be Manual
+  }
+
+  It "Ignores no SERVICE_QUERY_CONFIG access" {
+    $sddl = ((sc.exe sdshow $service.Name) -join "").Trim()
+    $sd = ConvertFrom-SddlString -Sddl $sddl
+    $sd.RawDescriptor.DiscretionaryAcl.AddAccess(
+      [System.Security.AccessControl.AccessControlType]::Deny,
+      [System.Security.Principal.WindowsIdentity]::GetCurrent().User,
+      0x1,  # SERVICE_QUERY_CONFIG
+      [System.Security.AccessControl.InheritanceFlags]::None,
+      [System.Security.AccessControl.PropagationFlags]::None)
+    $newSddl = $sd.RawDescriptor.GetSddlForm([System.Security.AccessControl.AccessControlSections]::All)
+    $null = sc.exe sdset $service.Name $newSddl
+
+    $actual = Get-Service -Name $service.Name -ErrorAction Stop
+
+    $actual.Name | Should -Be $service.Name
+    $actual.Status | Should -Be Stopped
+    $actual.Description | Should -BeNullOrEmpty
+    $actual.UserName | Should -BeNullOrEmpty
+    $actual.StartupType | Should -Be InvalidValue
+  }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Join-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Join-Path.Tests.ps1
index 8cb6391cd7b..9b0898fee90 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Join-Path.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Join-Path.Tests.ps1
@@ -50,4 +50,136 @@ Describe "Join-Path cmdlet tests" -Tags "CI" {
     $result.Count | Should -Be 1
     $result       | Should -BeExactly "one${sepChar}two${sepChar}three${sepChar}four${sepChar}five"
   }
+  It "Join-Path -Path <Path> -ChildPath <ChildPath> should return '<ExpectedResult>'" -TestCases @(
+    @{
+        Path = 'one'
+        ChildPath = 'two', 'three'
+        ExpectedResult = "one${sepChar}two${sepChar}three"
+    }
+    @{
+        Path = 'one', 'two'
+        ChildPath = 'three', 'four'
+        ExpectedResult = @(
+            "one${sepChar}three${sepChar}four"
+            "two${sepChar}three${sepChar}four"
+        )
+    }
+    @{
+        Path = 'one'
+        ChildPath = @()
+        ExpectedResult = "one${sepChar}"
+    }
+    @{
+        Path = 'one'
+        ChildPath = $null
+        ExpectedResult = "one${sepChar}"
+    }
+    @{
+        Path = 'one'
+        ChildPath = [string]::Empty
+        ExpectedResult = "one${sepChar}"
+    }
+  ) {
+    param($Path, $ChildPath, $ExpectedResult)
+    $result = Join-Path -Path $Path -ChildPath $ChildPath
+    $result | Should -BeExactly $ExpectedResult
+  }
+  It "should handle extension parameter: <TestName>" -TestCases @(
+    @{
+      TestName = "change extension"
+      ChildPath = "file.txt"
+      Extension = ".log"
+      ExpectedChildPath = "file.log"
+    }
+    @{
+      TestName = "add extension to file without extension"
+      ChildPath = "file"
+      Extension = ".txt"
+      ExpectedChildPath = "file.txt"
+    }
+    @{
+      TestName = "extension without leading dot"
+      ChildPath = "file.txt"
+      Extension = "log"
+      ExpectedChildPath = "file.log"
+    }
+    @{
+      TestName = "double extension with dot"
+      ChildPath = "file.txt"
+      Extension = ".tar.gz"
+      ExpectedChildPath = "file.tar.gz"
+    }
+    @{
+      TestName = "double extension without dot"
+      ChildPath = "file.txt"
+      Extension = "tar.gz"
+      ExpectedChildPath = "file.tar.gz"
+    }
+    @{
+      TestName = "remove extension with empty string"
+      ChildPath = "file.txt"
+      Extension = ""
+      ExpectedChildPath = "file"
+    }
+    @{
+      TestName = "preserve dots in base name when removing extension with empty string"
+      ChildPath = "file...txt"
+      Extension = ""
+      ExpectedChildPath = "file.."
+    }
+    @{
+      TestName = "replace only the last extension for files with multiple dots"
+      ChildPath = "file.backup.txt"
+      Extension = ".log"
+      ExpectedChildPath = "file.backup.log"
+    }
+    @{
+      TestName = "preserve dots in base name when changing extension"
+      ChildPath = "file...txt"
+      Extension = ".md"
+      ExpectedChildPath = "file...md"
+    }
+    @{
+      TestName = "add extension to directory-like path"
+      ChildPath = "subfolder"
+      Extension = ".log"
+      ExpectedChildPath = "subfolder.log"
+    }
+  ) {
+    param($TestName, $ChildPath, $Extension, $ExpectedChildPath)
+    $result = Join-Path -Path "folder" -ChildPath $ChildPath -Extension $Extension
+    $result | Should -BeExactly "folder${SepChar}${ExpectedChildPath}"
+  }
+  It "should handle extension parameter with multiple child path segments: <TestName>" -TestCases @(
+    @{
+      TestName = "change extension when joining multiple child path segments"
+      ChildPaths = @("subfolder", "file.txt")
+      Extension = ".log"
+      ExpectedPath = "folder${SepChar}subfolder${SepChar}file.log"
+    }
+  ) {
+    param($TestName, $ChildPaths, $Extension, $ExpectedPath)
+    $result = Join-Path -Path "folder" -ChildPath $ChildPaths -Extension $Extension
+    $result | Should -BeExactly $ExpectedPath
+  }
+  It "should change extension for multiple paths" {
+    $result = Join-Path -Path "folder1", "folder2" -ChildPath "file.txt" -Extension ".log"
+    $result.Count | Should -Be 2
+    $result[0] | Should -BeExactly "folder1${SepChar}file.log"
+    $result[1] | Should -BeExactly "folder2${SepChar}file.log"
+  }
+  It "should resolve path when -Extension changes to existing file" {
+    New-Item -Path TestDrive:\testfile.log -ItemType File -Force | Out-Null
+    $result = Join-Path -Path TestDrive: -ChildPath "testfile.txt" -Extension ".log" -Resolve
+    $result | Should -BeLike "*testfile.log"
+  }
+  It "should throw error when -Extension changes to non-existing file with -Resolve" {
+    { Join-Path -Path TestDrive: -ChildPath "testfile.txt" -Extension ".nonexistent" -Resolve -ErrorAction Stop; Throw "Previous statement unexpectedly succeeded..." } |
+      Should -Throw -ErrorId "PathNotFound,Microsoft.PowerShell.Commands.JoinPathCommand"
+  }
+  It "should accept Extension from pipeline by property name" {
+    $obj = [PSCustomObject]@{ Path = "folder"; ChildPath = "file.txt"; Extension = ".log" }
+    $result = $obj | Join-Path
+    $result | Should -BeExactly "folder${SepChar}file.log"
+  }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
index 89f21d5e055..5cd5a660c8b 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
@@ -386,3 +386,13 @@ Describe "New-Item -Force allows to create an item even if the directories in th
         $FullyQualifiedFile | Should -Exist
     }
 }
+
+Describe "New-Item -Force should throw an error for invalid characters in directory path" -Tags "CI" {
+    BeforeAll {
+        $invalidPath = Join-Path -Path $TestDrive -ChildPath 'Invalid?'
+    }
+
+    It "Should throw an error when -Force is used with an invalid directory path" -Skip:(!$IsWindows) {
+        { New-Item -Path $invalidPath -ItemType Directory -Force -ErrorAction Stop } | Should -Throw -ErrorId 'CreateDirectoryIOError,Microsoft.PowerShell.Commands.NewItemCommand'
+    }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/New-PSDrive.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/New-PSDrive.Tests.ps1
index 77d76b6ec6a..3894b5a0257 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/New-PSDrive.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/New-PSDrive.Tests.ps1
@@ -17,6 +17,12 @@ Describe "Tests for New-PSDrive cmdlet." -Tag "CI","RequireAdminOnWindows" {
             { New-PSDrive -Name $PSDriveName -PSProvider FileSystem -Root $RemoteShare -Persist -ErrorAction Stop } | Should -Not -Throw
         }
 
+        It "Network drive initialization on pwsh startup DisplayRoot should have value of share" -Skip:(-not $IsWindows) {
+            $null = New-PSDrive -Name $PSDriveName -PSProvider FileSystem -Root $RemoteShare -Persist -ErrorAction Stop
+            $drive = pwsh -noprofile -outputformat XML -command "Get-PSDrive -Name $PSDriveName"
+            $drive.DisplayRoot | Should -Be $RemoteShare.TrimEnd('\')
+        }
+
         It "Should throw exception if root is not a remote share." -Skip:(-not $IsWindows) {
             { New-PSDrive -Name $PSDriveName -PSProvider FileSystem -Root "TestDrive:\" -Persist -ErrorAction Stop } | Should -Throw -ErrorId 'DriveRootNotNetworkPath'
         }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Registry.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Registry.Tests.ps1
index 635e3f2940f..06e2cf81ac0 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Registry.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Registry.Tests.ps1
@@ -471,6 +471,47 @@ Describe "Extended Registry Provider Tests" -Tags @("Feature", "RequireAdminOnWi
             }
         }
     }
+
+    Context "Validate Get-ItemProperty Cast Exception" {
+        BeforeAll {
+            if ($IsWindows) {
+                $registrySubkeyPath = 'HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\badreg'
+
+                # Below will import .reg file with 64 bit integer in 32 bit DWORD
+                $badRegistryContent = @"
+Windows Registry Editor Version 5.00
+
+[$registrySubkeyPath]
+"NoModify"=hex(4):01,00,00,00,00,00,00,00
+"@
+
+                $badRegistryPath = Join-Path -Path $TestDrive -ChildPath badreg.reg
+                $badRegistryContent | Set-Content -Path $badRegistryPath
+                reg.exe import $badRegistryPath
+
+                $registryProviderSubkeyPath = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\badreg'
+            }
+        }
+
+        It "Validate non-terminating error for cast" {
+            Get-ItemProperty -Path $registryProviderSubkeyPath -ErrorVariable err -ErrorAction SilentlyContinue
+            $err | Should -HaveCount 1
+            $err[0].Exception | Should -BeOfType [System.InvalidCastException]
+            $err[0].TargetObject | Should -BeExactly $registrySubkeyPath
+            $err[0].CategoryInfo.Category | Should -BeExactly 'ReadError'
+            $err[0].FullyQualifiedErrorId | Should -BeExactly 'System.InvalidCastException,Microsoft.PowerShell.Commands.GetItemPropertyCommand'
+        }
+
+        It "Validate terminating error for cast" {
+            { Get-ItemProperty -Path $registryProviderSubkeyPath -ErrorAction Stop } | Should -Throw -ErrorId 'System.InvalidCastException,Microsoft.PowerShell.Commands.GetItemPropertyCommand'
+        }
+
+        AfterAll {
+            if ($IsWindows) {
+                reg.exe delete $registrySubkeyPath /f
+            }
+        }
+    }
 }
 
 } finally {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Computer.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Computer.Tests.ps1
index 82f944612f9..f1937f824a6 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Computer.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Computer.Tests.ps1
@@ -7,6 +7,7 @@ $DefaultResultValue = 0
 try
 {
     # set up for testing
+    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
     $PSDefaultParameterValues["it:skip"] = ! $IsWindows
     Enable-Testhook -testhookName $RenameTesthook
     # we also set TestStopComputer
@@ -73,7 +74,7 @@ try
 }
 finally
 {
-    $PSDefaultParameterValues.Remove("it:skip")
+    $global:PSDefaultParameterValues = $originalDefaultParameterValues
     Disable-Testhook -testhookName $RenameTestHook
     Disable-Testhook -testhookName TestStopComputer
     Set-TesthookResult -testhookName $RenameResultName -value 0
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1
index efd2441e0a7..9e38d1f8c20 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Resolve-Path.Tests.ps1
@@ -16,6 +16,25 @@ Describe "Resolve-Path returns proper path" -Tag "CI" {
             @{ wd = $fakeRoot; target = $testRoot; expected = $testRoot }
             @{ wd = $testRoot; target = Join-Path $fakeRoot "file.txt"; expected = Join-Path "." "fakeroot" "file.txt" }
         )
+
+        $hiddenFilePrefix = ($IsLinux -or $IsMacOS) ? '.' : ''
+
+        $hiddenFilePath1 = Join-Path -Path $TestDrive -ChildPath "$($hiddenFilePrefix)test1.txt"
+        $hiddenFilePath2 = Join-Path -Path $TestDrive -ChildPath "$($hiddenFilePrefix)test2.txt"
+
+        $hiddenFile1 = New-Item -Path $hiddenFilePath1 -ItemType File
+        $hiddenFile2 = New-Item -Path $hiddenFilePath2 -ItemType File
+
+        $relativeHiddenFilePath1 = ".$([System.IO.Path]::DirectorySeparatorChar)$($hiddenFilePrefix)test1.txt"
+        $relativeHiddenFilePath2 = ".$([System.IO.Path]::DirectorySeparatorChar)$($hiddenFilePrefix)test2.txt"
+
+        if ($IsWindows) {
+            $hiddenFile1.Attributes = "Hidden"
+            $hiddenFile2.Attributes = "Hidden"
+        }
+
+        $hiddenFileWildcardPath = Join-Path -Path $TestDrive -ChildPath "$($hiddenFilePrefix)test*.txt"
+        $relativeHiddenFileWildcardPath = ".$([System.IO.Path]::DirectorySeparatorChar)$($hiddenFilePrefix)test*.txt"
     }
     AfterAll {
         Remove-PSDrive -Name $driveName -Force
@@ -86,7 +105,7 @@ Describe "Resolve-Path returns proper path" -Tag "CI" {
         }
     ) -Test {
         param($Path, $BasePath, $Expected, $CD)
-        
+
         if ($null -eq $Expected)
         {
             {Resolve-Path -Path $Path -RelativeBasePath $BasePath -ErrorAction Stop} | Should -Throw -ErrorId "PathNotFound,Microsoft.PowerShell.Commands.ResolvePathCommand"
@@ -114,4 +133,46 @@ Describe "Resolve-Path returns proper path" -Tag "CI" {
             }
         }
     }
+
+    It "Resolve-Path -Path '<Path>' -RelativeBasePath '<BasePath>' -Force:<Force> should return '<ExpectedResult>'" -TestCases @(
+        @{
+            Path           = $relativeHiddenFilePath1
+            BasePath       = $TestDrive
+            Force          = $false
+            ExpectedResult = $hiddenFilePath1
+        }
+        @{
+            Path           = $relativeHiddenFilePath2
+            BasePath       = $TestDrive
+            Force          = $false
+            ExpectedResult = $hiddenFilePath2
+        }
+        @{
+            Path           = $relativeHiddenFileWildcardPath
+            BasePath       = $TestDrive
+            Force          = $false
+            ExpectedResult = $null
+        }
+        @{
+            Path           = $relativeHiddenFilePath1
+            BasePath       = $TestDrive
+            Force          = $true
+            ExpectedResult = $hiddenFilePath1
+        }
+        @{
+            Path           = $relativeHiddenFilePath2
+            BasePath       = $TestDrive
+            Force          = $true
+            ExpectedResult = $hiddenFilePath2
+        }
+        @{
+            Path           = $relativeHiddenFileWildcardPath
+            BasePath       = $TestDrive
+            Force          = $true
+            ExpectedResult = @($hiddenFilePath1, $hiddenFilePath2)
+        }
+    ) {
+        param($Path, $BasePath, $Force, $ExpectedResult)
+        (Resolve-Path -Path $Path -RelativeBasePath $BasePath -Force:$Force).Path | Should -BeExactly $ExpectedResult
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Service.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Service.Tests.ps1
index 2c5f0fed3ee..bcb7a56ccde 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Service.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Service.Tests.ps1
@@ -1,5 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Import-Module (Join-Path -Path $PSScriptRoot '..\Microsoft.PowerShell.Security\certificateCommon.psm1')
 
 Describe "Set/New/Remove-Service cmdlet tests" -Tags "Feature", "RequireAdminOnWindows" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1
index b9537a4a961..e34126b101f 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Split-Path.Tests.ps1
@@ -96,7 +96,33 @@ Describe "Split-Path" -Tags "CI" {
 	Split-Path -Parent "\\server1\share1"        | Should -BeExactly "${dirSep}${dirSep}server1"
     }
 
-    It 'Does not split a drive leter'{
-    Split-Path -Path 'C:\' | Should -BeNullOrEmpty
+    It 'Does not split a drive letter' {
+        Split-Path -Path 'C:\' | Should -BeNullOrEmpty
+    }
+
+    It "Should handle explicit -Qualifier:`$false parameter value correctly" {
+        # When -Qualifier:$false is specified, it should behave like -Parent (default)
+        # For env:PATH, the parent is empty string
+        $result = Split-Path -Path "env:PATH" -Qualifier:$false
+        $result | Should -BeNullOrEmpty
+    }
+
+    It "Should handle explicit -NoQualifier:`$false parameter value correctly" {
+        # When -NoQualifier:$false is specified, it should behave like -Parent (default)
+        # For env:PATH with no qualifier, we expect empty string (parent of PATH in env drive)
+        $result = Split-Path -Path "env:PATH" -NoQualifier:$false
+        $result | Should -BeNullOrEmpty
+    }
+
+    It "Should handle explicit -Leaf:`$false parameter value correctly" {
+        # When -Leaf:$false is specified, it should behave like -Parent (default)
+        $dirSep = [string]([System.IO.Path]::DirectorySeparatorChar)
+        Split-Path -Path "/usr/bin" -Leaf:$false | Should -BeExactly "${dirSep}usr"
+    }
+
+    It "Should handle explicit -IsAbsolute:`$false parameter value correctly" {
+        # When -IsAbsolute:$false is specified, it should behave like -Parent (default)
+        $dirSep = [string]([System.IO.Path]::DirectorySeparatorChar)
+        Split-Path -Path "fs:/usr/bin" -IsAbsolute:$false | Should -BeExactly "fs:${dirSep}usr"
     }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1
index 30bc1e676dc..65dd74e1b94 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1
@@ -115,6 +115,11 @@ Describe "Start-Process" -Tag "Feature","RequireAdminOnWindows" {
         { Start-Process -FilePath $pingCommand -NoNewWindow -WindowStyle Normal -ErrorAction Stop } | Should -Throw -ErrorId "InvalidOperationException,Microsoft.PowerShell.Commands.StartProcessCommand"
     }
 
+    It "ExitCode returns with -NoNewWindow, -PassThru and -Wait" {
+        $process = Start-Process -FilePath $pingCommand -ArgumentList $pingParam -NoNewWindow -PassThru -Wait -ErrorAction Stop
+        $process.ExitCode | Should -Be 0
+    }
+
     It "Should start cmd.exe with Verb 'open' and WindowStyle 'Minimized'" -Skip:(!$isFullWin) {
         $fileToWrite = Join-Path $TestDrive "VerbTest.txt"
         $process = Start-Process cmd.exe -ArgumentList "/c echo abc > $fileToWrite" -Verb open -WindowStyle Minimized -PassThru
@@ -236,3 +241,17 @@ Describe "Environment Tests" -Tags "Feature" {
         }
     }
 }
+
+Describe "Bug fixes" -Tags "CI" {
+
+    ## https://github.com/PowerShell/PowerShell/issues/24986
+    It "Error redirection along with '-NoNewWindow' should work for Start-Process" -Skip:(!$IsWindows) {
+        $errorFile = Join-Path -Path $TestDrive -ChildPath error.txt
+        $out = pwsh -noprofile -c "Start-Process -Wait -NoNewWindow -RedirectStandardError $errorFile -FilePath cmd -ArgumentList '/C echo Hello'"
+
+        ## 'Hello' should be sent to standard output; 'error.txt' file should be created but empty.
+        $out | Should -BeExactly "Hello"
+        Test-Path -Path $errorFile | Should -BeTrue
+        (Get-Item $errorFile).Length | Should -Be 0
+    }
+}
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 c7584293422..ad01b461b55 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
@@ -258,6 +258,15 @@ Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
                 $pingResults.Where( { $_.Status -eq 'Success' }, 'Default', 1 ).BufferSize | Should -Be 32
             }
         }
+
+        It "Repeat with explicit false should behave like default ping" {
+            # -Repeat:$false should behave the same as not specifying -Repeat
+            $pingResults = Test-Connection $targetAddress -Repeat:$false
+            
+            # Should get exactly 4 pings (the default Count value)
+            $pingResults.Count | Should -Be 4
+            $pingResults[0].Address | Should -BeExactly $targetAddress
+        }
     }
 
     Context "MTUSizeDetect" {
@@ -271,12 +280,18 @@ Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
                 return
             }
 
-            $result = Test-Connection $testAddress -MtuSize
+            # if we time out, that's a terminating exception, so set erroraction to continue
+            $result = Test-Connection $testAddress -MtuSize -ErrorVariable eVar -ErrorAction Continue
 
-            $result | Should -BeOfType Microsoft.PowerShell.Commands.TestConnectionCommand+PingMtuStatus
-            $result.Destination | Should -BeExactly $testAddress
-            $result.Status | Should -BeExactly "Success"
-            $result.MtuSize | Should -BeGreaterThan 0
+            if ($eVar.TargetObject.Status -eq "TimedOut") {
+                Set-ItResult -skipped -because "timed out"
+            }
+            else {
+                $result | Should -BeOfType Microsoft.PowerShell.Commands.TestConnectionCommand+PingMtuStatus
+                $result.Destination | Should -BeExactly $testAddress
+                $result.Status | Should -BeExactly "Success"
+                $result.MtuSize | Should -BeGreaterThan 0
+            }
         }
 
         It "Quiet works" {
@@ -285,6 +300,16 @@ Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
             $result | Should -BeOfType Int32
             $result | Should -BeGreaterThan 0
         }
+
+        It "MtuSize with explicit false should behave like default ping" {
+            # -MtuSize:$false should behave the same as not specifying -MtuSize (default ping)
+            $pingResults = Test-Connection $targetAddress -MtuSize:$false
+            
+            # Should return PingStatus, not PingMtuStatus
+            $pingResults[0] | Should -BeOfType Microsoft.PowerShell.Commands.TestConnectionCommand+PingStatus
+            # Should get 4 pings (the default Count value)
+            $pingResults.Count | Should -Be 4
+        }
     }
 
     Context "TraceRoute" {
@@ -326,6 +351,16 @@ Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
 
             $results.Hostname | Should -Not -BeNullOrEmpty
         }
+
+        It "Traceroute with explicit false should behave like default ping" {
+            # -Traceroute:$false should behave the same as not specifying -Traceroute (default ping)
+            $pingResults = Test-Connection $targetAddress -Traceroute:$false
+            
+            # Should return PingStatus, not TraceStatus
+            $pingResults[0] | Should -BeOfType Microsoft.PowerShell.Commands.TestConnectionCommand+PingStatus
+            # Should get 4 pings (the default Count value)
+            $pingResults.Count | Should -Be 4
+        }
     }
 }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Path.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Path.Tests.ps1
index edad763fe71..c3d1ded769f 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Path.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Path.Tests.ps1
@@ -12,6 +12,24 @@ Describe "Test-Path" -Tags "CI" {
 
         $nonExistentDir = Join-Path -Path (Join-Path -Path $testdirectory -ChildPath usr) -ChildPath bin
         $nonExistentPath = Join-Path -Path (Join-Path -Path (Join-Path -Path $testdirectory -ChildPath usr) -ChildPath bin) -ChildPath error
+
+        $today = Get-Date
+        $oneDayOld = (Get-Date).AddDays(-1)
+        $twoDaysOld = (Get-Date).AddDays(-2)
+
+        $oldFilePath = Join-Path -Path $testdirectory -ChildPath oldfile
+        $oldFile = New-Item -Path $oldFilePath -ItemType File
+        $oldFile.LastWriteTime = $oneDayOld
+
+        $oldDirPath = Join-Path -Path $testdirectory -ChildPath olddir
+        $oldDir = New-Item -Path $oldDirPath -ItemType Directory
+        $oldDir.LastWriteTime = $oneDayOld
+
+        $newFilePath = Join-Path -Path $testdirectory -ChildPath newfile
+        New-Item -Path $newFilePath -ItemType File | Out-Null
+
+        $newDirPath = Join-Path -Path $testdirectory -ChildPath newdir
+        New-Item -Path $newDirPath -ItemType Directory | Out-Null
     }
 
     It "Should be called on an existing path without error" {
@@ -110,6 +128,48 @@ Describe "Test-Path" -Tags "CI" {
         Test-Path -Path $badPath -IsValid | Should -BeFalse
     }
 
+    It 'Windows paths should be valid: <path>' -skip:(!$IsWindows) -TestCases @(
+        @{ path = "C:\Program Files" }
+        @{ path = "C:\Program Files (x86)\" }
+        @{ path = "filesystem::z:\foo" }
+        @{ path = "filesystem::z:\foo\" }
+        @{ path = "variable::psversiontable" }
+        @{ path = "c:\windows\cmd.exe:test" }
+    ) {
+        param($path)
+        Test-Path -Path $path -IsValid | Should -BeTrue
+    }
+
+    It 'Windows paths should be inavlid: <variant>' -Skip:(!$IsWindows) -TestCases @(
+        @{ variant = "wildcard"; path = "C:\Program Files\foo*" }
+        @{ variant = "pipe symbol"; path = "C:\Program Files|p\foo" }
+        @{ variant = "null char"; path = "C:\Win`u{0000}dows\System32" }
+    ) {
+        param($path)
+        Test-Path -Path $path -IsValid | Should -BeFalse
+    }
+
+    It 'Unix paths should be valid: <path>' -Skip:($IsWindows) -TestCases @(
+        @{ path = "/usr/bin" }
+        @{ path = "/usr/bin/" }
+        @{ path = "filesystem::/usr/bin" }
+        @{ path = "filesystem::/usr/bin/" }
+        @{ path = "variable::psversiontable" }
+        @{ path = "/usr/bi*n/test" }
+        @{ path = "/usr/bin/tes*t" }
+    ) {
+        param($path)
+        Test-Path -Path $path -IsValid | Should -BeTrue
+    }
+
+    It 'Unix paths should be invalid: <variant>' -Skip:($IsWindows) -TestCases @(
+        @{ variant = "null in path"; path = "/usr/bi`u{0000}n/test" }
+        @{ variant = "null in filename"; path = "/usr/bin/t`u{0000}est" }
+    ) {
+        param($path)
+        Test-Path -Path $path -IsValid | Should -BeFalse
+    }
+
     It "Should return true on paths containing spaces when the path is surrounded in quotes" {
         Test-Path -Path "/totally a valid/path" -IsValid | Should -BeTrue
     }
@@ -141,4 +201,57 @@ Describe "Test-Path" -Tags "CI" {
         Test-Path Env:\PATH  | Should -BeTrue
     }
 
+    It "Should return true if NewerThan is used and path is newer than one day" {
+        Test-Path -Path $newFilePath -PathType Leaf -NewerThan $oneDayOld | Should -BeTrue
+        Test-Path -Path $newDirPath -PathType Container -NewerThan $oneDayOld | Should -BeTrue
+        Test-Path -Path $newFilePath -PathType Any -NewerThan $oneDayOld | Should -BeTrue
+        Test-Path -Path $newDirPath -PathType Any -NewerThan $oneDayOld | Should -BeTrue
+        Test-Path -Path $newFilePath -NewerThan $oneDayOld | Should -BeTrue
+        Test-Path -Path $newDirPath -NewerThan $oneDayOld | Should -BeTrue
+    }
+
+    It "Should return false if NewerThan is used and path is not newer than today" {
+        Test-Path -Path $oldFilePath -PathType Leaf -NewerThan $today | Should -BeFalse
+        Test-Path -Path $oldDirPath -PathType Container -NewerThan $today | Should -BeFalse
+        Test-Path -Path $oldFilePath -PathType Any -NewerThan $today | Should -BeFalse
+        Test-Path -Path $oldDirPath -PathType Any -NewerThan $today | Should -BeFalse
+        Test-Path -Path $oldFilePath -NewerThan $today | Should -BeFalse
+        Test-Path -Path $oldDirPath -NewerThan $today | Should -BeFalse
+    }
+
+    It "Should return true if OlderThan is used and path is older than today" {
+        Test-Path -Path $oldFilePath -PathType Leaf -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldDirPath -PathType Container -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldFilePath -PathType Any -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldDirPath -PathType Any -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldFilePath -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldDirPath -OlderThan $today | Should -BeTrue
+    }
+
+    It "Should return false if OlderThan is used and path is not older than one day" {
+        Test-Path -Path $newFilePath -PathType Leaf -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newDirPath -PathType Container -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newFilePath -PathType Any -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newDirPath -PathType Any -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newFilePath -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newDirPath -OlderThan $oneDayOld | Should -BeFalse
+    }
+
+    It "Should return true if OlderThan and NewerThan is used together and path exists in date range" {
+        Test-Path -Path $oldFilePath -PathType Leaf -NewerThan $twoDaysOld -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldDirPath -PathType Container -NewerThan $twoDaysOld -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldFilePath -PathType Any -NewerThan $twoDaysOld -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldDirPath -PathType Any -NewerThan $twoDaysOld -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldFilePath -NewerThan $twoDaysOld -OlderThan $today | Should -BeTrue
+        Test-Path -Path $oldDirPath -NewerThan $twoDaysOld -OlderThan $today | Should -BeTrue
+    }
+
+    It "Should return false if OlderThan and NewerThan is used together and path does not exist in date range" {
+        Test-Path -Path $newFilePath -PathType Leaf -NewerThan $twoDaysOld -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newDirPath -PathType Container -NewerThan $twoDaysOld -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newFilePath -PathType Any -NewerThan $twoDaysOld -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newDirPath -PathType Any -NewerThan $twoDaysOld -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newFilePath -NewerThan $twoDaysOld -OlderThan $oneDayOld | Should -BeFalse
+        Test-Path -Path $newDirPath -NewerThan $twoDaysOld -OlderThan $oneDayOld | Should -BeFalse
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/TimeZone.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/TimeZone.Tests.ps1
index 5a23c7df75a..a3904fca41f 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/TimeZone.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/TimeZone.Tests.ps1
@@ -71,6 +71,12 @@ Describe "Get-Timezone test cases" -Tags "CI" {
         $oneExpectedOffset | Should -BeIn $observedIdList
     }
 
+    It "Call with -ListAvailable:`$false returns current TimeZoneInfo (not list)" {
+        $result = Get-TimeZone -ListAvailable:$false
+        $result | Should -BeOfType TimeZoneInfo
+        $result.Id | Should -Be ([System.TimeZoneInfo]::Local).Id
+    }
+
     It "Call Get-TimeZone using ID param and single item" {
         $selectedTZ = $TimeZonesAvailable[0]
         (Get-TimeZone -Id $selectedTZ.Id).Id | Should -Be $selectedTZ.Id
diff --git a/test/powershell/Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.Tests.ps1
index 9a6a7715786..9285281daec 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.Tests.ps1
@@ -5,8 +5,22 @@
 $ProgressPreference = "SilentlyContinue"
 
 $RepositoryName = 'PSGallery'
+$ACRRepositoryName = "ACRRepo"
+$ACRRepoUri = "https://psresourcegettest.azurecr.io/"
+$LocalRepoName = 'LocalRepo'
+$TempDir = 'TempDir'
+$LocalRepoUri = Microsoft.PowerShell.Management\Join-Path -Path $TempDir -ChildPath 'TempLocalRepoUri'
 $TestModule = 'newTestModule'
 $TestScript = 'TestTestScript'
+$ACRTestModule = 'newTestMod'
+
+$PublishedNupkgs = Microsoft.PowerShell.Management\Join-Path -Path $TempDir -ChildPath 'PublishedNupkgs'
+$TestModuleNupkgName = "$TestModule.0.0.1.nupkg"
+$TestModuleNupkgPath = Microsoft.PowerShell.Management\Join-Path -Path $PublishedNupkgs -ChildPath $TestModuleNupkgName
+$TestScriptPath = "$TestScript.ps1"
+$TestScriptNupkgName = "$TestScript.0.0.1.nupkg"
+$TestScriptNupkgPath = Microsoft.PowerShell.Management\Join-Path -Path $PublishedNupkgs -ChildPath $TestScriptNupkgName
+
 $Initialized = $false
 
 #region Install locations for modules and scripts
@@ -68,6 +82,11 @@ if (!(Test-Path $script:MyDocumentsScriptsPath)) {
 
 function Initialize
 {
+    if(!(Test-Path $TempDir))
+    {
+        New-Item -Path $TempDir -ItemType Directory
+    }
+
     $repo = Get-PSResourceRepository $RepositoryName -ErrorAction SilentlyContinue
     if($repo)
     {
@@ -77,6 +96,29 @@ function Initialize
     {
         Register-PSResourceRepository -PSGallery -Trusted
     }
+
+    $acrTests = $env:ACRTESTS -eq 'true'
+
+    if ($acrTests)
+    {
+        if ($null -eq $env:TENANTID)
+        {
+            Write-Error "The TENANTID environment variable must be set for ACR tests."
+            return
+        }
+
+        $psCredInfo = New-Object Microsoft.PowerShell.PSResourceGet.UtilClasses.PSCredentialInfo ("SecretStore", "$env:TENANTID")
+        Register-PSResourceRepository -Name $ACRRepositoryName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose -Trusted -Force
+    }
+}
+
+function Register-LocalRepo
+{
+    if (!(Test-Path $LocalRepoUri)) {
+        New-Item -Path $LocalRepoUri -ItemType Directory
+    }
+
+    Register-PSResourceRepository -Name $LocalRepoName -Uri $LocalRepoUri -Trusted -Force
 }
 
 #endregion
@@ -86,6 +128,28 @@ function Remove-InstalledModules
     Get-InstalledPSResource -Name $TestModule -Version '*' -ErrorAction SilentlyContinue | Microsoft.PowerShell.PSResourceGet\Uninstall-PSResource
 }
 
+function New-TestPackages
+{
+    if (!(Test-Path $PublishedNupkgs)) {
+        New-Item $PublishedNupkgs -ItemType Directory
+    }
+
+    if (!(Test-Path $TestModule)) {
+        New-Item $TestModule -ItemType Directory
+    }
+
+    $moduleManifestPath = Join-Path $TestModule -ChildPath "$TestModule.psd1"
+    if (!(Test-Path $moduleManifestPath))
+    {
+        New-ModuleManifest $moduleManifestPath -Description "Test module for PowerShell CI" -Author "PSGetAuthor"
+    }
+
+    if (!(Test-Path $TestScriptPath))
+    {
+        New-ScriptFileInfo -Path $TestScriptPath -Description "Test script for PowerShell CI" -Author "PSGetAuthor"
+    }
+}
+
 Describe "PSResourceGet - Module tests" -tags "Feature" {
 
     BeforeAll {
@@ -93,6 +157,9 @@ Describe "PSResourceGet - Module tests" -tags "Feature" {
             Initialize
             $script:Initialized = $true
         }
+
+        Register-LocalRepo
+        New-TestPackages
     }
 
     BeforeEach {
@@ -120,6 +187,39 @@ Describe "PSResourceGet - Module tests" -tags "Feature" {
         }
     }
 
+    It "Should publish a module" {
+        Publish-PSResource -Path $TestModule -Repository $LocalRepoName
+
+        $foundModuleInfo = Find-PSResource $TestModule -Repository $LocalRepoName
+        $foundModuleInfo | Should -Not -BeNullOrEmpty
+        $foundModuleInfo.Count | Should -Be 1
+        $foundModuleInfo.Name | Should -Be $TestModule
+    }
+
+    It "Should compress a module into a .nupkg" {
+        Compress-PSResource -Path $TestModule -DestinationPath (Resolve-Path -Path $PublishedNupkgs)
+        
+        $modulePublished = Get-ChildItem $TestModuleNupkgPath
+        $modulePublished | Should -Not -BeNullOrEmpty
+        $modulePublished.Name | Should -Be $TestModuleNupkgName
+    }
+
+    It "Should publish compressed .nupkg" {
+        Compress-PSResource -Path $TestModule -DestinationPath (Resolve-Path -Path $PublishedNupkgs)
+
+        Publish-PSResource -NupkgPath $TestModuleNupkgPath -Repository $LocalRepoName
+
+        $foundModuleInfo = Find-PSResource $TestModule -Repository $LocalRepoName
+        $foundModuleInfo | Should -Not -BeNullOrEmpty
+        $foundModuleInfo.Count | Should -Be 1
+        $foundModuleInfo.Name | Should -Be $TestModule
+    }
+
+    AfterEach {
+        Get-ChildItem $PublishedNupkgs | Remove-Item -Recurse -Force
+        Get-ChildItem $LocalRepoUri | Remove-Item -Recurse -Force
+    }
+
     AfterAll {
         Remove-InstalledModules
     }
@@ -139,7 +239,7 @@ Describe "PSResourceGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     It "Should install a module correctly to the required location with AllUsers scope" {
-        Install-PSResource -Name $TestModule -Repository $RepositoryName -Scope AllUsers
+        Install-PSResource -Name $TestModule -Repository $RepositoryName -Scope AllUsers -ErrorAction Stop
 
         $module = Get-Module $TestModule -ListAvailable
         $module.Name | Should -Be $TestModule
@@ -163,6 +263,9 @@ Describe "PSResourceGet - Script tests" -tags "Feature" {
             Initialize
             $script:Initialized = $true
         }
+
+        Register-LocalRepo
+        New-TestPackages
     }
 
     BeforeEach {
@@ -187,6 +290,20 @@ Describe "PSResourceGet - Script tests" -tags "Feature" {
         }
     }
 
+    It "Should publish a script" {
+        Publish-PSResource -Path $TestScriptPath -Repository $LocalRepoName
+
+        $foundScriptInfo = Find-PSResource $TestScript -Repository $LocalRepoName
+        $foundScriptInfo | Should -Not -BeNullOrEmpty
+        $foundScriptInfo.Count | Should -Be 1
+        $foundScriptInfo.Name | Should -Be $TestScript
+    }
+
+    AfterEach {
+        Get-ChildItem $PublishedNupkgs | Remove-Item -Recurse -Force
+        Get-ChildItem $LocalRepoUri | Remove-Item -Recurse -Force
+    }
+
     AfterAll {
         Remove-InstalledScripts
     }
@@ -206,10 +323,84 @@ Describe "PSResourceGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     It "Should install a script correctly to the required location with AllUsers scope" {
-        Install-PSResource -Name $TestScript -Repository $RepositoryName -Scope AllUsers
+        Install-PSResource -Name $TestScript -Repository $RepositoryName -Scope AllUsers -ErrorAction Stop
     }
 
     AfterAll {
         Remove-InstalledScripts
     }
 }
+
+function FinalCleanUp
+{
+    if(Test-Path $TempDir)
+    {
+        Remove-Item -Path $TempDir -Recurse -Force
+    }
+}
+
+Describe "PSResourceGet - ACR tests" -tags "Feature" {
+
+    BeforeAll {
+        if ($env:ACRTESTS -ne 'true') {
+            return
+        }
+
+        if ($script:Initialized -eq $false) {
+            Initialize
+            $script:Initialized = $true
+        }
+    }
+
+    BeforeEach {
+        if ($env:ACRTESTS -ne 'true') {
+            return
+        }
+
+        Remove-InstalledModules
+    }
+
+    It "Should find a module correctly" {
+        $isSkipped = $env:ACRTESTS -ne 'true'
+
+        Write-Verbose -Verbose "Test - Skipping = $isSkipped"
+
+        if ($isSkipped) {
+            Set-ItResult -Skipped -Because "The tests require the ACRTESTS environment variable to be set to 'true' for ACR authentication."
+        }
+
+        $psgetModuleInfo = Find-PSResource -Name $ACRTestModule -Repository $ACRRepositoryName
+        $psgetModuleInfo.Name | Should -Be $ACRTestModule
+        $psgetModuleInfo.Repository | Should -Be $ACRRepositoryName
+    }
+
+    It "Should install a module correctly to the required location with default CurrentUser scope" {
+        $isSkipped = $env:ACRTESTS -ne 'true'
+
+        if ($isSkipped) {
+            Set-ItResult -Skipped:$isSkipped -Because "The tests require the ACRTESTS environment variable to be set to 'true' for ACR authentication."
+        }
+
+        Install-PSResource -Name $ACRTestModule -Repository $ACRRepositoryName
+        $installedModuleInfo = Get-InstalledPSResource -Name $ACRTestModule
+
+        if (!$IsMacOS) {
+            $installedModuleInfo | Should -Not -BeNullOrEmpty
+            $installedModuleInfo.Name | Should -Be $ACRTestModule
+            $installedModuleInfo.InstalledLocation.StartsWith($script:MyDocumentsModulesPath, [System.StringComparison]::OrdinalIgnoreCase) | Should -BeTrue
+
+            $module = Get-Module $ACRTestModule -ListAvailable
+            $module.Name | Should -Be $ACRTestModule
+            $module.ModuleBase.StartsWith($script:MyDocumentsModulesPath, [System.StringComparison]::OrdinalIgnoreCase) | Should -BeTrue
+        }
+    }
+
+    AfterAll {
+        if ($env:ACRTESTS -ne 'true') {
+            return
+        }
+
+        Remove-InstalledModules
+        FinalCleanUp
+    }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1
index f523b2f575f..52938a0b881 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1
@@ -3,6 +3,7 @@
 Describe "Acl cmdlets are available and operate properly" -Tag CI {
     Context "Windows ACL test" {
         BeforeAll {
+            $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
             $PSDefaultParameterValues["It:Skip"] = -not $IsWindows
         }
 
@@ -77,8 +78,33 @@ Describe "Acl cmdlets are available and operate properly" -Tag CI {
             $newrule | Should -Not -BeNullOrEmpty
         }
 
+        It "Can edit SD that contains an orphaned SID" {
+            $badSid = [System.Security.Principal.SecurityIdentifier]::new("S-1-5-1234-5678")
+            $currentUserSid = [System.Security.Principal.WindowsIdentity]::GetCurrent().User
+
+            $testFilePath = "TestDrive:\pwsh-acl-test.txt"
+            $testFile = New-Item -Path $testFilePath -ItemType File -Value 'foo' -Force
+
+            # We should be able to set an SD entry to an untranslatable SID
+            $fileSecurity = $testFilePath | Get-Acl
+            $fileSecurity.SetGroup($badSid)
+            Set-Acl -Path $testFile -AclObject $fileSecurity
+
+            # We should be able to get the SD with an untranslatable SID
+            $setSD = Get-Acl -Path $testFile
+            $setSD.GetGroup([System.Security.Principal.SecurityIdentifier]) | Should -Be $badSid
+
+            # We should be able to set it back to a known SID
+            $setSD.SetGroup($currentUserSid)
+            Set-Acl -Path $testFile -AclObject $setSD
+
+            $actual = Get-Acl -Path $testFile
+            $actualGroup = $actual.GetGroup([System.Security.Principal.SecurityIdentifier])
+            $actualGroup | Should -Be $currentUserSid
+        }
+
         AfterAll {
-            $PSDefaultParameterValues.Remove("It:Skip")
+            $global:PSDefaultParameterValues = $originalDefaultParameterValues
         }
     }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/CertificateProvider.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/CertificateProvider.Tests.ps1
index c6c468e5f0b..191443bde9e 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/CertificateProvider.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/CertificateProvider.Tests.ps1
@@ -292,4 +292,80 @@ Describe "Certificate Provider tests" -Tags "Feature" {
             $certs.Thumbprint | Should -BeExactly $thumbprint
         }
     }
+
+    Context "SAN DNS Name Tests" {
+        BeforeAll {
+            $configFilePath = Join-Path -Path $TestDrive -ChildPath 'openssl.cnf'
+            $keyFilePath = Join-Path -Path $TestDrive -ChildPath 'privateKey.key'
+            $certFilePath = Join-Path -Path $TestDrive -ChildPath 'certificate.crt'
+            $pfxFilePath = Join-Path -Path $TestDrive -ChildPath 'certificate.pfx'
+            $password = New-CertificatePassword | ConvertFrom-SecureString -AsPlainText
+
+            $config = @"
+            [ req ]
+            default_bits       = 2048
+            distinguished_name = req_distinguished_name
+            req_extensions     = v3_req
+            prompt             = no
+
+            [ req_distinguished_name ]
+            CN                 = yourdomain.com
+
+            [ v3_req ]
+            subjectAltName     = @alt_names
+
+            [ alt_names ]
+            DNS.1              = yourdomain.com
+            DNS.2              = www.yourdomain.com
+            DNS.3              = api.yourdomain.com
+            DNS.4              = xn--mnchen-3ya.com
+            DNS.5              = xn--80aaxitdbjr.com
+            DNS.6              = xn--caf-dma.com
+"@
+
+            # Write the configuration to the specified path
+            Set-Content -Path $configFilePath -Value $config
+
+            # Generate the self-signed certificate with SANs
+            openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout $keyFilePath -out $certFilePath -config $configFilePath -extensions v3_req
+
+            # Create the PFX file
+            openssl pkcs12 -export -out $pfxFilePath -inkey $keyFilePath -in $certFilePath -passout pass:$password
+        }
+
+        It "Should set DNSNameList from SAN extensions" {
+            $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($pfxFilePath, $password)
+
+            $expectedDnsNameList = @(
+                [PSCustomObject]@{
+                    Punycode = "yourdomain.com"
+                    Unicode  = "yourdomain.com"
+                }
+                [PSCustomObject]@{
+                    Punycode = "www.yourdomain.com"
+                    Unicode  = "www.yourdomain.com"
+                }
+                [PSCustomObject]@{
+                    Punycode = "api.yourdomain.com"
+                    Unicode  = "api.yourdomain.com"
+                }
+                [PSCustomObject]@{
+                    Punycode = "xn--mnchen-3ya.com"
+                    Unicode  = "münchen.com"
+                }
+                [PSCustomObject]@{
+                    Punycode = "xn--80aaxitdbjr.com"
+                    Unicode  = "папитрока.com"
+                }
+                [PSCustomObject]@{
+                    Punycode = "xn--caf-dma.com"
+                    Unicode  = "café.com"
+                }
+            )
+
+            $cert | Should -Not -BeNullOrEmpty
+            $cert.DnsNameList | Should -HaveCount 6
+            ($cert.DnsNameList | ConvertTo-Json -Compress)  | Should -BeExactly ($expectedDnsNameList | ConvertTo-Json -Compress)
+        }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/CmsMessage.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/CmsMessage.Tests.ps1
index 50cbdebab69..a40dfc8cfcd 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/CmsMessage.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/CmsMessage.Tests.ps1
@@ -1,5 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Import-Module (Join-Path -Path $PSScriptRoot 'certificateCommon.psm1') -Force
 
 Describe "CmsMessage cmdlets and Get-PfxCertificate basic tests" -Tags "CI" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
index 398bc492711..6fb97a46cab 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
@@ -460,7 +460,7 @@ try
             $rs.Open()
             $pl = $rs.CreatePipeline('"Hello" > c:\temp\foo.txt')
 
-            $e = { $pl.Invoke() } | Should -Throw -ErrorId "CmdletInvocationException"
+            $e = { $pl.Invoke() } | Should -Throw -ErrorId "DriveNotFoundException"
 
             $rs.Dispose()
         }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1
index b187dbb43e1..78775bdb1ff 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1
@@ -416,6 +416,52 @@ Describe "Test suite for NewFileCatalogAndTestFileCatalogCmdlets" -Tags "CI" {
             $catalogPath | Should -Not -Exist
         }
     }
+
+    Context "TestCatalog Executing File Validation Tests"{
+
+        AfterEach {
+            Remove-Item "$script:catalogPath" -Force -ErrorAction SilentlyContinue
+        }
+
+        It "Test-FileCatalog should pass when target file is an executing process" {
+            $processFolder =  (Get-Process -Id $pid).Path
+            $script:catalogPath = "$env:TEMP\TestCatalogExecutingFileValidation.cat"
+            $null = New-FileCatalog -Path "$processFolder" -CatalogFilePath $script:catalogPath -CatalogVersion 2
+            $result = Test-FileCatalog -Path "$processFolder" -CatalogFilePath $script:catalogPath
+            $result | Should -Be "Valid"
+        }
+    }
+
+    Context "TestCatalog File Open Validation Tests" {
+
+        BeforeEach {
+            $null = New-Item -ItemType Directory -Path "$env:TEMP\testCatalog" -Force -ErrorAction SilentlyContinue
+            Set-Content -PassThru "$env:TEMP\testCatalog\test.txt" -Value "Test Data" | Out-Null
+        }
+
+        AfterEach {
+            Remove-Item "$script:catalogPath" -Force -ErrorAction SilentlyContinue
+            Remove-Item "$env:TEMP\testCatalog" -Recurse -Force -ErrorAction SilentlyContinue
+        }
+
+        it "Test-FileCatalog should pass when target file has an open reader with FileMode Open FileAccess Read and FileShare <name>" -TestCases @(
+            @{ Name = "Read"; fileShareParameter = [System.IO.FileShare]::Read }
+            @{ Name = "ReadWrite"; fileShareParameter = [System.IO.FileShare]::ReadWrite }
+        ) {
+            param($name, [System.IO.FileShare] $fileShareParameter)
+
+            $script:catalogPath = "$env:TEMP\TestCatalogFileOpenValidation.cat"
+            $null = New-FileCatalog -Path "$env:TEMP\testCatalog\" -CatalogFilePath $script:catalogPath -CatalogVersion 2
+            $fileStream = [System.IO.File]::Open("$env:TEMP\testCatalog\test.txt", [System.IO.FileMode]::Open, [System.IO.FileAccess]::Read, $fileShareParameter)
+            try {
+                $result = Test-FileCatalog -Path "$env:TEMP\testCatalog\" -CatalogFilePath $script:catalogPath
+                $result | Should -Be "Valid"
+            } finally {
+                $fileStream.Close()
+                $fileStream.Dispose()
+            }
+        }
+    }
 }
 
 } finally {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1
index cb9d0ee70ed..fad8285aab3 100755
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1
@@ -1,5 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Describe "Get-Credential Test" -Tag "CI" {
     BeforeAll {
         $th = New-TestHost
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion1/UserConfigProviderModVersion1.psm1 b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion1/UserConfigProviderModVersion1.psm1
index fd85fef1552..45188075fbc 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion1/UserConfigProviderModVersion1.psm1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion1/UserConfigProviderModVersion1.psm1
@@ -5,56 +5,50 @@
 # This cmdlet executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). The result of the script execution is in the form of a hashtable containing all the information
 # gathered from the GetScript execution.
-function Get-TargetResource
-{
+function Get-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
-       [ValidateNotNullOrEmpty()]
-       [string]
-       $text
-     )
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Text
+    )
 
     $result = @{
-    	                            Text = "Hello from Get!";
-                }
-     $result;
+        Text = "Hello from Get!"
+    }
+
+    $result
   }
 
 # The Set-TargetResource cmdlet is used to Set the desired state of the DSC managed node through a powershell script.
 # The method executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). If the DSC managed node requires a restart either during or after the execution of the SetScript,
 # the SetScript notifies the PS Infrastructure by setting the variable $DSCMachineStatus.IsRestartRequired to $true.
-function Set-TargetResource
-{
+function Set-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
-       [ValidateNotNullOrEmpty()]
-       [string]
-       $text
-     )
-	$path = "$env:SystemDrive\dscTestPath\hello1.txt"
- 	New-Item -Path $path -Type File -Force
-	Add-Content -Path $path -Value $text
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Text
+    )
+    $path = "$env:SystemDrive\dscTestPath\hello1.txt"
+    New-Item -Path $path -Type File -Force
+    Add-Content -Path $path -Value $text
 }
 
 # The Test-TargetResource cmdlet is used to validate the desired state of the DSC managed node through a powershell script.
 # The method executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). The result of the script execution should be true if the DSC managed machine is in the desired state
 # or else false should be returned.
-function Test-TargetResource
-{
+function Test-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
+    param(
+       [Parameter(Mandatory = $true)]
        [ValidateNotNullOrEmpty()]
        [string]
-       $text
-     )
-	$false
+       $Text
+    )
+    $false
 }
-
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion2/UserConfigProviderModVersion2.psm1 b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion2/UserConfigProviderModVersion2.psm1
index d2f6a9ac719..05dbdcec7e1 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion2/UserConfigProviderModVersion2.psm1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion2/UserConfigProviderModVersion2.psm1
@@ -5,57 +5,51 @@
 # This cmdlet executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). The result of the script execution is in the form of a hashtable containing all the information
 # gathered from the GetScript execution.
-function Get-TargetResource
-{
+function Get-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
-       [ValidateNotNullOrEmpty()]
-       [string]
-       $text
-     )
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Text
+    )
 
     $result = @{
-    	                            Text = "Hello from Get!";
-                }
-     $result;
-  }
+        Text = "Hello from Get!"
+    }
+
+    $result
+}
 
 # The Set-TargetResource cmdlet is used to Set the desired state of the DSC managed node through a powershell script.
 # The method executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). If the DSC managed node requires a restart either during or after the execution of the SetScript,
 # the SetScript notifies the PS Infrastructure by setting the variable $DSCMachineStatus.IsRestartRequired to $true.
-function Set-TargetResource
-{
+function Set-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
-       [ValidateNotNullOrEmpty()]
-       [string]
-       $text
-     )
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Text
+    )
 
- 	$path = "$env:SystemDrive\dscTestPath\hello2.txt"
- 	New-Item -Path $path -Type File -Force
-	Add-Content -Path $path -Value $text
+    $path = "$env:SystemDrive\dscTestPath\hello2.txt"
+    New-Item -Path $path -Type File -Force
+    Add-Content -Path $path -Value $text
 }
 
 # The Test-TargetResource cmdlet is used to validate the desired state of the DSC managed node through a powershell script.
 # The method executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). The result of the script execution should be true if the DSC managed machine is in the desired state
 # or else false should be returned.
-function Test-TargetResource
-{
+function Test-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
-       [ValidateNotNullOrEmpty()]
-       [string]
-       $text
-     )
-	$false
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Text
+    )
+    $false
 }
-
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion3/UserConfigProviderModVersion3.psm1 b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion3/UserConfigProviderModVersion3.psm1
index 45987a71f76..134158d62a9 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion3/UserConfigProviderModVersion3.psm1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/UserConfigProviderModVersion3/UserConfigProviderModVersion3.psm1
@@ -5,57 +5,51 @@
 # This cmdlet executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). The result of the script execution is in the form of a hashtable containing all the information
 # gathered from the GetScript execution.
-function Get-TargetResource
-{
+function Get-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
+    param(
+       [Parameter(Mandatory = $true)]
        [ValidateNotNullOrEmpty()]
        [string]
-       $text
-     )
+       $Text
+    )
 
     $result = @{
-    	                            Text = "Hello from Get!";
-                }
-     $result;
-  }
+        Text = "Hello from Get!"
+    }
+
+    $result
+}
 
 # The Set-TargetResource cmdlet is used to Set the desired state of the DSC managed node through a powershell script.
 # The method executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). If the DSC managed node requires a restart either during or after the execution of the SetScript,
 # the SetScript notifies the PS Infrastructure by setting the variable $DSCMachineStatus.IsRestartRequired to $true.
-function Set-TargetResource
-{
+function Set-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
+    param(
+       [Parameter(Mandatory = $true)]
        [ValidateNotNullOrEmpty()]
        [string]
-       $text
-     )
+       $Text
+    )
 
- 	$path = "$env:SystemDrive\dscTestPath\hello3.txt"
- 	New-Item -Path $path -Type File -Force
-	Add-Content -Path $path -Value $text
+    $path = "$env:SystemDrive\dscTestPath\hello3.txt"
+    New-Item -Path $path -Type File -Force
+    Add-Content -Path $path -Value $text
 }
 
 # The Test-TargetResource cmdlet is used to validate the desired state of the DSC managed node through a powershell script.
 # The method executes the user supplied script (i.e., the script is responsible for validating the desired state of the
 # DSC managed node). The result of the script execution should be true if the DSC managed machine is in the desired state
 # or else false should be returned.
-function Test-TargetResource
-{
+function Test-TargetResource {
     [CmdletBinding()]
-     param
-     (
-       [parameter(Mandatory = $true)]
-       [ValidateNotNullOrEmpty()]
-       [string]
-       $text
-     )
-	$false
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Text
+    )
+    $false
 }
-
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1 b/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1
index 5601767a120..46092386fe3 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1
@@ -1,6 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Function New-GoodCertificate
 {
     <#
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 f03b29e4c82..aebdc37d1c2 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,7 @@ 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 } |
@@ -66,7 +66,7 @@ Describe 'ConvertFrom-Json Unit Tests' -tags "CI" {
         { 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
@@ -161,6 +161,227 @@ b                              2
 c                              3
 "@
     }
+
+    It 'Parses DateKind Default strings for <Value>' -TestCases @(
+        @{
+            Value = '"2022-11-02T12:01:44.5801388+04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours 4)).AddTicks(8).LocalDateTime)
+        }
+        @{
+            Value = '"2022-11-02T12:01:44.5801388-04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours -4)).AddTicks(8).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00"'
+            Expected = ([DateTime]::new(1970, 1, 1, 0, 0, 0, 0, 0, 'Unspecified'))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000Z"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).UtcDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 10)).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours -10)).LocalDateTime)
+        }
+    ) {
+        param ($Value, $Expected)
+
+        $json = $Value | ConvertFrom-Json
+        $json | Should -BeOfType ([DateTime])
+        $json.Kind | Should -Be $Expected.Kind
+        $json | Should -Be $Expected
+
+        $json = $Value | ConvertFrom-Json -DateKind Default
+        $json | Should -BeOfType ([DateTime])
+        $json.Kind | Should -Be $Expected.Kind
+        $json | Should -Be $Expected
+    }
+
+    It 'Parses DateKind Local strings for <Value>' -TestCases @(
+        @{
+            Value = '"2022-11-02T12:01:44.5801388+04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours 4)).AddTicks(8).LocalDateTime)
+        }
+        @{
+            Value = '"2022-11-02T12:01:44.5801388-04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours -4)).AddTicks(8).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00"'
+            Expected = ([DateTime]::new(1970, 1, 1, 0, 0, 0, 0, 0, 'Local'))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000Z"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 10)).LocalDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours -10)).LocalDateTime)
+        }
+    ) {
+        param ($Value, $Expected)
+
+        $json = $Value | ConvertFrom-Json -DateKind Local
+        $json | Should -BeOfType ([DateTime])
+        $json.Kind | Should -Be Local
+        $json | Should -Be $Expected
+    }
+
+    It 'Parses DateKind Utc strings for <Value>' -TestCases @(
+        @{
+            Value = '"2022-11-02T12:01:44.5801388+04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours 4)).AddTicks(8).UtcDateTime)
+        }
+        @{
+            Value = '"2022-11-02T12:01:44.5801388-04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours -4)).AddTicks(8).UtcDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00"'
+            Expected = ([DateTime]::new(1970, 1, 1, 0, 0, 0, 0, 0, 'Utc'))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000Z"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).UtcDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).UtcDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)).UtcDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 10)).UtcDateTime)
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours -10)).UtcDateTime)
+        }
+    ) {
+        param ($Value, $Expected)
+
+        $json = $Value | ConvertFrom-Json -DateKind Utc
+        $json | Should -BeOfType ([DateTime])
+        $json.Kind | Should -Be Utc
+        $json | Should -Be $Expected
+    }
+
+    It 'Parses DateKind Offset strings for <Value>' -TestCases @(
+        @{
+            Value = '"2022-11-02T12:01:44.5801388+04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours 4)).AddTicks(8))
+        }
+        @{
+            Value = '"2022-11-02T12:01:44.5801388-04:00"'
+            Expected = ([DateTimeOffset]::new(2022, 11, 2, 12, 1, 44, 580, 138, (New-TimeSpan -Hours -4)).AddTicks(8))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00"'
+            Expected = ([DateTimeOffset]::new([DateTime]::new(1970, 1, 1, 0, 0, 0, 0, 0, 'Local')))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000Z"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-00:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 0)))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000+10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours 10)))
+        }
+        @{
+            Value = '"1970-01-01T00:00:00.0000000-10:00"'
+            Expected = ([DateTimeOffset]::new(1970, 1, 1, 0, 0, 0, 0, 0, (New-TimeSpan -Hours -10)))
+        }
+    ) {
+        param ($Value, $Expected)
+
+        $json = $Value | ConvertFrom-Json -DateKind Offset
+        $json | Should -BeOfType ([DateTimeOffset])
+        $json.EqualsExact($Expected) | Should -BeTrue
+    }
+
+    It 'Parses DateKind String strings for <Value>' -TestCases @(
+        @{ Value = '"2022-11-02T12:01:44.5801388+04:00"' }
+        @{ Value = '"2022-11-02T12:01:44.5801388-04:00"' }
+        @{ Value = '"1970-01-01T00:00:00"' }
+        @{ Value = '"1970-01-01T00:00:00.0000000Z"' }
+        @{ Value = '"1970-01-01T00:00:00.0000000+00:00"' }
+        @{ Value = '"1970-01-01T00:00:00.0000000-00:00"' }
+        @{ Value = '"1970-01-01T00:00:00.0000000+10:00"' }
+        @{ Value = '"1970-01-01T00:00:00.0000000-10:00"' }
+    ) {
+        param ($Value)
+
+        $json = $Value | ConvertFrom-Json -DateKind String
+        $json | Should -BeOfType ([string])
+        $json | Should -Be $Value.Substring(1, $Value.Length - 2)
+    }
+
+    It 'Ignores comments in arrays' -TestCase $testCasesWithAndWithoutAsHashtableSwitch {
+        param($AsHashtable)
+
+        # https://github.com/powerShell/powerShell/issues/14553
+        '[
+            // comment
+            100,
+            /* comment */
+            200
+        ]' | ConvertFrom-Json -AsHashtable:$AsHashtable | Should -Be @(100, 200)
+    }
+
+    It 'Ignores comments in dictionaries' -TestCase $testCasesWithAndWithoutAsHashtableSwitch {
+        param($AsHashtable)
+
+        $json = '{
+            // comment
+            "a": 100,
+            /* comment */
+            "b": 200
+        }' | ConvertFrom-Json -AsHashtable:$AsHashtable
+
+        if ($AsHashtable) {
+            $json.Keys | Should -Be @("a", "b")
+        } else {
+            $json.psobject.Properties | Should -HaveCount 2
+        }
+
+        $json.a | Should -Be 100
+        $json.b | Should -Be 200
+    }
 }
 
 Describe 'ConvertFrom-Json -Depth Tests' -tags "Feature" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
index 0d484260813..bfba7718272 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
@@ -101,11 +101,6 @@ Describe "ConvertTo-Csv" -Tags "CI" {
             Should -Throw -ErrorId "CannotSpecifyQuoteFieldsAndUseQuotes,Microsoft.PowerShell.Commands.ConvertToCsvCommand"
     }
 
-    It "Does not support -IncludeTypeInformation and -NoTypeInformation at the same time" {
-        { $testObject | ConvertTo-Csv -IncludeTypeInformation -NoTypeInformation } |
-            Should -Throw -ErrorId "CannotSpecifyIncludeTypeInformationAndNoTypeInformation,Microsoft.PowerShell.Commands.ConvertToCsvCommand"
-    }
-
     Context "QuoteFields parameter" {
         It "QuoteFields" {
             # Use 'FiRstCoLumn' to test case insensitivity
@@ -212,6 +207,7 @@ Describe "ConvertTo-Csv" -Tags "CI" {
                 [ordered]@{ Number = $_; Letter = $Letters[$_] }
             }
             $CsvString = $Items | ConvertTo-Csv
+            $TestHashTable = [ordered]@{ 'first' = 'value1'; 'second' = $null; 'third' = 'value3' }
         }
 
         It 'should treat dictionary entries as properties' {
@@ -235,5 +231,12 @@ Describe "ConvertTo-Csv" -Tags "CI" {
             $NewCsvString[0] | Should -MatchExactly 'Extra'
             $NewCsvString | Select-Object -Skip 1 | Should -MatchExactly 'Surprise!'
         }
+
+        It 'should properly convert hashtable with null and non-null values'{
+            $CsvResult = $TestHashTable | ConvertTo-Csv
+
+            $CsvResult[0] | Should -BeExactly "`"first`",`"second`",`"third`""
+            $CsvResult[1] | Should -BeExactly "`"value1`",$null,`"value3`""
+        }
     }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.PSSerializeJSONLongEnumAsNumber.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.PSSerializeJSONLongEnumAsNumber.Tests.ps1
new file mode 100644
index 00000000000..d21b87ce221
--- /dev/null
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.PSSerializeJSONLongEnumAsNumber.Tests.ps1
@@ -0,0 +1,34 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+Describe 'ConvertTo-Json with PSSerializeJSONLongEnumAsNumber' -tags "CI" {
+
+    BeforeAll {
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues['It:Skip'] = -not [ExperimentalFeature]::IsEnabled('PSSerializeJSONLongEnumAsNumber')
+    }
+
+    AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
+    }
+
+    It 'Should treat enums as integers' {
+        enum LongEnum : long {
+            LongValue = -1
+        }
+
+        enum ULongEnum : ulong {
+            ULongValue = 18446744073709551615
+        }
+
+        $obj = [Ordered]@{
+            Long = [LongEnum]::LongValue
+            ULong = [ULongEnum]::ULongValue
+        }
+
+        $actual = ConvertTo-Json -InputObject $obj -Compress
+        $actual | Should -Be '{"Long":-1,"ULong":18446744073709551615}'
+
+        $actual = ConvertTo-Json -InputObject $obj -EnumsAsStrings -Compress
+        $actual | Should -Be '{"Long":"LongValue","ULong":"ULongValue"}'
+    }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
index c549975b32c..f1ddc43a220 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
@@ -146,4 +146,1748 @@ Describe 'ConvertTo-Json' -tags "CI" {
         $t = Add-Member -InputObject $text -MemberType NoteProperty -Name text -Value $text -PassThru
         $t | ConvertTo-Json -Compress | Should -BeExactly "`"$text`""
     }
+
+    It 'Should serialize BigInteger values' {
+        $obj = [Ordered]@{
+            Positive = 18446744073709551615n
+            Negative = -18446744073709551615n
+        }
+
+        $actual = ConvertTo-Json -Compress -InputObject $obj
+        $actual | Should -Be '{"Positive":18446744073709551615,"Negative":-18446744073709551615}'
+    }
+    #region Comprehensive Scalar Type Tests (Phase 1)
+    # Test coverage for ConvertTo-Json scalar serialization
+    # Covers: Pipeline vs InputObject, ETS vs no ETS, all primitive and special types
+
+    Context 'Primitive scalar types' {
+        It 'Should serialize <TypeName> value <Value> correctly via Pipeline and InputObject' -TestCases @(
+            # Byte types
+            @{ TypeName = 'byte'; Value = [byte]0; Expected = '0' }
+            @{ TypeName = 'byte'; Value = [byte]255; Expected = '255' }
+            @{ TypeName = 'sbyte'; Value = [sbyte]-128; Expected = '-128' }
+            @{ TypeName = 'sbyte'; Value = [sbyte]127; Expected = '127' }
+            # Short types
+            @{ TypeName = 'short'; Value = [short]-32768; Expected = '-32768' }
+            @{ TypeName = 'short'; Value = [short]32767; Expected = '32767' }
+            @{ TypeName = 'ushort'; Value = [ushort]0; Expected = '0' }
+            @{ TypeName = 'ushort'; Value = [ushort]65535; Expected = '65535' }
+            # Integer types
+            @{ TypeName = 'int'; Value = 42; Expected = '42' }
+            @{ TypeName = 'int'; Value = -42; Expected = '-42' }
+            @{ TypeName = 'int'; Value = 0; Expected = '0' }
+            @{ TypeName = 'int'; Value = [int]::MaxValue; Expected = '2147483647' }
+            @{ TypeName = 'int'; Value = [int]::MinValue; Expected = '-2147483648' }
+            @{ TypeName = 'uint'; Value = [uint]0; Expected = '0' }
+            @{ TypeName = 'uint'; Value = [uint]::MaxValue; Expected = '4294967295' }
+            # Long types
+            @{ TypeName = 'long'; Value = [long]::MaxValue; Expected = '9223372036854775807' }
+            @{ TypeName = 'long'; Value = [long]::MinValue; Expected = '-9223372036854775808' }
+            @{ TypeName = 'ulong'; Value = [ulong]0; Expected = '0' }
+            @{ TypeName = 'ulong'; Value = [ulong]::MaxValue; Expected = '18446744073709551615' }
+            # Floating-point types
+            @{ TypeName = 'float'; Value = [float]3.14; Expected = '3.14' }
+            @{ TypeName = 'float'; Value = [float]::NaN; Expected = '"NaN"' }
+            @{ TypeName = 'float'; Value = [float]::PositiveInfinity; Expected = '"Infinity"' }
+            @{ TypeName = 'float'; Value = [float]::NegativeInfinity; Expected = '"-Infinity"' }
+            @{ TypeName = 'double'; Value = 3.14159; Expected = '3.14159' }
+            @{ TypeName = 'double'; Value = -3.14159; Expected = '-3.14159' }
+            @{ TypeName = 'double'; Value = 0.0; Expected = '0.0' }
+            @{ TypeName = 'double'; Value = [double]::NaN; Expected = '"NaN"' }
+            @{ TypeName = 'double'; Value = [double]::PositiveInfinity; Expected = '"Infinity"' }
+            @{ TypeName = 'double'; Value = [double]::NegativeInfinity; Expected = '"-Infinity"' }
+            @{ TypeName = 'decimal'; Value = 123.456d; Expected = '123.456' }
+            # BigInteger
+            @{ TypeName = 'BigInteger'; Value = 18446744073709551615n; Expected = '18446744073709551615' }
+            # Boolean
+            @{ TypeName = 'bool'; Value = $true; Expected = 'true' }
+            @{ TypeName = 'bool'; Value = $false; Expected = 'false' }
+            # Null
+            @{ TypeName = 'null'; Value = $null; Expected = 'null' }
+        ) {
+            param($TypeName, $Value, $Expected)
+            $jsonPipeline = $Value | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $Value -Compress
+            $jsonPipeline | Should -BeExactly $Expected
+            $jsonInputObject | Should -BeExactly $Expected
+        }
+
+        It 'Should include ETS properties on <TypeName>' -TestCases @(
+            @{ TypeName = 'int'; Value = 42; Expected = '{"value":42,"MyProp":"test"}' }
+            @{ TypeName = 'double'; Value = 3.14; Expected = '{"value":3.14,"MyProp":"test"}' }
+        ) {
+            param($TypeName, $Value, $Expected)
+            $valueWithEts = Add-Member -InputObject $Value -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $valueWithEts | ConvertTo-Json -Compress
+            $json | Should -BeExactly $Expected
+        }
+    }
+
+    Context 'String scalar types' {
+        It 'Should serialize string <Description> correctly via Pipeline and InputObject' -TestCases @(
+            @{ Description = 'regular'; Value = 'hello'; Expected = '"hello"' }
+            @{ Description = 'empty'; Value = ''; Expected = '""' }
+            @{ Description = 'with spaces'; Value = 'hello world'; Expected = '"hello world"' }
+            @{ Description = 'with newline'; Value = "line1`nline2"; Expected = '"line1\nline2"' }
+            @{ Description = 'with tab'; Value = "col1`tcol2"; Expected = '"col1\tcol2"' }
+            @{ Description = 'with quotes'; Value = 'say "hello"'; Expected = '"say \"hello\""' }
+            @{ Description = 'with backslash'; Value = 'c:\path'; Expected = '"c:\\path"' }
+            @{ Description = 'unicode'; Value = '???'; Expected = '"???"' }
+            @{ Description = 'emoji'; Value = '??'; Expected = '"??"' }
+        ) {
+            param($Description, $Value, $Expected)
+            $jsonPipeline = $Value | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $Value -Compress
+            $jsonPipeline | Should -BeExactly $Expected
+            $jsonInputObject | Should -BeExactly $Expected
+        }
+
+        It 'Should ignore ETS properties on string' {
+            $str = Add-Member -InputObject 'hello' -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $str | ConvertTo-Json -Compress
+            $json | Should -BeExactly '"hello"'
+        }
+    }
+
+    Context 'DateTime and related types' {
+        It 'Should serialize DateTime with UTC kind via Pipeline and InputObject' {
+            $dt = [DateTime]::new(2024, 6, 15, 10, 30, 0, [DateTimeKind]::Utc)
+            $jsonPipeline = $dt | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $dt -Compress
+            $jsonPipeline | Should -BeExactly '"2024-06-15T10:30:00Z"'
+            $jsonInputObject | Should -BeExactly '"2024-06-15T10:30:00Z"'
+        }
+
+        It 'Should serialize DateTime with Local kind' {
+            $dt = [DateTime]::new(2024, 6, 15, 10, 30, 0, [DateTimeKind]::Local)
+            $json = $dt | ConvertTo-Json -Compress
+            $offset = $dt.ToString('zzz')
+            $expected = '"2024-06-15T10:30:00' + $offset + '"'
+            $json | Should -BeExactly $expected
+        }
+
+        It 'Should serialize DateTime with Unspecified kind via Pipeline and InputObject' {
+            $dt = [DateTime]::new(2024, 6, 15, 10, 30, 0, [DateTimeKind]::Unspecified)
+            $jsonPipeline = $dt | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $dt -Compress
+            $jsonPipeline | Should -BeExactly '"2024-06-15T10:30:00"'
+            $jsonInputObject | Should -BeExactly '"2024-06-15T10:30:00"'
+        }
+
+        It 'Should serialize DateTimeOffset correctly via Pipeline and InputObject' {
+            $dto = [DateTimeOffset]::new(2024, 6, 15, 10, 30, 0, [TimeSpan]::FromHours(9))
+            $jsonPipeline = $dto | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $dto -Compress
+            $jsonPipeline | Should -BeExactly '"2024-06-15T10:30:00+09:00"'
+            $jsonInputObject | Should -BeExactly '"2024-06-15T10:30:00+09:00"'
+        }
+
+        It 'Should serialize DateOnly as object with properties' {
+            $d = [DateOnly]::new(2024, 6, 15)
+            $json = $d | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"Year":2024,"Month":6,"Day":15,"DayOfWeek":6,"DayOfYear":167,"DayNumber":739051}'
+        }
+
+        It 'Should serialize TimeOnly as object with properties' {
+            $t = [TimeOnly]::new(10, 30, 45)
+            $json = $t | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"Hour":10,"Minute":30,"Second":45,"Millisecond":0,"Microsecond":0,"Nanosecond":0,"Ticks":378450000000}'
+        }
+
+        It 'Should serialize TimeSpan as object with properties' {
+            $ts = [TimeSpan]::new(1, 2, 3, 4, 5)
+            $json = $ts | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"Ticks":937840050000,"Days":1,"Hours":2,"Milliseconds":5,"Microseconds":0,"Nanoseconds":0,"Minutes":3,"Seconds":4,"TotalDays":1.0854630208333333,"TotalHours":26.0511125,"TotalMilliseconds":93784005.0,"TotalMicroseconds":93784005000.0,"TotalNanoseconds":93784005000000.0,"TotalMinutes":1563.06675,"TotalSeconds":93784.005}'
+        }
+
+        It 'Should ignore ETS properties on DateTime' {
+            $dt = [DateTime]::new(2024, 6, 15, 0, 0, 0, [DateTimeKind]::Utc)
+            $dt = Add-Member -InputObject $dt -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $dt | ConvertTo-Json -Compress
+            $json | Should -BeExactly '"2024-06-15T00:00:00Z"'
+        }
+
+        It 'Should include ETS properties on DateTimeOffset' {
+            $dto = [DateTimeOffset]::new(2024, 6, 15, 10, 30, 0, [TimeSpan]::Zero)
+            $dto = Add-Member -InputObject $dto -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $dto | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"value":"2024-06-15T10:30:00+00:00","MyProp":"test"}'
+        }
+
+        It 'Should include ETS properties on DateOnly' {
+            $d = [DateOnly]::new(2024, 6, 15)
+            $d = Add-Member -InputObject $d -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $d | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"Year":2024,"Month":6,"Day":15,"DayOfWeek":6,"DayOfYear":167,"DayNumber":739051,"MyProp":"test"}'
+        }
+
+        It 'Should include ETS properties on TimeOnly' {
+            $t = [TimeOnly]::new(10, 30, 45)
+            $t = Add-Member -InputObject $t -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $t | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"Hour":10,"Minute":30,"Second":45,"Millisecond":0,"Microsecond":0,"Nanosecond":0,"Ticks":378450000000,"MyProp":"test"}'
+        }
+    }
+
+    Context 'Guid type' {
+        It 'Should serialize Guid as string via InputObject' {
+            $guid = [Guid]::new('12345678-1234-1234-1234-123456789abc')
+            $json = ConvertTo-Json -InputObject $guid -Compress
+            $json | Should -BeExactly '"12345678-1234-1234-1234-123456789abc"'
+        }
+
+        It 'Should serialize Guid with Extended properties via Pipeline' {
+            $guid = [Guid]::new('12345678-1234-1234-1234-123456789abc')
+            $json = $guid | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"value":"12345678-1234-1234-1234-123456789abc","Guid":"12345678-1234-1234-1234-123456789abc"}'
+        }
+
+        It 'Should serialize empty Guid correctly via InputObject' {
+            $json = ConvertTo-Json -InputObject ([Guid]::Empty) -Compress
+            $json | Should -BeExactly '"00000000-0000-0000-0000-000000000000"'
+        }
+
+        It 'Should include ETS properties on Guid via Pipeline' {
+            $guid = [Guid]::new('12345678-1234-1234-1234-123456789abc')
+            $guid = Add-Member -InputObject $guid -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $guid | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"value":"12345678-1234-1234-1234-123456789abc","MyProp":"test","Guid":"12345678-1234-1234-1234-123456789abc"}'
+        }
+    }
+
+    Context 'Uri type' {
+        It 'Should serialize Uri <Description> correctly via Pipeline and InputObject' -TestCases @(
+            @{ Description = 'http'; UriString = 'http://example.com'; Expected = '"http://example.com"' }
+            @{ Description = 'https with path'; UriString = 'https://example.com/path'; Expected = '"https://example.com/path"' }
+            @{ Description = 'with query'; UriString = 'https://example.com/search?q=test'; Expected = '"https://example.com/search?q=test"' }
+            @{ Description = 'file'; UriString = 'file:///c:/temp/file.txt'; Expected = '"file:///c:/temp/file.txt"' }
+        ) {
+            param($Description, $UriString, $Expected)
+            $uri = [Uri]$UriString
+            $jsonPipeline = $uri | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $uri -Compress
+            $jsonPipeline | Should -BeExactly $Expected
+            $jsonInputObject | Should -BeExactly $Expected
+        }
+
+        It 'Should include ETS properties on Uri' {
+            $uri = [Uri]'https://example.com'
+            $uri = Add-Member -InputObject $uri -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $uri | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"value":"https://example.com","MyProp":"test"}'
+        }
+    }
+
+    Context 'Enum types' {
+        It 'Should serialize enum <EnumType>::<Value> as <Expected> via Pipeline and InputObject' -TestCases @(
+            @{ EnumType = 'System.DayOfWeek'; Value = 'Sunday'; Expected = '0' }
+            @{ EnumType = 'System.DayOfWeek'; Value = 'Monday'; Expected = '1' }
+            @{ EnumType = 'System.DayOfWeek'; Value = 'Saturday'; Expected = '6' }
+            @{ EnumType = 'System.ConsoleColor'; Value = 'Red'; Expected = '12' }
+            @{ EnumType = 'System.IO.FileAttributes'; Value = 'ReadOnly'; Expected = '1' }
+            @{ EnumType = 'System.IO.FileAttributes'; Value = 'Hidden'; Expected = '2' }
+        ) {
+            param($EnumType, $Value, $Expected)
+            $enumValue = [Enum]::Parse($EnumType, $Value)
+            $jsonPipeline = $enumValue | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $enumValue -Compress
+            $jsonPipeline | Should -BeExactly $Expected
+            $jsonInputObject | Should -BeExactly $Expected
+        }
+
+        It 'Should serialize enum as "<Expected>" with -EnumsAsStrings' -TestCases @(
+            @{ EnumType = 'System.DayOfWeek'; Value = 'Sunday'; Expected = 'Sunday' }
+            @{ EnumType = 'System.DayOfWeek'; Value = 'Monday'; Expected = 'Monday' }
+            @{ EnumType = 'System.ConsoleColor'; Value = 'Red'; Expected = 'Red' }
+        ) {
+            param($EnumType, $Value, $Expected)
+            $enumValue = [Enum]::Parse($EnumType, $Value)
+            $json = $enumValue | ConvertTo-Json -Compress -EnumsAsStrings
+            $json | Should -BeExactly "`"$Expected`""
+        }
+
+        It 'Should serialize flags enum correctly via Pipeline and InputObject' {
+            $flags = [System.IO.FileAttributes]::ReadOnly -bor [System.IO.FileAttributes]::Hidden
+            $jsonPipeline = $flags | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $flags -Compress
+            $jsonPipeline | Should -BeExactly '3'
+            $jsonInputObject | Should -BeExactly '3'
+        }
+
+        It 'Should serialize flags enum as string with -EnumsAsStrings' {
+            $flags = [System.IO.FileAttributes]::ReadOnly -bor [System.IO.FileAttributes]::Hidden
+            $json = $flags | ConvertTo-Json -Compress -EnumsAsStrings
+            $json | Should -BeExactly '"ReadOnly, Hidden"'
+        }
+
+        It 'Should include ETS properties on Enum' {
+            $enum = Add-Member -InputObject ([DayOfWeek]::Monday) -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $enum | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"value":1,"MyProp":"test"}'
+        }
+    }
+
+    Context 'IPAddress type' {
+        It 'Should serialize IPAddress v4 correctly via InputObject' {
+            $ip = [System.Net.IPAddress]::Parse('192.168.1.1')
+            $json = ConvertTo-Json -InputObject $ip -Compress
+            $json | Should -BeExactly '{"AddressFamily":2,"ScopeId":null,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":16885952}'
+        }
+
+        It 'Should serialize IPAddress v4 correctly via Pipeline' {
+            $ip = [System.Net.IPAddress]::Parse('192.168.1.1')
+            $json = $ip | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"AddressFamily":2,"ScopeId":null,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":16885952,"IPAddressToString":"192.168.1.1"}'
+        }
+
+        It 'Should serialize IPAddress v6 correctly via InputObject' {
+            $ip = [System.Net.IPAddress]::Parse('::1')
+            $json = ConvertTo-Json -InputObject $ip -Compress
+            $json | Should -BeExactly '{"AddressFamily":23,"ScopeId":0,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":null}'
+        }
+
+        It 'Should serialize IPAddress v6 correctly via Pipeline' {
+            $ip = [System.Net.IPAddress]::Parse('::1')
+            $json = $ip | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"AddressFamily":23,"ScopeId":0,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":null,"IPAddressToString":"::1"}'
+        }
+
+        It 'Should include ETS properties on IPAddress' {
+            $ip = [System.Net.IPAddress]::Parse('192.168.1.1')
+            $ip = Add-Member -InputObject $ip -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = $ip | ConvertTo-Json -Compress
+            $json | Should -BeExactly '{"AddressFamily":2,"ScopeId":null,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":16885952,"MyProp":"test","IPAddressToString":"192.168.1.1"}'
+        }
+    }
+
+    Context 'Scalars as elements of arrays' {
+        It 'Should serialize array of <TypeName> correctly via Pipeline and InputObject' -TestCases @(
+            @{ TypeName = 'int'; Values = @(1, 2, 3); Expected = '[1,2,3]' }
+            @{ TypeName = 'string'; Values = @('a', 'b', 'c'); Expected = '["a","b","c"]' }
+            @{ TypeName = 'double'; Values = @(1.1, 2.2, 3.3); Expected = '[1.1,2.2,3.3]' }
+        ) {
+            param($TypeName, $Values, $Expected)
+            $jsonPipeline = $Values | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $Values -Compress
+            $jsonPipeline | Should -BeExactly $Expected
+            $jsonInputObject | Should -BeExactly $Expected
+        }
+
+        # Note: bool array test uses InputObject only because $true/$false are singletons
+        # and ETS properties added in other tests would affect Pipeline serialization
+        It 'Should serialize array of bool correctly via InputObject' {
+            $bools = @($true, $false, $true)
+            $json = ConvertTo-Json -InputObject $bools -Compress
+            $json | Should -BeExactly '[true,false,true]'
+        }
+
+        It 'Should serialize array of Guid with Extended properties via Pipeline' {
+            $guids = @(
+                [Guid]'11111111-1111-1111-1111-111111111111',
+                [Guid]'22222222-2222-2222-2222-222222222222'
+            )
+            $json = $guids | ConvertTo-Json -Compress
+            $json | Should -BeExactly '[{"value":"11111111-1111-1111-1111-111111111111","Guid":"11111111-1111-1111-1111-111111111111"},{"value":"22222222-2222-2222-2222-222222222222","Guid":"22222222-2222-2222-2222-222222222222"}]'
+        }
+
+        It 'Should serialize array of enum correctly via Pipeline and InputObject' {
+            $enums = @([DayOfWeek]::Monday, [DayOfWeek]::Wednesday, [DayOfWeek]::Friday)
+            $jsonPipeline = $enums | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $enums -Compress
+            $jsonPipeline | Should -BeExactly '[1,3,5]'
+            $jsonInputObject | Should -BeExactly '[1,3,5]'
+        }
+
+        It 'Should serialize array of enum as strings with -EnumsAsStrings' {
+            $enums = @([DayOfWeek]::Monday, [DayOfWeek]::Wednesday, [DayOfWeek]::Friday)
+            $json = $enums | ConvertTo-Json -Compress -EnumsAsStrings
+            $json | Should -BeExactly '["Monday","Wednesday","Friday"]'
+        }
+
+        # Note: mixed array test uses InputObject only due to $true singleton issue
+        It 'Should serialize mixed type array correctly via InputObject' {
+            $mixed = @(1, 'two', $true, 3.14)
+            $json = ConvertTo-Json -InputObject $mixed -Compress
+            $json | Should -BeExactly '[1,"two",true,3.14]'
+        }
+
+        It 'Should serialize array with null elements correctly' {
+            $arr = @(1, $null, 'three')
+            $json = $arr | ConvertTo-Json -Compress
+            $json | Should -BeExactly '[1,null,"three"]'
+        }
+
+        It 'Should include ETS properties on array via InputObject' {
+            $arr = @(1, 2, 3)
+            $arr = Add-Member -InputObject $arr -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = ConvertTo-Json -InputObject $arr -Compress
+            $json | Should -BeExactly '{"value":[1,2,3],"MyProp":"test"}'
+        }
+    }
+
+    Context 'Scalars as values in hashtables and PSCustomObject' {
+        It 'Should serialize hashtable with scalar values correctly via Pipeline and InputObject' {
+            $hash = [ordered]@{
+                intVal = 42
+                strVal = 'hello'
+                boolVal = $true
+                doubleVal = 3.14
+                nullVal = $null
+            }
+            $expected = '{"intVal":42,"strVal":"hello","boolVal":true,"doubleVal":3.14,"nullVal":null}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with scalar values correctly via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                intVal = 42
+                strVal = 'hello'
+                boolVal = $true
+                doubleVal = 3.14
+            }
+            $expected = '{"intVal":42,"strVal":"hello","boolVal":true,"doubleVal":3.14}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize hashtable with <TypeName> value correctly' -TestCases @(
+            @{ TypeName = 'DateTime'; Value = [DateTime]::new(2024, 6, 15, 10, 30, 0, [DateTimeKind]::Utc); Expected = '{"val":"2024-06-15T10:30:00Z"}' }
+            @{ TypeName = 'Guid'; Value = [Guid]'12345678-1234-1234-1234-123456789abc'; Expected = '{"val":"12345678-1234-1234-1234-123456789abc"}' }
+            @{ TypeName = 'Enum'; Value = [DayOfWeek]::Monday; Expected = '{"val":1}' }
+            @{ TypeName = 'Uri'; Value = [Uri]'https://example.com'; Expected = '{"val":"https://example.com"}' }
+            @{ TypeName = 'BigInteger'; Value = 18446744073709551615n; Expected = '{"val":18446744073709551615}' }
+        ) {
+            param($TypeName, $Value, $Expected)
+            $hash = @{ val = $Value }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $Expected
+            $jsonInputObject | Should -BeExactly $Expected
+        }
+
+        It 'Should serialize hashtable with enum as string correctly' {
+            $hash = @{ day = [DayOfWeek]::Monday }
+            $json = $hash | ConvertTo-Json -Compress -EnumsAsStrings
+            $json | Should -BeExactly '{"day":"Monday"}'
+        }
+
+        It 'Should include ETS properties on hashtable via InputObject' {
+            $hash = @{ a = 1 }
+            $hash = Add-Member -InputObject $hash -MemberType NoteProperty -Name MyProp -Value 'test' -PassThru
+            $json = ConvertTo-Json -InputObject $hash -Compress
+            $json | Should -BeExactly '{"a":1,"MyProp":"test"}'
+        }
+    }
+
+    #endregion Comprehensive Scalar Type Tests (Phase 1)
+
+    #region Comprehensive Array and Dictionary Tests (Phase 2)
+    # Test coverage for ConvertTo-Json array and dictionary serialization
+    # Covers: Pipeline vs InputObject, ETS vs no ETS, nested structures
+
+    Context 'Array basic serialization' {
+        It 'Should serialize empty array correctly via Pipeline and InputObject' {
+            $arr = @()
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[]'
+            $jsonInputObject | Should -BeExactly '[]'
+        }
+
+        It 'Should serialize single element array correctly via Pipeline and InputObject' {
+            $arr = @(42)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[42]'
+            $jsonInputObject | Should -BeExactly '[42]'
+        }
+
+        It 'Should serialize multi-element array correctly via Pipeline and InputObject' {
+            $arr = @(1, 2, 3, 4, 5)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[1,2,3,4,5]'
+            $jsonInputObject | Should -BeExactly '[1,2,3,4,5]'
+        }
+
+        It 'Should serialize string array correctly via Pipeline and InputObject' {
+            $arr = @('apple', 'banana', 'cherry')
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '["apple","banana","cherry"]'
+            $jsonInputObject | Should -BeExactly '["apple","banana","cherry"]'
+        }
+
+        It 'Should serialize typed array correctly via Pipeline and InputObject' {
+            [int[]]$arr = @(10, 20, 30)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[10,20,30]'
+            $jsonInputObject | Should -BeExactly '[10,20,30]'
+        }
+
+        It 'Should serialize array with single null element correctly via Pipeline and InputObject' {
+            $arr = @($null)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[null]'
+            $jsonInputObject | Should -BeExactly '[null]'
+        }
+
+        It 'Should serialize array with multiple null elements correctly via Pipeline and InputObject' {
+            $arr = @($null, $null, $null)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[null,null,null]'
+            $jsonInputObject | Should -BeExactly '[null,null,null]'
+        }
+    }
+
+    Context 'Nested arrays' {
+        It 'Should serialize 2D array correctly via Pipeline and InputObject' {
+            $arr = @(@(1, 2), @(3, 4))
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[[1,2],[3,4]]'
+            $jsonInputObject | Should -BeExactly '[[1,2],[3,4]]'
+        }
+
+        It 'Should serialize 3D array correctly via Pipeline and InputObject' {
+            $arr = @(@(@(1, 2), @(3, 4)), @(@(5, 6), @(7, 8)))
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[[[1,2],[3,4]],[[5,6],[7,8]]]'
+            $jsonInputObject | Should -BeExactly '[[[1,2],[3,4]],[[5,6],[7,8]]]'
+        }
+
+        It 'Should serialize jagged array correctly via Pipeline and InputObject' {
+            $arr = @(@(1), @(2, 3), @(4, 5, 6))
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[[1],[2,3],[4,5,6]]'
+            $jsonInputObject | Should -BeExactly '[[1],[2,3],[4,5,6]]'
+        }
+
+        It 'Should serialize array containing empty arrays correctly via Pipeline and InputObject' {
+            $arr = @(@(), @(1), @())
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[[],[1],[]]'
+            $jsonInputObject | Should -BeExactly '[[],[1],[]]'
+        }
+
+        It 'Should serialize deeply nested array with Depth limit using ToString via Pipeline and InputObject' {
+            $ip = [System.Net.IPAddress]::Parse('192.168.1.1')
+            $arr = ,(,(,(,($ip))))
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress -Depth 2
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress -Depth 2
+            $jsonPipeline | Should -BeExactly '[[["192.168.1.1"]]]'
+            $jsonInputObject | Should -BeExactly '[[["192.168.1.1"]]]'
+        }
+
+        It 'Should serialize deeply nested array with sufficient Depth as full object via Pipeline and InputObject' {
+            $ip = [System.Net.IPAddress]::Parse('192.168.1.1')
+            $arr = ,(,(,(,($ip))))
+            $expected = '[[[[{"AddressFamily":2,"ScopeId":null,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":16885952}]]]]'
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress -Depth 10
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress -Depth 10
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Array with mixed content types' {
+        It 'Should serialize array with mixed scalars correctly via Pipeline and InputObject' {
+            $arr = @(1, 'two', 3.14, $true, $null)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[1,"two",3.14,true,null]'
+            $jsonInputObject | Should -BeExactly '[1,"two",3.14,true,null]'
+        }
+
+        It 'Should serialize array with nested array and scalars correctly via Pipeline and InputObject' {
+            $arr = @(1, @(2, 3), 4)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[1,[2,3],4]'
+            $jsonInputObject | Should -BeExactly '[1,[2,3],4]'
+        }
+
+        It 'Should serialize array with PSCustomObject elements correctly via Pipeline and InputObject' {
+            $arr = @([PSCustomObject]@{x = 1}, [PSCustomObject]@{y = 2})
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[{"x":1},{"y":2}]'
+            $jsonInputObject | Should -BeExactly '[{"x":1},{"y":2}]'
+        }
+
+        It 'Should serialize array with DateTime elements correctly via Pipeline and InputObject' {
+            $date1 = [DateTime]::new(2024, 6, 15, 10, 30, 0, [DateTimeKind]::Utc)
+            $date2 = [DateTime]::new(2024, 12, 25, 0, 0, 0, [DateTimeKind]::Utc)
+            $arr = @($date1, $date2)
+            $expected = '["2024-06-15T10:30:00Z","2024-12-25T00:00:00Z"]'
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize array with Guid elements correctly via Pipeline and InputObject' {
+            $guid1 = [Guid]'12345678-1234-1234-1234-123456789abc'
+            $guid2 = [Guid]'87654321-4321-4321-4321-cba987654321'
+            $arr = @($guid1, $guid2)
+            $expected = '["12345678-1234-1234-1234-123456789abc","87654321-4321-4321-4321-cba987654321"]'
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize array with enum elements correctly via Pipeline and InputObject' {
+            $arr = @([DayOfWeek]::Monday, [DayOfWeek]::Friday)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '[1,5]'
+            $jsonInputObject | Should -BeExactly '[1,5]'
+        }
+
+        It 'Should serialize array with enum as string correctly via Pipeline and InputObject' {
+            $arr = @([DayOfWeek]::Monday, [DayOfWeek]::Friday)
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress -EnumsAsStrings
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress -EnumsAsStrings
+            $jsonPipeline | Should -BeExactly '["Monday","Friday"]'
+            $jsonInputObject | Should -BeExactly '["Monday","Friday"]'
+        }
+    }
+
+    Context 'Array ETS properties' {
+        It 'Should include ETS properties on array via Pipeline and InputObject' {
+            $arr = @(1, 2, 3)
+            $arr = Add-Member -InputObject $arr -MemberType NoteProperty -Name ArrayName -Value 'MyArray' -PassThru
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '{"value":[1,2,3],"ArrayName":"MyArray"}'
+            $jsonInputObject | Should -BeExactly '{"value":[1,2,3],"ArrayName":"MyArray"}'
+        }
+
+        It 'Should include multiple ETS properties on array via Pipeline and InputObject' {
+            $arr = @('a', 'b')
+            $arr = Add-Member -InputObject $arr -MemberType NoteProperty -Name Prop1 -Value 'val1' -PassThru
+            $arr = Add-Member -InputObject $arr -MemberType NoteProperty -Name Prop2 -Value 'val2' -PassThru
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly '{"value":["a","b"],"Prop1":"val1","Prop2":"val2"}'
+            $jsonInputObject | Should -BeExactly '{"value":["a","b"],"Prop1":"val1","Prop2":"val2"}'
+        }
+    }
+
+    Context 'Hashtable basic serialization' {
+        It 'Should serialize empty hashtable correctly via Pipeline and InputObject' {
+            $hash = @{}
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{}'
+            $jsonInputObject | Should -BeExactly '{}'
+        }
+
+        It 'Should serialize single key hashtable correctly via Pipeline and InputObject' {
+            $hash = @{ key = 'value' }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"key":"value"}'
+            $jsonInputObject | Should -BeExactly '{"key":"value"}'
+        }
+
+        It 'Should serialize hashtable with null value correctly via Pipeline and InputObject' {
+            $hash = @{ nullKey = $null }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"nullKey":null}'
+            $jsonInputObject | Should -BeExactly '{"nullKey":null}'
+        }
+
+        It 'Should serialize hashtable with various scalar types correctly via Pipeline and InputObject' {
+            $hash = [ordered]@{
+                intKey = 42
+                strKey = 'hello'
+                boolKey = $true
+                doubleKey = 3.14
+            }
+            $expected = '{"intKey":42,"strKey":"hello","boolKey":true,"doubleKey":3.14}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'OrderedDictionary serialization' {
+        It 'Should preserve order in OrderedDictionary via Pipeline and InputObject' {
+            $ordered = [ordered]@{
+                z = 1
+                a = 2
+                m = 3
+            }
+            $expected = '{"z":1,"a":2,"m":3}'
+            $jsonPipeline = $ordered | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $ordered -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize large OrderedDictionary preserving order via Pipeline and InputObject' {
+            $ordered = [ordered]@{}
+            1..5 | ForEach-Object { $ordered["key$_"] = $_ }
+            $expected = '{"key1":1,"key2":2,"key3":3,"key4":4,"key5":5}'
+            $jsonPipeline = $ordered | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $ordered -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Nested dictionaries' {
+        It 'Should serialize nested hashtable correctly via Pipeline and InputObject' {
+            $hash = @{
+                outer = @{
+                    inner = 'value'
+                }
+            }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"outer":{"inner":"value"}}'
+            $jsonInputObject | Should -BeExactly '{"outer":{"inner":"value"}}'
+        }
+
+        It 'Should serialize deeply nested hashtable correctly via Pipeline and InputObject' {
+            $hash = @{
+                level1 = @{
+                    level2 = @{
+                        level3 = 'deep'
+                    }
+                }
+            }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"level1":{"level2":{"level3":"deep"}}}'
+            $jsonInputObject | Should -BeExactly '{"level1":{"level2":{"level3":"deep"}}}'
+        }
+
+        It 'Should serialize nested hashtable with Depth limit via Pipeline and InputObject' {
+            $hash = @{
+                level1 = @{
+                    level2 = @{
+                        level3 = 'deep'
+                    }
+                }
+            }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress -Depth 1
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress -Depth 1
+            $jsonPipeline | Should -BeExactly '{"level1":{"level2":"System.Collections.Hashtable"}}'
+            $jsonInputObject | Should -BeExactly '{"level1":{"level2":"System.Collections.Hashtable"}}'
+        }
+
+        It 'Should serialize hashtable with array value correctly via Pipeline and InputObject' {
+            $hash = @{ arr = @(1, 2, 3) }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"arr":[1,2,3]}'
+            $jsonInputObject | Should -BeExactly '{"arr":[1,2,3]}'
+        }
+
+        It 'Should serialize hashtable with nested array of hashtables correctly via Pipeline and InputObject' {
+            $hash = @{
+                items = @(
+                    @{ id = 1 },
+                    @{ id = 2 }
+                )
+            }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"items":[{"id":1},{"id":2}]}'
+            $jsonInputObject | Should -BeExactly '{"items":[{"id":1},{"id":2}]}'
+        }
+    }
+
+    Context 'Dictionary key types' {
+        It 'Should serialize hashtable with string keys correctly via Pipeline and InputObject' {
+            $hash = @{ 'string-key' = 'value' }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"string-key":"value"}'
+            $jsonInputObject | Should -BeExactly '{"string-key":"value"}'
+        }
+
+        It 'Should serialize hashtable with special character keys correctly via Pipeline and InputObject' {
+            $hash = [ordered]@{
+                'key with space' = 1
+                'key-with-dash' = 2
+                'key_with_underscore' = 3
+            }
+            $expected = '{"key with space":1,"key-with-dash":2,"key_with_underscore":3}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize hashtable with unicode keys correctly via Pipeline and InputObject' {
+            $hash = @{ "`u{65E5}`u{672C}`u{8A9E}" = 'Japanese' }
+            $expected = "{`"`u{65E5}`u{672C}`u{8A9E}`":`"Japanese`"}"
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize hashtable with empty string key correctly via Pipeline and InputObject' {
+            $hash = @{ '' = 'empty key' }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"":"empty key"}'
+            $jsonInputObject | Should -BeExactly '{"":"empty key"}'
+        }
+    }
+
+    Context 'Dictionary with complex values' {
+        It 'Should serialize hashtable with DateTime value correctly via Pipeline and InputObject' {
+            $hash = @{ date = [DateTime]::new(2024, 6, 15, 10, 30, 0, [DateTimeKind]::Utc) }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"date":"2024-06-15T10:30:00Z"}'
+            $jsonInputObject | Should -BeExactly '{"date":"2024-06-15T10:30:00Z"}'
+        }
+
+        It 'Should serialize hashtable with Guid value correctly via Pipeline and InputObject' {
+            $hash = @{ guid = [Guid]'12345678-1234-1234-1234-123456789abc' }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"guid":"12345678-1234-1234-1234-123456789abc"}'
+            $jsonInputObject | Should -BeExactly '{"guid":"12345678-1234-1234-1234-123456789abc"}'
+        }
+
+        It 'Should serialize hashtable with enum value correctly via Pipeline and InputObject' {
+            $hash = @{ day = [DayOfWeek]::Monday }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"day":1}'
+            $jsonInputObject | Should -BeExactly '{"day":1}'
+        }
+
+        It 'Should serialize hashtable with enum as string correctly via Pipeline and InputObject' {
+            $hash = @{ day = [DayOfWeek]::Monday }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress -EnumsAsStrings
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress -EnumsAsStrings
+            $jsonPipeline | Should -BeExactly '{"day":"Monday"}'
+            $jsonInputObject | Should -BeExactly '{"day":"Monday"}'
+        }
+
+        It 'Should serialize hashtable with PSCustomObject value correctly via Pipeline and InputObject' {
+            $hash = @{ obj = [PSCustomObject]@{ prop = 'value' } }
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"obj":{"prop":"value"}}'
+            $jsonInputObject | Should -BeExactly '{"obj":{"prop":"value"}}'
+        }
+    }
+
+    Context 'Dictionary ETS properties' {
+        It 'Should include ETS properties on hashtable via Pipeline and InputObject' {
+            $hash = @{ a = 1 }
+            $hash = Add-Member -InputObject $hash -MemberType NoteProperty -Name ETSProp -Value 'ets' -PassThru
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly '{"a":1,"ETSProp":"ets"}'
+            $jsonInputObject | Should -BeExactly '{"a":1,"ETSProp":"ets"}'
+        }
+
+        It 'Should include ETS properties on OrderedDictionary via Pipeline and InputObject' {
+            $ordered = [ordered]@{ a = 1 }
+            $ordered = Add-Member -InputObject $ordered -MemberType NoteProperty -Name ETSProp -Value 'ets' -PassThru
+            $jsonPipeline = $ordered | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $ordered -Compress
+            $jsonPipeline | Should -BeExactly '{"a":1,"ETSProp":"ets"}'
+            $jsonInputObject | Should -BeExactly '{"a":1,"ETSProp":"ets"}'
+        }
+    }
+
+    Context 'Generic Dictionary types' {
+        It 'Should serialize Generic Dictionary correctly via Pipeline and InputObject' {
+            $dict = [System.Collections.Generic.Dictionary[string,int]]::new()
+            $dict['one'] = 1
+            $dict['two'] = 2
+            $jsonPipeline = $dict | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $dict -Compress
+            $jsonPipeline | Should -Match '"one":1'
+            $jsonPipeline | Should -Match '"two":2'
+            $jsonInputObject | Should -Match '"one":1'
+            $jsonInputObject | Should -Match '"two":2'
+        }
+
+        It 'Should serialize SortedDictionary correctly via Pipeline and InputObject' {
+            $dict = [System.Collections.Generic.SortedDictionary[string,int]]::new()
+            $dict['b'] = 2
+            $dict['a'] = 1
+            $dict['c'] = 3
+            $jsonPipeline = $dict | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $dict -Compress
+            $jsonPipeline | Should -BeExactly '{"a":1,"b":2,"c":3}'
+            $jsonInputObject | Should -BeExactly '{"a":1,"b":2,"c":3}'
+        }
+    }
+
+    #endregion Comprehensive Array and Dictionary Tests (Phase 2)
+
+
+    #region Comprehensive PSCustomObject Tests (Phase 3)
+    # Test coverage for ConvertTo-Json PSCustomObject serialization
+    # Covers: Pipeline vs InputObject, ETS vs no ETS, nested structures
+
+    Context 'PSCustomObject basic serialization' {
+        It 'Should serialize PSCustomObject with single property via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Name = 'Test' }
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly '{"Name":"Test"}'
+            $jsonInputObject | Should -BeExactly '{"Name":"Test"}'
+        }
+
+        It 'Should serialize PSCustomObject with multiple properties via Pipeline and InputObject' {
+            $obj = [PSCustomObject][ordered]@{
+                Name = 'Test'
+                Value = 42
+                Active = $true
+            }
+            $expected = '{"Name":"Test","Value":42,"Active":true}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should preserve property order in PSCustomObject via Pipeline and InputObject' {
+            $obj = [PSCustomObject][ordered]@{
+                Zebra = 1
+                Alpha = 2
+                Middle = 3
+            }
+            $expected = '{"Zebra":1,"Alpha":2,"Middle":3}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with null property via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ NullProp = $null }
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly '{"NullProp":null}'
+            $jsonInputObject | Should -BeExactly '{"NullProp":null}'
+        }
+    }
+
+    Context 'PSCustomObject with various property types' {
+        It 'Should serialize PSCustomObject with scalar properties via Pipeline and InputObject' {
+            $obj = [PSCustomObject][ordered]@{
+                IntVal = 42
+                DoubleVal = 3.14
+                StringVal = 'hello'
+                BoolVal = $true
+            }
+            $expected = '{"IntVal":42,"DoubleVal":3.14,"StringVal":"hello","BoolVal":true}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with DateTime property via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Date = [DateTime]::new(2024, 6, 15, 10, 30, 0, [DateTimeKind]::Utc)
+            }
+            $expected = '{"Date":"2024-06-15T10:30:00Z"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with Guid property via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Id = [Guid]'12345678-1234-1234-1234-123456789abc'
+            }
+            $expected = '{"Id":"12345678-1234-1234-1234-123456789abc"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with enum property via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Day = [DayOfWeek]::Monday }
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly '{"Day":1}'
+            $jsonInputObject | Should -BeExactly '{"Day":1}'
+        }
+
+        It 'Should serialize PSCustomObject with enum as string via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Day = [DayOfWeek]::Monday }
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -EnumsAsStrings
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -EnumsAsStrings
+            $jsonPipeline | Should -BeExactly '{"Day":"Monday"}'
+            $jsonInputObject | Should -BeExactly '{"Day":"Monday"}'
+        }
+
+        It 'Should serialize PSCustomObject with array property via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Numbers = @(1, 2, 3) }
+            $expected = '{"Numbers":[1,2,3]}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with hashtable property via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Config = @{ Key = 'Value' } }
+            $expected = '{"Config":{"Key":"Value"}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Nested PSCustomObject' {
+        It 'Should serialize nested PSCustomObject via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Outer = [PSCustomObject]@{
+                    Inner = 'value'
+                }
+            }
+            $expected = '{"Outer":{"Inner":"value"}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize deeply nested PSCustomObject via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Level1 = [PSCustomObject]@{
+                    Level2 = [PSCustomObject]@{
+                        Level3 = 'deep'
+                    }
+                }
+            }
+            $expected = '{"Level1":{"Level2":{"Level3":"deep"}}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize nested PSCustomObject with Depth limit via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Level1 = [PSCustomObject]@{
+                    Level2 = [PSCustomObject]@{
+                        Level3 = 'deep'
+                    }
+                }
+            }
+            $expected = '{"Level1":{"Level2":"@{Level3=deep}"}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 1
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 1
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with mixed nested types via Pipeline and InputObject' {
+            $obj = [PSCustomObject][ordered]@{
+                Child = [PSCustomObject]@{ Name = 'child' }
+                Items = @(1, 2, 3)
+                Config = @{ Key = 'Value' }
+            }
+            $expected = '{"Child":{"Name":"child"},"Items":[1,2,3],"Config":{"Key":"Value"}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'PSCustomObject ETS properties' {
+        It 'Should include NoteProperty on PSCustomObject via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Original = 'value' }
+            $obj | Add-Member -MemberType NoteProperty -Name Added -Value 'added'
+            $expected = '{"Original":"value","Added":"added"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should include ScriptProperty on PSCustomObject via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Value = 10 }
+            $obj | Add-Member -MemberType ScriptProperty -Name Doubled -Value { $this.Value * 2 }
+            $expected = '{"Value":10,"Doubled":20}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should include multiple ETS properties on PSCustomObject via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Base = 'base' }
+            $obj | Add-Member -MemberType NoteProperty -Name Note1 -Value 'note1'
+            $obj | Add-Member -MemberType NoteProperty -Name Note2 -Value 'note2'
+            $expected = '{"Base":"base","Note1":"note1","Note2":"note2"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Array of PSCustomObject' {
+        It 'Should serialize array of PSCustomObject via Pipeline and InputObject' {
+            $arr = @(
+                [PSCustomObject][ordered]@{ Id = 1; Name = 'First' }
+                [PSCustomObject][ordered]@{ Id = 2; Name = 'Second' }
+            )
+            $expected = '[{"Id":1,"Name":"First"},{"Id":2,"Name":"Second"}]'
+            $jsonPipeline = $arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize single PSCustomObject without array wrapper via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Id = 1 }
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly '{"Id":1}'
+            $jsonInputObject | Should -BeExactly '{"Id":1}'
+        }
+
+        It 'Should serialize single PSCustomObject with -AsArray via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ Id = 1 }
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -AsArray
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -AsArray
+            $jsonPipeline | Should -BeExactly '[{"Id":1}]'
+            $jsonInputObject | Should -BeExactly '[{"Id":1}]'
+        }
+    }
+
+    #endregion Comprehensive PSCustomObject Tests (Phase 3)
+
+    #region Comprehensive Depth Truncation and Multilevel Composition Tests (Phase 4)
+    # Test coverage for ConvertTo-Json depth truncation and complex nested structures
+    # Covers: -Depth parameter behavior, multilevel type compositions
+
+    Context 'Depth parameter basic behavior' {
+        It 'Should use default depth of 2 via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                L0 = [PSCustomObject]@{
+                    L1 = [PSCustomObject]@{
+                        L2 = [PSCustomObject]@{
+                            L3 = 'deep'
+                        }
+                    }
+                }
+            }
+            $expected = '{"L0":{"L1":{"L2":"@{L3=deep}"}}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should truncate at Depth 0 via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                L0 = [PSCustomObject]@{ L1 = 1 }
+            }
+            $expected = '{"L0":"@{L1=1}"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 0
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 0
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should truncate at Depth 1 via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                L0 = [PSCustomObject]@{
+                    L1 = [PSCustomObject]@{
+                        L2 = 'deep'
+                    }
+                }
+            }
+            $expected = '{"L0":{"L1":"@{L2=deep}"}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 1
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 1
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize fully with sufficient Depth via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                L0 = [PSCustomObject]@{
+                    L1 = [PSCustomObject]@{
+                        L2 = [PSCustomObject]@{
+                            L3 = 'very deep'
+                        }
+                    }
+                }
+            }
+            $expected = '{"L0":{"L1":{"L2":{"L3":"very deep"}}}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 10
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 10
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should handle Depth 100 for deeply nested structures via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{ L0 = [PSCustomObject]@{ L1 = [PSCustomObject]@{ L2 = [PSCustomObject]@{ L3 = [PSCustomObject]@{ L4 = 'deep' } } } } }
+            $expected = '{"L0":{"L1":{"L2":{"L3":{"L4":"deep"}}}}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 100
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 100
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should throw on Depth 101 exceeding maximum via Pipeline and InputObject' {
+            { [PSCustomObject]@{ L0 = 1 } | ConvertTo-Json -Depth 101 } | Should -Throw -ErrorId 'ParameterArgumentValidationError,Microsoft.PowerShell.Commands.ConvertToJsonCommand'
+            { ConvertTo-Json -InputObject ([PSCustomObject]@{ L0 = 1 }) -Depth 101 } | Should -Throw -ErrorId 'ParameterArgumentValidationError,Microsoft.PowerShell.Commands.ConvertToJsonCommand'
+        }
+    }
+
+    Context 'Depth truncation with arrays' {
+        It 'Should truncate nested array at Depth limit via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Arr = ,(,(1, 2, 3))
+            }
+            $expected = '{"Arr":["System.Object[]"]}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 1
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 1
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize nested array fully with sufficient Depth via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Arr = ,(,(1, 2, 3))
+            }
+            $expected = '{"Arr":[[[1,2,3]]]}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 10
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 10
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should truncate array of objects at Depth limit via Pipeline and InputObject' {
+            $arr = @(
+                [PSCustomObject]@{ Inner = [PSCustomObject]@{ Value = 1 } }
+            )
+            $expected = '[{"Inner":"@{Value=1}"}]'
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress -Depth 1
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress -Depth 1
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Depth truncation with hashtables' {
+        It 'Should truncate nested hashtable at Depth limit via Pipeline and InputObject' {
+            $hash = @{
+                L0 = @{
+                    L1 = @{
+                        L2 = 'deep'
+                    }
+                }
+            }
+            $expected = '{"L0":{"L1":"System.Collections.Hashtable"}}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress -Depth 1
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress -Depth 1
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize nested hashtable fully with sufficient Depth via Pipeline and InputObject' {
+            $hash = @{
+                L0 = @{
+                    L1 = @{
+                        L2 = 'deep'
+                    }
+                }
+            }
+            $expected = '{"L0":{"L1":{"L2":"deep"}}}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress -Depth 10
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress -Depth 10
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Depth truncation string representation' {
+        It 'Should convert PSCustomObject to @{...} string when truncated via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Child = [PSCustomObject]@{ A = 1; B = 2 }
+            }
+            $expected = '{"Child":"@{A=1; B=2}"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 0
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 0
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should convert Hashtable to type name when truncated via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Child = @{ Key = 'Value' }
+            }
+            $expected = '{"Child":"System.Collections.Hashtable"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 0
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 0
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should convert Array to space-separated string when truncated via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Child = @(1, 2, 3)
+            }
+            $expected = '{"Child":"1 2 3"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 0
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 0
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Multilevel composition: Array containing Dictionary' {
+        It 'Should serialize array of hashtables correctly via Pipeline and InputObject' {
+            $arr = @(@{ a = 1 }, @{ b = 2 }, @{ c = 3 })
+            $expected = '[{"a":1},{"b":2},{"c":3}]'
+            $jsonPipeline = $arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize array of ordered dictionaries correctly via Pipeline and InputObject' {
+            $arr = @(
+                [ordered]@{ x = 1; y = 2 },
+                [ordered]@{ x = 3; y = 4 }
+            )
+            $expected = '[{"x":1,"y":2},{"x":3,"y":4}]'
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize nested array of hashtables correctly via Pipeline and InputObject' {
+            $arr = @(
+                @{
+                    Items = @(
+                        @{ Value = 1 },
+                        @{ Value = 2 }
+                    )
+                }
+            )
+            $expected = '[{"Items":[{"Value":1},{"Value":2}]}]'
+            $jsonPipeline = ,$arr | ConvertTo-Json -Compress -Depth 3
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress -Depth 3
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Multilevel composition: Dictionary containing Array' {
+        It 'Should serialize dictionary with array values correctly via Pipeline and InputObject' {
+            $hash = [ordered]@{
+                numbers = @(1, 2, 3)
+                strings = @('a', 'b', 'c')
+            }
+            $expected = '{"numbers":[1,2,3],"strings":["a","b","c"]}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize dictionary with nested array values correctly via Pipeline and InputObject' {
+            $hash = @{
+                matrix = @(@(1, 2), @(3, 4))
+            }
+            $expected = '{"matrix":[[1,2],[3,4]]}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize dictionary with empty array value correctly via Pipeline and InputObject' {
+            $hash = @{ empty = @() }
+            $expected = '{"empty":[]}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize dictionary with array of dictionaries correctly via Pipeline and InputObject' {
+            $hash = @{
+                Items = @(
+                    @{ X = 1 },
+                    @{ X = 2 }
+                )
+            }
+            $expected = '{"Items":[{"X":1},{"X":2}]}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Multilevel composition: PSCustomObject with mixed types' {
+        It 'Should serialize PSCustomObject with array and hashtable properties via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                List = @(1, 2, 3)
+                Config = @{ Key = 'Value' }
+                Name = 'Test'
+            }
+            $expected = '{"List":[1,2,3],"Config":{"Key":"Value"},"Name":"Test"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject with nested PSCustomObject and array via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Child = [PSCustomObject]@{
+                    Items = @(1, 2, 3)
+                }
+            }
+            $expected = '{"Child":{"Items":[1,2,3]}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize array of PSCustomObject with mixed properties via Pipeline and InputObject' {
+            $arr = @(
+                [PSCustomObject]@{ Type = 'A'; Data = @(1, 2) },
+                [PSCustomObject]@{ Type = 'B'; Data = @{ Key = 'Val' } }
+            )
+            $expected = '[{"Type":"A","Data":[1,2]},{"Type":"B","Data":{"Key":"Val"}}]'
+            $jsonPipeline = $arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Multilevel composition: PowerShell class in complex structures' {
+        BeforeAll {
+            class ItemClass {
+                [int]$Id
+                [string]$Name
+            }
+
+            class ContainerClass {
+                [string]$Type
+                [ItemClass]$Item
+            }
+        }
+
+        It 'Should serialize array of PowerShell class correctly via Pipeline and InputObject' {
+            $arr = @(
+                [ItemClass]@{ Id = 1; Name = 'First' },
+                [ItemClass]@{ Id = 2; Name = 'Second' }
+            )
+            $expected = '[{"Id":1,"Name":"First"},{"Id":2,"Name":"Second"}]'
+            $jsonPipeline = $arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize hashtable containing PowerShell class correctly via Pipeline and InputObject' {
+            $item = [ItemClass]@{ Id = 1; Name = 'Test' }
+            $hash = @{ Item = $item }
+            $expected = '{"Item":{"Id":1,"Name":"Test"}}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize nested PowerShell classes correctly via Pipeline and InputObject' {
+            $item = [ItemClass]@{ Id = 1; Name = 'Inner' }
+            $container = [ContainerClass]@{ Type = 'Outer'; Item = $item }
+            $expected = '{"Type":"Outer","Item":{"Id":1,"Name":"Inner"}}'
+            $jsonPipeline = $container | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $container -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize PSCustomObject containing PowerShell class correctly via Pipeline and InputObject' {
+            $item = [ItemClass]@{ Id = 1; Name = 'Test' }
+            $obj = [PSCustomObject]@{
+                Label = 'Container'
+                Content = $item
+            }
+            $expected = '{"Label":"Container","Content":{"Id":1,"Name":"Test"}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should truncate nested PowerShell class at Depth limit via Pipeline and InputObject' {
+            $item = [ItemClass]@{ Id = 1; Name = 'Test' }
+            $container = [ContainerClass]@{ Type = 'Outer'; Item = $item }
+            $itemString = $item.ToString()
+            $expected = "{`"Type`":`"Outer`",`"Item`":`"$itemString`"}"
+            $jsonPipeline = $container | ConvertTo-Json -Compress -Depth 0
+            $jsonInputObject = ConvertTo-Json -InputObject $container -Compress -Depth 0
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Complex multilevel compositions' {
+        It 'Should serialize 3-level mixed composition correctly via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                Users = @(
+                    [PSCustomObject]@{
+                        Name = 'Alice'
+                        Roles = @('Admin', 'User')
+                    },
+                    [PSCustomObject]@{
+                        Name = 'Bob'
+                        Roles = @('User')
+                    }
+                )
+            }
+            $expected = '{"Users":[{"Name":"Alice","Roles":["Admin","User"]},{"Name":"Bob","Roles":["User"]}]}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 3
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 3
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize dictionary with nested mixed types correctly via Pipeline and InputObject' {
+            $hash = [ordered]@{
+                Meta = [PSCustomObject]@{ Version = '1.0' }
+                Data = @(
+                    ([ordered]@{ Key = 'A'; Values = @(1, 2) }),
+                    ([ordered]@{ Key = 'B'; Values = @(3, 4) })
+                )
+            }
+            $expected = '{"Meta":{"Version":"1.0"},"Data":[{"Key":"A","Values":[1,2]},{"Key":"B","Values":[3,4]}]}'
+            $jsonPipeline = $hash | ConvertTo-Json -Compress -Depth 3
+            $jsonInputObject = ConvertTo-Json -InputObject $hash -Compress -Depth 3
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should handle deeply nested mixed types with sufficient Depth via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                L0 = @{
+                    L1 = [PSCustomObject]@{
+                        L2 = @(
+                            [PSCustomObject]@{ L3 = 'deep' }
+                        )
+                    }
+                }
+            }
+            $expected = '{"L0":{"L1":{"L2":[{"L3":"deep"}]}}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 10
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 10
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should truncate deeply nested mixed types at Depth limit via Pipeline and InputObject' {
+            $obj = [PSCustomObject]@{
+                L0 = @{
+                    L1 = [PSCustomObject]@{
+                        L2 = @(
+                            [PSCustomObject]@{ L3 = 'deep' }
+                        )
+                    }
+                }
+            }
+            $expected = '{"L0":{"L1":{"L2":""}}}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 2
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 2
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    #endregion Comprehensive Depth Truncation and Multilevel Composition Tests (Phase 4)
+
+    #region Comprehensive PowerShell Class Tests (Phase 5)
+    # Test coverage for ConvertTo-Json PowerShell class serialization
+    # Covers: Pipeline vs InputObject, ETS vs no ETS, nested structures, inheritance
+
+    Context 'PowerShell class serialization' {
+        BeforeAll {
+            class SimpleClass {
+                [string]$StringVal
+                [int]$IntVal
+                [bool]$BoolVal
+                [double]$DoubleVal
+                [bigint]$BigIntVal
+                [guid]$GuidVal
+                [ipaddress]$IPVal
+                [object[]]$ArrayVal
+                [System.Collections.Specialized.OrderedDictionary]$DictVal
+                hidden [string]$HiddenVal
+            }
+        }
+
+        It 'Should serialize PowerShell class with various property types including ETS via Pipeline and InputObject' {
+            $obj = [SimpleClass]::new()
+            $obj.StringVal = 'hello'
+            $obj.IntVal = 42
+            $obj.BoolVal = $true
+            $obj.DoubleVal = 3.14
+            $obj.BigIntVal = [bigint]::Parse('99999999999999999999')
+            $obj.GuidVal = [guid]'12345678-1234-1234-1234-123456789abc'
+            $obj.IPVal = [ipaddress]::Parse('192.168.1.1')
+            $obj.ArrayVal = @(1, 'two', $true)
+            $obj.DictVal = [ordered]@{ Key = 'Value'; Nested = [ordered]@{ Inner = 1 } }
+            $obj.HiddenVal = 'secret'
+            $obj | Add-Member -MemberType NoteProperty -Name ETSNote -Value 'note'
+            $obj | Add-Member -MemberType ScriptProperty -Name ETSScript -Value { $this.StringVal.Length }
+            $obj.IPVal | Add-Member -MemberType NoteProperty -Name Label -Value 'primary'
+            $expectedPipeline = '{"StringVal":"hello","IntVal":42,"BoolVal":true,"DoubleVal":3.14,"BigIntVal":99999999999999999999,"GuidVal":"12345678-1234-1234-1234-123456789abc","IPVal":{"AddressFamily":2,"ScopeId":null,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":16885952},"ArrayVal":[1,"two",true],"DictVal":{"Key":"Value","Nested":{"Inner":1}},"HiddenVal":"secret","ETSNote":"note","ETSScript":5}'
+            $expectedInputObject = '{"StringVal":"hello","IntVal":42,"BoolVal":true,"DoubleVal":3.14,"BigIntVal":99999999999999999999,"GuidVal":"12345678-1234-1234-1234-123456789abc","IPVal":{"AddressFamily":2,"ScopeId":null,"IsIPv6Multicast":false,"IsIPv6LinkLocal":false,"IsIPv6SiteLocal":false,"IsIPv6Teredo":false,"IsIPv6UniqueLocal":false,"IsIPv4MappedToIPv6":false,"Address":16885952},"ArrayVal":[1,"two",true],"DictVal":{"Key":"Value","Nested":{"Inner":1}},"HiddenVal":"secret"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress -Depth 3
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress -Depth 3
+            $jsonPipeline | Should -BeExactly $expectedPipeline
+            $jsonInputObject | Should -BeExactly $expectedInputObject
+        }
+
+        It 'Should serialize PowerShell class with default values via Pipeline and InputObject' {
+            $obj = [SimpleClass]::new()
+            $expected = '{"StringVal":null,"IntVal":0,"BoolVal":false,"DoubleVal":0.0,"BigIntVal":0,"GuidVal":"00000000-0000-0000-0000-000000000000","IPVal":null,"ArrayVal":null,"DictVal":null,"HiddenVal":null}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'Nested PowerShell class' {
+        BeforeAll {
+            class InnerClass {
+                [string]$Inner
+            }
+
+            class OuterClass {
+                [string]$Outer
+                [InnerClass]$Child
+            }
+
+            class DeepClass {
+                [string]$Name
+                [OuterClass]$Nested
+            }
+        }
+
+        It 'Should serialize deeply nested PowerShell class via Pipeline and InputObject' {
+            $inner = [InnerClass]@{ Inner = 'deep' }
+            $outer = [OuterClass]@{ Outer = 'middle'; Child = $inner }
+            $deep = [DeepClass]@{ Name = 'top'; Nested = $outer }
+            $expected = '{"Name":"top","Nested":{"Outer":"middle","Child":{"Inner":"deep"}}}'
+            $jsonPipeline = $deep | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $deep -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize nested PowerShell class with null child via Pipeline and InputObject' {
+            $outer = [OuterClass]@{ Outer = 'outer value'; Child = $null }
+            $expected = '{"Outer":"outer value","Child":null}'
+            $jsonPipeline = $outer | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $outer -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    Context 'PowerShell class inheritance' {
+        BeforeAll {
+            class BaseClass {
+                [string]$BaseProp
+            }
+
+            class ChildClass : BaseClass {
+                [string]$ChildProp
+            }
+
+            class GrandChildClass : ChildClass {
+                [string]$GrandChildProp
+            }
+        }
+
+        It 'Should serialize derived class with base properties via Pipeline and InputObject' {
+            $obj = [ChildClass]@{ BaseProp = 'base'; ChildProp = 'child' }
+            $expected = '{"ChildProp":"child","BaseProp":"base"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+        It 'Should serialize multi-level inherited class via Pipeline and InputObject' {
+            $obj = [GrandChildClass]@{
+                BaseProp = 'base'
+                ChildProp = 'child'
+                GrandChildProp = 'grandchild'
+            }
+            $expected = '{"GrandChildProp":"grandchild","ChildProp":"child","BaseProp":"base"}'
+            $jsonPipeline = $obj | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $obj -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+
+    }
+
+    Context 'Mixed PSCustomObject and PowerShell class' {
+        BeforeAll {
+            class MixedClass {
+                [string]$ClassName
+            }
+        }
+
+        It 'Should serialize array with mixed types via Pipeline and InputObject' {
+            $classObj = [MixedClass]@{ ClassName = 'class' }
+            $customObj = [PSCustomObject]@{ CustomName = 'custom' }
+            $arr = @($classObj, $customObj)
+            $expected = '[{"ClassName":"class"},{"CustomName":"custom"}]'
+            $jsonPipeline = $arr | ConvertTo-Json -Compress
+            $jsonInputObject = ConvertTo-Json -InputObject $arr -Compress
+            $jsonPipeline | Should -BeExactly $expected
+            $jsonInputObject | Should -BeExactly $expected
+        }
+    }
+
+    #endregion Comprehensive PowerShell Class Tests (Phase 5)
+
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-SecureString.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-SecureString.Tests.ps1
index e58a227fbcf..5a2660ed621 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-SecureString.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-SecureString.Tests.ps1
@@ -1,5 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 	Describe "ConvertTo--SecureString" -Tags "CI" {
 
     Context "Checking return types of ConvertTo--SecureString" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Debug-Runspace.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Debug-Runspace.Tests.ps1
index 8aa28b00aef..2b517e4f301 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Debug-Runspace.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Debug-Runspace.Tests.ps1
@@ -31,6 +31,33 @@ Describe "Debug-Runspace" -Tag "CI" {
         $rs1.Debugger.SetDebugMode("None")
         { Debug-Runspace -Runspace $rs1 -ErrorAction stop } | Should -Throw -ErrorId "InvalidOperation,Microsoft.PowerShell.Commands.DebugRunspaceCommand"
     }
+    
+    It "Should write attach event and mark runspace as having a remote debugger attached" {
+        $onAttachName = [System.Management.Automation.PSEngineEvent]::OnDebugAttach
+        
+        $debugTarget = [PowerShell]::Create()
+        $null = $debugTarget.AddCommand('Wait-Event').AddParameter('SourceIdentifier', $onAttachName)
+        $waitTask = $debugTarget.BeginInvoke()
 
+        $debugTarget.Runspace.IsRemoteDebuggerAttached | Should -BeFalse
+
+        $debugger = [PowerShell]::Create()
+        $null = $debugger.AddCommand('Debug-Runspace').AddParameter('Id', $debugTarget.Runspace.Id)
+        $debugTask = $debugger.BeginInvoke()
+        
+        $waitTask.AsyncWaitHandle.WaitOne(5000) | Should -BeTrue
+        $waitInfo = $debugTarget.EndInvoke($waitTask)
+        $waitInfo.SourceIdentifier | Should -Be $onAttachName
+
+        $debugTarget.Runspace.IsRemoteDebuggerAttached | Should -BeTrue
+
+        $debugger.Stop()
+        $exp = {
+            $debugger.EndInvoke($debugTask)
+        } | Should -Throw -PassThru
+        $exp.FullyQualifiedErrorId | Should -Be "PipelineStoppedException"
+
+        $debugTarget.Runspace.IsRemoteDebuggerAttached | Should -BeFalse
+    }
 }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1
index 67234f24c58..aae457f2f82 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1
@@ -11,6 +11,7 @@ Describe "Export-Csv" -Tags "CI" {
         $P1 = [pscustomobject]@{"P1" = "first"}
         $P2 = [pscustomobject]@{"P2" = "second"}
         $P11 = [pscustomobject]@{"P1" = "eleventh"}
+        $testHashTable = @{ 'first' = "value1"; 'second' = $null; 'third' = "value3" }
     }
 
     AfterEach {
@@ -90,11 +91,6 @@ Describe "Export-Csv" -Tags "CI" {
         $results[0] | Should -BeExactly "#TYPE System.String"
     }
 
-    It "Does not support -IncludeTypeInformation and -NoTypeInformation at the same time" {
-        { $testObject | Export-Csv -Path $testCsv -IncludeTypeInformation -NoTypeInformation } |
-            Should -Throw -ErrorId "CannotSpecifyIncludeTypeInformationAndNoTypeInformation,Microsoft.PowerShell.Commands.ExportCsvCommand"
-    }
-
     It "Should support -LiteralPath parameter" {
         $testObject | Export-Csv -LiteralPath $testCsv
         $results = Import-Csv -Path  $testCsv
@@ -186,6 +182,10 @@ Describe "Export-Csv" -Tags "CI" {
         $results[1].PSObject.properties.Name | Should -Not -Contain 'third'
     }
 
+    It "Should throw when -Append and -NoHeader are specified together" {
+        { $P1 | Export-Csv -Path $testCsv -Append -NoHeader -ErrorAction Stop } | Should -Throw -ErrorId "CannotSpecifyBothAppendAndNoHeader,Microsoft.PowerShell.Commands.ExportCsvCommand"
+    }
+
     It "First line should be #TYPE if -IncludeTypeInformation used and pstypenames object property is empty" {
         $object = [PSCustomObject]@{first = 1}
         $pstypenames = $object.pstypenames | ForEach-Object -Process {$_}
@@ -249,6 +249,33 @@ Describe "Export-Csv" -Tags "CI" {
         $contents[1].Contains($delimiter) | Should -BeTrue
     }
 
+    It "Should not throw when exporting hashtable with property that has null value"{
+        { $testHashTable | Export-Csv -Path $testCsv } | Should -Not -Throw
+    }
+
+    It "Should not throw when exporting PSCustomObject with property that has null value"{
+        $testObject = [pscustomobject]$testHashTable
+        { $testObject | Export-Csv -Path $testCsv } | Should -Not -Throw
+    }
+
+    It "Export hashtable with null and non-null values"{
+        $testHashTable | Export-Csv -Path $testCsv
+        $result2 = Import-CSV -Path $testCsv
+
+        $result2.first | Should -BeExactly "value1"
+        $result2.second | Should -BeNullOrEmpty
+        $result2.third | Should -BeExactly "value3"
+    }
+
+    It "Export hashtable with non-null values"{
+        $testTable = @{ 'first' = "value1"; 'second' = "value2" }
+        $testTable | Export-Csv -Path $testCsv
+        $results = Import-CSV -Path $testCsv
+
+        $results.first | Should -BeExactly "value1"
+        $results.second | Should -BeExactly "value2"
+    }
+
     Context "UseQuotes parameter" {
 
         # A minimum of tests. The rest are in ConvertTo-Csv.Tests.ps1
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-FormatData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-FormatData.Tests.ps1
index c024f364c68..3325b21a9c4 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-FormatData.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-FormatData.Tests.ps1
@@ -16,7 +16,7 @@ Describe "Export-FormatData" -Tags "CI" {
         {
             $fd | Export-FormatData -Path $TESTDRIVE\allformat.ps1xml -IncludeScriptBlock
 
-            $sessionState = [System.Management.Automation.Runspaces.InitialSessionState]::CreateDefault()
+            $sessionState = [initialsessionstate]::CreateDefault()
             $sessionState.Formats.Clear()
             $sessionState.Types.Clear()
 
@@ -135,7 +135,7 @@ Describe "Export-FormatData" -Tags "CI" {
             $testfile = Join-Path -Path $TestDrive -ChildPath "$testfilename.ps1xml"
             Set-Content -Path $testfile -Value $xmlContent
 
-            $sessionState = [System.Management.Automation.Runspaces.InitialSessionState]::CreateDefault()
+            $sessionState = [initialsessionstate]::CreateDefault()
             $sessionState.Formats.Clear()
             $sessionState.Types.Clear()
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Custom.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Custom.Tests.ps1
index 80aad6ef5b9..c82d8b77b8a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Custom.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Custom.Tests.ps1
@@ -466,4 +466,48 @@ SelectScriptBlock
         $ps.Invoke() -replace '\r?\n', "^" | Should -BeExactly $expectedOutput
         $ps.Streams.Error | Should -BeNullOrEmpty
     }
+
+    Context 'ExcludeProperty parameter' {
+        It 'Should exclude specified properties' {
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle' }
+            $result = $obj | Format-Custom -ExcludeProperty Age | Out-String
+            $result | Should -Match 'Name'
+            $result | Should -Match 'City'
+            $result | Should -Not -Match 'Age'
+        }
+
+        It 'Should work with wildcard patterns' {
+            $obj = [pscustomobject]@{ Prop1 = 1; Prop2 = 2; Other = 3 }
+            $result = $obj | Format-Custom -ExcludeProperty Prop* | Out-String
+            $result | Should -Match 'Other'
+            $result | Should -Not -Match 'Prop1'
+            $result | Should -Not -Match 'Prop2'
+        }
+
+        It 'Should work without Property parameter (implies -Property *)' {
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3 }
+            $result = $obj | Format-Custom -ExcludeProperty B | Out-String
+            $result | Should -Match 'A\s*='
+            $result | Should -Match 'C\s*='
+            $result | Should -Not -Match 'B\s*='
+        }
+
+        It 'Should work with Property parameter' {
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle'; Country = 'USA' }
+            $result = $obj | Format-Custom -Property Name, Age, City, Country -ExcludeProperty Age | Out-String
+            $result | Should -Match 'Name'
+            $result | Should -Match 'City'
+            $result | Should -Match 'Country'
+            $result | Should -Not -Match 'Age'
+        }
+
+        It 'Should handle multiple excluded properties' {
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3; D = 4 }
+            $result = $obj | Format-Custom -ExcludeProperty B, D | Out-String
+            $result | Should -Match 'A\s*='
+            $result | Should -Match 'C\s*='
+            $result | Should -Not -Match 'B\s*='
+            $result | Should -Not -Match 'D\s*='
+        }
+    }
 }
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 b9079b92139..342383f3880 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
@@ -261,4 +261,48 @@ Describe 'Format-List color tests' -Tag 'CI' {
         $output = Get-Content "$TestDrive/outfile.txt" -Raw
         $output.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
     }
+
+    Context 'ExcludeProperty parameter' {
+        It 'Should exclude specified properties' {
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle' }
+            $result = $obj | Format-List -ExcludeProperty Age | Out-String
+            $result | Should -Match 'Name'
+            $result | Should -Match 'City'
+            $result | Should -Not -Match 'Age'
+        }
+
+        It 'Should work with wildcard patterns' {
+            $obj = [pscustomobject]@{ Prop1 = 1; Prop2 = 2; Other = 3 }
+            $result = $obj | Format-List -ExcludeProperty Prop* | Out-String
+            $result | Should -Match 'Other'
+            $result | Should -Not -Match 'Prop1'
+            $result | Should -Not -Match 'Prop2'
+        }
+
+        It 'Should work without Property parameter (implies -Property *)' {
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3 }
+            $result = $obj | Format-List -ExcludeProperty B | Out-String
+            $result | Should -Match 'A'
+            $result | Should -Match 'C'
+            $result | Should -Not -Match 'B'
+        }
+
+        It 'Should work with Property parameter' {
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle'; Country = 'USA' }
+            $result = $obj | Format-List -Property Name, Age, City, Country -ExcludeProperty Age | Out-String
+            $result | Should -Match 'Name'
+            $result | Should -Match 'City'
+            $result | Should -Match 'Country'
+            $result | Should -Not -Match 'Age'
+        }
+
+        It 'Should handle multiple excluded properties' {
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3; D = 4 }
+            $result = $obj | Format-List -ExcludeProperty B, D | Out-String
+            $result | Should -Match 'A'
+            $result | Should -Match 'C'
+            $result | Should -Not -Match 'B'
+            $result | Should -Not -Match 'D'
+        }
+    }
 }
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 78cfb88b613..d102ef8bbdf 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
@@ -879,6 +879,55 @@ A Name                                  B
                 $numDecimals | Should -Be $expectedDecimals -Because $num
             }
         }
+
+        It 'Works for empty column header label' {
+            $ps1xml = @'
+    <Configuration>
+        <ViewDefinitions>
+            <View>
+                <Name>Test.Header.Empty</Name>
+                <ViewSelectedBy>
+                    <TypeName>Test.Format</TypeName>
+                </ViewSelectedBy>
+                <TableControl>
+                    <TableHeaders>
+                        <TableColumnHeader>
+                            <Label></Label>
+                            <Width>4</Width>
+                        </TableColumnHeader>
+                    </TableHeaders>
+                    <TableRowEntries>
+                        <TableRowEntry>
+                            <TableColumnItems>
+                                <TableColumnItem>
+                                    <PropertyName>Prop</PropertyName>
+                                </TableColumnItem>
+                            </TableColumnItems>
+                        </TableRowEntry>
+                    </TableRowEntries>
+                </TableControl>
+            </View>
+        </ViewDefinitions>
+    </Configuration>
+'@
+
+            $ps1xmlPath = Join-Path -Path $TestDrive -ChildPath 'empty.format.ps1xml'
+            Set-Content -Path $ps1xmlPath -Value $ps1xml
+            $object = [pscustomobject]@{Prop = '123'}
+            # run in own runspace so not affect global sessionstate
+            $ps = [powershell]::Create()
+            $ps.AddScript( {
+                param($ps1xmlPath, $object)
+                Update-FormatData -AppendPath $ps1xmlPath
+                $object.PSObject.TypeNames.Insert(0, 'Test.Format')
+                $object | Format-Table | Out-String
+            } ).AddArgument($ps1xmlPath).AddArgument($object) | Out-Null
+            $output = $ps.Invoke()
+            $expected = @"
+Prop----123
+"@
+            $output.Replace("`n","").Replace("`r","") | Should -BeExactly $expected
+        }
     }
 
 Describe 'Table color tests' -Tag 'CI' {
@@ -904,4 +953,48 @@ Describe 'Table color tests' -Tag 'CI' {
 
         $actual | Should -BeExactly $expected
     }
+
+    Context 'ExcludeProperty parameter' {
+        It 'Should exclude specified properties' {
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle' }
+            $result = $obj | Format-Table -ExcludeProperty Age | Out-String
+            $result | Should -Match 'Name'
+            $result | Should -Match 'City'
+            $result | Should -Not -Match 'Age'
+        }
+
+        It 'Should work with wildcard patterns' {
+            $obj = [pscustomobject]@{ Prop1 = 1; Prop2 = 2; Other = 3 }
+            $result = $obj | Format-Table -ExcludeProperty Prop* | Out-String
+            $result | Should -Match 'Other'
+            $result | Should -Not -Match 'Prop1'
+            $result | Should -Not -Match 'Prop2'
+        }
+
+        It 'Should work without Property parameter (implies -Property *)' {
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3 }
+            $result = $obj | Format-Table -ExcludeProperty B | Out-String
+            $result | Should -Match 'A'
+            $result | Should -Match 'C'
+            $result | Should -Not -Match 'B'
+        }
+
+        It 'Should work with Property parameter' {
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle'; Country = 'USA' }
+            $result = $obj | Format-Table -Property Name, Age, City, Country -ExcludeProperty Age | Out-String
+            $result | Should -Match 'Name'
+            $result | Should -Match 'City'
+            $result | Should -Match 'Country'
+            $result | Should -Not -Match 'Age'
+        }
+
+        It 'Should handle multiple excluded properties' {
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3; D = 4 }
+            $result = $obj | Format-Table -ExcludeProperty B, D | Out-String
+            $result | Should -Match 'A'
+            $result | Should -Match 'C'
+            $result | Should -Not -Match 'B'
+            $result | Should -Not -Match 'D'
+        }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Wide.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Wide.Tests.ps1
index c81db9fa1f9..10acd699068 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Wide.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Wide.Tests.ps1
@@ -105,4 +105,56 @@ Describe "Format-Wide DRT basic functionality" -Tags "CI" {
         $result | Should -Match " GroupingKey:"
         $result | Should -Match "name2\s+name3"
     }
+
+    Context 'ExcludeProperty parameter' {
+        It 'Should exclude specified property and display first remaining' {
+            # PSCustomObject properties are in definition order: Name, Age, City
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle' }
+            # Exclude Name, should display Age (first remaining)
+            $result = $obj | Format-Wide -ExcludeProperty Name | Out-String
+            $result | Should -Match '30'
+            $result | Should -Not -Match 'Test'
+        }
+
+        It 'Should work with wildcard patterns' {
+            # Properties: Prop1, Prop2, Other
+            $obj = [pscustomobject]@{ Prop1 = 1; Prop2 = 2; Other = 3 }
+            # Exclude Prop*, should display Other (only remaining)
+            $result = $obj | Format-Wide -ExcludeProperty Prop* | Out-String
+            $result | Should -Match '3'
+            $result | Should -Not -Match '1'
+            $result | Should -Not -Match '2'
+        }
+
+        It 'Should work without Property parameter (implies -Property *)' {
+            # Properties: A, B, C
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3 }
+            # Exclude B, C - should display A (first remaining)
+            $result = $obj | Format-Wide -ExcludeProperty B, C | Out-String
+            $result | Should -Match '1'
+            $result | Should -Not -Match '2'
+            $result | Should -Not -Match '3'
+        }
+
+        It 'Should display first remaining property after exclusion' {
+            # Properties: Name, Age, City, Country
+            $obj = [pscustomobject]@{ Name = 'Test'; Age = 30; City = 'Seattle'; Country = 'USA' }
+            # Exclude Name and Age, should display City (first remaining)
+            $result = $obj | Format-Wide -ExcludeProperty Name, Age | Out-String
+            $result | Should -Match 'Seattle'
+            $result | Should -Not -Match 'Test'
+            $result | Should -Not -Match '30'
+            # USA might appear but not in the wide field, or might not appear at all since only first property is shown
+        }
+
+        It 'Should handle multiple excluded properties' {
+            # Properties: A, B, C, D
+            $obj = [pscustomobject]@{ A = 1; B = 2; C = 3; D = 4 }
+            # Exclude A and B, should display C (first remaining)
+            $result = $obj | Format-Wide -ExcludeProperty A, B | Out-String
+            $result | Should -Match '3'
+            $result | Should -Not -Match '1'
+            $result | Should -Not -Match '2'
+        }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1
index edccb912ca7..a5b0b039d00 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1
@@ -155,6 +155,16 @@ Describe "Get-Alias DRT Unit Tests" -Tags "CI" {
             $returnObject[$i].Definition | Should -Be 'Get-Command'
         }
     }
+
+    It "Get-Alias DisplayName should always show AliasName -> ResolvedCommand for all aliases" {
+        Set-Alias -Name Test-MyAlias -Value Get-Command -Force
+        Set-Alias -Name tma -Value Test-MyAlias -force
+        $aliases = Get-Alias Test-MyAlias, tma
+        $aliases | ForEach-Object {
+            $_.DisplayName | Should -Be "$($_.Name) -> Get-Command"
+        }
+        $aliases.Name.foreach{Remove-Item Alias:$_ -ErrorAction SilentlyContinue}
+    }
 }
 
 Describe "Get-Alias" -Tags "CI" {
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 4f86ee561cb..5caa1c4e0ee 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
@@ -155,4 +155,18 @@ Describe 'Get-Error tests' -Tag CI {
         $out = pwsh -noprofile -command 'Set-StrictMode -Version Latest; $PSStyle.OutputRendering = "PlainText"; 1/0; Get-Error' | Out-String
         $out | Should -Match "Message : Attempted to divide by zero."
     }
+
+    It 'BoundParameters show as name/value pairs' {
+        try {
+            function test { [CmdletBinding()]param($A,$B) }
+            $Param = @{ A = "First"; B = "Second"; C = 24 }
+            test @Param
+        }
+        catch {
+            # do nothing
+        }
+
+        $out = Get-Error | Out-String
+        $out | Should -Match "BoundParameters\s+:\s+A : First\s+B : Second\s"
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Random.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Random.Tests.ps1
index cd9fee41873..100ca90b357 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Random.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Random.Tests.ps1
@@ -162,6 +162,12 @@ Describe "Get-Random" -Tags "CI" {
         $randomNumber | Should -BeIn 1, 2, 3, 5, 8, 13
     }
 
+    It "Should return a single random item when -Shuffle:`$false is used" {
+        $randomNumber = Get-Random -InputObject 1, 2, 3, 5, 8, 13 -Shuffle:$false
+        $randomNumber.Count | Should -Be 1
+        $randomNumber | Should -BeIn 1, 2, 3, 5, 8, 13
+    }
+
     It "Should return for a string collection " {
         $randomNumber = Get-Random -InputObject "red", "yellow", "blue"
         $randomNumber | Should -Be ("red" -or "yellow" -or "blue")
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-SecureRandom.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-SecureRandom.Tests.ps1
index acc560abdb3..957bfa30e9e 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-SecureRandom.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-SecureRandom.Tests.ps1
@@ -150,6 +150,12 @@ Describe "Get-SecureRandom" -Tags "CI" {
         $randomNumber | Should -BeIn 1, 2, 3, 5, 8, 13
     }
 
+    It "Should return a single random item when -Shuffle:`$false is used" {
+        $randomNumber = Get-SecureRandom -InputObject 1, 2, 3, 5, 8, 13 -Shuffle:$false
+        $randomNumber.Count | Should -Be 1
+        $randomNumber | Should -BeIn 1, 2, 3, 5, 8, 13
+    }
+
     It "Should return for a string collection " {
         $randomNumber = Get-SecureRandom -InputObject "red", "yellow", "blue"
         $randomNumber | Should -Be ("red" -or "yellow" -or "blue")
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1
index aff5e4d50af..b3275a61f2a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1
@@ -25,6 +25,10 @@ Describe "Get-Uptime" -Tags "CI" {
         $upt = Get-Uptime -Since
         $upt | Should -BeOfType DateTime
     }
+    It "Get-Uptime -Since:`$false return TimeSpan" {
+        $upt = Get-Uptime -Since:$false
+        $upt | Should -BeOfType TimeSpan
+    }
     It "Get-Uptime throw if IsHighResolution == false" {
         # Enable the test hook
         [system.management.automation.internal.internaltesthooks]::SetTestHook('StopwatchIsNotHighResolution', $true)
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Group-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Group-Object.Tests.ps1
index b1787bddad2..5811db60cfc 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Group-Object.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Group-Object.Tests.ps1
@@ -130,6 +130,14 @@ Describe "Group-Object" -Tags "CI" {
         $result[0].Name | Should -Be ""
         $result[0].Group | Should -Be '@{X=}'
     }
+
+    It "Should handle format-like strings with curly braces like normal strings" {
+        $result = '{', '}', '{0}' | Group-Object
+        $result.Count | Should -Be 3
+        $result[0].Name | Should -BeExactly '{'
+        $result[1].Name | Should -BeExactly '{0}'
+        $result[2].Name | Should -BeExactly '}'
+    }
 }
 
 Describe "Check 'Culture' parameter in order object cmdlets (Group-Object, Sort-Object, Compare-Object)" -Tags "CI" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1
index 4b459fe67d9..0c15fe6d359 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1
@@ -1633,7 +1633,7 @@ try
             try {
                 Invoke-Command $session { function attack(${foo="$(calc)"}){Write-Output "It is done."}}
                 $module = Import-PSSession -Session $session -CommandName attack -ErrorAction SilentlyContinue -ErrorVariable expectedError -AllowClobber
-                $expectedError | Should -Not -BeNullOrEmpty
+                $expectedError | Should -Not -Be $null
             } finally {
                 if ($null -ne $module) { Remove-Module $module -Force -ErrorAction SilentlyContinue }
             }
@@ -1901,7 +1901,7 @@ try
                 Export-PSSession -Session $session -OutputModule $tempdir\Diag -CommandName New-Guid -AllowClobber > $null
 
                 # Only the snapin Microsoft.PowerShell.Core is loaded
-                $iss = [System.Management.Automation.Runspaces.InitialSessionState]::CreateDefault2()
+                $iss = [initialsessionstate]::CreateDefault2()
                 $ps = [PowerShell]::Create($iss)
                 $result = $ps.AddScript(" & $tempdir\TestBug450687.ps1").Invoke()
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1
index 5f33e1b6b75..46ce42c223c 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1
@@ -58,7 +58,9 @@ Describe "Json Tests" -Tags "Feature" {
             $valueFromNotCompressedResult.FirstName | Should -Match $valueFromCompressedResult.FirstName
         }
 
-        It "Convertto-Json should handle Enum based on Int64" {
+        It "Convertto-Json should handle Enum based on Int64" -Skip:(
+            [ExperimentalFeature]::IsEnabled("PSSerializeJSONLongEnumAsNumber")
+        ) {
 
             # Test follow-up for bug Win8: 378368 Convertto-Json problems with Enum based on Int64.
             if ( $null -eq ("JsonEnumTest" -as "Type")) {
@@ -355,7 +357,7 @@ Describe "Json Tests" -Tags "Feature" {
 {
 	"date-s-should-parse-as-datetime": "2008-09-22T14:01:54",
 	"date-upperO-should-parse-as-datetime": "2008-09-22T14:01:54.9571247Z",
-	
+
 	"date-o-should-parse-as-string": "2019-12-17T06:14:06 +06:00",
 	"date-upperD-should-parse-as-string": "Monday, September 22, 2008",
 	"date-f-should-parse-as-string": "Monday, September 22, 2008 2:01 PM",
@@ -399,7 +401,7 @@ Describe "Json Tests" -Tags "Feature" {
 				$result."date-s-should-parse-as-datetime".ToString("Y") | Should -Be "September 2008"
 				$result."date-s-should-parse-as-datetime".ToString("y") | Should -Be "September 2008"
 				$result."date-s-should-parse-as-datetime" | Should -BeOfType [DateTime]
-				
+
                 $result."date-upperO-should-parse-as-datetime" = [datetime]::SpecifyKind($result."date-upperO-should-parse-as-datetime", [System.DateTimeKind]::Utc)
 				$result."date-upperO-should-parse-as-datetime".ToString("d") | Should -Be "9/22/2008"
 				$result."date-upperO-should-parse-as-datetime".ToString("D") | Should -Be "Monday, September 22, 2008"
@@ -420,7 +422,7 @@ Describe "Json Tests" -Tags "Feature" {
 				$result."date-upperO-should-parse-as-datetime".ToString("Y") | Should -Be "September 2008"
 				$result."date-upperO-should-parse-as-datetime".ToString("y") | Should -Be "September 2008"
 				$result."date-upperO-should-parse-as-datetime" | Should -BeOfType [DateTime]
-				
+
 				$result."date-o-should-parse-as-string" | Should -Be "2019-12-17T06:14:06 +06:00"
 				$result."date-o-should-parse-as-string" | Should -BeOfType [String]
 				$result."date-f-should-parse-as-string" | Should -Be "Monday, September 22, 2008 2:01 PM"
@@ -453,7 +455,7 @@ Describe "Json Tests" -Tags "Feature" {
 				$result."date-y-should-parse-as-string" | Should -BeOfType [String]
 			}
 		}
-		
+
 		It "ConvertFrom-Json properly parses complex objects" {
 			$json = @"
 {
@@ -541,13 +543,13 @@ Describe "Json Tests" -Tags "Feature" {
 			$result."registered" | Should -BeOfType [String]
 			$result."_id"| Should -BeExactly "60dd3ea9253016932039a0a2"
 			$result."_id" | Should -BeOfType [String]
-			
+
 			$result.Tags | Should -BeOfType [string]
-			
-			$result.Tags.count | Should -Be 7 
+
+			$result.Tags.count | Should -Be 7
 			$result.Tags[0] | Should -BeExactly "laboris"
 			$result.Tags | Should -Be @("laboris", "voluptate", "amet", "ad", "velit", "ipsum", "do")
-			
+
 			$result.Friends | Should -BeOfType [pscustomobject]
 			$result.Friends[0].id | Should -Be 0
 			$result.Friends[0].name | Should -BeExactly "Renee Holden"
@@ -556,7 +558,7 @@ Describe "Json Tests" -Tags "Feature" {
 			$result.Friends[2].id | Should -Be 2
 			$result.Friends[2].name | Should -BeExactly "Emilia Holder"
 		}
-		
+
 		It "ConvertFrom-Json chooses the appropriate number type" {
 			ConvertFrom-Json -InputObject "5" | should -Be 5
 			ConvertFrom-Json -InputObject 5 | should -Be 5
@@ -570,33 +572,33 @@ Describe "Json Tests" -Tags "Feature" {
 			ConvertFrom-Json -InputObject 5.0 | should -Be 5.0
 			ConvertFrom-Json -InputObject "5.0" | should -BeOfType [double]
 			ConvertFrom-Json -InputObject 5.0 | should -BeOfType [double]
-			
+
 			# The decimal is lost but only when this is quoted
 			ConvertFrom-Json -InputObject "500000000000.0000000000000001" | should -Be "500000000000"
-			
+
 			# Counter intuitively all four of these tests pass because precision is lost on both sides of the test, likely due to powershell number handling
 			ConvertFrom-Json -InputObject 500000000000.0000000000000001 | should -Be 500000000000
 			ConvertFrom-Json -InputObject 500000000000.0000000000000001 | should -Be 500000000000.0000000000000001
 			ConvertFrom-Json -InputObject 500000000000 | should -Be 500000000000.0000000000000001
 			ConvertFrom-Json -InputObject 500000000000 | should -Be 500000000000
-			
+
 			ConvertFrom-Json -InputObject "500000000000.0000000000000001" | should -BeOfType [double]
 			ConvertFrom-Json -InputObject 500000000000.0000000000000001 | should -BeOfType [double]
-			
+
 			# these tests also pass because precision is lost during conversion/powershell handling
 			ConvertFrom-Json -InputObject "50000000000000000000000000000000000.0000000000000001" | should -Be "5E+34"
 			ConvertFrom-Json -InputObject 50000000000000000000000000000000000.0000000000000001 | should -Be "5E+34"
-			
+
 			ConvertFrom-Json -InputObject "50000000000000000000000000000000000.0000000000000001" | should -BeOfType [double]
 			ConvertFrom-Json -InputObject 50000000000000000000000000000000000.0000000000000001 | should -BeOfType [double]
-			
-			
+
+
 			ConvertFrom-Json -InputObject "50000000000000000000000000000000000" | should -Be 50000000000000000000000000000000000
 			ConvertFrom-Json -InputObject 50000000000000000000000000000000000 | should -Be 50000000000000000000000000000000000
 			ConvertFrom-Json -InputObject "50000000000000000000000000000000000" | should -BeOfType [BigInt]
 			ConvertFrom-Json -InputObject 50000000000000000000000000000000000 | should -BeOfType [BigInt]
 		}
-		
+
         It "ConvertFrom-Json with special characters" {
 
             $json = '{"SampleValue":"\"\\\b\f\n\r\t\u4321\uD7FF"}'
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Guid.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Guid.Tests.ps1
index 54d609d2753..8756fed7726 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Guid.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-Guid.Tests.ps1
@@ -17,6 +17,11 @@ Describe "New-Guid" -Tags "CI" {
         $guid.ToString() | Should -BeExactly "00000000-0000-0000-0000-000000000000"
     }
 
+    It "Should respect explicit false value for -Empty" {
+        $guid = New-Guid -Empty:$false
+        $guid.ToString() | Should -Not -BeExactly "00000000-0000-0000-0000-000000000000"
+    }
+
     It "Should convert a string to a guid" {
         $guid1 = New-Guid
         $guid2 = New-Guid -InputObject $guid1.ToString()
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1
index cfba4a4cbed..148993b69b1 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1
@@ -49,4 +49,10 @@ Describe "Tests for the Import-PowerShellDataFile cmdlet" -Tags "CI" {
         $result = Import-PowerShellDataFile $largePsd1Path -SkipLimitCheck
         $result.Keys.Count | Should -Be 501
     }
+
+    It 'Fails if psd1 file is insecure while -SkipLimitCheck is used' {
+        $path = Setup -f insecure2.psd1 -Content '@{ Foo = [object] (calc.exe) }' -pass
+        { Import-PowerShellDataFile $path -SkipLimitCheck -ErrorAction Stop } |
+            Should -Throw -ErrorId "System.InvalidOperationException,Microsoft.PowerShell.Commands.ImportPowerShellDataFileCommand"
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-TypeData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-TypeData.Tests.ps1
index ba009de4b1b..96178fa13c0 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-TypeData.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Remove-TypeData.Tests.ps1
@@ -36,7 +36,7 @@ Describe "Remove-TypeData DRT Unit Tests" -Tags "CI" {
 
     BeforeEach {
         $ps = [powershell]::Create()
-        $iss = [system.management.automation.runspaces.initialsessionstate]::CreateDefault2()
+        $iss = [initialsessionstate]::CreateDefault2()
         $rs = [system.management.automation.runspaces.runspacefactory]::CreateRunspace($iss)
         $rs.Open()
         $ps.Runspace = $rs
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Variable.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Variable.Tests.ps1
index 0b6b9c59dfc..6e6fc1a2e1d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Variable.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Variable.Tests.ps1
@@ -241,4 +241,33 @@ Describe "Set-Variable" -Tags "CI" {
 	    { Set-Variable globalVar -Value 1 -Scope local -Force } | Should -Not -Throw
 	}
     }
+
+    Context "Set-Variable -Append tests" {
+        BeforeAll {
+            $testCases = @{ value = 2; Count = 2 },
+                @{ value = @(2,3,4); Count = 2},
+                @{ value = "abc",(Get-Process -Id $PID) ; count = 2}
+        }
+
+        It "Can append values <value> to a variable" -testCases $testCases {
+            param ($value, $count)
+
+            $variableName = "testVar"
+            Set-Variable -Name $variableName -Value 1
+            Set-Variable -Name $variableName -Value $value -Append
+
+            $observedValues = Get-Variable $variableName -Value
+
+            $observedValues.Count | Should -Be $count
+            $observedValues[0] | Should -Be 1
+
+            $observedValues[1] | Should -Be $value
+        }
+
+        It "Can use set-variable via streaming and append values" {
+            $testVar = 1
+            4..6 | Set-Variable -Name testVar -Append
+            $testVar | Should -Be @(1,4,5,6)
+        }
+    }
 }
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 a5aa52e0296..7b1b58d8258 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1
@@ -66,6 +66,161 @@ Describe "Test-Json" -Tags "CI" {
             }
 '@
 
+        $jsonWithComments = @'
+            {
+                // A Json comment
+                "string": "test"
+            }
+'@
+
+        $jsonWithTrailingComma = @'
+            {
+                "string": "test",
+            }
+'@
+
+        $jsonWithCommentsAndTrailingComma = @'
+            {
+                // A Json comment
+                "string": "test",
+            }
+'@
+
+        # Schema using oneOf to allow either integer or string pattern for port items
+        $oneOfSchema = @'
+            {
+                "type": "object",
+                "properties": {
+                    "ports": {
+                        "type": "array",
+                        "items": {
+                            "oneOf": [
+                                { "type": "integer", "minimum": 0, "maximum": 65535 },
+                                { "type": "string", "pattern": "^\\d+-\\d+$" }
+                            ]
+                        }
+                    }
+                }
+            }
+'@
+
+        # Valid JSON where ports are integers (first oneOf choice matches)
+        $validOneOfJson = '{ "ports": [80, 443, 8080] }'
+
+        # Invalid JSON where a port value matches neither oneOf choice
+        $invalidOneOfJson = '{ "ports": [80, "invalid-port", 8080] }'
+
+        # Schema using oneOf to allow either smartphone or laptop device types
+        $oneOfDeviceSchema = @'
+            {
+                "type": "object",
+                "properties": {
+                    "Devices": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "oneOf": [
+                                {
+                                    "properties": {
+                                        "id": { "type": "string" },
+                                        "deviceType": { "const": "smartphone" },
+                                        "os": { "type": "string", "enum": ["iOS", "Android"] }
+                                    },
+                                    "required": ["deviceType", "os"]
+                                },
+                                {
+                                    "properties": {
+                                        "id": { "type": "string" },
+                                        "deviceType": { "const": "laptop" },
+                                        "arch": { "type": "string", "enum": ["x86", "x64", "arm64"] }
+                                    },
+                                    "required": ["deviceType", "arch"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "required": ["Devices"]
+            }
+'@
+
+        # Valid JSON with mixed device types (all matching their respective oneOf choice)
+        $validOneOfDeviceJson = @'
+            {
+                "Devices": [
+                    { "id": "0", "deviceType": "laptop", "arch": "x64" },
+                    { "id": "1", "deviceType": "smartphone", "os": "iOS" },
+                    { "id": "2", "deviceType": "laptop", "arch": "arm64" },
+                    { "id": "3", "deviceType": "smartphone", "os": "Android" }
+                ]
+            }
+'@
+
+        # Invalid JSON where only Devices/3 has an invalid os value
+        $invalidOneOfDeviceJson = @'
+            {
+                "Devices": [
+                    { "id": "0", "deviceType": "laptop", "arch": "x64" },
+                    { "id": "1", "deviceType": "smartphone", "os": "iOS" },
+                    { "id": "2", "deviceType": "laptop", "arch": "arm64" },
+                    { "id": "3", "deviceType": "smartphone", "os": "WindowsPhone" }
+                ]
+            }
+'@
+
+        # Schema using anyOf to allow either smartphone or laptop device types
+        $anyOfDeviceSchema = @'
+            {
+                "type": "object",
+                "properties": {
+                    "Devices": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "anyOf": [
+                                {
+                                    "properties": {
+                                        "deviceType": { "const": "smartphone" },
+                                        "os": { "type": "string", "enum": ["iOS", "Android"] }
+                                    },
+                                    "required": ["deviceType", "os"]
+                                },
+                                {
+                                    "properties": {
+                                        "deviceType": { "const": "laptop" },
+                                        "arch": { "type": "string", "enum": ["x86", "x64", "arm64"] }
+                                    },
+                                    "required": ["deviceType", "arch"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "required": ["Devices"]
+            }
+'@
+
+        # Valid JSON with mixed device types (all matching their respective anyOf choice)
+        $validAnyOfDeviceJson = @'
+            {
+                "Devices": [
+                    { "deviceType": "laptop", "arch": "x64" },
+                    { "deviceType": "smartphone", "os": "iOS" }
+                ]
+            }
+'@
+
+        # Invalid JSON where only Devices/2 has an invalid os value
+        $invalidAnyOfDeviceJson = @'
+            {
+                "Devices": [
+                    { "deviceType": "laptop", "arch": "x64" },
+                    { "deviceType": "smartphone", "os": "iOS" },
+                    { "deviceType": "smartphone", "os": "WindowsPhone" }
+                ]
+            }
+'@
+
         $validJsonPath = Join-Path -Path $TestDrive -ChildPath 'validJson.json'
         $validLiteralJsonPath = Join-Path -Path $TestDrive -ChildPath "[valid]Json.json"
         $invalidNodeInJsonPath = Join-Path -Path $TestDrive -ChildPath 'invalidNodeInJson.json'
@@ -309,4 +464,78 @@ Describe "Test-Json" -Tags "CI" {
             Test-Json -Json $value -Schema $schema -ErrorAction SilentlyContinue
         } | Should -Be $expected
     }
+
+    It "Test-Json returns True with document options '<options>'" -TestCases @(
+        @{ Json = $jsonWithComments; Options = 'IgnoreComments' }
+        @{ Json = $jsonWithTrailingComma; Options = 'AllowTrailingCommas'}
+        @{ Json = $jsonWithCommentsAndTrailingComma; Options = 'IgnoreComments', 'AllowTrailingCommas'}
+    ) {
+        param($Json, $Options)
+
+        # Without options should fail
+        ($Json | Test-Json -ErrorAction SilentlyContinue) | Should -BeFalse
+
+        # With options should pass
+        ($Json | Test-Json -Option $Options -ErrorAction SilentlyContinue) | Should -BeTrue
+    }
+
+    It "Test-Json does not report false positives for valid oneOf matches" {
+        $errorVar = $null
+        $result = Test-Json -Json $validOneOfJson -Schema $oneOfSchema -ErrorVariable errorVar -ErrorAction SilentlyContinue
+
+        $result | Should -BeTrue
+        $errorVar.Count | Should -Be 0
+    }
+
+    It "Test-Json reports only relevant errors for invalid oneOf values" {
+        $errorVar = $null
+        $result = Test-Json -Json $invalidOneOfJson -Schema $oneOfSchema -ErrorVariable errorVar -ErrorAction SilentlyContinue
+
+        $result | Should -BeFalse
+        # Should report error only for the invalid item, not for valid items
+        $errorVar.Count | Should -BeGreaterThan 0
+        $errorVar[0].Exception.Message | Should -Match "/ports/1"
+    }
+
+    It "Test-Json does not report false positives for valid oneOf device matches" {
+        $errorVar = $null
+        $result = Test-Json -Json $validOneOfDeviceJson -Schema $oneOfDeviceSchema -ErrorVariable errorVar -ErrorAction SilentlyContinue
+
+        $result | Should -BeTrue
+        $errorVar.Count | Should -Be 0
+    }
+
+    It "Test-Json reports errors only for the invalid device in oneOf schema" {
+        $errorVar = $null
+        $result = Test-Json -Json $invalidOneOfDeviceJson -Schema $oneOfDeviceSchema -ErrorVariable errorVar -ErrorAction SilentlyContinue
+
+        $result | Should -BeFalse
+        # Should not report errors for valid devices (Devices/0, /1, /2)
+        $falsePositives = $errorVar | Where-Object { $_.Exception.Message -match '/Devices/(0|1|2)' }
+        $falsePositives.Count | Should -Be 0
+        # Should report errors only for the invalid device (Devices/3)
+        $relevantErrors = $errorVar | Where-Object { $_.Exception.Message -match '/Devices/3' }
+        $relevantErrors.Count | Should -BeGreaterThan 0
+    }
+
+    It "Test-Json does not report false positives for valid anyOf device matches" {
+        $errorVar = $null
+        $result = Test-Json -Json $validAnyOfDeviceJson -Schema $anyOfDeviceSchema -ErrorVariable errorVar -ErrorAction SilentlyContinue
+
+        $result | Should -BeTrue
+        $errorVar.Count | Should -Be 0
+    }
+
+    It "Test-Json reports errors only for the invalid device in anyOf schema" {
+        $errorVar = $null
+        $result = Test-Json -Json $invalidAnyOfDeviceJson -Schema $anyOfDeviceSchema -ErrorVariable errorVar -ErrorAction SilentlyContinue
+
+        $result | Should -BeFalse
+        # Should not report errors for valid devices (Devices/0, /1)
+        $falsePositives = $errorVar | Where-Object { $_.Exception.Message -match '/Devices/(0|1)' }
+        $falsePositives.Count | Should -Be 0
+        # Should report errors only for the invalid device (Devices/2)
+        $relevantErrors = $errorVar | Where-Object { $_.Exception.Message -match '/Devices/2' }
+        $relevantErrors.Count | Should -BeGreaterThan 0
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Trace-Command.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Trace-Command.Tests.ps1
index cdccd0e9ed3..533f3fc2d0c 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Trace-Command.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Trace-Command.Tests.ps1
@@ -84,6 +84,171 @@ Describe "Trace-Command" -tags "CI" {
         }
     }
 
+    Context "MethodInvocation traces" {
+
+        BeforeAll {
+            $filePath = Join-Path $TestDrive 'testtracefile.txt'
+
+            class MyClass {
+                MyClass() {}
+                MyClass([int]$arg) {}
+
+                [void]Method() { return }
+                [void]Method([string]$arg) { return }
+                [void]Method([int]$arg) { return }
+
+                [string]ReturnMethod() { return "foo" }
+
+                static [void]StaticMethod() { return }
+                static [void]StaticMethod([string]$arg) { return }
+            }
+
+            # C# classes support more features than pwsh classes
+            Add-Type -TypeDefinition @'
+namespace TraceCommandTests;
+
+public sealed class OverloadTests
+{
+    public int PropertySetter { get; set; }
+
+    public OverloadTests() {}
+    public OverloadTests(int value)
+    {
+        PropertySetter = value;
+    }
+
+    public void GenericMethod<T>()
+    {}
+
+    public T GenericMethodWithArg<T>(T obj) => obj;
+
+    public void MethodWithDefault(string arg1, int optional = 1)
+    {}
+
+    public void MethodWithOut(out int val)
+    {
+        val = 1;
+    }
+
+    public void MethodWithRef(ref int val)
+    {
+        val = 1;
+    }
+}
+'@
+        }
+
+        AfterEach {
+            Remove-Item $filePath -Force -ErrorAction SilentlyContinue
+        }
+
+        It "Traces instance method" {
+            $myClass = [MyClass]::new()
+            Trace-Command -Name MethodInvocation -Expression {
+                $myClass.Method(1)
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: void Method(int arg)"
+        }
+
+        It "Traces static method" {
+            Trace-Command -Name MethodInvocation -Expression {
+                [MyClass]::StaticMethod(1)
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: static void StaticMethod(string arg)"
+        }
+
+        It "Traces method with return type" {
+            $myClass = [MyClass]::new()
+            Trace-Command -Name MethodInvocation -Expression {
+                $myClass.ReturnMethod()
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: string ReturnMethod()"
+        }
+
+        It "Traces constructor" {
+            Trace-Command -Name MethodInvocation -Expression {
+                [TraceCommandTests.OverloadTests]::new("1234")
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: TraceCommandTests.OverloadTests new(int value)"
+        }
+
+        It "Traces Property setter invoked as a method" {
+            $obj = [TraceCommandTests.OverloadTests]::new()
+            Trace-Command -Name MethodInvocation -Expression {
+                $obj.set_PropertySetter(1234)
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: void set_PropertySetter(int value)"
+        }
+
+        It "Traces generic method" {
+            $obj = [TraceCommandTests.OverloadTests]::new()
+            Trace-Command -Name MethodInvocation -Expression {
+                $obj.GenericMethod[int]()
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: void GenericMethod``[int``]()"
+        }
+
+        It "Traces generic method with argument" {
+            $obj = [TraceCommandTests.OverloadTests]::new()
+            Trace-Command -Name MethodInvocation -Expression {
+                $obj.GenericMethodWithArg("foo")
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: string GenericMethodWithArg``[string``](string obj)"
+        }
+
+        It "Traces .NET call with default value" {
+            $obj = [TraceCommandTests.OverloadTests]::new()
+            Trace-Command -Name MethodInvocation -Expression {
+                $obj.MethodWithDefault("foo")
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: void MethodWithDefault(string arg1, int optional = 1)"
+        }
+
+        It "Traces method with ref argument" {
+            $obj = [TraceCommandTests.OverloadTests]::new()
+            $v = 1
+
+            Trace-Command -Name MethodInvocation -Expression {
+                $obj.MethodWithRef([ref]$v)
+            } -FilePath $filePath
+            # [ref] goes through the binder so will trigger the first trace
+            Get-Content $filePath | Select-Object -Skip 1 | Should -BeLike "*Invoking method: void MethodWithRef(``[ref``] int val)"
+        }
+
+        It "Traces method with out argument" {
+            $obj = [TraceCommandTests.OverloadTests]::new()
+            $v = 1
+
+            Trace-Command -Name MethodInvocation -Expression {
+                $obj.MethodWithOut([ref]$v)
+            } -FilePath $filePath
+            # [ref] goes through the binder so will trigger the first trace
+            Get-Content $filePath | Select-Object -Skip 1 | Should -BeLike "*Invoking method: void MethodWithOut(``[ref``] int val)"
+        }
+
+        It "Traces a binding error" {
+            Trace-Command -Name MethodInvocation -Expression {
+                # try/catch is used as error formatter will hit the trace as well
+                try {
+                    [System.Runtime.InteropServices.Marshal]::SizeOf([int])
+                }
+                catch {
+                    # Satisfy codefactor
+                    $_ | Out-Null
+                }
+            } -FilePath $filePath
+            # type fqn is used, the wildcard avoids hardcoding that
+            Get-Content $filePath | Should -BeLike "*Invoking method: static int SizeOf``[System.RuntimeType, *``](System.RuntimeType, * structure)"
+        }
+
+        It "Traces LINQ call" {
+            Trace-Command -Name MethodInvocation -Expression {
+                [System.Linq.Enumerable]::Union([int[]]@(1, 2), [int[]]@(3, 4))
+            } -FilePath $filePath
+            Get-Content $filePath | Should -BeLike "*Invoking method: static System.Collections.Generic.IEnumerable``[int``] Union``[int``](System.Collections.Generic.IEnumerable``[int``] first, System.Collections.Generic.IEnumerable``[int``] second)"
+        }
+    }
+
     Context "Trace-Command tests for code coverage" {
 
         BeforeAll {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-FormatData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-FormatData.Tests.ps1
index d7cfa1f3204..0c2969dfb2a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-FormatData.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-FormatData.Tests.ps1
@@ -110,7 +110,7 @@ Describe "Update-FormatData with resources in CustomControls" -Tags "CI" {
         $templatePath = Join-Path $PSScriptRoot (Join-Path 'assets' 'UpdateFormatDataTests.format.ps1xml')
         $formatFilePath = Join-Path $TestDrive 'UpdateFormatDataTests.format.ps1xml'
         $ps = [powershell]::Create()
-        $iss = [system.management.automation.runspaces.initialsessionstate]::CreateDefault2()
+        $iss = [initialsessionstate]::CreateDefault2()
         $rs = [system.management.automation.runspaces.runspacefactory]::CreateRunspace($iss)
         $rs.Open()
         $ps.Runspace = $rs
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-TypeData.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-TypeData.Tests.ps1
index e2666ea6199..07a5f8ae2e6 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-TypeData.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Update-TypeData.Tests.ps1
@@ -37,7 +37,7 @@ Describe "Update-TypeData basic functionality" -Tags "CI" {
 
     BeforeEach {
         $ps = [powershell]::Create()
-        $iss = [system.management.automation.runspaces.initialsessionstate]::CreateDefault2()
+        $iss = [initialsessionstate]::CreateDefault2()
         $rs = [system.management.automation.runspaces.runspacefactory]::CreateRunspace($iss)
         $rs.Open()
         $ps.Runspace = $rs
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index bb283b57951..7c0fffa5c4a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -284,7 +284,7 @@ function ExecuteWebRequest {
     return $result
 }
 
-[string] $verboseEncodingPrefix = 'Content encoding: '
+[string] $debugEncodingPrefix = 'WebResponse content encoding: '
 # This function calls Invoke-WebRequest with the given uri and
 # parses the verbose output to determine the encoding used for the content.
 function ExecuteRestMethod {
@@ -297,37 +297,39 @@ function ExecuteRestMethod {
         $UseBasicParsing
     )
     $result = @{Output = $null; Error = $null; Encoding = $null; Content = $null}
-    $verbosePreferenceSave = $VerbosePreference
-    $VerbosePreference = 'Continue'
+    $debugPreferenceSave = $DebugPreference
+    $DebugPreference = 'Continue'
     try {
-        $verboseFile = Join-Path $TestDrive -ChildPath ExecuteRestMethod.verbose.txt
-        $result.Output = Invoke-RestMethod -Uri $Uri -UseBasicParsing:$UseBasicParsing.IsPresent -Verbose 4>$verboseFile
+        $debugFile = Join-Path $TestDrive -ChildPath ExecuteRestMethod.debug.txt
+        $result.Output = Invoke-RestMethod -Uri $Uri -UseBasicParsing:$UseBasicParsing.IsPresent 5>$debugFile
         $result.Content = $result.Output
 
-        if (Test-Path -Path $verboseFile) {
-            $result.Verbose = Get-Content -Path $verboseFile
-            foreach ($item in $result.Verbose) {
+        # Invoke-RestMethod does not return encoding as part of an object, only in debug output, so we parse the debug output for the purposes of verifying the test.
+        # This debug output is defined in InvokeRestMethodCommand.Common.cs ProcessResponse()
+        if (Test-Path -Path $debugFile) {
+            $result.Debug = Get-Content -Path $debugFile
+            foreach ($item in $result.Debug) {
                 $line = $item.Trim()
-                if ($line.StartsWith($verboseEncodingPrefix)) {
-                    $encodingName = $item.SubString($verboseEncodingPrefix.Length).Trim()
+                if ($line.StartsWith($debugEncodingPrefix)) {
+                    $encodingName = [int]::Parse($item.SubString($EncodingPrefix.Length).Split('CodePage: ')[1].Trim())
                     $result.Encoding = [System.Text.Encoding]::GetEncoding($encodingName)
                     break
                 }
             }
-            if ($result.Encoding -eq $null) {
-                throw "Encoding not found in verbose output. Lines: $($result.Verbose.Count) Content:$($result.Verbose)"
+            if ($null -eq $result.Encoding) {
+                throw "Encoding not found in debug output. Lines: $($result.Debug.Count) Content:$($result.Debug)"
             }
         }
 
-        if ($result.Verbose -eq $null) {
-            throw "No verbose output was found"
+        if ($null -eq $result.Debug) {
+            throw "No debug output was found"
         }
     } catch {
         $result.Error = $_ | Select-Object * | Out-String
     } finally {
-        $VerbosePreference = $verbosePreferenceSave
-        if (Test-Path -Path $verboseFile) {
-            Remove-Item -Path $verboseFile -ErrorAction SilentlyContinue
+        $DebugPreference = $debugPreferenceSave
+        if (Test-Path -Path $debugFile) {
+            Remove-Item -Path $debugFile -ErrorAction SilentlyContinue
         }
     }
 
@@ -692,8 +694,9 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
             $uri = Get-WebListenerUrl -Test $method
             $body = GetTestData -contentType $contentType
             $command = "Invoke-WebRequest -Uri $uri -Body '$body' -Method $method -ContentType $contentType"
+            $commandNoContentType = "Invoke-WebRequest -Uri $uri -Body '$body' -Method $method"
 
-            It "Invoke-WebRequest -Uri $uri  -Method $method -ContentType $contentType -Body [body data]" {
+            It "Invoke-WebRequest -Uri $uri -Method $method -ContentType $contentType -Body [body data]" {
 
                 $result = ExecuteWebCommand -command $command
                 ValidateResponse -response $result
@@ -705,6 +708,29 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
                 # Validate that the response Content.data field is the same as what we sent.
                 $jsonContent.data | Should -Be $body
             }
+
+            It "Invoke-WebRequest -Uri $uri -Method $method -Body [body data]" {
+
+                $result = ExecuteWebCommand -command $commandNoContentType
+                ValidateResponse -response $result
+
+                # Validate response content
+                $jsonContent = $result.Output.Content | ConvertFrom-Json
+                $jsonContent.url | Should -Match $uri
+                if ($method -eq "POST")
+                {
+                    $jsonContent.headers.'Content-Type' | Should -Match "application/x-www-form-urlencoded"
+                    # Validate that the response Content.form field is the same as what we sent.
+                    [string]$jsonContent.form | Should -Be ([string][PSCustomObject]@{$body.Split("=")[0] = [System.Object[]]})
+                    $jsonContent.data | Should -BeNullOrEmpty
+                }
+                else
+                {
+                    # Validate that the response Content.data field is the same as what we sent.
+                    $jsonContent.data | Should -Be $body
+                }
+
+            }
         }
     }
 
@@ -762,6 +788,28 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
         Get-Item $outFile | Select-Object -ExpandProperty Length | Should -Be $content.Content.Length
     }
 
+    It "Invoke-WebRequest -PassThru -OutFile <directory> saves the downloaded file path as a property in WebResponseObject"{
+        $uri = Get-WebListenerUrl -Test 'Get'
+        $content = Invoke-WebRequest -Uri $uri -PassThru -OutFile $TestDrive
+        $content.OutFile | Should -exist
+        $content.OutFile | Should -Be (Join-Path $TestDrive 'Get')
+    }
+
+    It "Invoke-WebRequest -PassThru -OutFile <file> saves the downloaded file path as a property in WebResponseObject"{
+        $uri = Get-WebListenerUrl -Test 'Get'
+        $filePath = Join-Path $TestDrive "pestertest-outfile"
+        $content = Invoke-WebRequest -Uri $uri -PassThru -OutFile $filePath
+        $content.OutFile | Should -exist
+        $content.OutFile | Should -Be $filePath
+    }
+
+    It "Invoke-WebRequest -PassThru -OutFile -Verbose File Name reflects the downloaded file name" {
+        $uri = Get-WebListenerUrl -Test 'Get'
+        $filePath = Join-Path $TestDrive "pestertest-outfile"
+        $content = Invoke-WebRequest -Verbose -Uri $uri -PassThru -OutFile $filePath 4>variable:verbo
+        $verbo[-1].Message | Should -Match "pestertest-outfile"
+    }
+
     It "Invoke-WebRequest should fail if -OutFile is <Name>." -TestCases @(
         @{ Name = "empty"; Value = [string]::Empty }
         @{ Name = "null"; Value = $null }
@@ -795,14 +843,9 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
         ($result.Output.Content | ConvertFrom-Json).method | Should -Be "TEST"
     }
 
-    It "Validate Invoke-WebRequest default ContentType for CustomMethod <method>" -TestCases @(
-        @{method = "POST"}
-        @{method = "PUT"}
-    ) {
-        param($method)
-
-        $uri = Get-WebListenerUrl -Test $method
-        $command = "Invoke-WebRequest -Uri '$uri' -CustomMethod $method -Body 'testparam=testvalue'"
+    It "Validate Invoke-WebRequest default ContentType for CustomMethod POST" {
+        $uri = Get-WebListenerUrl -Test 'Post'
+        $command = "Invoke-WebRequest -Uri '$uri' -CustomMethod POST -Body 'testparam=testvalue'"
         $result = ExecuteWebCommand -command $command
         $jsonResult = $result.Output.Content | ConvertFrom-Json
         $jsonResult.form.testparam | Should -Be "testvalue"
@@ -1684,6 +1727,26 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
             $result.Files[0].Content | Should -Match $file1Contents
         }
 
+        It "Verifies Invoke-WebRequest -Form supports read-only file values" {
+            # Create a read-only test file
+            $readOnlyFile = Join-Path $TestDrive "readonly-test.txt"
+            "ReadOnly test content" | Out-File -FilePath $readOnlyFile -Encoding utf8
+            Set-ItemProperty -Path $readOnlyFile -Name IsReadOnly -Value $true
+
+            $form = @{TestFile = [System.IO.FileInfo]$readOnlyFile}
+            $uri = Get-WebListenerUrl -Test 'Multipart'
+            $response = Invoke-WebRequest -Uri $uri -Form $form -Method 'POST'
+            $result = $response.Content | ConvertFrom-Json
+
+            $result.Headers.'Content-Type' | Should -Match 'multipart/form-data'
+            $result.Files.Count | Should -Be 1
+
+            $result.Files[0].Name | Should -BeExactly "TestFile"
+            $result.Files[0].FileName | Should -BeExactly "readonly-test.txt"
+            $result.Files[0].ContentType | Should -BeExactly 'application/octet-stream'
+            $result.Files[0].Content | Should -Match "ReadOnly test content"
+        }
+
         It "Verifies Invoke-WebRequest -Form sets Content-Disposition FileName and FileNameStar." {
             $ContentDisposition = [System.Net.Http.Headers.ContentDispositionHeaderValue]::new("attachment")
             $ContentDisposition.FileName = $fileName
@@ -2744,6 +2807,7 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
             $uri = Get-WebListenerUrl -Test $method
             $body = GetTestData -contentType $contentType
             $command = "Invoke-RestMethod -Uri $uri -Body '$body' -Method $method -ContentType $contentType"
+            $commandNoContentType = "Invoke-RestMethod -Uri $uri -Body '$body' -Method $method"
 
             It "Invoke-RestMethod -Uri $uri -Method $method -ContentType $contentType -Body [body data]" {
 
@@ -2756,6 +2820,27 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
                 # Validate that the response Content.data field is the same as what we sent.
                 $result.Output.data | Should -Be $body
             }
+
+            It "Invoke-RestMethod -Uri $uri -Method $method -Body [body data]" {
+
+                $result = ExecuteWebCommand -command $commandNoContentType
+
+                # Validate response
+                $result.Output.url | Should -Match $uri
+
+                if ($method -eq "POST")
+                {
+                    $result.Output.headers.'Content-Type' | Should -Match "application/x-www-form-urlencoded"
+                    # Validate that the response Content.form field is the same as what we sent.
+                    [string]$result.Output.form | Should -Be ([string][PSCustomObject]@{$body.Split("=")[0] = [System.Object[]]})
+                    $result.Output.data | Should -BeNullOrEmpty
+                }
+                else
+                {
+                    # Validate that the response Content.data field is the same as what we sent.
+                    $result.Output.data | Should -Be $body
+                }
+            }
         }
     }
 
@@ -2813,6 +2898,27 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
         Get-Item $outFile | Select-Object -ExpandProperty Length | Should -Be $content.Content.Length
     }
 
+    It "Invoke-RestMethod -PassThru -OutFile Downloads the file and pipes it" {
+        $uri = Get-WebListenerUrl -Test 'Get'
+        $content = Invoke-WebRequest -Uri $uri
+        $outFile = Join-Path $TestDrive $content.BaseResponse.RequestMessage.RequestUri.Segments[-1]
+
+        # ensure the file does not exist
+        Remove-Item -Force -ErrorAction Ignore -Path $outFile
+        $response = Invoke-RestMethod -Uri $uri -PassThru -OutFile $outFile
+
+        # check if the file is downloaded.
+        Test-Path $outFile | Should -Be $true
+
+        # check if the file is correctly downloaded
+        Get-Content -Path $outFile | Should -BeExactly $content.Content
+
+        # check if the response stores the downloaded file contents
+        # response is a PSCustomObject so converted it string for comparison
+        $responseAsJsonString = $response | ConvertTo-Json -Compress
+        $responseAsJsonString | Should -BeExactly $content.Content
+    }
+
     It "Invoke-RestMethod should fail if -OutFile is <Name>." -TestCases @(
         @{ Name = "empty"; Value = [string]::Empty }
         @{ Name = "null"; Value = $null }
@@ -2845,13 +2951,9 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
         $result.Output.method | Should -Be "TEST"
     }
 
-    It "Validate Invoke-RestMethod default ContentType for CustomMethod <method>" -TestCases @(
-        @{method = "POST"}
-        @{method = "PUT"}
-    ) {
-        param($method)
-        $uri = Get-WebListenerUrl -Test $method
-        $command = "Invoke-RestMethod -Uri '$uri' -CustomMethod $method -Body 'testparam=testvalue'"
+    It "Validate Invoke-RestMethod default ContentType for CustomMethod POST" {
+        $uri = Get-WebListenerUrl -Test 'Post'
+        $command = "Invoke-RestMethod -Uri '$uri' -CustomMethod POST -Body 'testparam=testvalue'"
         $result = ExecuteWebCommand -command $command
         $result.Output.form.testparam | Should -Be "testvalue"
         $result.Output.Headers.'Content-Type' | Should -Be "application/x-www-form-urlencoded"
@@ -3486,6 +3588,25 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
             $result.Files[0].Content | Should -Match $file1Contents
         }
 
+        It "Verifies Invoke-RestMethod -Form supports read-only file values" {
+            # Create a read-only test file
+            $readOnlyFile = Join-Path $TestDrive "readonly-test.txt"
+            "ReadOnly test content" | Out-File -FilePath $readOnlyFile -Encoding utf8
+            Set-ItemProperty -Path $readOnlyFile -Name IsReadOnly -Value $true
+
+            $form = @{TestFile = [System.IO.FileInfo]$readOnlyFile}
+            $uri = Get-WebListenerUrl -Test 'Multipart'
+            $result = Invoke-RestMethod -Uri $uri -Form $form -Method 'POST'
+
+            $result.Headers.'Content-Type' | Should -Match 'multipart/form-data'
+            $result.Files.Count | Should -Be 1
+
+            $result.Files[0].Name | Should -Be "TestFile"
+            $result.Files[0].FileName | Should -Be "readonly-test.txt"
+            $result.Files[0].ContentType | Should -Be 'application/octet-stream'
+            $result.Files[0].Content | Should -Match "ReadOnly test content"
+        }
+
         It "Verifies Invoke-RestMethod -Form sets Content-Disposition FileName and FileNameStar." {
             $ContentDisposition = [System.Net.Http.Headers.ContentDispositionHeaderValue]::new("attachment")
             $ContentDisposition.FileName = $fileName
@@ -4601,7 +4722,6 @@ Describe 'Invoke-WebRequest and Invoke-RestMethod support OperationTimeoutSecond
     }
 }
 
-
 Describe "Invoke-RestMethod should run in the default synchronization context (threadpool)" -Tag "CI" {
     BeforeAll {
         $oldProgress = $ProgressPreference
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Debug.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Debug.Tests.ps1
index f93027cc578..951400349c3 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Debug.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Debug.Tests.ps1
@@ -34,4 +34,44 @@ Describe "Write-Debug tests" -Tags "CI" {
         $out = $p.StandardError.ReadToEnd()
         $out | Should -BeNullOrEmpty
     }
+
+    It "'-Debug' should not trigger 'ShouldProcess'" {
+        $pwsh = [PowerShell]::Create()
+        $pwsh.AddScript(@'
+function Test-DebugWithConfirm
+{
+    [CmdletBinding(SupportsShouldProcess = $true, ConfirmImpact = 'Low')]
+    Param ()
+
+    PROCESS
+    {
+        Write-Debug -Message "Debug_Message1"
+        If ($PSCmdlet.ShouldProcess('Doing the thing.','Proceed?','Ready to do the thing.'))
+        {
+            Write-Output 'success'
+        }
+        Write-Debug -Message "Debug_Message2"
+    }
+
+    END {}
+}
+'@)
+        $pwsh.Invoke()
+        $pwsh.Commands.Clear()
+        $pwsh.Streams.ClearStreams()
+
+        try {
+            $result = $pwsh.AddScript("Test-DebugWithConfirm -Debug").Invoke()
+            $result.Count | Should -BeExactly 1
+            $result[0] | Should -BeExactly 'success'
+
+            $pwsh.Streams.Error.Count | Should -BeExactly 0
+            $pwsh.Streams.Debug.Count | Should -BeExactly 2
+            $pwsh.Streams.Debug[0] | Should -BeExactly 'Debug_Message1'
+            $pwsh.Streams.Debug[1] | Should -BeExactly 'Debug_Message2'
+        }
+        finally {
+            $pwsh.Dispose()
+        }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1
index a75c17bcbaa..92b6a027853 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1
@@ -60,6 +60,8 @@ Describe "Write-Host with TestHostCS" -Tags "CI" {
             @{ Name = '-Separator, colors and -NoNewLine'; Command = "Write-Host a,b,c -Separator ',' -ForegroundColor Yellow -BackgroundColor DarkBlue -NoNewline"; returnCount = 1; returnValue = @("Yellow:DarkBlue:a,b,c:NoNewLine"); returnInfo = @("a,b,c") }
             @{ Name = '-NoNewline:$true and colors';       Command = "Write-Host a,b -NoNewline:`$true -ForegroundColor Red -BackgroundColor Green;Write-Host a,b";  returnCount = 2; returnValue = @("Red:Green:a b:NoNewLine", "White:Black:a b:NewLine"); returnInfo = @("a b", "a b") }
             @{ Name = '-NoNewline:$false and colors';      Command = "Write-Host a,b -NoNewline:`$false -ForegroundColor Red -BackgroundColor Green;Write-Host a,b"; returnCount = 2; returnValue = @("Red:Green:a b:NewLine","White:Black:a b:NewLine"); returnInfo = @("a b", "a b") }
+            @{ Name = 'XMLElement';                        Command = "Write-Host ([xml] '<OhElement>Where art thou?</OhElement>').DocumentElement";                  returnCount = 1; returnValue = @("White:Black:OhElement:NewLine"); returnInfo = @("OhElement") }
+            @{ Name = 'XMLDocument';                        Command = "Write-Host ([system.xml.xmldocument] '<OhElement>Where art thou?</OhElement>').DocumentElement";                  returnCount = 1; returnValue = @("White:Black:OhElement:NewLine"); returnInfo = @("OhElement") }
         )
 
     }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
index 53e4fbf8d7d..3b5b5276358 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
@@ -25,6 +25,29 @@ Describe "XmlCommand DRT basic functionality Tests" -Tags "CI" {
         }
 "@
 		}
+
+        class Four
+        {
+            [int] $num = 4;
+        }
+
+        class Three
+        {
+            [Four] $four = [Four]::New();
+            [int] $num = 3;
+        }
+
+        class Two
+        {
+            [Three] $three = [Three]::New();
+            [int] $value = 2;
+        }
+
+        class One
+        {
+            [Two] $two = [Two]::New();
+            [int] $value = 1;
+        }
     }
 
 	BeforeEach {
@@ -259,23 +282,6 @@ Describe "XmlCommand DRT basic functionality Tests" -Tags "CI" {
 	}
 
 	It "Export-Clixml using -Depth should work" {
-		class Three
-		{
-			[int] $num = 3;
-		}
-
-		class Two
-		{
-			[Three] $three = [Three]::New();
-			[int] $value = 2;
-		}
-
-		class One
-		{
-			[Two] $two = [Two]::New();
-			[int] $value = 1;
-		}
-
 		$one = [One]::New()
 		$one | Export-Clixml -Depth 2 -Path $testfile
 		$deserialized_one = Import-Clixml -Path $testfile
@@ -340,4 +346,251 @@ Describe "XmlCommand DRT basic functionality Tests" -Tags "CI" {
 		$cmd.Xml = $xml
 		$cmd.Xml | Should -Be $xml
 	}
+
+    Context "ConvertTo-CliXml & ConvertFrom-CliXml" {
+
+        It "Getting cmdlet info should work" {
+            $content = $content = Get-Command ConvertTo-CliXml,ConvertFrom-CliXml | ConvertTo-Clixml
+            $results = ConvertFrom-CliXml $content
+            $results.Count | Should -Be 2
+            $results[0].PSTypeNames[0] | Should -BeExactly "Deserialized.System.Management.Automation.CmdletInfo"
+            $results[1].PSTypeNames[0] | Should -BeExactly "Deserialized.System.Management.Automation.CmdletInfo"
+        }
+
+        It "Rehydration should work" {
+            $property1 = 256
+            $property2 = "abcdef"
+            $isHiddenTestType = [IsHiddenTestType]::New($property1,$property2)
+            $content = $isHiddenTestType | ConvertTo-CliXml
+            $results = ConvertFrom-CliXml $content
+            $results.Property1 | Should -Be $property1
+            $results.Property2 | Should -BeExactly $property2
+        }
+
+        It "ConvertTo-CliXml StopProcessing should succeed" {
+            $ps = [PowerShell]::Create()
+            $null = $ps.AddScript("1..10")
+            $null = $ps.AddCommand("foreach-object")
+            $null = $ps.AddParameter("Process", { $_; Start-Sleep -Seconds 1 })
+            $null = $ps.AddCommand("ConvertTo-CliXml")
+
+            Wait-UntilTrue { $ps.BeginInvoke() } -IntervalInMilliseconds 1000
+            $null = $ps.Stop()
+            $ps.InvocationStateInfo.State | Should -BeExactly "Stopped"
+            $ps.Dispose()
+        }
+
+        It "ConvertFrom-CliXml StopProcessing should succeed" {
+            $content = 1,2,3 | ConvertTo-CliXml
+            $ps = [PowerShell]::Create()
+            $ps.AddCommand("Get-Process")
+            $ps.AddCommand("ConvertFrom-CliXml")
+            $ps.AddParameter("InputObject", $content)
+            $ps.BeginInvoke()
+            $ps.Stop()
+            $ps.InvocationStateInfo.State | Should -BeExactly "Stopped"
+        }
+
+        It "Should serialize integers correctly using ValueFromPipeline" {
+            $testObject = 1,2,3
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-CliXml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [array] | Should -BeTrue
+            $out.Count | Should -Be 3
+            $out[0] | Should -BeOfType [int]
+            $out[0] | Should -Be 1
+            $out[1] | Should -BeOfType [int]
+            $out[1] | Should -Be 2
+            $out[2] | Should -BeOfType [int]
+            $out[2] | Should -Be 3
+        }
+
+        It "Using default depth of 2 should work" {
+            $testObject = [One]::New()
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-Clixml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $deserialized_one = ConvertFrom-CliXml -InputObject $content
+            $deserialized_one.value | Should -Be 1
+            $deserialized_one.two | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.value | Should -Be 2
+            $deserialized_one.two.three | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.three.num | Should -BeNullOrEmpty
+        }
+
+        It "Using -Depth 3 should work" {
+            $testObject = [One]::New()
+            $content = $testObject | ConvertTo-CliXml -Depth 3
+            $testObject | Export-CliXml -Path $testfile -Depth 3
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $deserialized_one = ConvertFrom-CliXml -InputObject $content
+            $deserialized_one.value | Should -Be 1
+            $deserialized_one.two | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.value | Should -Be 2
+            $deserialized_one.two.three | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.three.num | Should -Be 3
+            $deserialized_one.two.three.four | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.three.four.num | Should -BeNullOrEmpty
+        }
+
+        It "Using -Depth 4 should work" {
+            $testObject = [One]::New()
+            $content = $testObject | ConvertTo-CliXml -Depth 4
+            $testObject | Export-CliXml -Path $testfile -Depth 4
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $deserialized_one = ConvertFrom-CliXml -InputObject $content
+            $deserialized_one.value | Should -Be 1
+            $deserialized_one.two | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.value | Should -Be 2
+            $deserialized_one.two.three | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.three.num | Should -Be 3
+            $deserialized_one.two.three.four | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.three.four.num | Should -Be 4
+        }
+
+        It "Using -Depth 2 cannot get value beyond depth" {
+            $testObject = [One]::New()
+            $content = $testObject | ConvertTo-CliXml -Depth 2
+            $testObject | Export-CliXml -Path $testfile -Depth 2
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $deserialized_one = ConvertFrom-CliXml -InputObject $content
+            $deserialized_one.value | Should -Be 1
+            $deserialized_one.two | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.value | Should -Be 2
+            $deserialized_one.two.three | Should -Not -BeNullOrEmpty
+            $deserialized_one.two.three.num | Should -BeNullOrEmpty
+        }
+
+        It "Should serialize array correctly using ValueFromPipeline" {
+            $testObject = @(1,2,3,4)
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-CliXml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [array] | Should -BeTrue
+            $out.Count | Should -Be 4
+            $out[0] | Should -BeOfType [int]
+            $out[0] | Should -Be 1
+            $out[1] | Should -BeOfType [int]
+            $out[1] | Should -Be 2
+            $out[2] | Should -BeOfType [int]
+            $out[2] | Should -Be 3
+            $out[3] | Should -BeOfType [int]
+            $out[3] | Should -Be 4
+        }
+
+        It "Should serialize array correctly using -InputObject" {
+            $testObject = @(1,2,3,4)
+            $content = ConvertTo-CliXml -InputObject $testObject
+            Export-CliXml -Path $testfile -InputObject $testObject
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [System.Collections.ArrayList] | Should -BeTrue
+            $out.Count | Should -Be 4
+            $out[0] | Should -BeOfType [int]
+            $out[0] | Should -Be 1
+            $out[1] | Should -BeOfType [int]
+            $out[1] | Should -Be 2
+            $out[2] | Should -BeOfType [int]
+            $out[2] | Should -Be 3
+            $out[3] | Should -BeOfType [int]
+            $out[3] | Should -Be 4
+        }
+
+        It "Should serialize hashtable correctly" {
+            $testObject = [ordered]@{ a = 1; b = 2; c = 3; d = 4 }
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-CliXml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [ordered] | Should -BeTrue
+            $out.Count | Should -Be 4
+            $out.Keys | Should -BeIn @('a', 'b', 'c', 'd')
+            $out.Values | Should -BeIn @(1, 2, 3, 4)
+        }
+
+        It "Should serialize PSCustomObject correctly" {
+            $testObject = [PSCustomObject]@{ a = 1; b = 2; c = 3; d = 4 }
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-CliXml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [pscustomobject] | Should -BeTrue
+            $out.a | Should -BeOfType [int]
+            $out.a | Should -Be 1
+            $out.b | Should -BeOfType [int]
+            $out.b | Should -Be 2
+            $out.c | Should -BeOfType [int]
+            $out.c | Should -Be 3
+            $out.d | Should -BeOfType [int]
+            $out.d | Should -Be 4
+        }
+
+        It "Should serialize nested PSCustomObject correctly" {
+            $testObject = [PSCustomObject]@{ a = 1; b = 2; c = 3; d = [PSCustomObject]@{ e = 4 } }
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-CliXml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [pscustomobject] | Should -BeTrue
+            $out.a | Should -BeOfType [int]
+            $out.a | Should -Be 1
+            $out.b | Should -BeOfType [int]
+            $out.b | Should -Be 2
+            $out.c | Should -BeOfType [int]
+            $out.c | Should -Be 3
+            $out.d -is [pscustomobject] | Should -BeTrue
+            $out.d.e | Should -BeOfType [int]
+            $out.d.e | Should -Be 4
+        }
+
+        It "Should serialize array of PSCustomObjects correctly" {
+            $testObject = @(
+                [PSCustomObject]@{ Property = 1 }
+                [PSCustomObject]@{ Property = 2 }
+                [PSCustomObject]@{ Property = 3 }
+            )
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-CliXml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [array] | Should -BeTrue
+            $out.Count | Should -Be 3
+            $out[0].Property | Should -BeOfType [int]
+            $out[0].Property | Should -Be 1
+            $out[1].Property | Should -BeOfType [int]
+            $out[1].Property | Should -Be 2
+            $out[2].Property | Should -BeOfType [int]
+            $out[2].Property | Should -Be 3
+        }
+
+        It "Should serialize array of single PSCustomObject when using ValueFromPipeline" {
+            $testObject = @(
+                [PSCustomObject]@{ Property = 1 }
+            )
+            $content = $testObject | ConvertTo-CliXml
+            $testObject | Export-CliXml -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [pscustomobject] | Should -BeTrue
+            $out.Property | Should -BeOfType [int]
+            $out.Property | Should -Be 1
+        }
+
+        It "Should serialize array of single PSCustomObject when using -InputObject" {
+            $testObject = @(
+                [PSCustomObject]@{ Property = 1 }
+            )
+            $content = ConvertTo-CliXml -InputObject $testObject
+            Export-CliXml -InputObject $testObject -Path $testfile
+            (Get-Content -Path $testfile -Raw) | Should -Be $content
+            $out = ConvertFrom-CliXml -InputObject $content
+            $out -is [System.Collections.ArrayList] | Should -BeTrue
+            $out.Count | Should -Be 1
+            $out[0].Property | Should -BeOfType [int]
+            $out[0].Property | Should -Be 1
+        }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1
index 46b04594f99..58f6a4f3353 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1
@@ -1,5 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Describe "CliXml test" -Tags "CI" {
 
     BeforeAll {
@@ -181,6 +185,97 @@ Describe "CliXml test" -Tags "CI" {
             $cred.Password | Should -BeOfType System.Security.SecureString
         }
     }
+
+    Context "ConvertTo-CliXml"{
+        BeforeAll {
+            $gpsList = Get-Process pwsh
+            $gps = $gpsList | Select-Object -First 1
+        }
+
+        It "Create by passing as parameter" {
+            $content = ConvertTo-CliXml -Depth 1 -InputObject ($gpsList | Select-Object -First 1)
+            $isExisted = $false
+
+            foreach($item in $content)
+            {
+                foreach($gpsItem in $gpsList)
+                {
+                    $checkId = $gpsItem.Id
+                    if (($null -ne $(Select-String -InputObject $item -SimpleMatch $checkId)) -and ($null -ne $(Select-String -InputObject $item -SimpleMatch "Id")))
+                    {
+                        $isExisted = $true
+                        break;
+                    }
+                }
+            }
+
+            $isExisted | Should -BeTrue
+        }
+
+        It "Create by passing as pipeline" {
+            $content = ($gpsList | Select-Object -First 1) | ConvertTo-CliXml -Depth 1
+
+            $isExisted = $false
+
+            foreach($item in $content)
+            {
+                foreach($gpsItem in $gpsList)
+                {
+                    $checkId = $gpsItem.Id
+                    if (($null -ne $(Select-String -InputObject $item -SimpleMatch $checkId)) -and ($null -ne $(Select-String -InputObject $item -SimpleMatch "Id")))
+                    {
+                        $isExisted = $true
+                        break;
+                    }
+                }
+            }
+
+            $isExisted | Should -BeTrue
+        }
+    }
+
+    Context "ConvertFrom-CliXml" {
+        BeforeAll {
+            $gpsList = Get-Process pwsh
+            $gps = $gpsList | Select-Object -First 1
+        }
+
+        It "Create by passing as parameter" {
+            $content = ConvertTo-CliXml -Depth 1 -InputObject $gps
+
+            $content | Should -Not -Be $null
+
+            $importedProcess = ConvertFrom-CliXml -InputObject $content
+            $importedProcess.ProcessName | Should -Not -BeNullOrEmpty
+            $gps.ProcessName | Should -Be $importedProcess.ProcessName
+            $importedProcess.Id | Should -Not -BeNullOrEmpty
+            $gps.Id | Should -Be $importedProcess.Id
+        }
+
+        It "Create by passing as pipeline" {
+            $content = $gps | ConvertTo-CliXml -Depth 1
+
+            $content | Should -Not -Be $null
+
+            $importedProcess = $content | ConvertFrom-CliXml
+            $importedProcess.ProcessName | Should -Not -BeNullOrEmpty
+            $gps.ProcessName | Should -Be $importedProcess.ProcessName
+            $importedProcess.Id | Should -Not -BeNullOrEmpty
+            $gps.Id | Should -Be $importedProcess.Id
+        }
+
+        It "Should import PSCredential" {
+            $UserName = "Foo"
+            $pass = ConvertTo-SecureString (New-RandomHexString) -AsPlainText -Force
+            $cred =  [PSCredential]::new($UserName, $pass)
+
+            $content = $cred | ConvertTo-CliXml
+            $cred2 = ConvertFrom-CliXml -InputObject $content
+            $cred2.UserName | Should -BeExactly $cred.UserName
+            $cred2.Password | Should -BeOfType System.Security.SecureString
+            $cred2.GetNetworkCredential().Password | Should -BeExactly $cred.GetNetworkCredential().Password
+        }
+    }
 }
 
 ##
@@ -191,7 +286,7 @@ Describe "Deserializing corrupted Cim classes should not instantiate non-Cim typ
     BeforeAll {
 
         # Only run on Windows platform.
-        # Ensure calc.exe is avaiable for test.
+        # Ensure calc.exe is available for test.
         $shouldRunTest = $IsWindows -and ((Get-Command calc.exe -ErrorAction SilentlyContinue) -ne $null)
         $skipNotWindows = ! $shouldRunTest
         if ( $shouldRunTest )
diff --git a/test/powershell/Modules/Microsoft.Powershell.Host/Start-Transcript.Tests.ps1 b/test/powershell/Modules/Microsoft.Powershell.Host/Start-Transcript.Tests.ps1
index 3e398a0fa70..8e142c7655f 100644
--- a/test/powershell/Modules/Microsoft.Powershell.Host/Start-Transcript.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.Powershell.Host/Start-Transcript.Tests.ps1
@@ -86,6 +86,11 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
         $outputFilePath = Join-Path $TestDrive "PowerShell_transcript*"
         ValidateTranscription -scriptToExecute $script -outputFilePath $outputFilePath
     }
+    It "Should create Transcript file with 'Transcript' preference variable" {
+        # Casting to PSObject is necessary because Set-Variable does not automatically wrap the value in a PSObject
+        $script = "Set-Variable -Scope Global -Name Transcript -Value ([PSObject]'$transcriptFilePath'); Start-Transcript"
+        ValidateTranscription -scriptToExecute $script -outputFilePath $transcriptFilePath
+    }
     It "Should Append Transcript data in existing file if 'Append' parameter is used with Path parameter" {
         $script = "Start-Transcript -path $transcriptFilePath -Append"
         ValidateTranscription -scriptToExecute $script -outputFilePath $transcriptFilePath -append
diff --git a/test/powershell/Modules/Microsoft.WSMan.Management/ConfigProvider.Tests.ps1 b/test/powershell/Modules/Microsoft.WSMan.Management/ConfigProvider.Tests.ps1
index 49d60cd1283..1845933e8f4 100644
--- a/test/powershell/Modules/Microsoft.WSMan.Management/ConfigProvider.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.WSMan.Management/ConfigProvider.Tests.ps1
@@ -1,6 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Describe "WSMan Config Provider" -Tag Feature,RequireAdminOnWindows {
     BeforeAll {
         #skip all tests on non-windows platform
diff --git a/test/powershell/Modules/PSDiagnostics/PSDiagnostics.Tests.ps1 b/test/powershell/Modules/PSDiagnostics/PSDiagnostics.Tests.ps1
index 64fa8ba269f..30cc1b36fd4 100644
--- a/test/powershell/Modules/PSDiagnostics/PSDiagnostics.Tests.ps1
+++ b/test/powershell/Modules/PSDiagnostics/PSDiagnostics.Tests.ps1
@@ -9,7 +9,7 @@ Describe "PSDiagnostics cmdlets tests." -Tag "CI", "RequireAdminOnWindows" {
             $PSDefaultParameterValues["it:skip"] = $true
         }
         else{
-            $LogSettingBak = Get-LogProperties -Name Microsoft-Windows-PowerShell/$LogType
+            $LogSettingBak = Get-LogProperties -Name PowerShellCore/$LogType
         }
     }
     AfterAll {
@@ -20,37 +20,37 @@ Describe "PSDiagnostics cmdlets tests." -Tag "CI", "RequireAdminOnWindows" {
     }
 
     Context "Test for Enable-PSTrace and Disable-PSTrace cmdlets." {
-        It "Should enable $LogType logs for Microsoft-Windows-PowerShell." {
-            [XML]$CurrentSetting = & wevtutil gl Microsoft-Windows-PowerShell/$LogType /f:xml
+        It "Should enable $LogType logs for PowerShellCore." {
+            [XML]$CurrentSetting = & wevtutil gl PowerShellCore/$LogType /f:xml
             if($CurrentSetting.Channel.Enabled -eq 'true'){
-                & wevtutil sl Microsoft-Windows-PowerShell/$LogType /e:false /q
+                & wevtutil sl PowerShellCore/$LogType /e:false /q
             }
 
             Enable-PSTrace -Force
 
-            [XML]$ExpectedOutput = & wevtutil gl Microsoft-Windows-PowerShell/$LogType /f:xml
+            [XML]$ExpectedOutput = & wevtutil gl PowerShellCore/$LogType /f:xml
 
             $ExpectedOutput.Channel.enabled | Should -BeExactly 'true'
         }
 
-        It "Should disable $LogType logs for Microsoft-Windows-PowerShell." {
-            [XML]$CurrentState = & wevtutil gl Microsoft-Windows-PowerShell/$LogType /f:xml
+        It "Should disable $LogType logs for PowerShellCore." {
+            [XML]$CurrentState = & wevtutil gl PowerShellCore/$LogType /f:xml
             if($CurrentState.channel.enabled -eq 'false'){
-                & wevtutil sl Microsoft-Windows-PowerShell/$LogType /e:true /q
+                & wevtutil sl PowerShellCore/$LogType /e:true /q
             }
             Disable-PSTrace
 
-            [XML]$ExpectedOutput = & wevtutil gl Microsoft-Windows-PowerShell/$LogType /f:xml
+            [XML]$ExpectedOutput = & wevtutil gl PowerShellCore/$LogType /f:xml
 
             $ExpectedOutput.Channel.enabled | Should -Be 'false'
         }
     }
 
     Context "Test for Get-LogProperties cmdlet." {
-        It "Should return properties of $LogType logs for 'Microsoft-Windows-PowerShell'." {
-            [XML]$ExpectedOutput = wevtutil gl Microsoft-Windows-PowerShell/$LogType /f:xml
+        It "Should return properties of $LogType logs for 'PowerShellCore'." {
+            [XML]$ExpectedOutput = wevtutil gl PowerShellCore/$LogType /f:xml
 
-            $LogProperty = Get-LogProperties -Name Microsoft-Windows-PowerShell/$LogType
+            $LogProperty = Get-LogProperties -Name PowerShellCore/$LogType
 
             $LogProperty.Name       | Should -Be $ExpectedOutput.channel.Name
             $LogProperty.Enabled    | Should -Be $ExpectedOutput.channel.Enabled
@@ -67,7 +67,7 @@ Describe "PSDiagnostics cmdlets tests." -Tag "CI", "RequireAdminOnWindows" {
     Context "Test for Set-LogProperties cmdlet." {
         BeforeAll {
             if ($IsWindows) {
-                [XML]$WevtUtilBefore = wevtutil gl Microsoft-Windows-PowerShell/$LogType /f:xml
+                [XML]$WevtUtilBefore = wevtutil gl PowerShellCore/$LogType /f:xml
                 $LogPropertyToSet = [Microsoft.PowerShell.Diagnostics.LogDetails]::new($WevtUtilBefore.channel.Name,
                     [bool]::Parse($WevtUtilBefore.channel.Enabled),
                     $LogType,
@@ -78,12 +78,12 @@ Describe "PSDiagnostics cmdlets tests." -Tag "CI", "RequireAdminOnWindows" {
             }
         }
 
-        It "Should invert AutoBackup setting of $LogType logs for 'Microsoft-Windows-PowerShell'." {
+        It "Should invert AutoBackup setting of $LogType logs for 'PowerShellCore'." {
             $LogPropertyToSet.AutoBackup = -not $LogPropertyToSet.AutoBackup
             Set-LogProperties -LogDetails $LogPropertyToSet -Force
 
-            [XML]$ExpectedOutput = & wevtutil gl Microsoft-Windows-PowerShell/$LogType /f:xml
-            (Get-LogProperties -Name Microsoft-Windows-PowerShell/$LogType).AutoBackup | Should -Be ([bool]::Parse($ExpectedOutput.Channel.Logging.AutoBackup))
+            [XML]$ExpectedOutput = & wevtutil gl PowerShellCore/$LogType /f:xml
+            (Get-LogProperties -Name PowerShellCore/$LogType).AutoBackup | Should -Be ([bool]::Parse($ExpectedOutput.Channel.Logging.AutoBackup))
         }
 
         It "Should throw exception for invalid LogName." {
diff --git a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
index 975f4f82da3..732404a6b36 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.3.\d$'
+        $module.Version | Should -Match '^2.4.\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.3.\d$'
+        $module.Version | Should -Match '^2.4.\d$'
         $module.Path | Should -Be (Join-Path -Path $PSHOME -ChildPath "Modules/PSReadLine/PSReadLine.psd1")
     }
 
diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
index 1fd935b22dd..a3a60fa359a 100644
--- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
+++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
@@ -170,7 +170,7 @@ Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     It "Should install a module correctly to the required location with AllUsers scope" {
-        Install-Module -Name $TestModule -Repository $RepositoryName -Scope AllUsers
+        Install-Module -Name $TestModule -Repository $RepositoryName -Scope AllUsers -ErrorAction Stop
 
         $module = Get-Module $TestModule -ListAvailable
         $module.Name | Should -Be $TestModule
@@ -247,7 +247,7 @@ Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     It "Should install a script correctly to the required location with AllUsers scope" {
-        Install-Script -Name $TestScript -Repository $RepositoryName -NoPathUpdate -Scope AllUsers
+        Install-Script -Name $TestScript -Repository $RepositoryName -NoPathUpdate -Scope AllUsers -ErrorAction Stop
         $installedScriptInfo = Get-InstalledScript -Name $TestScript
 
         $installedScriptInfo | Should -Not -BeNullOrEmpty
diff --git a/test/powershell/dsc/dsc.profileresource.Tests.ps1 b/test/powershell/dsc/dsc.profileresource.Tests.ps1
new file mode 100644
index 00000000000..cb357c7350b
--- /dev/null
+++ b/test/powershell/dsc/dsc.profileresource.Tests.ps1
@@ -0,0 +1,214 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "DSC PowerShell Profile Resource Tests" -Tag "CI" {
+    BeforeAll {
+        $DSC_ROOT = $env:DSC_ROOT
+        $skipCleanup = $false
+
+        if (-not (Test-Path -Path $DSC_ROOT)) {
+            $skipCleanup = $true
+            throw "DSC_ROOT environment variable is not set or path does not exist."
+        }
+
+        Write-Verbose "DSC_ROOT is set to $DSC_ROOT" -Verbose
+
+        $originalPath = $env:PATH
+
+        $pathSeparator = [System.IO.Path]::PathSeparator
+        $env:PATH += "$pathSeparator$DSC_ROOT"
+        $env:PATH += "$pathSeparator$PSHome"
+
+        Write-Verbose "Updated PATH to include DSC_ROOT: $env:PATH" -Verbose
+
+        # Ensure DSC v3 is available
+        if (-not (Get-Command -name dsc -CommandType Application -ErrorAction SilentlyContinue)) {
+            Get-ChildItem $DSC_ROOT -Recurse 'dsc' | ForEach-Object {
+                Write-Verbose "Found DSC executable at $($_.FullName)" -Verbose
+            }
+            throw "DSC v3 is not installed"
+        }
+
+        $dscExe = Get-Command -name dsc -CommandType Application | Select-Object -First 1
+
+        $testProfileContent = "# Test profile content currentuser currenthost"
+        $testProfilePathCurrentUserCurrentHost = $PROFILE.CurrentUserCurrentHost
+        Copy-Item -Path $testProfilePathCurrentUserCurrentHost -Destination "$TestDrive/currentuser-currenthost-profile.bak" -Force -ErrorAction SilentlyContinue
+        New-Item -Path $testProfilePathCurrentUserCurrentHost -Value $testProfileContent -Force -ItemType File
+
+        $testProfileContent = "# Test profile content currentuser allhosts"
+        $testProfilePathCurrentUserAllHosts = $PROFILE.CurrentUserAllHosts
+        Copy-Item -Path $testProfilePathCurrentUserAllHosts -Destination "$TestDrive/currentuser-allhosts-profile.bak" -Force -ErrorAction SilentlyContinue
+        New-Item -Path $testProfilePathCurrentUserAllHosts -Value $testProfileContent -Force -ItemType File
+    }
+    AfterAll {
+        if ($skipCleanup) {
+            return
+        }
+
+        # Restore original profile
+        $testProfilePathCurrentUserCurrentHost = $PROFILE.CurrentUserCurrentHost
+        if (Test-Path "$TestDrive/currentuser-currenthost-profile.bak") {
+            Copy-Item -Path "$TestDrive/currentuser-currenthost-profile.bak" -Destination $testProfilePathCurrentUserCurrentHost -Force -ErrorAction SilentlyContinue
+        }
+        else {
+            Remove-Item $testProfilePathCurrentUserCurrentHost -Force -ErrorAction SilentlyContinue
+        }
+
+        $testProfilePathCurrentUserAllHosts = $PROFILE.CurrentUserAllHosts
+        if (Test-Path "$TestDrive/currentuser-allhosts-profile.bak") {
+            Copy-Item -Path "$TestDrive/currentuser-allhosts-profile.bak" -Destination $testProfilePathCurrentUserAllHosts -Force -ErrorAction SilentlyContinue
+        }
+        else {
+            Remove-Item $testProfilePathCurrentUserAllHosts -Force -ErrorAction SilentlyContinue
+        }
+
+        $env:PATH = $originalPath
+        Remove-Item -Path "$TestDrive/currentuser-currenthost-profile.bak" -Force -ErrorAction SilentlyContinue
+        Remove-Item -Path "$TestDrive/currentuser-allhosts-profile.bak" -Force -ErrorAction SilentlyContinue
+    }
+
+    It 'DSC resource is located at $PSHome' {
+        $resourceFile = Join-Path -Path $PSHome -ChildPath 'pwsh.profile.resource.ps1'
+        $resourceFile | Should -Exist
+
+        $resourceManifest = Join-Path -Path $PSHome -ChildPath 'pwsh.profile.dsc.resource.json'
+        $resourceManifest | Should -Exist
+    }
+
+    It 'DSC resource can be found' {
+        (& $dscExe resource list -o json | ConvertFrom-Json  | Select-Object -Property type).type | Should -Contain 'Microsoft.PowerShell/Profile'
+    }
+
+    It 'DSC resource can set current user current host profile' {
+        $setOutput = (& $dscExe config set --file $PSScriptRoot/psprofile_currentuser_currenthost.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - CurrentUserCurrentHost!'"
+        $setOutput.results.result.afterState.content | Should -BeExactly $expectedContent
+    }
+
+    It 'DSC resource can get current user current host profile' {
+        $getOutput = (& $dscExe config get --file $PSScriptRoot/psprofile_currentuser_currenthost.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - CurrentUserCurrentHost!'"
+        $getOutput.results.result.actualState.content | Should -BeExactly $expectedContent
+    }
+
+    It 'DSC resource can set content as empty for current user current host profile' -Pending {
+        $setOutput = (& $dscExe config set --file $PSScriptRoot/psprofile_currentuser_currenthost_emptycontent.dsc.yaml -o json) | ConvertFrom-Json
+        $setOutput.results.result.afterState.content | Should -BeExactly ''
+    }
+
+    It 'DSC resource can set current user all hosts profile' {
+        $setOutput = (& $dscExe config set --file $PSScriptRoot/psprofile_currentuser_allhosts.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - CurrentUserAllHosts!'"
+        $setOutput.results.result.afterState.content | Should -BeExactly $expectedContent
+    }
+
+    It 'DSC resource can get current user all hosts profile' {
+        $getOutput = (& $dscExe config get --file $PSScriptRoot/psprofile_currentuser_allhosts.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - CurrentUserAllHosts!'"
+        $getOutput.results.result.actualState.content | Should -BeExactly $expectedContent
+    }
+
+    It 'DSC resource can export all profiles' {
+        $exportOutput = (& $dscExe config export --file $PSScriptRoot/psprofile_export.dsc.yaml -o json) | ConvertFrom-Json
+
+        $exportOutput.resources | Should -HaveCount 4
+
+        $exportOutput.resources | ForEach-Object {
+            $_.type | Should -Be 'Microsoft.PowerShell/Profile'
+            $_.name | Should -BeIn @('AllUsersCurrentHost', 'AllUsersAllHosts', 'CurrentUserCurrentHost', 'CurrentUserAllHosts')
+        }
+    }
+}
+
+Describe "DSC PowerShell Profile resource elevated tests" -Tag "CI", 'RequireAdminOnWindows', 'RequireSudoOnUnix' {
+    BeforeAll {
+        $DSC_ROOT = $env:DSC_ROOT
+        $skipCleanup = $false
+
+        if (-not (Test-Path -Path $DSC_ROOT)) {
+            $skipCleanup = $true
+            throw "DSC_ROOT environment variable is not set or path does not exist."
+        }
+
+        Write-Verbose "DSC_ROOT is set to $DSC_ROOT" -Verbose
+
+        $originalPath = $env:PATH
+
+        $pathSeparator = [System.IO.Path]::PathSeparator
+        $env:PATH += "$pathSeparator$DSC_ROOT"
+        $env:PATH += "$pathSeparator$PSHome"
+
+        Write-Verbose "Updated PATH to include DSC_ROOT: $env:PATH" -Verbose
+
+        # Ensure DSC v3 is available
+        if (-not (Get-Command -name dsc -CommandType Application -ErrorAction SilentlyContinue)) {
+            Get-ChildItem $DSC_ROOT -Recurse 'dsc' | ForEach-Object {
+                Write-Verbose "Found DSC executable at $($_.FullName)" -Verbose
+            }
+            throw "DSC v3 is not installed"
+        }
+
+        $dscExe = Get-Command -name dsc -CommandType Application | Select-Object -First 1
+
+        $testProfileContent = "# Test profile content allusers currenthost"
+        $testProfilePathAllUsersCurrentHost = $PROFILE.AllUsersCurrentHost
+        Copy-Item -Path $testProfilePathAllUsersCurrentHost -Destination "$TestDrive/allusers-currenthost-profile.bak" -Force -ErrorAction SilentlyContinue
+        New-Item -Path $testProfilePathAllUsersCurrentHost -Value $testProfileContent -Force -ItemType File
+
+        $testProfileContent = "# Test profile content allusers allhosts"
+        $testProfilePathAllUsersAllHosts = $PROFILE.AllUsersAllHosts
+        Copy-Item -Path $testProfilePathAllUsersAllHosts -Destination "$TestDrive/allusers-allhosts-profile.bak" -Force -ErrorAction SilentlyContinue
+        New-Item -Path $testProfilePathAllUsersAllHosts -Value $testProfileContent -Force -ItemType File
+    }
+    AfterAll {
+        if ($skipCleanup) {
+            return
+        }
+
+        $env:PATH = $originalPath
+
+        $testProfilePathAllUsersCurrentHost = $PROFILE.AllUsersCurrentHost
+        if (Test-Path "$TestDrive/allusers-currenthost-profile.bak") {
+            Copy-Item -Path "$TestDrive/allusers-currenthost-profile.bak" -Destination $testProfilePathAllUsersCurrentHost -Force -ErrorAction SilentlyContinue
+        }
+        else {
+            Remove-Item $testProfilePathAllUsersCurrentHost -Force -ErrorAction SilentlyContinue
+        }
+
+        $testProfilePathAllUsersAllHosts = $PROFILE.AllUsersAllHosts
+        if (Test-Path "$TestDrive/allusers-allhosts-profile.bak") {
+            Copy-Item -Path "$TestDrive/allusers-allhosts-profile.bak" -Destination $testProfilePathAllUsersAllHosts -Force -ErrorAction SilentlyContinue
+        }
+        else {
+            Remove-Item $testProfilePathAllUsersAllHosts -Force -ErrorAction SilentlyContinue
+        }
+
+        Remove-Item -Path "$TestDrive/currentuser-allhosts-profile.bak" -Force -ErrorAction SilentlyContinue
+        Remove-Item -Path "$TestDrive/allusers-allhosts-profile.bak" -Force -ErrorAction SilentlyContinue
+    }
+
+    It 'DSC resource can set all users all hosts profile' {
+        $setOutput = (& $dscExe config set --file $PSScriptRoot/psprofile_alluser_allhost.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - AllUsersAllHosts!'"
+        $setOutput.results.result.afterState.content | Should -BeExactly $expectedContent
+    }
+
+    It 'DSC resource can get all users all hosts profile' {
+        $getOutput = (& $dscExe config get --file $PSScriptRoot/psprofile_alluser_allhost.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - AllUsersAllHosts!'"
+        $getOutput.results.result.actualState.content | Should -BeExactly $expectedContent
+    }
+
+    It 'DSC resource can set all users current hosts profile' {
+        $setOutput = (& $dscExe config set --file $PSScriptRoot/psprofile_allusers_currenthost.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - AllUsersCurrentHost!'"
+        $setOutput.results.result.afterState.content | Should -BeExactly $expectedContent
+    }
+
+    It 'DSC resource can get all users current hosts profile' {
+        $getOutput = (& $dscExe config get --file $PSScriptRoot/psprofile_allusers_currenthost.dsc.yaml -o json) | ConvertFrom-Json
+        $expectedContent = "Write-Host 'Welcome to your PowerShell profile - AllUsersCurrentHost!'"
+        $getOutput.results.result.actualState.content | Should -BeExactly $expectedContent
+    }
+}
diff --git a/test/powershell/dsc/psprofile_alluser_allhost.dsc.yaml b/test/powershell/dsc/psprofile_alluser_allhost.dsc.yaml
new file mode 100644
index 00000000000..356119826c3
--- /dev/null
+++ b/test/powershell/dsc/psprofile_alluser_allhost.dsc.yaml
@@ -0,0 +1,9 @@
+# Set PowerShell profile content
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: PSProfile
+  type: Microsoft.PowerShell/Profile
+  properties:
+    profileType: AllUsersAllHosts
+    content: "Write-Host 'Welcome to your PowerShell profile - AllUsersAllHosts!'"
+    _exist: true
diff --git a/test/powershell/dsc/psprofile_allusers_currenthost.dsc.yaml b/test/powershell/dsc/psprofile_allusers_currenthost.dsc.yaml
new file mode 100644
index 00000000000..bc51f0a4392
--- /dev/null
+++ b/test/powershell/dsc/psprofile_allusers_currenthost.dsc.yaml
@@ -0,0 +1,9 @@
+# Set PowerShell profile content
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: PSProfile
+  type: Microsoft.PowerShell/Profile
+  properties:
+    profileType: AllUsersCurrentHost
+    content: "Write-Host 'Welcome to your PowerShell profile - AllUsersCurrentHost!'"
+    _exist: true
diff --git a/test/powershell/dsc/psprofile_currentuser_allhosts.dsc.yaml b/test/powershell/dsc/psprofile_currentuser_allhosts.dsc.yaml
new file mode 100644
index 00000000000..8ed8d98c3ab
--- /dev/null
+++ b/test/powershell/dsc/psprofile_currentuser_allhosts.dsc.yaml
@@ -0,0 +1,9 @@
+# Set PowerShell profile content
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: PSProfile
+  type: Microsoft.PowerShell/Profile
+  properties:
+    profileType: CurrentUserAllHosts
+    content: "Write-Host 'Welcome to your PowerShell profile - CurrentUserAllHosts!'"
+    _exist: true
diff --git a/test/powershell/dsc/psprofile_currentuser_currenthost.dsc.yaml b/test/powershell/dsc/psprofile_currentuser_currenthost.dsc.yaml
new file mode 100644
index 00000000000..5a42c28eb96
--- /dev/null
+++ b/test/powershell/dsc/psprofile_currentuser_currenthost.dsc.yaml
@@ -0,0 +1,9 @@
+# Set PowerShell profile content
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: PSProfile
+  type: Microsoft.PowerShell/Profile
+  properties:
+    profileType: CurrentUserCurrentHost
+    content: "Write-Host 'Welcome to your PowerShell profile - CurrentUserCurrentHost!'"
+    _exist: true
diff --git a/test/powershell/dsc/psprofile_currentuser_currenthost_emptycontent.yaml b/test/powershell/dsc/psprofile_currentuser_currenthost_emptycontent.yaml
new file mode 100644
index 00000000000..76439387d2e
--- /dev/null
+++ b/test/powershell/dsc/psprofile_currentuser_currenthost_emptycontent.yaml
@@ -0,0 +1,9 @@
+# Set PowerShell profile content
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: PSProfile
+  type: Microsoft.PowerShell/Profile
+  properties:
+    profileType: CurrentUserCurrentHost
+    content: ''
+    _exist: true
diff --git a/test/powershell/dsc/psprofile_export.dsc.yaml b/test/powershell/dsc/psprofile_export.dsc.yaml
new file mode 100644
index 00000000000..cf7881b5df8
--- /dev/null
+++ b/test/powershell/dsc/psprofile_export.dsc.yaml
@@ -0,0 +1,5 @@
+# Set PowerShell profile content
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: PSProfile
+  type: Microsoft.PowerShell/Profile
diff --git a/test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1 b/test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1
index aa9fb401279..719accbb11d 100644
--- a/test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1
+++ b/test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1
@@ -175,4 +175,50 @@ namespace TestParameterizedPropertyDefinition {
             $result.Definition | Should -BeExactly "int TheItem(int i) {get;}"
         }
     }
+
+    Context "Verify Definition of CodeMethod" {
+        BeforeAll {
+            Add-Type -TypeDefinition @"
+using System.Management.Automation;
+
+namespace TestCodeMethodDefinition;
+
+public static class TestClass1
+{
+    public static T Generic1<T>(PSObject obj, T val) => val;
+
+    public static T1 Generic2<T1, T2>(PSObject obj, T1 val, T2 dummy) => val;
+}
+"@
+
+            $mi1 = [TestCodeMethodDefinition.TestClass1].GetMethod("Generic1")
+            $mi2 = [TestCodeMethodDefinition.TestClass1].GetMethod("Generic2")
+
+            $obj = [PSCustomObject]@{}
+            $obj | Add-Member -MemberType CodeMethod -Name Generic1 -Value $mi1
+            $obj | Add-Member -MemberType CodeMethod -Name Generic2 -Value $mi2
+            $obj | Add-Member -MemberType CodeMethod -Name FromGeneric1 -Value $mi1.MakeGenericMethod(@([int]))
+            $obj | Add-Member -MemberType CodeMethod -Name FromGeneric2 -Value $mi2.MakeGenericMethod(@([string], [int]))
+        }
+
+        It "Get definition of CodeMethod with generic method of 1 type" {
+            $result = $obj | Get-Member -Name Generic1
+            $result.Definition | Should -BeExactly "static T Generic1[T](psobject obj, T val)"
+        }
+
+        It "Get definition of CodeMethod with generic method of 2 types" {
+            $result = $obj | Get-Member -Name Generic2
+            $result.Definition | Should -BeExactly "static T1 Generic2[T1, T2](psobject obj, T1 val, T2 dummy)"
+        }
+
+        It "Get definition of CodeMethod with constructed generic method of 1 type" {
+            $result = $obj | Get-Member -Name FromGeneric1
+            $result.Definition | Should -BeExactly "static int Generic1[int](psobject obj, int val)"
+        }
+
+        It "Get definition of CodeMethod with constructed generic method of 2 types" {
+            $result = $obj | Get-Member -Name FromGeneric2
+            $result.Definition | Should -BeExactly "static string Generic2[string, int](psobject obj, string val, int dummy)"
+        }
+    }
 }
diff --git a/test/powershell/engine/Api/LanguagePrimitive.Tests.ps1 b/test/powershell/engine/Api/LanguagePrimitive.Tests.ps1
index bc9d812afe4..6149adc2ab7 100644
--- a/test/powershell/engine/Api/LanguagePrimitive.Tests.ps1
+++ b/test/powershell/engine/Api/LanguagePrimitive.Tests.ps1
@@ -185,4 +185,42 @@ Describe "Language Primitive Tests" -Tags "CI" {
         $test.TestHandlerReturnEnum() | Should -BeTrue
         $test.TestHandlerReturnObject() | Should -BeTrue
     }
+    
+    It 'Handles large numbers with thousands separators that previously failed' {
+        $formattedNumber = "9223372036854775,807"
+        $convertedValue = [System.Management.Automation.LanguagePrimitives]::ConvertTo($formattedNumber, [bigint])
+        $convertedValue | Should -Be 9223372036854775807
+    }
+
+    It 'Handles extremely large numbers to verify precision' {
+        $formattedNumber = "99999999999999999999999999999"
+        $convertedValue = [System.Management.Automation.LanguagePrimitives]::ConvertTo($formattedNumber, [bigint])
+        $convertedValue | Should -Be 99999999999999999999999999999
+    }
+
+    It 'Parses mixed separators correctly' {
+        $formattedNumber = "1,0000,00"
+        $convertedValue = [System.Management.Automation.LanguagePrimitives]::ConvertTo($formattedNumber, [bigint])
+        $convertedValue | Should -Be 1000000
+    }
+
+    It 'Parses a number string using the invariant culture, irrespective of the current culture' {
+        $originalCulture = [cultureinfo]::CurrentCulture
+        try {
+            [cultureinfo]::CurrentCulture = [cultureinfo]::GetCultureInfo("de-DE")
+            $formattedNumber = "1.000"  # in de-DE this means 1000
+            $convertedValue = [System.Management.Automation.LanguagePrimitives]::ConvertTo($formattedNumber, [bigint])
+            # since [bigint] uses invariant culture, this will be parsed as 1
+            $convertedValue | Should -Be 1
+        }
+        finally {
+            [cultureinfo]::CurrentCulture = $originalCulture
+        }
+    }
+
+    It 'Casts from floating-point number string to BigInteger using fallback' {
+        $formattedNumber = "1.2"
+        $convertedValue = [System.Management.Automation.LanguagePrimitives]::ConvertTo($formattedNumber, [bigint])
+        $convertedValue | Should -Be 1
+    }
 }
diff --git a/test/powershell/engine/Api/Serialization.Tests.ps1 b/test/powershell/engine/Api/Serialization.Tests.ps1
index 6b011ffc6ab..317a0907ca5 100644
--- a/test/powershell/engine/Api/Serialization.Tests.ps1
+++ b/test/powershell/engine/Api/Serialization.Tests.ps1
@@ -1,5 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Describe "Serialization Tests" -tags "CI" {
     BeforeAll {
         $testfileName="SerializationTest.txt"
@@ -99,4 +103,3 @@ Describe "Serialization Tests" -tags "CI" {
         SerializeAndDeserialize($versionObject).TestScriptProperty | Should -Be $versionObject.TestScriptProperty
     }
 }
-
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index 69817f6290d..fc6bdae74b8 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -268,6 +268,66 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Name | Should -Be 'System.Management.ManagementObject#root\cimv2\Win32_Process'
     }
 
+    It "Infers type from parameter in classic function definition" {
+        $res = [AstTypeInference]::InferTypeOf(({
+            function MyFunction ([int]$param1)
+            {
+                $param1
+            }
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Int32'
+    }
+
+    It "Infers type from binary expression with a bool operator as bool" {
+        $res = [AstTypeInference]::InferTypeOf( {
+                (1..10) -contains 5
+            }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Boolean'
+    }
+
+    It "Infers type from binary expression with a string operator as string" {
+        $res = [AstTypeInference]::InferTypeOf( {
+                (1..10) -join ','
+            }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.String'
+    }
+
+    It "Infers type from binary expression with a split operator as string array" {
+        $res = [AstTypeInference]::InferTypeOf( {
+                "Test:Value" -split ':'
+            }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.String[]'
+    }
+
+    It "Infers type from binary expression with a comparison operator as bool + the left hand side type" {
+        $res = [AstTypeInference]::InferTypeOf( {
+                ("Hello", "World") -eq "Hello"
+            }.Ast)
+        $res.Count | Should -Be 2
+        $res.Name[0] | Should -Be 'System.Boolean'
+        $res.Name[1] | Should -Be 'System.String[]'
+    }
+
+    It "Infers type from binary expression with a null coalescing operator as left and right hand side types" {
+        $res = [AstTypeInference]::InferTypeOf( {
+                "NotNull" ?? 10
+            }.Ast)
+        $res.Count | Should -Be 2
+        $res.Name[0] | Should -Be 'System.String'
+        $res.Name[1] | Should -Be 'System.Int32'
+    }
+
+    It "Infers type from binary expression with an overridden operator" {
+        $res = [AstTypeInference]::InferTypeOf( {
+                (Get-Date) - (Get-Date)
+            }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.TimeSpan'
+    }
+
     It "Infers type from DATA statement" {
         $res = [AstTypeInference]::InferTypeOf( {
                 DATA {
@@ -361,10 +421,8 @@ Describe "Type inference Tests" -tags "CI" {
 
     It "Infers type from foreach-object of integer" {
         $res = [AstTypeInference]::InferTypeOf( { [int[]] $i = 1..20; $i | ForEach-Object {$_ * 10} }.Ast)
-        $res.Count | Should -Be 2
-        foreach ($r in $res) {
-            $r.Name -In 'System.Int32', 'System.Int32[]' | Should -BeTrue
-        }
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Int32'
     }
 
     It "Infers type from generic new" {
@@ -386,9 +444,9 @@ Describe "Type inference Tests" -tags "CI" {
 
     It "Infers type from foreach-object with begin/end" {
         $res = [AstTypeInference]::InferTypeOf( { [int[]] $i = 1..20; $i | ForEach-Object -Begin {"Hi"} {$_ * 10} -End {[int]} }.Ast)
-        $res.Count | Should -Be 4
+        $res.Count | Should -Be 3
         foreach ($r in $res) {
-            $r.Name -In 'System.Int32', 'System.Int32[]', 'System.String', 'System.Type' | Should -BeTrue
+            $r.Name -In 'System.Int32', 'System.String', 'System.Type' | Should -BeTrue
         }
     }
 
@@ -444,6 +502,14 @@ Describe "Type inference Tests" -tags "CI" {
         }
     }
 
+    It 'Infers typeof pipeline chain' {
+        $ast = {New-TimeSpan && New-Guid}.Ast
+        $typeNames = [AstTypeInference]::InferTypeof($ast, [TypeInferenceRuntimePermissions]::AllowSafeEval)
+        $typeNames.Count | Should -Be 2
+        $typeNames[0] | Should -Be 'System.TimeSpan'
+        $typeNames[1] | Should -Be 'System.Guid'
+    }
+
     It "Infers typeof pscustomobject" {
 
         $res = [AstTypeInference]::InferTypeOf( { [pscustomobject] @{
@@ -594,8 +660,10 @@ Describe "Type inference Tests" -tags "CI" {
     }
 
     It "Infers type from variable with AllowSafeEval" {
-        function Hide-GetProcess { Get-Process }
-        $p = Hide-GetProcess
+        # Invoke-Expression is used to "hide" Get-Process from the type inference.
+        # If the typeinference code is updated to handle Invoke-Expression, this test will need to find some other way to set $p
+        # so that the type inference can't figure it out without evaluating the variable value
+        $p = Invoke-Expression -Command 'Get-Process'
         $res = [AstTypeInference]::InferTypeOf( { $p }.Ast, [TypeInferenceRuntimePermissions]::AllowSafeEval)
         $res.Name | Should -Be 'System.Diagnostics.Process'
     }
@@ -618,16 +686,6 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Name | Should -Be 'System.Int32'
     }
 
-    It 'Infers type from attributed expession' {
-        $res = [AstTypeInference]::InferTypeOf( {
-                [ValidateRange(1, 2)]
-                [int]$i = 1
-            }.Ast)
-
-        $res.Count | Should -Be 1
-        $res.Name | Should -Be System.Int32
-    }
-
     It 'Infers type from if statement' {
         $res = [AstTypeInference]::InferTypeOf( {
                 if ($true) { return 1}
@@ -1139,6 +1197,18 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Name | Should -Be System.String
     }
 
+    It 'Ignores assignment when a variable is declared and used within the same commandAst' {
+        $variableAst = { Get-Random 2>variable:RandomError1 -InputObject ($RandomError1) }.Ast.FindAll({ param($a) $a -is [Language.VariableExpressionAst] }, $true) | select -Last 1
+        $res = [AstTypeInference]::InferTypeOf($variableAst)
+        $res.Count | Should -Be 0
+    }
+
+    It 'Ignores the last assignment when a variable is reused' {
+        $variableAst = { $x = New-Guid; $x = $x.Where{$_} }.Ast.FindAll({ param($a) $a -is [Language.VariableExpressionAst] }, $true) | select -Last 1
+        $res = [AstTypeInference]::InferTypeOf($variableAst)
+        $res.Name | Should -Be System.Guid
+    }
+
     $catchClauseTypes = @(
         @{ Type = 'System.ArgumentException' }
         @{ Type = 'System.ArgumentNullException' }
@@ -1379,15 +1449,28 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Name -join ' ' | Should -Be "System.IO.FileInfo System.IO.DirectoryInfo"
     }
 
+    It 'Falls back to type inference for hashtable assignments with pure expression with no value' {
+        $res = [AstTypeInference]::InferTypeOf( {$KeyWithNoValue = Get-ChildItem $HOME; (@{RandomKey = $KeyWithNoValue}).RandomKey }.Ast)
+        $Res.Count | Should -Be 2
+        $res.Name -join ' ' | Should -Be "System.IO.FileInfo System.IO.DirectoryInfo"
+    }
+
     It 'Infers type of index expression on hashtable with synthetic type' {
         $res = [AstTypeInference]::InferTypeOf( { (@{RandomKey = Get-ChildItem $HOME})['RandomKey'] }.Ast)
         $res.Count | Should -Be 2
         $res.Name -join ' ' | Should -Be "System.IO.FileInfo System.IO.DirectoryInfo"
     }
 
+    It 'Infers type of member expression on a custom object' {
+        $res = [AstTypeInference]::InferTypeOf( { ([pscustomobject]@{RandomProp1 = Get-ChildItem $HOME}).RandomProp1 }.Ast)
+        $res.Count | Should -Be 2
+        $res.Name -join ' ' | Should -Be "System.IO.FileInfo System.IO.DirectoryInfo"
+    }
+
     It 'Infers closest variable type' {
         $res = [AstTypeInference]::InferTypeOf( { [string]$TestVar = "";[hashtable]$TestVar = @{};$TestVar }.Ast)
-        $res.Name | Select-Object -Last 1 | Should -Be "System.Collections.Hashtable"
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be "System.Collections.Hashtable"
     }
 
     It 'Infers closest variable type and ignores unrelated param blocks' {
@@ -1408,6 +1491,26 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Count | Should -Be 0
     }
 
+    It 'Infers right side of assignment expression' {
+        $res = [AstTypeInference]::InferTypeOf( { $Test1 = "Hello" }.Ast.Find({param($ast) $ast -is [Language.AssignmentStatementAst]}, $true))
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be "System.String"
+    }
+
+    It 'Infers left side of assignment expression when it is a ConvertExpression' {
+        $res = [AstTypeInference]::InferTypeOf( { [string]$Test1 = 42 }.Ast.Find({param($ast) $ast -is [Language.AssignmentStatementAst]}, $true))
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be "System.String"
+    }
+
+    It 'Infers left side of assignment expression when there is a ConvertExpression among other attributes' {
+        $res = [AstTypeInference]::InferTypeOf( {
+            [ValidateLength()] [string] [ValidatePattern()]$Test1 = 42
+        }.Ast.Find({param($ast) $ast -is [Language.AssignmentStatementAst]}, $true))
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be "System.String"
+    }
+
     It 'Infers type of all scope variable after variable assignment' {
         $res = [AstTypeInference]::InferTypeOf( { $true = "Hello";$true }.Ast)
         $res.Count | Should -Be 1
@@ -1420,6 +1523,30 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Name | Should -Be 'System.Management.Automation.Internal.Host.InternalHost'
     }
 
+    It 'Infers type of variable assigned inside do while loop' {
+        $res = [AstTypeInference]::InferTypeOf(({
+            do
+            {
+                $Test = 1
+                $Test
+            }
+            while (1)
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Int32'
+    }
+
+    It 'Infers type of variable assigned inside do until loop' {
+        $res = [AstTypeInference]::InferTypeOf(({
+            do
+            {
+                $Test = 1
+                $Test
+            }
+            until ($null = gci)
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst] -and $Ast.VariablePath.UserPath -eq 'Test'}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Int32'
+    }
+
     It 'Infers type of external applications' {
         $res = [AstTypeInference]::InferTypeOf( { pwsh }.Ast)
         $res.Name | Should -Be 'System.String'
@@ -1432,6 +1559,290 @@ Describe "Type inference Tests" -tags "CI" {
         )
         $null = [AstTypeInference]::InferTypeOf($FoundAst)
     }
+
+    It 'Ignores type constraint defined outside of scope' {
+        $res = [AstTypeInference]::InferTypeOf(({
+            function Outer
+            {
+                [string] $Test = "Hello"
+                function Inner
+                {
+                    $Test = 2
+                    $Test
+                }
+            }
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Int32'
+    }
+
+    It 'Considers the type constraint defined outside of scope when dot sourcing' {
+        $res = [AstTypeInference]::InferTypeOf(({
+            [string] $Test = "Hello"
+            . {$Test = 2; $Test}
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.String'
+    }
+
+    It 'Infers type of ref assigned variable' {
+        $res = [AstTypeInference]::InferTypeOf(({
+            $MyRefVar = $null
+            $null = [System.Management.Automation.Language.Parser]::ParseInput("", [ref] $MyRefVar, [ref] $null)
+            $MyRefVar
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Management.Automation.Language.Token[]'
+    }
+
+    It 'Infers type of variable assigned with New/Set-Variable' {
+        $res = [AstTypeInference]::InferTypeOf( {
+            New-Variable -Name Var1 -Value $true | Out-Null
+            New-Variable -Name Var2 -Value "Hello" | Out-Null
+            $Var1
+            $Var2
+        }.Ast)
+        $res[0].Name | Should -Be 'System.Boolean'
+        $res[1].Name | Should -Be 'System.String'
+    }
+
+    It 'Infers type of variable assigned with <ParameterName> common parameter' -TestCases @(
+        @{ParameterName = "WarningVariable";     ExpectedType = [List[WarningRecord]]}
+        @{ParameterName = "wv";                  ExpectedType = [List[WarningRecord]]}
+        @{ParameterName = "ErrorVariable";       ExpectedType = [List[ErrorRecord]]}
+        @{ParameterName = "ev";                  ExpectedType = [List[ErrorRecord]]}
+        @{ParameterName = "InformationVariable"; ExpectedType = [List[InformationalRecord]]}
+        @{ParameterName = "iv";                  ExpectedType = [List[InformationalRecord]]}
+        @{ParameterName = "OutVariable";         ExpectedType = [guid]}
+        @{ParameterName = "ov";                  ExpectedType = [guid]}
+        @{ParameterName = "PipelineVariable";    ExpectedType = [guid]}
+        @{ParameterName = "pv";                  ExpectedType = [guid]}
+    ) -Test {
+            param($ParameterName, $ExpectedType)
+            $Ast = [scriptblock]::Create("New-Guid -$ParameterName MyOutVar | % {`$MyOutVar}").Ast.FindAll({
+                param($Ast)
+                $Ast -is [Language.VariableExpressionAst]
+            }, $true) | Select-Object -Last 1
+            $res = [AstTypeInference]::InferTypeOf($Ast)
+            $res.Type | Should -Be $ExpectedType
+        }
+
+    It 'Infers type of variable assigned via Data statement' {
+        $res = [AstTypeInference]::InferTypeOf(({
+            Data MyDataVar {"Hello"}
+            $MyDataVar
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.String'
+    }
+
+    It 'Infers type of well known variable with global scope' {
+        $res = [AstTypeInference]::InferTypeOf({$global:true}.Ast)
+        $res.Name | Should -Be 'System.Boolean'
+    }
+
+    It 'Infers parameter type from closest parameter' {
+        $res = [AstTypeInference]::InferTypeOf( ({
+            param([string]$Param1)
+            function TestFunction {param([bool]$Param1) $Param1}
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Boolean'
+    }
+
+    It 'Infers variable type from closest foreach statement' {
+        $res = [AstTypeInference]::InferTypeOf( ({
+            foreach ($X in 1..10)
+            {
+                $X
+            }
+            foreach ($X in New-Guid)
+            {
+                $X
+            }
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Guid'
+    }
+
+    It 'Infers global variable type in child scope' {
+        $res = [AstTypeInference]::InferTypeOf( ({
+            $Global:GlobalTest1 = "Hello"
+            function TestFunction {$GlobalTest1}
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.String'
+    }
+
+    It 'Does not infer private variable type in child scope' {
+        $res = [AstTypeInference]::InferTypeOf( ({
+            $Private:PrivateTest1 = "Hello"
+            function TestFunction {$PrivateTest1}
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Count | Should -Be 0
+    }
+
+    It 'Infers variable assigned with an attribute' {
+        $res = [AstTypeInference]::InferTypeOf( ({
+            [ValidateNotNull()]$ValidatedVar1 = New-Guid
+            $ValidatedVar1
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Guid'
+    }
+
+    It 'Infers variable assigned with multiple type constraints' {
+        $res = [AstTypeInference]::InferTypeOf( ({
+            [int] [string]$MultiConstraintVar1 = "10"
+            $MultiConstraintVar1
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $res.Name | Should -Be 'System.Int32'
+    }
+
+    It 'Infers variable assigned by redirection' {
+        $res = [AstTypeInference]::InferTypeOf( ({
+            New-Guid *>&1 1>variable:RedirVar1; $RedirVar1
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true) | Select-Object -Last 1 ))
+        $ExpectedTypeNames = @(
+            [ErrorRecord].FullName
+            [WarningRecord].FullName
+            [VerboseRecord].FullName
+            [DebugRecord].FullName
+            [InformationRecord].FullName
+            [guid].FullName
+        ) -join ';'
+        $res.Name -join ';' | Should -Be $ExpectedTypeNames
+    }
+
+    It 'Infers variables assigned by redirection from specific streams' {
+        $VarAsts = [List[Language.Ast]]{
+            [void](New-Guid 1>variable:RedirSuccess 2>variable:RedirError 3>variable:RedirWarning 4>variable:RedirVerbose 5>variable:RedirDebug 6>variable:RedirInfo)
+            $RedirSuccess
+            $RedirError
+            $RedirWarning
+            $RedirVerbose
+            $RedirDebug
+            $RedirInfo
+        }.Ast.FindAll({param($Ast) $Ast -is [Language.VariableExpressionAst]}, $true)
+        $ExpectedTypeNames = @(
+            [guid].FullName
+            [ErrorRecord].FullName
+            [WarningRecord].FullName
+            [VerboseRecord].FullName
+            [DebugRecord].FullName
+            [InformationRecord].FullName
+        )
+
+        for ($i = 0; $i -lt $VarAsts.Count; $i++)
+        {
+            $res = [AstTypeInference]::InferTypeOf($VarAsts[$i])
+            $res.Name | Should -Be $ExpectedTypeNames[$i]
+        }
+    }
+
+    It 'Should infer output from anonymous function' {
+        $res = [AstTypeInference]::InferTypeOf( { & {"Hello"} }.Ast)
+        $res.Name | Should -Be 'System.String'
+    }
+
+    It 'Should infer output from function without OutputType attribute' {
+        function MyHello{"Hello"}
+        $res = [AstTypeInference]::InferTypeOf( { MyHello }.Ast)
+        $res.Name | Should -Be 'System.String'
+    }
+
+    It 'Infers type of command with all streams redirected to Success stream' {
+        $res = [AstTypeInference]::InferTypeOf( { Get-PSDrive *>&1 }.Ast)
+        $ExpectedTypeNames = @(
+            [ErrorRecord].FullName
+            [WarningRecord].FullName
+            [VerboseRecord].FullName
+            [DebugRecord].FullName
+            [InformationRecord].FullName
+            [PSDriveInfo].FullName
+        ) -join ';'
+        $res.Name -join ';' | Should -Be $ExpectedTypeNames
+    }
+
+    It 'Infers type of command with success stream redirected' {
+        $res = [AstTypeInference]::InferTypeOf( { Get-PSDrive *>&1 1>$null }.Ast)
+        $res.Count | Should -Be 0
+    }
+
+    It 'Infers type of command with some streams redirected to success' {
+        $res = [AstTypeInference]::InferTypeOf( { Get-PSDrive 3>&1 4>&1 }.Ast)
+        $res.Count | Should -Be 3
+        $ExpectedTypeNames = @(
+            [PSDriveInfo].FullName
+            [VerboseRecord].FullName
+            [WarningRecord].FullName
+        ) -join ';'
+        ($res.Name | Sort-Object) -join ';' | Should -Be $ExpectedTypeNames
+    }
+
+    It 'Infers type of command with other streams redirected to success' {
+        $res = [AstTypeInference]::InferTypeOf( { Get-PSDrive 2>&1 5>&1 6>&1 }.Ast)
+        $res.Count | Should -Be 4
+        $ExpectedTypeNames = @(
+            [DebugRecord].FullName
+            [ErrorRecord].FullName
+            [InformationRecord].FullName
+            [PSDriveInfo].FullName
+        ) -join ';'
+        ($res.Name | Sort-Object) -join ';' | Should -Be $ExpectedTypeNames
+    }
+
+    It 'Should only consider assignments wrapped in parentheses to be a part of the output in a Named block' {
+        $res = [AstTypeInference]::InferTypeOf( { [string]$Assignment1 = "Hello"; ([int]$Assignment2 = 42) }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Int32'
+    }
+
+    It 'Should only consider assignments wrapped in parentheses to be a part of the output in a Statement block' {
+        $res = [AstTypeInference]::InferTypeOf( { if ($true){ [string]$Assignment1 = "Hello"; ([int]$Assignment2 = 42) }}.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Int32'
+    }
+
+    It 'Should only consider increments/decrements wrapped in parentheses to be a part of the output in a Named block' {
+        $res = [AstTypeInference]::InferTypeOf( {
+            [Int16]$Int16 = 1; [Int32]$Int32 = 1; [Int64]$Int64 = 1; [System.Int128]$Int128 = 1;
+
+            $Int16++; $Int32--; ++$Int64; --$Int128}.Ast)
+        $res.Count | Should -Be 0
+
+        $res = [AstTypeInference]::InferTypeOf( {
+            [UInt16]$Uint16 = 1; [UInt32]$Uint32 = 1; [UInt64]$Uint64 = 1; [System.UInt128]$Uint128 = 1
+
+            ($Uint16++); ($Uint32--); (++$Uint64); (--$Uint128) }.Ast)
+        $res.Count | Should -Be 4
+        $res.Name -join ',' | Should -Be ('System.UInt16', 'System.UInt32', 'System.UInt64', 'System.UInt128' -join ',')
+    }
+
+    It 'Should only consider increments/decrements wrapped in parentheses to be a part of the output in a Statement block' {
+        $res = [AstTypeInference]::InferTypeOf( {if ($true){
+            [Int16]$Int16 = 1; [Int32]$Int32 = 1; [Int64]$Int64 = 1; [System.Int128]$Int128 = 1;
+
+            $Int16++; $Int32--; ++$Int64; --$Int128}}.Ast)
+        $res.Count | Should -Be 0
+
+        $res = [AstTypeInference]::InferTypeOf( {if ($true){
+            [UInt16]$Uint16 = 1; [UInt32]$Uint32 = 1; [UInt64]$Uint64 = 1; [System.UInt128]$Uint128 = 1
+
+            ($Uint16++); ($Uint32--); (++$Uint64); (--$Uint128) }}.Ast)
+        $res.Count | Should -Be 4
+        $res.Name -join ',' | Should -Be ('System.UInt16', 'System.UInt32', 'System.UInt64', 'System.UInt128' -join ',')
+    }
+
+    It 'Redirected increments/decrements should be considered part of the output in a Named block' {
+        $res = [AstTypeInference]::InferTypeOf( {
+            [Int16]$Int16 = 1; [Int32]$Int32 = 1; [Int64]$Int64 = 1; [System.Int128]$Int128 = 1;
+
+            $Int16++ *>&1; $Int32-- *>&1; ++$Int64 *>&1; --$Int128 *>&1}.Ast)
+        $res.Count | Should -Be 4
+        $res.Name -join ',' | Should -Be ('System.Int16', 'System.Int32', 'System.Int64', 'System.Int128' -join ',')
+    }
+
+    It 'Redirected increments/decrements should be considered part of the output in a Statement block' {
+        $res = [AstTypeInference]::InferTypeOf( {if ($true){
+            [Int16]$Int16 = 1; [Int32]$Int32 = 1; [Int64]$Int64 = 1; [System.Int128]$Int128 = 1;
+
+            $Int16++ *>&1; $Int32-- *>&1; ++$Int64 *>&1; --$Int128 *>&1}}.Ast)
+        $res.Count | Should -Be 4
+        $res.Name -join ',' | Should -Be ('System.Int16', 'System.Int32', 'System.Int64', 'System.Int128' -join ',')
+    }
 }
 
 Describe "AstTypeInference tests" -Tags CI {
diff --git a/test/powershell/engine/Basic/CLRBinding.Tests.ps1 b/test/powershell/engine/Basic/CLRBinding.Tests.ps1
new file mode 100644
index 00000000000..cb23fa168db
--- /dev/null
+++ b/test/powershell/engine/Basic/CLRBinding.Tests.ps1
@@ -0,0 +1,172 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe ".NET Method Binding Tests" -tags CI {
+    BeforeAll {
+        Add-Type -TypeDefinition @'
+using System;
+using System.Runtime.InteropServices;
+
+namespace CLRBindingTests;
+
+public class TestClass
+{
+    public int Prop { get; }
+
+    public TestClass(int value = 1)
+    {
+        Prop = value;
+    }
+
+    public static string StaticWithDefaultExpected() => StaticWithDefault();
+    public static string StaticWithDefault(string value = "foo") => value;
+
+    public static string StaticWithOptionalAndValueExpected() => StaticWithOptionalAndValue();
+    public static string StaticWithOptionalAndValue([Optional, DefaultParameterValue("bar")] string value) => value;
+
+    public static string StaticWithOptionalExpected() => StaticWithOptional();
+    public static string StaticWithOptional([Optional] string value) => value;
+
+    public static int PrimitiveTypeWithInDefault(in int value = default) => value;
+
+    public static Guid ValueTypeWithInDefault(in Guid value = default) => value;
+
+    public static string RefTypeWithInDefault(in string value = default) => value;
+
+    public object InstanceWithDefaultExpected() => InstanceWithDefault();
+    public object InstanceWithDefault(object value = null) => value;
+
+    public object InstanceWithOptionalAndValueExpected() => InstanceWithOptionalAndValue();
+    public object InstanceWithOptionalAndValue([Optional, DefaultParameterValue("foo")] object value) => value;
+
+    public object InstanceWithOptionalExpected() => InstanceWithOptional();
+    public object InstanceWithOptional([Optional] object value) => value;
+
+    public string MultipleArgsWithDefaultExpected(string prefix) => MultipleArgsWithDefault(prefix);
+    public string MultipleArgsWithDefault(string prefix, string extra = "abc") => $"{prefix}{extra}";
+
+    public string MultipleArgsWithOptionalAndValueExpected(string prefix) => MultipleArgsWithOptionalAndValue(prefix);
+    public string MultipleArgsWithOptionalAndValue(string prefix, [Optional, DefaultParameterValue("def")] string extra) => $"{prefix}{extra}";
+
+    public string MultipleArgsWithOptionalExpected(string prefix) => MultipleArgsWithOptional(prefix);
+    public string MultipleArgsWithOptional(string prefix, [Optional] string extra) => $"{prefix}{extra}";
+}
+
+public class TestClassCstorWithOptionalAndValue
+{
+    public int Prop { get; }
+
+    public TestClassCstorWithOptionalAndValue([Optional, DefaultParameterValue(2)] int value)
+    {
+        Prop = value;
+    }
+}
+
+public class TestClassCstorWithOptional
+{
+    public int Prop { get; }
+
+    public TestClassCstorWithOptional([Optional] int value)
+    {
+        Prop = value;
+    }
+}
+'@
+    }
+
+    It "Binds to constructor with default argument" {
+        $c = [CLRBindingTests.TestClass]::new()
+        $c.Prop | Should -Be 1
+    }
+
+    It "Binds to constructor with Optional with DefaultValue argument" {
+        $c = [CLRBindingTests.TestClassCstorWithOptionalAndValue]::new()
+        $c.Prop | Should -Be 2
+    }
+
+    It "Binds to constructor with Optional argument" {
+        $c = [CLRBindingTests.TestClassCstorWithOptional]::new()
+        $c.Prop | Should -Be 0
+    }
+
+    It "Binds to static method with default argument" {
+        $expected = [CLRBindingTests.TestClass]::StaticWithDefaultExpected()
+        $actual = [CLRBindingTests.TestClass]::StaticWithDefault()
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to static method with Optional with DefaultValue argument" {
+        $expected = [CLRBindingTests.TestClass]::StaticWithOptionalAndValueExpected()
+        $actual = [CLRBindingTests.TestClass]::StaticWithOptionalAndValue()
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to static method with Optional argument" {
+        $expected = [CLRBindingTests.TestClass]::StaticWithOptionalExpected()
+        $actual = [CLRBindingTests.TestClass]::StaticWithOptional()
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to static method with primitive type with in modifier and default argument" {
+        $actual = [CLRBindingTests.TestClass]::PrimitiveTypeWithInDefault()
+        $actual | Should -Be 0
+    }
+
+    It "Binds to static method with value type with in modifier and default argument" {
+        $actual = [CLRBindingTests.TestClass]::ValueTypeWithInDefault()
+        $actual | Should -Be ([Guid]::Empty)
+    }
+
+    It "Binds to static method with ref type with in modifier and default argument" {
+        $actual = [CLRBindingTests.TestClass]::RefTypeWithInDefault()
+        $null -eq $actual | Should -BeTrue
+    }
+
+    It "Binds to instance method with default argument" {
+        $c = [CLRBindingTests.TestClass]::new()
+
+        $expected = $c.InstanceWithDefaultExpected()
+        $actual = $c.InstanceWithDefault()
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to instance method with Optional with DefaultValue argument" {
+        $c = [CLRBindingTests.TestClass]::new()
+
+        $expected = $c.InstanceWithOptionalAndValueExpected()
+        $actual = $c.InstanceWithOptionalAndValue()
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to instance method with Optional argument" {
+        $c = [CLRBindingTests.TestClass]::new()
+
+        $expected = $c.InstanceWithOptionalExpected()
+        $actual = $c.InstanceWithOptional()
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to instance method with normal arg and default argument" {
+        $c = [CLRBindingTests.TestClass]::new()
+
+        $expected = $c.MultipleArgsWithDefaultExpected("prefix")
+        $actual = $c.MultipleArgsWithDefault("prefix")
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to instance method with Optional with normal arg and DefaultValue argument" {
+        $c = [CLRBindingTests.TestClass]::new()
+
+        $expected = $c.MultipleArgsWithOptionalAndValueExpected("prefix")
+        $actual = $c.MultipleArgsWithOptionalAndValue("prefix")
+        $actual | Should -Be $expected
+    }
+
+    It "Binds to instance method with normal arg and Optional argument" {
+        $c = [CLRBindingTests.TestClass]::new()
+
+        $expected = $c.MultipleArgsWithOptionalExpected("prefix")
+        $actual = $c.MultipleArgsWithOptional("prefix")
+        $actual | Should -Be $expected
+    }
+}
diff --git a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1 b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
index 6744bf0295c..7a757e6eac4 100644
--- a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
+++ b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
@@ -231,6 +231,7 @@ Describe "Verify aliases and cmdlets" -Tags "CI" {
 "Cmdlet",       "Complete-Transaction",             "",                                 $($FullCLR                               ),     "",                     "",                     ""
 "Cmdlet",       "Connect-PSSession",                "",                                 $($FullCLR -or $CoreWindows              ),     "",                     "",                     "Medium"
 "Cmdlet",       "Connect-WSMan",                    "",                                 $($FullCLR -or $CoreWindows              ),     "",                     "",                     "None"
+"Cmdlet",       "ConvertFrom-CliXml",               "",                                 $($CoreWindows -or $CoreUnix),                  "",                     "",                     "None"
 "Cmdlet",       "ConvertFrom-Csv",                  "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "ConvertFrom-Json",                 "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "ConvertFrom-Markdown",             "",                                 $(             $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
@@ -240,6 +241,7 @@ Describe "Verify aliases and cmdlets" -Tags "CI" {
 "Cmdlet",       "ConvertFrom-StringData",           "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Convert-Path",                     "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Convert-String",                   "",                                 $($FullCLR                               ),     "",                     "",                     ""
+"Cmdlet",       "ConvertTo-CliXml",                 "",                                 $($CoreWindows -or $CoreUnix),                  "",                     "",                     "None"
 "Cmdlet",       "ConvertTo-Csv",                    "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "ConvertTo-Html",                   "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "ConvertTo-Json",                   "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
@@ -335,6 +337,7 @@ Describe "Verify aliases and cmdlets" -Tags "CI" {
 "Cmdlet",       "Get-PSSessionCapability",          "",                                 $($FullCLR -or $CoreWindows              ),     "",                     "",                     "None"
 "Cmdlet",       "Get-PSSessionConfiguration",       "",                                 $($FullCLR -or $CoreWindows              ),     "",                     "",                     "None"
 "Cmdlet",       "Get-PSSnapin",                     "",                                 $($FullCLR                               ),     "",                     "",                     ""
+"Cmdlet",       "Get-PSSubsystem",                  "",                                 $(             $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Get-Random",                       "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Get-Runspace",                     "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Get-RunspaceDebug",                "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
diff --git a/test/powershell/engine/Basic/Encoding.Tests.ps1 b/test/powershell/engine/Basic/Encoding.Tests.ps1
index dc1a0b15ba2..455c7e2ddea 100644
--- a/test/powershell/engine/Basic/Encoding.Tests.ps1
+++ b/test/powershell/engine/Basic/Encoding.Tests.ps1
@@ -89,6 +89,8 @@ Describe "File encoding tests" -Tag CI {
         It "Parameter 'Encoding' should accept '<encoding>'" -TestCases @(
             @{ encoding = 1251 }
             @{ encoding = "windows-1251" }
+            # Piping the string creates a PSObject boxed value that we are testing.
+            @{ encoding = ("windows-1251" | Write-Output) }
         ) {
             param ( $encoding )
             $testFile = "${TESTDRIVE}/fileEncoding-$($encoding).txt"
diff --git a/test/powershell/engine/Basic/GroupPolicySettings.Tests.ps1 b/test/powershell/engine/Basic/GroupPolicySettings.Tests.ps1
index 1986a270259..dd3943a8f81 100644
--- a/test/powershell/engine/Basic/GroupPolicySettings.Tests.ps1
+++ b/test/powershell/engine/Basic/GroupPolicySettings.Tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'Group policy settings tests' -Tag CI,RequireAdminOnWindows {
+Describe 'Group policy settings tests' -Tags @('CI', 'RequireAdminOnWindows') {
     BeforeAll {
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
         if ( ! $IsWindows ) {
diff --git a/test/powershell/engine/Basic/NativeCommandEncoding.Tests.ps1 b/test/powershell/engine/Basic/NativeCommandEncoding.Tests.ps1
new file mode 100644
index 00000000000..5f044d059e0
--- /dev/null
+++ b/test/powershell/engine/Basic/NativeCommandEncoding.Tests.ps1
@@ -0,0 +1,62 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Native command output encoding tests' -Tags 'CI' {
+    BeforeAll {
+        $WriteConsoleOutPath = Join-Path $PSScriptRoot assets WriteConsoleOut.ps1
+        $defaultEncoding = [Console]::OutputEncoding.WebName
+    }
+
+    BeforeEach {
+        Clear-Variable -Name PSApplicationOutputEncoding
+    }
+
+    AfterEach {
+        Clear-Variable -Name PSApplicationOutputEncoding
+    }
+
+    It 'Defaults to [Console]::OutputEncoding if not set' {
+        $actual = pwsh -File $WriteConsoleOutPath -Value café -Encoding $defaultEncoding
+        $actual | Should -Be café
+    }
+
+    It 'Defaults to [Console]::OutputEncoding if set to $null' {
+        $PSApplicationOutputEncoding = $null
+        $actual = pwsh -File $WriteConsoleOutPath -Value café -Encoding $defaultEncoding
+        $actual | Should -Be café
+    }
+
+    It 'Uses scoped $PSApplicationOutputEncoding value' {
+        $PSApplicationOutputEncoding = [System.Text.Encoding]::Unicode
+        $actual = & {
+            $PSApplicationOutputEncoding = [System.Text.UTF8Encoding]::new()
+            pwsh -File $WriteConsoleOutPath -Value café -Encoding utf-8
+        }
+
+        $actual | Should -Be café
+
+        # Will use UTF-16-LE hence the different values
+        $actual = pwsh -File $WriteConsoleOutPath -Value café -Encoding Unicode
+        $actual | Should -Be café
+    }
+
+    It 'Uses variable in class method' {
+        class NativeEncodingTestClass {
+            static [string] RunTest([string]$Script) {
+                $PSApplicationOutputEncoding = [System.Text.Encoding]::Unicode
+                return pwsh -File $Script -Value café -Encoding unicode
+            }
+        }
+
+        $actual = [NativeEncodingTestClass]::RunTest($WriteConsoleOutPath)
+        $actual | Should -Be café
+    }
+
+    It 'Fails to set variable with invalid encoding object' {
+        $ps = [PowerShell]::Create()
+        $ps.AddScript('$PSApplicationOutputEncoding = "utf-8"').Invoke()
+
+        $ps.Streams.Error.Count | Should -Be 1
+        [string]$ps.Streams.Error[0] | Should -Be 'Cannot convert the "utf-8" value of type "System.String" to type "System.Text.Encoding".'
+    }
+}
diff --git a/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1 b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
index 8122e598d2c..62696ec1692 100644
--- a/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
+++ b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
@@ -48,7 +48,7 @@ Describe 'Native command error handling tests' -Tags 'CI' {
 
             $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
             $error[0].TargetObject | Should -BeExactly $exePath
-            $stderr[1].Exception.Message | Should -BeExactly "Program `"$exeName`" ended with non-zero exit code: 1."
+            $stderr[1].Exception.Message | Should -BeExactly ("Program `"$exeName`" ended with non-zero exit code: 1 ({0})." -f ($IsWindows ? '0x00000001' : '0x01'))
         }
 
         It "Non-boolean value should not cause type casting error when the native command exited with non-zero code" {
@@ -61,7 +61,7 @@ Describe 'Native command error handling tests' -Tags 'CI' {
 
             $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
             $error[0].TargetObject | Should -BeExactly $exePath
-            $stderr[1].Exception.Message | Should -BeExactly "Program `"$exeName`" ended with non-zero exit code: 1."
+            $stderr[1].Exception.Message | Should -BeExactly ("Program `"$exeName`" ended with non-zero exit code: 1 ({0})." -f ($IsWindows ? '0x00000001' : '0x01'))
         }
 
         It 'Non-zero exit code generates a non-teminating error for $ErrorActionPreference = ''SilentlyContinue''' {
diff --git a/test/powershell/engine/Basic/RegisterAssemblyResolverEarly.ps1 b/test/powershell/engine/Basic/RegisterAssemblyResolverEarly.ps1
new file mode 100644
index 00000000000..fbd745b3e1d
--- /dev/null
+++ b/test/powershell/engine/Basic/RegisterAssemblyResolverEarly.ps1
@@ -0,0 +1,13 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Assembly resolvers should be registered early at startup" -Tags "CI" {
+
+    ## The PKI module requires loading an assembly from GAC, and thus depends on the PowerShell assembly resolver to work.
+    It "Can load the PKI module with 'pwsh -ExecutionPolicy bypass -NoProfile -c `"Import-Module PKI`"'" -Skip:(!$IsWindows) {
+        ## Use 'Bypass' execution policy so that it doesn't trigger 'AuthorizationManager' which would trigger 'ClrFacade' initialization.
+        ## We want to make sure even if 'ClrFacade' is not hit during startup, the resolvers are still registered early enough.
+        $out = pwsh -ExecutionPolicy bypass -NoProfile -c "Import-Module PKI; Get-Module | % name"
+        $out | Should -BeExactly "PKI"
+    }
+}
diff --git a/test/powershell/engine/Basic/SemanticVersion.Tests.ps1 b/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
index c6fbc6af969..82cc425cd6f 100644
--- a/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
+++ b/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
@@ -267,4 +267,105 @@ Describe "SemanticVersion api tests" -Tags 'CI' {
             { $PSVersionTable.PSVersion | Format-Table | Out-String } | Should -Not -Throw
         }
     }
+
+    Context 'Semver official tests' {
+        BeforeAll {
+            $valid = @'
+0.0.4
+1.2.3
+10.20.30
+1.1.2-prerelease+meta
+1.1.2+meta
+1.1.2+meta-valid
+1.0.0-alpha
+1.0.0-beta
+1.0.0-alpha.beta
+1.0.0-alpha.beta.1
+1.0.0-alpha.1
+1.0.0-alpha0.valid
+1.0.0-alpha.0valid
+1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay
+1.0.0-rc.1+build.1
+2.0.0-rc.1+build.123
+1.2.3-beta
+10.2.3-DEV-SNAPSHOT
+1.2.3-SNAPSHOT-123
+1.0.0
+2.0.0
+1.1.7
+2.0.0+build.1848
+2.0.1-alpha.1227
+1.0.0-alpha+beta
+1.2.3----RC-SNAPSHOT.12.9.1--.12+788
+1.2.3----R-S.12.9.1--.12+meta
+1.2.3----RC-SNAPSHOT.12.9.1--.12
+1.0.0+0.build.1-rc.10000aaa-kk-0.1
+1.0.0-0A.is.legal
+'@
+
+            $validVersions = @()
+            foreach ($version in $valid.Split([Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries)) {
+                $validVersions += @{version = $version}
+            }
+
+            $invalid = @'
+1
+1.2
+1.2.3-0123
+1.2.3-0123.0123
+1.1.2+.123
++invalid
+-invalid
+-invalid+invalid
+-invalid.01
+alpha
+alpha.beta
+alpha.beta.1
+alpha.1
+alpha+beta
+alpha_beta
+alpha.
+alpha..
+beta
+1.0.0-alpha_beta
+-alpha.
+1.0.0-alpha..
+1.0.0-alpha..1
+1.0.0-alpha...1
+1.0.0-alpha....1
+1.0.0-alpha.....1
+1.0.0-alpha......1
+1.0.0-alpha.......1
+01.1.1
+1.01.1
+1.1.01
+1.2
+1.2.3.DEV
+1.2-SNAPSHOT
+1.2.31.2.3----RC-SNAPSHOT.12.09.1--..12+788
+1.2-RC-SNAPSHOT
+-1.0.3-gamma+b7718
++justmeta
+9.8.7+meta+meta
+9.8.7-whatever+meta+meta
+99999999999999999999999.999999999999999999.99999999999999999----RC-SNAPSHOT.12.09.1--------------------------------..12
+'@
+
+            $invalidVersions = @()
+            foreach ($version in $invalid.Split([Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries)) {
+                $invalidVersions += @{version = $version}
+            }
+        }
+
+        It 'Should parse valid versions: <version>' -TestCases $validVersions {
+            param($version)
+            $v = [semver]"$version"
+            $v.ToString() | Should -Be $version
+        }
+
+        It 'Should not parse invalid versions: <version>' -TestCases $invalidVersions {
+            { [semver]"$version" } | Should -Throw
+        }
+    }
+
 }
diff --git a/test/powershell/engine/Basic/StandardLibraryTypes.Tests.ps1 b/test/powershell/engine/Basic/StandardLibraryTypes.Tests.ps1
index 51191f49764..8aed31c3f41 100644
--- a/test/powershell/engine/Basic/StandardLibraryTypes.Tests.ps1
+++ b/test/powershell/engine/Basic/StandardLibraryTypes.Tests.ps1
@@ -19,7 +19,7 @@ Describe "Types referenced by PowerShell Standard should not be missing"  -Tags
             "IsSecurityCritical",
             "IsSecuritySafeCritical",
             "IsSecurityTransparent",
-            "IsInterface",
+            ## "IsInterface", -- disable due to issue https://github.com/dotnet/runtime/issues/98533
             "IsNested",
             "IsArray",
             "IsByRef",
diff --git a/test/powershell/engine/Basic/Telemetry.Tests.ps1 b/test/powershell/engine/Basic/Telemetry.Tests.ps1
index 2378b9e5a66..0da08316a56 100644
--- a/test/powershell/engine/Basic/Telemetry.Tests.ps1
+++ b/test/powershell/engine/Basic/Telemetry.Tests.ps1
@@ -5,8 +5,53 @@
 # these tests aren't going to check that telemetry is being sent
 # only that we're not treating the telemetry.uuid file correctly
 
+function Get-OSTelemetryLevel {
+    <#
+    .SYNOPSIS
+        Returns the effective Windows Telemetry level (0-3).
+        Logic: Checks GPO overrides, then System preferences, then defaults to 1.
+    #>
+
+    $gpoPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection"
+    $sysPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection"
+    $valueName = "AllowTelemetry"
+
+    # 1. Check the "Managed" Policy (Group Policy)
+    if (Test-Path $gpoPath) {
+        $gpoValue = Get-ItemProperty -Path $gpoPath -Name $valueName -ErrorAction SilentlyContinue
+        if ($gpoValue -and $gpoValue.$valueName) {
+            return [int]$gpoValue.$valueName
+        }
+    }
+
+    # 2. Check the "User/System" Preference (Settings App)
+    if (Test-Path $sysPath) {
+        $sysValue = Get-ItemProperty -Path $sysPath -Name $valueName -ErrorAction SilentlyContinue
+        if ($sysValue -and $sysValue.$valueName) {
+            return [int]$sysValue.$valueName
+        }
+    }
+
+    # 3. Fallback to OS Default (Basic/Required)
+    return 1
+}
+
 Describe "Telemetry for shell startup" -Tag CI {
     BeforeAll {
+        $skipTelemetryTests = $false
+
+        if ($IsWindows) {
+            ## Skip telemetry tests if the OS telemetry level is less than 2 (Enhanced) -- PS telemetry is disabled in this case.
+            $osTelemetryLevel = Get-OSTelemetryLevel
+            $skipTelemetryTests = $osTelemetryLevel -lt 2
+        }
+
+        if ($skipTelemetryTests) {
+            $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+            $PSDefaultParameterValues["it:skip"] = $true
+            return
+        }
+
         # if the telemetry file exists, move it out of the way
         # the member is internal, but we can retrieve it via reflection
         $cacheDir = [System.Management.Automation.Platform].GetField("CacheDirectory","NonPublic,Static").GetValue($null)
@@ -23,6 +68,11 @@ Describe "Telemetry for shell startup" -Tag CI {
     }
 
     AfterAll {
+        if ($skipTelemetryTests) {
+            $global:PSDefaultParameterValues = $originalDefaultParameterValues
+            return
+        }
+
         # check and reset the telemetry.uuid file
         if ( $uuidFileExists ) {
             if ( Test-Path -Path "${uuidPath}.original" ) {
diff --git a/test/powershell/engine/Basic/ValidateAttributes.Tests.ps1 b/test/powershell/engine/Basic/ValidateAttributes.Tests.ps1
index c8d56786d51..ff4ad0ebcac 100644
--- a/test/powershell/engine/Basic/ValidateAttributes.Tests.ps1
+++ b/test/powershell/engine/Basic/ValidateAttributes.Tests.ps1
@@ -6,33 +6,33 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         BeforeAll {
            $testCases = @(
                 @{
-                    ScriptBlock              = { function foo { param([ValidateCount(-1,2)] [string[]] $bar) }; foo }
+                    ScriptBlock              = { function Test-ArrayCount { param([ValidateCount(-1,2)] [string[]] $Items) }; Test-ArrayCount }
                     FullyQualifiedErrorId    = "ExceptionConstructingAttribute"
                     InnerErrorId             = ""
                 }
                 @{
-                    ScriptBlock              = { function foo { param([ValidateCount(1,-1)] [string[]] $bar) }; foo }
+                    ScriptBlock              = { function Test-ArrayCount { param([ValidateCount(1,-1)] [string[]] $Items) }; Test-ArrayCount }
                     FullyQualifiedErrorId    = "ExceptionConstructingAttribute"
                     InnerErrorId             = ""
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateCount(2, 1)] [string[]] $bar) }; foo }
+                    ScriptBlock             = { function Test-ArrayCount { param([ValidateCount(2, 1)] [string[]] $Items) }; Test-ArrayCount }
                     FullyQualifiedErrorId   = "ValidateRangeMaxLengthSmallerThanMinLength"
                     InnerErrorId            = ""
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateCount(2, 2)] [string[]] $bar) }; foo 1 }
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    ScriptBlock             = { function Test-ArrayCount { param([ValidateCount(2, 2)] [string[]] $Items) }; Test-ArrayCount 1 }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-ArrayCount"
                     InnerErrorId            = "ValidateCountExactFailure"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateCount(2, 3)] [string[]] $bar) }; foo 1 }
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    ScriptBlock             = { function Test-ArrayCount { param([ValidateCount(2, 3)] [string[]] $Items) }; Test-ArrayCount 1 }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-ArrayCount"
                     InnerErrorId            = "ValidateCountMinMaxFailure"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateCount(2, 3)] [string[]] $bar) }; foo 1,2,3,4 }
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    ScriptBlock             = { function Test-ArrayCount { param([ValidateCount(2, 3)] [string[]] $Items) }; Test-ArrayCount 1,2,3,4 }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-ArrayCount"
                     InnerErrorId            = "ValidateCountMinMaxFailure"
                 }
            )
@@ -41,14 +41,14 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         It 'Exception: <FullyQualifiedErrorId>:<InnerErrorId>' -TestCases $testCases {
             param($ScriptBlock, $FullyQualifiedErrorId, $InnerErrorId)
 
-            $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId
+            $err = $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId -PassThru
             if ($InnerErrorId) {
-                $error[0].exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
+                $err.exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
             }
         }
 
         It 'No Exception: valid argument count' {
-            { function foo { param([ValidateCount(2, 4)] [string[]] $bar) }; foo 1,2,3,4 } | Should -Not -Throw
+            { function Test-ArrayCount { param([ValidateCount(2, 4)] [string[]] $Items) }; Test-ArrayCount 1,2,3,4 } | Should -Not -Throw
         }
     }
 
@@ -56,22 +56,22 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         BeforeAll {
             $testCases = @(
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange('xPositive')] $bar) }; foo }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange('xPositive')] $Number) }; Test-NumericRange }
                     FullyQualifiedErrorId   = "ExceptionConstructingAttribute"
                     InnerErrorId            = "SubstringDisambiguationEnumParseThrewAnException"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange(2,1)] [int] $bar) }; foo }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange(2,1)] [int] $Number) }; Test-NumericRange }
                     FullyQualifiedErrorId   = "MaxRangeSmallerThanMinRange"
                     InnerErrorId            = ""
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange("one",10)] $bar) }; foo }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange("one",10)] $Number) }; Test-NumericRange }
                     FullyQualifiedErrorId   = "MinRangeNotTheSameTypeOfMaxRange"
                     InnerErrorId            = ""
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange(1,"two")] $bar) }; foo }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange(1,"two")] $Number) }; Test-NumericRange }
                     FullyQualifiedErrorId   = "MinRangeNotTheSameTypeOfMaxRange"
                     InnerErrorId            = ""
                 }
@@ -81,9 +81,9 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         It 'Exception: <FullyQualifiedErrorId>:<InnerErrorId>' -TestCases $testCases {
             param($ScriptBlock, $FullyQualifiedErrorId, $InnerErrorId)
 
-            $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId
+            $err = $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId -PassThru
             if ($InnerErrorId) {
-                $error[0].exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
+                $err.exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
             }
         }
     }
@@ -91,25 +91,25 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         BeforeAll {
            $testCases = @(
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange(1,10)] [int] $bar) }; foo -1 }
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange(1,10)] [int] $Number) }; Test-NumericRange -1 }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangeTooSmall"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange(1,10)] [int] $bar) }; foo 11 }
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange(1,10)] [int] $Number) }; Test-NumericRange 11 }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangeTooBig"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange(1,10)] $bar) }; foo "one" }
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange(1,10)] $Number) }; Test-NumericRange "one" }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidationRangeElementType"
                 }
            )
 
             $validTestCases = @(
                @{
-                   ScriptBlock = { function foo { param([ValidateRange(1,10)] [int] $bar) }; foo 5 }
+                   ScriptBlock = { function Test-NumericRange { param([ValidateRange(1,10)] [int] $Number) }; Test-NumericRange 5 }
                 }
            )
         }
@@ -117,9 +117,9 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         It 'Exception: <FullyQualifiedErrorId>:<InnerErrorId>' -TestCases $testCases {
             param($ScriptBlock, $FullyQualifiedErrorId, $InnerErrorId)
 
-            $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId
+            $err = $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId -PassThru
             if ($InnerErrorId) {
-                $error[0].exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
+                $err.exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
             }
         }
 
@@ -133,115 +133,115 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         BeforeAll {
            $testCases = @(
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange("Positive")] [int] $bar) }; foo -1 }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange("Positive")] [int] $Number) }; Test-NumericRange -1 }
                     RangeType               = "Positive"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangePositiveFailure"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange("Positive")] [int] $bar) }; foo 0 }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange("Positive")] [int] $Number) }; Test-NumericRange 0 }
                     RangeType               = "Positive"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangePositiveFailure"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange("Positive")] $bar) }; foo "one" }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange("Positive")] $Number) }; Test-NumericRange "one" }
                     RangeType               = "Positive"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = ""
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange('NonNegative')] [int] $bar) }; foo -1 }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange('NonNegative')] [int] $Number) }; Test-NumericRange -1 }
                     RangeType               = "NonNegative"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangeNonNegativeFailure"
                 }
                 @{
-                   ScriptBlock              = { function foo { param([ValidateRange('NonNegative')] $bar) }; foo "one" }
+                   ScriptBlock              = { function Test-NumericRange { param([ValidateRange('NonNegative')] $Number) }; Test-NumericRange "one" }
                    RangeType                = "NonNegative"
-                   FullyQualifiedErrorId    = "ParameterArgumentValidationError,foo"
+                   FullyQualifiedErrorId    = "ParameterArgumentValidationError,Test-NumericRange"
                    InnerErrorId             = ""
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange('Negative')] [int] $bar) }; foo 1 }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange('Negative')] [int] $Number) }; Test-NumericRange 1 }
                     RangeType               = "Negative"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangeNegativeFailure"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange('Negative')] [int] $bar) }; foo 0 }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange('Negative')] [int] $Number) }; Test-NumericRange 0 }
                     RangeType               = "Negative"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangeNegativeFailure"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange('Negative')] $bar) }; foo "one" }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange('Negative')] $Number) }; Test-NumericRange "one" }
                     RangeType               = "Negative"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = ""
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange('NonPositive')] $bar) }; foo 1 }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange('NonPositive')] $Number) }; Test-NumericRange 1 }
                     RangeType               = "NonPositive"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = "ValidateRangeNonPositiveFailure"
                 }
                 @{
-                    ScriptBlock             = { function foo { param([ValidateRange('NonPositive')] $bar) }; foo "one" }
+                    ScriptBlock             = { function Test-NumericRange { param([ValidateRange('NonPositive')] $Number) }; Test-NumericRange "one" }
                     RangeType               = "NonPositive"
-                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,foo"
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-NumericRange"
                     InnerErrorId            = ""
                 }
            )
 
            $validTestCases = @(
                 @{
-                   ScriptBlock  = { function foo { param([ValidateRange("Positive")] [int] $bar) }; foo 15 }
+                   ScriptBlock  = { function Test-NumericRange { param([ValidateRange("Positive")] [int] $Number) }; Test-NumericRange 15 }
                    RangeType    = "Positive"
                    TestValue    = 15
                 }
                 @{
-                   ScriptBlock  = { function foo { param([ValidateRange("Positive")] [double]$bar) }; foo ([double]::MaxValue) };
+                   ScriptBlock  = { function Test-NumericRange { param([ValidateRange("Positive")] [double]$Number) }; Test-NumericRange ([double]::MaxValue) };
                    RangeType    = "Positive"
                    TestValue    = [double]::MaxValue
                 }
                 @{
-                   ScriptBlock  = { function foo { param([ValidateRange('NonNegative')] [int] $bar) }; foo 0 }
+                   ScriptBlock  = { function Test-NumericRange { param([ValidateRange('NonNegative')] [int] $Number) }; Test-NumericRange 0 }
                    RangeType    = "NonNegative"
                    TestValue    = 0
                 }
                 @{
-                   ScriptBlock  = { function foo { param([ValidateRange('NonNegative')] [int] $bar) }; foo 15 }
+                   ScriptBlock  = { function Test-NumericRange { param([ValidateRange('NonNegative')] [int] $Number) }; Test-NumericRange 15 }
                    RangeType    = "NonNegative"
                    TestValue    = 15
                 }
                 @{
-                   ScriptBlock  = { function foo { param([ValidateRange('NonNegative')] [double]$bar) }; foo ([double]::MaxValue) };
+                   ScriptBlock  = { function Test-NumericRange { param([ValidateRange('NonNegative')] [double]$Number) }; Test-NumericRange ([double]::MaxValue) };
                    RangeType    = "NonNegative"
                    TestValue    = [double]::MaxValue
                 }
                 @{
-                    ScriptBlock = { function foo { param([ValidateRange('Negative')] [int] $bar) }; foo -15 }
+                    ScriptBlock = { function Test-NumericRange { param([ValidateRange('Negative')] [int] $Number) }; Test-NumericRange -15 }
                     RangeType   = "Negative"
                     TestValue   = -15
                 }
                 @{
-                    ScriptBlock = { function foo { param([ValidateRange('Negative')] [double]$bar) }; foo ([double]::MinValue) };
+                    ScriptBlock = { function Test-NumericRange { param([ValidateRange('Negative')] [double]$Number) }; Test-NumericRange ([double]::MinValue) };
                     TestValue   = [double]::MinValue
                     RangeType   = "Negative"
                 }
                 @{
-                    ScriptBlock = { function foo { param([ValidateRange('NonPositive')] [int] $bar) }; foo 0 }
+                    ScriptBlock = { function Test-NumericRange { param([ValidateRange('NonPositive')] [int] $Number) }; Test-NumericRange 0 }
                     RangeType   = "NonPositive"
                     TestValue   = 0
                 }
                 @{
-                    ScriptBlock = { function foo { param([ValidateRange('NonPositive')] [int] $bar) }; foo -15 }
+                    ScriptBlock = { function Test-NumericRange { param([ValidateRange('NonPositive')] [int] $Number) }; Test-NumericRange -15 }
                     RangeType   = "NonPositive"
                     TestValue   = -15
                 }
                 @{
-                    ScriptBlock = { function foo { param([ValidateRange('NonPositive')] [double]$bar) }; foo ([double]::MinValue) }
+                    ScriptBlock = { function Test-NumericRange { param([ValidateRange('NonPositive')] [double]$Number) }; Test-NumericRange ([double]::MinValue) }
                     RangeType   = "NonPositive"
                     TestValue   = [double]::MinValue
                 }
@@ -251,9 +251,9 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         It 'Exception: <FullyQualifiedErrorId>:<InnerErrorId>, RangeType: <RangeType>' -TestCases $testCases {
             param($ScriptBlock, $RangeType, $FullyQualifiedErrorId, $InnerErrorId)
 
-            $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId
+            $err = $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId -PassThru
             if ($InnerErrorId) {
-                $error[0].exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
+                $err.exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
             }
         }
 
@@ -263,6 +263,70 @@ Describe 'Validate Attributes Tests' -Tags 'CI' {
         }
     }
 
+    Context "ValidateLength" {
+        BeforeAll {
+            $testCases = @(
+                @{
+                    ScriptBlock             = { function Test-StringLength { param([ValidateLength(2, 5)] [string] $InputString) }; Test-StringLength "a" }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-StringLength"
+                    InnerErrorId            = "ValidateLengthMinLengthFailure"
+                }
+                @{
+                    ScriptBlock             = { function Test-StringLength { param([ValidateLength(2, 5)] [string] $InputString) }; Test-StringLength "abcdef" }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-StringLength"
+                    InnerErrorId            = "ValidateLengthMaxLengthFailure"
+                }
+                @{
+                    ScriptBlock             = { function Test-StringLength { param([ValidateLength(2, 5)] $InputString) }; Test-StringLength 123 }
+                    FullyQualifiedErrorId   = "ParameterArgumentValidationError,Test-StringLength"
+                    InnerErrorId            = "ValidateLengthNotString"
+                }
+            )
+
+            $validTestCases = @(
+                @{
+                    ScriptBlock  = { function Test-StringLength { param([ValidateLength(2, 5)] [string] $InputString) }; Test-StringLength "abc" }
+                }
+                @{
+                    ScriptBlock  = { function Test-StringLength { param([ValidateLength(2, 5)] [string] $InputString) }; Test-StringLength "ab" }
+                }
+                @{
+                    ScriptBlock  = { function Test-StringLength { param([ValidateLength(2, 5)] [string] $InputString) }; Test-StringLength "abcde" }
+                }
+            )
+        }
+
+        It 'Exception: <FullyQualifiedErrorId>:<InnerErrorId>' -TestCases $testCases {
+            param($ScriptBlock, $FullyQualifiedErrorId, $InnerErrorId)
+
+            $err = $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId -PassThru
+            if ($InnerErrorId) {
+                $err.exception.innerexception.errorrecord.FullyQualifiedErrorId | Should -Be $InnerErrorId
+            }
+        }
+
+        It 'No Exception: valid string length' -TestCases $validTestCases {
+            param($ScriptBlock)
+            $ScriptBlock | Should -Not -Throw
+        }
+
+        It 'ValidateLength error message should be properly formatted' {
+            function Test-ValidateLengthMax { param([ValidateLength(0,2)] [string] $Value) $Value }
+            function Test-ValidateLengthMin { param([ValidateLength(5,10)] [string] $Value) $Value }
+
+            $TestStringTooLong = "11111"
+            $TestStringTooShort = "123"
+            $ExpectedMaxLength = 2
+            $ExpectedMinLength = 5
+
+            $err = { Test-ValidateLengthMax $TestStringTooLong } | Should -Throw -ErrorId "ParameterArgumentValidationError,Test-ValidateLengthMax" -PassThru
+            $err.Exception.InnerException.Message | Should -Match ".+\($($TestStringTooLong.Length)\).+\`"$ExpectedMaxLength\`""
+
+            $err = { Test-ValidateLengthMin $TestStringTooShort } | Should -Throw -ErrorId "ParameterArgumentValidationError,Test-ValidateLengthMin" -PassThru
+            $err.Exception.InnerException.Message | Should -Match ".+\($($TestStringTooShort.Length)\).+\`"$ExpectedMinLength\`""
+        }
+    }
+
     Context "ValidateNotNull, ValidateNotNullOrEmpty, ValidateNotNullOrWhiteSpace and Not-Null-Or-Empty check for Mandatory parameter" {
 
         BeforeAll {
diff --git a/test/powershell/engine/Basic/assets/WriteConsoleOut.ps1 b/test/powershell/engine/Basic/assets/WriteConsoleOut.ps1
new file mode 100644
index 00000000000..ef82907a17f
--- /dev/null
+++ b/test/powershell/engine/Basic/assets/WriteConsoleOut.ps1
@@ -0,0 +1,23 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+[CmdletBinding()]
+param (
+    [Parameter(Mandatory)]
+    [string]
+    $Value,
+
+    [Parameter(Mandatory)]
+    [string]
+    $Encoding
+)
+
+$enc = [System.Text.Encoding]::GetEncoding($Encoding)
+$data = $enc.GetBytes($Value)
+
+$outStream = [System.Console]::OpenStandardOutput()
+try {
+    $outStream.Write($data, 0, $data.Length)
+} finally {
+    $outStream.Dispose()
+}
diff --git a/test/powershell/engine/ETS/Adapter.Tests.ps1 b/test/powershell/engine/ETS/Adapter.Tests.ps1
index 7876dd778a6..f65b08f8174 100644
--- a/test/powershell/engine/ETS/Adapter.Tests.ps1
+++ b/test/powershell/engine/ETS/Adapter.Tests.ps1
@@ -200,6 +200,17 @@ Describe "Adapter Tests" -tags "CI" {
 
             # TODO: dynamic method calls
         }
+
+        It "Can use PSForEach as an alias for the Foreach magic method" {
+            $x = 5
+            $x.PSForEach({$_}) | Should -Be 5
+
+            $p = $null.PSForEach{"I didn't run"}
+            $p.GetType().Name | Should -BeExactly 'Collection`1'
+            $p.Count | Should -BeExactly 0
+
+            ([pscustomobject]@{ Name = 'bar' }).PSForEach({$_.Name}) | Should -BeExactly 'bar'
+        }
     }
 
     Context "Where Magic Method Adapter Tests" {
@@ -240,6 +251,17 @@ Describe "Adapter Tests" -tags "CI" {
                 } -PassThru -Force
             $x.Where(5) | Should -Be 10
         }
+
+        It "Can use PSWhere as an alias for the Where magic method" {
+            $x = 5
+            $x.PSWhere{$true} | Should -Be 5
+
+            $p = $null.PSWhere{"I didn't run"}
+            $p.GetType().Name | Should -BeExactly 'Collection`1'
+            $p.Count | Should -BeExactly 0
+
+            ([pscustomobject]@{ Name = 'bar' }).PSWhere({$_.Name}) | ForEach-Object Name | Should -BeExactly 'bar'
+        }
     }
 }
 
diff --git a/test/powershell/engine/ETS/CimAdapter.Tests.ps1 b/test/powershell/engine/ETS/CimAdapter.Tests.ps1
index 1e71bc28b95..3cfff4bd9e4 100644
--- a/test/powershell/engine/ETS/CimAdapter.Tests.ps1
+++ b/test/powershell/engine/ETS/CimAdapter.Tests.ps1
@@ -3,6 +3,8 @@
 
 Describe "CIM Objects are adapted properly" -Tag @("CI") {
     BeforeAll {
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        
         function getIndex
         {
             param([string[]]$strings,[string]$pattern)
@@ -32,7 +34,7 @@ Describe "CIM Objects are adapted properly" -Tag @("CI") {
         }
     }
     AfterAll {
-        $PSDefaultParameterValues.Remove("it:pending")
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
     }
 
     It "Namespace-qualified Win32_Process is present" -Skip:(!$IsWindows) {
diff --git a/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs b/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs
index 219c01058e9..73bb24ccd08 100644
--- a/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs
+++ b/test/powershell/engine/ExperimentalFeature/assets/ExpTest/ExpTest.cs
@@ -151,7 +151,7 @@ public class SaveMyFileCommand : PSCmdlet
 
         [Parameter]
         public string FileName { get; set; }
-        
+
         [Experimental("ExpTest.FeatureOne", ExperimentAction.Show)]
         [Parameter]
         public string Destination { get; set; }
diff --git a/test/powershell/engine/Formatting/BugFix.Tests.ps1 b/test/powershell/engine/Formatting/BugFix.Tests.ps1
index 5be7797134c..8b1ecdaccd9 100644
--- a/test/powershell/engine/Formatting/BugFix.Tests.ps1
+++ b/test/powershell/engine/Formatting/BugFix.Tests.ps1
@@ -63,3 +63,17 @@ Describe "Hidden properties should not be returned by the 'FirstOrDefault' primi
         $outstring.Trim() | Should -BeExactly "Param$([System.Environment]::NewLine)-----$([System.Environment]::NewLine)Foo"
     }
 }
+
+Describe "'Format-Table/List/Custom -Property' should not throw NullRef exception" -Tag CI {
+
+    It "'<Command> -Property' requires value to be not null and not empty" -TestCases @(
+        @{ Command = "Format-Table"; NameInErrorId = "FormatTableCommand" }
+        @{ Command = "Format-List"; NameInErrorId = "FormatListCommand" }
+        @{ Command = "Format-Custom"; NameInErrorId = "FormatCustomCommand" }
+    ) {
+        param($Command, $NameInErrorId)
+
+        { Get-Process -Id $PID | & $Command -Property @() } | Should -Throw -ErrorId "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.$NameInErrorId"
+        { Get-Process -Id $PID | & $Command -Property $null } | Should -Throw -ErrorId "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.$NameInErrorId"
+    }
+}
diff --git a/test/powershell/engine/Formatting/ErrorView.Tests.ps1 b/test/powershell/engine/Formatting/ErrorView.Tests.ps1
index 2188648872a..6af2b5fb504 100644
--- a/test/powershell/engine/Formatting/ErrorView.Tests.ps1
+++ b/test/powershell/engine/Formatting/ErrorView.Tests.ps1
@@ -15,7 +15,7 @@ Describe 'Tests for $ErrorView' -Tag CI {
 
     It 'Exceptions not thrown do not get formatted as ErrorRecord' {
         $exp = [System.Exception]::new('test') | Out-String
-        $exp | Should -BeLike "*Message        : *test*"
+        $exp | Should -BeLike '*Message        : *test*'
     }
 
     Context 'ConciseView tests' {
@@ -49,24 +49,24 @@ Describe 'Tests for $ErrorView' -Tag CI {
             $e | Should -BeLike '* 4 *'
         }
 
-        It "Remote errors show up correctly" {
+        It 'Remote errors show up correctly' {
             Start-Job -ScriptBlock { Get-Item (New-Guid) } | Wait-Job | Receive-Job -ErrorVariable e -ErrorAction SilentlyContinue
             ($e | Out-String).Trim().Count | Should -Be 1
         }
 
-        It "Activity shows up correctly for scriptblocks" {
+        It 'Activity shows up correctly for scriptblocks' {
             $e = & "$PSHOME/pwsh" -noprofile -command 'Write-Error 'myError' -ErrorAction SilentlyContinue; $error[0] | Out-String'
-            [string]::Join('', $e).Trim() | Should -BeLike "*Write-Error:*myError*" # wildcard due to VT100
+            [string]::Join('', $e).Trim() | Should -BeLike '*Write-Error:*myError*' # wildcard due to VT100
         }
 
-        It "Function shows up correctly" {
+        It 'Function shows up correctly' {
             function test-myerror { [cmdletbinding()] param() Write-Error 'myError' }
 
             $e = & "$PSHOME/pwsh" -noprofile -command 'function test-myerror { [cmdletbinding()] param() write-error "myError" }; test-myerror -ErrorAction SilentlyContinue; $error[0] | Out-String'
-            [string]::Join('', $e).Trim() | Should -BeLike "*test-myerror:*myError*" # wildcard due to VT100
+            [string]::Join('', $e).Trim() | Should -BeLike '*test-myerror:*myError*' # wildcard due to VT100
         }
 
-        It "Pester Should shows test file and not pester" {
+        It 'Pester Should shows test file and not pester' {
             $testScript = '1 + 1 | Should -Be 3'
 
             Set-Content -Path $testScriptPath -Value $testScript
@@ -75,7 +75,7 @@ Describe 'Tests for $ErrorView' -Tag CI {
             $e | Should -Not -BeLike '*pester*'
         }
 
-        It "Long lines should be rendered correctly with indentation" {
+        It 'Long lines should be rendered correctly with indentation' {
             $testscript = @'
                         $myerrors = [System.Collections.ArrayList]::new()
                         Copy-Item (New-Guid) (New-Guid) -ErrorVariable +myerrors -ErrorAction SilentlyContinue
@@ -89,11 +89,10 @@ Describe 'Tests for $ErrorView' -Tag CI {
             $e | Should -BeLike '* 2 *'
         }
 
-        It "Long exception message gets rendered" {
+        It 'Long exception message gets rendered' {
 
-            $msg = "1234567890"
-            while ($msg.Length -le $Host.UI.RawUI.WindowSize.Width)
-            {
+            $msg = '1234567890'
+            while ($msg.Length -le $Host.UI.RawUI.WindowSize.Width) {
                 $msg += $msg
             }
 
@@ -101,19 +100,19 @@ Describe 'Tests for $ErrorView' -Tag CI {
             $e | Should -BeLike "*$msg*"
         }
 
-        It "Position message does not contain line information" {
+        It 'Position message does not contain line information' {
 
-            $e = & "$PSHOME/pwsh" -noprofile -command "foreach abc" 2>&1 | Out-String
+            $e = & "$PSHOME/pwsh" -noprofile -command 'foreach abc' 2>&1 | Out-String
             $e | Should -Not -BeNullOrEmpty
-            $e | Should -Not -BeLike "*At line*"
+            $e | Should -Not -BeLike '*At line*'
         }
 
         It "Error shows if `$PSModuleAutoLoadingPreference is set to 'none'" {
             $e = & "$PSHOME/pwsh" -noprofile -command '$PSModuleAutoLoadingPreference = "none"; cmdletThatDoesntExist' 2>&1 | Out-String
-            $e | Should -BeLike "*cmdletThatDoesntExist*"
+            $e | Should -BeLike '*cmdletThatDoesntExist*'
         }
 
-        It "Error shows for advanced function" {
+        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
             $e = $e | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] } | Out-String
@@ -122,9 +121,8 @@ Describe 'Tests for $ErrorView' -Tag CI {
             # need to see if ANSI escape sequences are in the output as ANSI is disabled for CI
             if ($e.Contains("`e")) {
                 $e | Should -BeLike "*: `e*myTest*"
-            }
-            else {
-                $e | Should -BeLike "*: myTest*"
+            } else {
+                $e | Should -BeLike '*: myTest*'
             }
         }
 
@@ -134,12 +132,12 @@ Describe 'Tests for $ErrorView' -Tag CI {
         ) {
             param($newline)
 
-            Set-Content -path $testScriptPath -Value "throw 'hello${newline}there'"
+            Set-Content -Path $testScriptPath -Value "throw 'hello${newline}there'"
             $e = & "$PSHOME/pwsh" -noprofile -file $testScriptPath 2>&1 | Out-String
-            $e.Split("o${newline}t").Count | Should -Be 1 -Because "Error message should not contain newline"
+            $e.Split("o${newline}t").Count | Should -Be 1 -Because 'Error message should not contain newline'
         }
 
-        It "Script module error should not show line information" {
+        It 'Script module error should not show line information' {
             $testModule = @'
                 function Invoke-Error() {
                     throw 'oops'
@@ -149,7 +147,7 @@ Describe 'Tests for $ErrorView' -Tag CI {
             Set-Content -Path $testModulePath -Value $testModule
             $e = & "$PSHOME/pwsh" -noprofile -command "Import-Module '$testModulePath'; Invoke-Error" 2>&1 | Out-String
             $e | Should -Not -BeNullOrEmpty
-            $e | Should -Not -BeLike "*Line*"
+            $e | Should -Not -BeLike '*Line*'
         }
 
         It 'Parser error shows line information' {
@@ -157,15 +155,411 @@ Describe 'Tests for $ErrorView' -Tag CI {
             $e = & "$PSHOME/pwsh" -noprofile -command $testScript 2>&1 | Out-String
             $e | Should -Not -BeNullOrEmpty
             $e = $e.Split([Environment]::NewLine)
-            $e[0] | Should -BeLike "ParserError:*"
-            $e[1] | Should -BeLike "Line *" -Because ($e | Out-String)
-            $e[2] | Should -BeLike "*|*1 ++ 1*"
+            $e[0] | Should -BeLike 'ParserError:*'
+            $e[1] | Should -BeLike 'Line *' -Because ($e | Out-String)
+            $e[2] | Should -BeLike '*|*1 ++ 1*'
         }
 
         It 'Faux remote parser error shows concise message' {
-            start-job { [cmdletbinding()]param() $e = [System.Management.Automation.ErrorRecord]::new([System.Exception]::new('hello'), 1, 'ParserError', $null); $pscmdlet.ThrowTerminatingError($e) } | Wait-Job | Receive-Job -ErrorVariable e -ErrorAction SilentlyContinue
+            Start-Job { [cmdletbinding()]param() $e = [System.Management.Automation.ErrorRecord]::new([System.Exception]::new('hello'), 1, 'ParserError', $null); $pscmdlet.ThrowTerminatingError($e) } | Wait-Job | Receive-Job -ErrorVariable e -ErrorAction SilentlyContinue
             $e | Out-String | Should -BeLike '*ParserError*'
         }
+
+        It 'Parser TargetObject shows Line information' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   1 | This is the line with the error"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+                            Line = 1
+                            LineText = 'This is the line with the error'
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject shows File information' {
+            $expected = (@(
+                ": MyFile.ps1"
+                "Line |"
+                "   1 | This is the line with the error"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+                            File = 'MyFile.ps1'
+                            Line = 1
+                            LineText = 'This is the line with the error'
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject has StartColumn' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   5 | This is the line with the error"
+                "     |                  ~~~~~~~~~~~~~~"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+
+                            Line = 5
+                            LineText = 'This is the line with the error'
+                            StartColumn = 18
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject has StartColumn and EndColumn' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   5 | This is the line with the error"
+                "     |                  ~~~~"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+
+                            Line = 5
+                            LineText = 'This is the line with the error'
+                            StartColumn = 18
+                            EndColumn = 22
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject has StartColumn at end of the line' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   5 | This is the line with the error"
+                "     |                               ~"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+
+                            Line = 5
+                            LineText = 'This is the line with the error'
+                            StartColumn = 31
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+
+        It 'Parser TargetObject has StartColumn at end of the line with EndColumn' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   5 | This is the line with the error"
+                "     |                               ~"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+
+                            Line = 5
+                            LineText = 'This is the line with the error'
+                            StartColumn = 31
+                            EndColumn = 32
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject ignores EndColumn if no StartColumn' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   1 | This is the line with the error"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+                            Line = 1
+                            LineText = 'This is the line with the error'
+                            EndColumn = 22
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject converts StartColumn and EndColumn from string' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   5 | This is the line with the error"
+                "     |                  ~~~~"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+
+                            Line = 5
+                            LineText = 'This is the line with the error'
+                            StartColumn = "18"
+                            EndColumn = "22"
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject ignores StartColumn if it cannot be converted' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   1 | This is the line with the error"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+                            Line = 1
+                            LineText = 'This is the line with the error'
+                            StartColumn = 'abc'
+                            EndColumn = 22
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject ignores EndColumn if it cannot be converted' {
+            $expected = (@(
+                ": "
+                "Line |"
+                "   5 | This is the line with the error"
+                "     |                  ~~~~~~~~~~~~~~"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+
+                            Line = 5
+                            LineText = 'This is the line with the error'
+                            StartColumn = 18
+                            EndColumn = 'abc'
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject ignores StartColumn with invalid value <Value>' -TestCases @(
+            @{ Value = -1 }
+            @{ Value = 0 }
+            @{ Value = 32 }  # Beyond end of line
+        ) {
+            param ($Value)
+
+            $expected = (@(
+                ": "
+                "Line |"
+                "   1 | This is the line with the error"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+                            Line = 1
+                            LineText = 'This is the line with the error'
+                            StartColumn = $Value
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Parser TargetObject ignores EndColumn with invalid value <Value>' -TestCases @(
+            @{ Value = -1 }
+            @{ Value = 0 }
+            @{ Value = 17 }  # Before StartColumn
+            @{ Value = 18 }  # Equal to StartColumn
+            @{ Value = 33 }  # Beyond end of line + 1
+        ) {
+            param ($Value)
+
+            $expected = (@(
+                ": "
+                "Line |"
+                "   1 | This is the line with the error"
+                "     |                  ~~~~~~~~~~~~~~"
+                "     | Test Parser Error"
+            ) -join ([Environment]::NewLine)).TrimEnd()
+            $e = {
+                [CmdletBinding()]
+                param ()
+
+                $PSCmdlet.ThrowTerminatingError(
+                    [System.Management.Automation.ErrorRecord]::new(
+                        [System.Exception]::new('Test Parser Error'),
+                        'ParserErrorText',
+                        [System.Management.Automation.ErrorCategory]::ParserError,
+                        @{
+                            Line = 1
+                            LineText = 'This is the line with the error'
+                            StartColumn = 18
+                            EndColumn = $Value
+                        }
+                    )
+                )
+            } | Should -Throw -PassThru
+
+            $actual = ($e | Out-String).TrimEnd()
+            $actual | Should -BeExactly $expected
+        }
+
+        It 'Exception thrown from Enumerator.MoveNext in a pipeline shows information' {
+            $e = {
+                $l = [System.Collections.Generic.List[string]] @('one', 'two')
+                $l | ForEach-Object { $null = $l.Remove($_) }
+            } | Should -Throw -ErrorId 'BadEnumeration' -PassThru | Out-String
+
+            $e | Should -BeLike 'InvalidOperation:*'
+        }
+
+        It 'Displays a RecommendedAction if present in the ErrorRecord' {
+            $testScript = 'Write-Error -Message ''TestError'' -RecommendedAction ''TestAction'''
+            $e = & "$PSHOME/pwsh" -noprofile -command $testScript 2>&1 | Out-String
+            $e | Should -BeLike "*$([Environment]::NewLine)  Recommendation: TestAction*"
+        }
     }
 
     Context 'NormalView tests' {
@@ -175,11 +569,9 @@ Describe 'Tests for $ErrorView' -Tag CI {
                 $ErrorView = 'NormalView'
                 Set-StrictMode -Version 2
                 throw 'Oops!'
-            }
-            catch {
+            } catch {
                 $e = $_ | Out-String
-            }
-            finally {
+            } finally {
                 Set-StrictMode -Off
             }
 
@@ -193,8 +585,7 @@ Describe 'Tests for $ErrorView' -Tag CI {
             try {
                 $ErrorView = 'DetailedView'
                 throw 'Oops!'
-            }
-            catch {
+            } catch {
                 # an extra newline gets added by the formatting system so we remove them
                 $e = ($_ | Out-String).Trim([Environment]::NewLine.ToCharArray())
             }
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index d8a124a2332..18baed17dd2 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -488,7 +488,7 @@ Billy Bob… Senior DevOps …  13
         $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
     }
 
-    It "Word wrapping for string with escape sequences" {
+    It "Word wrapping for string with escape sequences (1)" {
        $expected = @"
 `e[32;1mLongDescription : `e[0m`e[33mPowerShell `e[0m
                   `e[33mscripting `e[0m
@@ -501,7 +501,46 @@ Billy Bob… Senior DevOps …  13
         $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
     }
 
-    It "Splitting multi-line string with escape sequences" {
+    It "Word wrapping for string with escape sequences (2)" {
+       $expected = @"
+`e[32;1mLongDescription : `e[0m`e[33mPowerShell`e[0m 
+                  scripting 
+                  language
+"@
+        $obj = [pscustomobject] @{ LongDescription = "`e[33mPowerShell`e[0m 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 "Word wrapping for string with escape sequences (3)" {
+       $expected = @"
+`e[32;1mLongDescription : `e[0m`e[33mPowerShell`e[0m 
+                  `e[32mscripting `e[0m
+                  `e[32mlanguage`e[0m
+"@
+        $obj = [pscustomobject] @{ LongDescription = "`e[33mPowerShell`e[0m `e[32mscripting 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 "Word wrapping for string with escape sequences (4)" {
+       $expected = @"
+`e[32;1mLongDescription : `e[0m`e[33mPowerShell`e[0m 
+                  `e[32mscripting`e[0m 
+                  language
+"@
+        $obj = [pscustomobject] @{ LongDescription = "`e[33mPowerShell`e[0m `e[32mscripting`e[0m 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 (1)" {
         $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
@@ -513,6 +552,30 @@ Billy Bob… Senior DevOps …  13
         $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
     }
 
+    It "Splitting multi-line string with escape sequences (2)" {
+        $expected = @"
+`e[32;1mb : `e[0m`e[33mPowerShell is a task automation and configuration management program from Microsoft,`e[0m
+    consisting of a command-line shell and the associated scripting language
+"@
+        $obj = [pscustomobject] @{ b = "`e[33mPowerShell is a task automation and configuration management program from Microsoft,`e[0m`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 "Splitting multi-line string with escape sequences (3)" {
+        $expected = @"
+`e[32;1mb : `e[0m`e[33mPowerShell is a task automation and configuration management program from Microsoft,`e[0m
+    `e[32mconsisting 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,`e[0m`n`e[32mconsisting 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
@@ -525,4 +588,18 @@ Billy Bob… Senior DevOps …  13
         $text = Get-Content $outFile -Raw
         $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
     }
+
+    It "Format 'MatchInfo' object correctly" {
+        $expected = @"
+`e[32;1mb : `e[0mmouclass     `e[7mMouse`e[0m Class Driver     Mouse Class Driver     Kernel        Manual     Running    OK         TRUE        FALSE        12,288         `e[0m
+       32,768      0                                 C:\WINDOWS\system32\drivers\mouclass.sys         4,096
+"@
+
+        ## This string mimics the VT decorated string for a 'MatchInfo' object that matches the word 'mouse'.
+        $str = "mouclass     `e[7mMouse`e[0m Class Driver     Mouse Class Driver     Kernel        Manual     Running    OK         TRUE        FALSE        12,288            32,768      0                                 C:\WINDOWS\system32\drivers\mouclass.sys         4,096"
+        $obj = [pscustomobject] @{ b = $str }
+        $text = $obj | Format-List | Out-String -Width 150
+
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
 }
diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
index 53ce9ad7494..a17394c1d9f 100644
--- a/test/powershell/engine/Help/HelpSystem.Tests.ps1
+++ b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -112,6 +112,15 @@ Describe "Validate that get-help works for CurrentUserScope" -Tags @('CI') {
             $help.Description | Out-String | Should -Match $cmdletName
             $help.Examples | Out-String | Should -Match $cmdletName
         }
+
+        It "Validate 'Aliases' is present in help content formatting" {
+            ## The parameter help content should be formatted with the following section:
+            ##   Accept pipeline input?       xxxx
+            ##   Aliases                      NoOverwrite
+            ##   Accept wildcard characters?  xxxx
+            $output = Get-Help Import-Module -Parameter NoClobber | Out-String
+            $output | Should -Match "Accept pipeline input\?.*\n\s+Aliases\s+NoOverwrite.*\n\s+Accept wildcard characters\?.*"
+        }
     }
 }
 
@@ -686,3 +695,21 @@ Describe 'Update-Help allows partial culture matches' -Tags 'CI' {
         Test-UpdateHelpAux $null $Pass
     }
 }
+
+Describe 'InputTypes accurately describe pipelinable input' {
+    BeforeAll {
+        function invoke-inputtypetest {
+            [CmdletBinding()]
+            param (
+            [Parameter(Position=0,Mandatory=$true,ValueFromPipeline=$true)][string]$a,
+            [Parameter(Position=1,ValueFromRemainingArguments=$true)][object[]]$c)
+            Process { "$a $c" }
+        }
+    }
+
+    It 'Should have only 1 input type' {
+        $inputTypes = (Get-Help -full invoke-inputtypetest).inputtypes.inputtype.type.name.trim().split("`n")
+        $inputTypes.Count | Should -Be 1
+        $inputTypes | Should -Be "System.String"
+    }
+}
diff --git a/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 b/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1
index 439dc3be989..155654b3b80 100644
--- a/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1
+++ b/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1
@@ -47,7 +47,7 @@ else
 }
 
 # default values for system modules
-[string] $myUICulture = 'en-US'   
+[string] $myUICulture = 'en-US'
 [string] $HelpInstallationPath = Join-Path $PSHOME $myUICulture
 [string] $HelpInstallationPathHome = Join-Path $userHelpRoot $myUICulture
 
@@ -118,7 +118,7 @@ else
     }
 
     "Microsoft.PowerShell.Utility" = @{
-        HelpFiles            = "Microsoft.PowerShell.Commands.Utility.dll-Help.xml", "Microsoft.PowerShell.Utility-help.xml"
+        HelpFiles            = "Microsoft.PowerShell.Commands.Utility.dll-Help.xml"
         HelpInfoFiles        = "Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml"
         CompressedFiles      = "Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent$extension"
         HelpInstallationPath = $HelpInstallationPath
@@ -191,7 +191,8 @@ function RunUpdateHelpTests
     param (
         [string]$tag = "CI",
         [switch]$useSourcePath,
-        [switch]$userscope
+        [switch]$userscope,
+        [switch]$markAsPending
     )
 
     foreach ($moduleName in $modulesInBox)
@@ -214,12 +215,19 @@ function RunUpdateHelpTests
 
             It ('Validate Update-Help for module ''{0}'' in {1}' -F $moduleName, [PSCustomObject] $updateScope) -Skip:(!(Test-CanWriteToPsHome) -and $userscope -eq $false) {
 
+                if ($markAsPending -or ($IsLinux -and $moduleName -eq "PackageManagement")) {
+                    Set-ItResult -Pending -Because "Update-Help from the web has intermittent connectivity issues. See issues #2807 and #6541."
+                    return
+                }
+
                 # Delete the whole help directory
-                Remove-Item ($moduleHelpPath) -Recurse
- 
+                if ($moduleHelpPath) {
+                    Remove-Item ($moduleHelpPath) -Recurse -Force -ErrorAction SilentlyContinue
+                }
+
                 [hashtable] $UICultureParam = $(if ((Get-UICulture).Name -ne $myUICulture) { @{ UICulture = $myUICulture } } else { @{} })
                 [hashtable] $sourcePathParam = $(if ($useSourcePath) { @{ SourcePath = Join-Path $PSScriptRoot assets } } else { @{} })
-                Update-Help -Module:$moduleName -Force @UICultureParam @sourcePathParam -Scope:$updateScope
+                Update-Help -Module:$moduleName -Force @UICultureParam @sourcePathParam -Scope:$updateScope -ErrorAction Stop
 
                 [hashtable] $userScopeParam = $(if ($userscope) { @{ UserScope = $true } } else { @{} })
                 ValidateInstalledHelpContent -moduleName:$moduleName @userScopeParam
@@ -246,8 +254,15 @@ function RunSaveHelpTests
         {
             try
             {
-                $saveHelpFolder = Join-Path $TestDrive (Get-Random).ToString()
-                New-Item  $saveHelpFolder -Force -ItemType Directory > $null
+                $saveHelpFolder = if ($TestDrive) {
+                    Join-Path $TestDrive (Get-Random).ToString()
+                } else {
+                    $null
+                }
+                
+                if ($saveHelpFolder) {
+                    New-Item  $saveHelpFolder -Force -ItemType Directory > $null
+                }
 
                 ## Save help has intermittent connectivity issues for downloading PackageManagement help content.
                 ## Hence the test has been marked as Pending.
@@ -283,7 +298,9 @@ function RunSaveHelpTests
             }
             finally
             {
-                Remove-Item $saveHelpFolder -Force -ErrorAction SilentlyContinue -Recurse
+                if ($saveHelpFolder) {
+                    Remove-Item $saveHelpFolder -Force -ErrorAction SilentlyContinue -Recurse
+                }
             }
         }
     }
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.cab b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.cab
index 949471140ce..ec0d3294f79 100644
Binary files a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.cab and b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.cab differ
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.zip b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.zip
index 47643e90de6..480f920114f 100644
Binary files a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.zip and b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_helpcontent.zip differ
diff --git a/test/powershell/engine/Module/IsolatedModule.Tests.ps1 b/test/powershell/engine/Module/IsolatedModule.Tests.ps1
index 5d1289271de..08729386ced 100644
--- a/test/powershell/engine/Module/IsolatedModule.Tests.ps1
+++ b/test/powershell/engine/Module/IsolatedModule.Tests.ps1
@@ -3,6 +3,7 @@
 
 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'.
         ## 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.
@@ -11,9 +12,15 @@ Describe "Isolated module scenario - load the whole module in custom ALC" -Tag '
         ## │   Test.Isolated.Init.dll (contains the custom ALC and code to setup 'Resolving' handler)
         ## │
         ## └───Dependencies
-        ##        Newtonsoft.Json.dll (version 10.0.0.0 dependency)
+        ##        System.CommandLine.dll (version 2.0.0.0 dependency)
         ##        Test.Isolated.Nested.dll (nested binary module)
         ##        Test.Isolated.Root.dll (root binary module)
+
+        ## The assembly 'System.CommandLine.dll' should not be loaded in the PowerShell default ALC by default.
+        [System.Runtime.Loader.AssemblyLoadContext]::Default.Assemblies |
+            Where-Object FullName -Like 'System.CommandLine,*' |
+            Should -Be $null
+
         $module = Import-Module IsolatedModule -PassThru
         $nestedCmd = Get-Command Test-NestedCommand
         $rootCmd = Get-Command Test-RootCommand
@@ -27,10 +34,14 @@ Describe "Isolated module scenario - load the whole module in custom ALC" -Tag '
         $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.
+        ## Test-NestedCommand depends on 'System.CommandLine.dll' which is loaded in the module's 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"
+        Test-NestedCommand -Param $foo | Should -BeExactly "Hello-World-System.CommandLine, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+
+        ## The assembly 'System.CommandLine.dll' should still not be loaded in the PowerShell default ALC.
+        [System.Runtime.Loader.AssemblyLoadContext]::Default.Assemblies |
+            Where-Object FullName -Like 'System.CommandLine,*' |
+            Should -Be $null
 
         ## 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)
diff --git a/test/powershell/engine/Module/ModulePath.Tests.ps1 b/test/powershell/engine/Module/ModulePath.Tests.ps1
index 5861455e726..1450eb31f2c 100644
--- a/test/powershell/engine/Module/ModulePath.Tests.ps1
+++ b/test/powershell/engine/Module/ModulePath.Tests.ps1
@@ -68,7 +68,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
 
     It "validate sxs module path" -Skip:$skipNoPwsh {
 
-        $env:PSModulePath = ""
+        $env:PSModulePath = $null
         $defaultModulePath = & $powershell -nopro -c '$env:PSModulePath'
         $pathSeparator = [System.IO.Path]::PathSeparator
 
diff --git a/test/powershell/engine/Module/TestModuleManifest.Tests.ps1 b/test/powershell/engine/Module/TestModuleManifest.Tests.ps1
index 091b968c276..ddb6ca5d526 100644
--- a/test/powershell/engine/Module/TestModuleManifest.Tests.ps1
+++ b/test/powershell/engine/Module/TestModuleManifest.Tests.ps1
@@ -151,6 +151,16 @@ Describe "Test-ModuleManifest tests" -tags "CI" {
         $module.NestedModules | Should -HaveCount 1
         $module.NestedModules.Name | Should -BeExactly "Foo"
     }
+
+    It 'Works for manifest specified as UNC path' -Skip:(!$IsWindows) {
+        # chance the testdrive path to a UNC path
+
+        $testModulePath = '\\localhost\' + "$testDrive\test.psd1".Replace(':', '$')
+        New-Item -ItemType File -Path testdrive:/foo.psm1 > $null
+        New-ModuleManifest -Path $testModulePath -RootModule "foo.psm1"
+        $module = Test-ModuleManifest -Path $testModulePath
+        $module.RootModule | Should -Be "foo.psm1"
+    }
 }
 
 Describe "Tests for circular references in required modules" -tags "CI" {
diff --git a/test/powershell/engine/Remoting/CustomConnection.Tests.ps1 b/test/powershell/engine/Remoting/CustomConnection.Tests.ps1
index 4be4d335a84..a8d4652ae93 100644
--- a/test/powershell/engine/Remoting/CustomConnection.Tests.ps1
+++ b/test/powershell/engine/Remoting/CustomConnection.Tests.ps1
@@ -27,14 +27,14 @@ function Start-PwshProcess
 
 Describe 'NamedPipe Custom Remote Connection Tests' -Tags 'Feature','RequireAdminOnWindows' {
 
-    BeforeAll {
+    BeforeEach {
         Import-Module -Name Microsoft.PowerShell.NamedPipeConnection -ErrorAction Stop
 
         $script:PwshProcId = Start-PwshProcess
         $script:session = $null
     }
 
-    AfterAll {
+    AfterEach {
         if ($null -ne $script:session)
         {
             Remove-PSSession -Session $script:session
@@ -43,7 +43,7 @@ Describe 'NamedPipe Custom Remote Connection Tests' -Tags 'Feature','RequireAdmi
         Remove-Job -Id $script:JobId -Force -ErrorAction SilentlyContinue
     }
 
-    It 'Verifies that New-NamedPipeSession succeeds in connectiong to Pwsh process' {
+    It 'Verifies that New-NamedPipeSession succeeds in connecting to Pwsh process' {
         $script:session = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 10 -Name CustomNPConnection -ErrorAction Stop
 
         # Verify created PSSession
@@ -57,6 +57,10 @@ Describe 'NamedPipe Custom Remote Connection Tests' -Tags 'Feature','RequireAdmi
     # 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) {
+        # We start an active connection to have it block the second connection attempt.
+        $script:session = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 10 -Name CustomNPConnection -ErrorAction Stop
+        
+        # The above connection means the named pipe server is busy and won't allow this second connection.
         $brokenSession = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 2 -Name CustomNPConnection -ErrorAction Stop
 
         # Verify expected broken session
@@ -66,4 +70,29 @@ Describe 'NamedPipe Custom Remote Connection Tests' -Tags 'Feature','RequireAdmi
 
         $brokenSession | Remove-PSSession
     }
+
+    It 'Passes $using: with PSv5 compatibility in Invoke-Command' {
+        $script:session = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 10 -Name CustomNPConnection -ErrorAction Stop
+
+        Function Test-Function {
+            'foo'
+        }
+
+        # The v2 engine will choke on a var with '-' in the name and the v3/v4
+        # using logic will revert to the v2 branch if $using is in a new scope.
+        # By using a function and a new scope we can verify the v5 logic is
+        # used and not the v2-4 one.
+        $result = Invoke-Command -Session $script:session -ScriptBlock {
+            ${function:Test-Function} = ${using:function:Test-Function}
+
+            Test-Function
+
+            # Running in a new scope triggers the v2 logic if the v3/v4 branch
+            # was used.
+            & { (${using:function:Test-Function}).Trim() }
+        }
+        $result.Count | Should -Be 2
+        $result[0] | Should -BeExactly foo
+        $result[1] | Should -BeExactly "'foo'"
+    }
 }
diff --git a/test/powershell/engine/Remoting/PSSession.Tests.ps1 b/test/powershell/engine/Remoting/PSSession.Tests.ps1
index cbf7313eed0..317ed4af734 100644
--- a/test/powershell/engine/Remoting/PSSession.Tests.ps1
+++ b/test/powershell/engine/Remoting/PSSession.Tests.ps1
@@ -5,6 +5,9 @@
 # PSSession tests for non-Windows platforms
 #
 
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 function GetRandomString()
 {
     return [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName())
@@ -88,3 +91,48 @@ Describe "SkipCACheck and SkipCNCheck PSSession options are required for New-PSS
         $er.Exception.ErrorCode | Should -Be $expectedErrorCode
     }
 }
+
+Describe "New-PSSession -UseWindowsPowerShell switch parameter" -Tag "CI" {
+
+    BeforeAll {
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+
+        if (-not $IsWindows) {
+            $PSDefaultParameterValues['it:skip'] = $true
+        }
+    }
+
+    AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
+    }
+
+    It "Should respect explicit -UseWindowsPowerShell:`$false parameter value" {
+        # Test 1: -UseWindowsPowerShell:$true should create a Windows PowerShell 5.1 session
+        $sessionWithTrue = $null
+        try {
+            { $script:sessionWithTrue = New-PSSession -UseWindowsPowerShell:$true } | Should -Not -Throw
+            $script:sessionWithTrue | Should -Not -BeNullOrEmpty
+
+            # Verify it's Windows PowerShell 5.1
+            $version = Invoke-Command -Session $script:sessionWithTrue -ScriptBlock { $PSVersionTable.PSVersion }
+            $version.Major | Should -Be 5
+            $version.Minor | Should -Be 1
+        }
+        finally {
+            if ($script:sessionWithTrue) { Remove-PSSession $script:sessionWithTrue -ErrorAction SilentlyContinue }
+        }
+
+        # Test 2: -UseWindowsPowerShell:$false should use WSMan transport (not Process)
+        $sessionWithFalse = $null
+        try {
+            { $script:sessionWithFalse = New-PSSession -UseWindowsPowerShell:$false } | Should -Not -Throw
+            $script:sessionWithFalse | Should -Not -BeNullOrEmpty
+
+            # Transport should be WSMan, not Process
+            $script:sessionWithFalse.Transport | Should -Be 'WSMan'
+        }
+        finally {
+            if ($script:sessionWithFalse) { Remove-PSSession $script:sessionWithFalse -ErrorAction SilentlyContinue }
+        }
+    }
+}
diff --git a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1 b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
index 43f92cef295..2093eaa7ce5 100644
--- a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
+++ b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
@@ -1,6 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Import-Module HelpersCommon
 
 function GetRandomString()
@@ -80,9 +83,7 @@ Describe "JEA session Transcript script test" -Tag @("Feature", 'RequireAdminOnW
     AfterAll {
         if ($skipTest) {
             Pop-DefaultParameterValueStack
-            return
         }
-        Pop-DefaultParameterValueStack
     }
 
     It "Configuration name should be in the transcript header" {
diff --git a/test/powershell/engine/Remoting/SSHRemotingCmdlets.Tests.ps1 b/test/powershell/engine/Remoting/SSHRemotingCmdlets.Tests.ps1
index 1568d284d0f..c1090bdc186 100644
--- a/test/powershell/engine/Remoting/SSHRemotingCmdlets.Tests.ps1
+++ b/test/powershell/engine/Remoting/SSHRemotingCmdlets.Tests.ps1
@@ -70,3 +70,24 @@ Describe "SSHConnection parameter hashtable type conversions" -Tags 'Feature', '
         $err.FullyQualifiedErrorId | Should -Match 'PSSessionOpenFailed'
     }
 }
+
+Describe "No hangs when host doesn't exist" -Tags "CI" {
+    $testCases = @(
+        @{
+            Name = 'Verifies no hang for New-PSSession with non-existing host name'
+            ScriptBlock = { New-PSSession -HostName "test-notexist" -UserName "test" -ErrorAction Stop }
+            FullyQualifiedErrorId = 'PSSessionOpenFailed'
+        },
+        @{
+            Name = 'Verifies no hang for Invoke-Command with non-existing host name'
+            ScriptBlock = { Invoke-Command -HostName "test-notexist" -UserName "test" -ScriptBlock { 1 } -ErrorAction Stop }
+            FullyQualifiedErrorId = 'PSSessionStateBroken'
+        }
+    )
+
+    It "<Name>" -TestCases $testCases {
+        param ($ScriptBlock, $FullyQualifiedErrorId)
+
+        $ScriptBlock | Should -Throw -ErrorId $FullyQualifiedErrorId -ExceptionType 'System.Management.Automation.Remoting.PSRemotingTransportException'
+    }
+}
diff --git a/test/powershell/engine/Remoting/SessionOption.Tests.ps1 b/test/powershell/engine/Remoting/SessionOption.Tests.ps1
index 1ff51e2a707..e85777e90ba 100644
--- a/test/powershell/engine/Remoting/SessionOption.Tests.ps1
+++ b/test/powershell/engine/Remoting/SessionOption.Tests.ps1
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 try {
+    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
     if ( ! $IsWindows ) {
         $PSDefaultParameterValues['it:skip'] = $true
     }
@@ -52,5 +53,5 @@ try {
     }
 }
 finally {
-    $PSDefaultParameterValues.remove("it:skip")
+    $global:PSDefaultParameterValues = $originalDefaultParameterValues
 }
diff --git a/test/powershell/engine/Security/FileSignature.Tests.ps1 b/test/powershell/engine/Security/FileSignature.Tests.ps1
index 51194903a94..f2815fad4ff 100644
--- a/test/powershell/engine/Security/FileSignature.Tests.ps1
+++ b/test/powershell/engine/Security/FileSignature.Tests.ps1
@@ -18,6 +18,9 @@ Describe "Windows platform file signatures" -Tags 'Feature' {
         $signature | Should -Not -BeNullOrEmpty
         $signature.Status | Should -BeExactly 'Valid'
         $signature.SignatureType | Should -BeExactly 'Catalog'
+        
+        # Verify that SubjectAlternativeName property exists
+        $signature.PSObject.Properties.Name | Should -Contain 'SubjectAlternativeName'
     }
 }
 
@@ -89,6 +92,7 @@ Describe "Windows file content signatures" -Tags @('Feature', 'RequireAdminOnWin
 
     AfterAll {
         if ($shouldSkip) {
+            Pop-DefaultParameterValueStack
             return
         }
 
@@ -185,4 +189,102 @@ Describe "Windows file content signatures" -Tags @('Feature', 'RequireAdminOnWin
         $actual.SignerCertificate.Thumbprint | Should -Be $certificate.Thumbprint
         $actual.Status | Should -Be 'Valid'
     }
+
+    It "Verifies SubjectAlternativeName is populated for certificate with SAN" {
+        $session = New-PSSession -UseWindowsPowerShell
+        try {
+            $sanThumbprint = Invoke-Command -Session $session -ScriptBlock {
+                $testPrefix = 'SelfSignedTestSAN'
+
+                $enhancedKeyUsage = [Security.Cryptography.OidCollection]::new()
+                $null = $enhancedKeyUsage.Add('1.3.6.1.5.5.7.3.3')
+
+                $caParams = @{
+                    Extension         = @(
+                        [Security.Cryptography.X509Certificates.X509BasicConstraintsExtension]::new($true, $false, 0, $true),
+                        [Security.Cryptography.X509Certificates.X509KeyUsageExtension]::new('KeyCertSign', $false),
+                        [Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension]::new($enhancedKeyUsage, $false)
+                    )
+                    CertStoreLocation = 'Cert:\CurrentUser\My'
+                    NotAfter          = (Get-Date).AddDays(1)
+                    Type              = 'Custom'
+                }
+                $sanCA = PKI\New-SelfSignedCertificate @caParams -Subject "CN=$testPrefix-CA"
+
+                $rootStore = Get-Item -Path Cert:\LocalMachine\Root
+                $rootStore.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite)
+                try {
+                    $rootStore.Add([System.Security.Cryptography.X509Certificates.X509Certificate2]::new($sanCA.RawData))
+                } finally {
+                    $rootStore.Close()
+                }
+
+                $certParams = @{
+                    CertStoreLocation = 'Cert:\CurrentUser\My'
+                    KeyUsage          = 'DigitalSignature'
+                    TextExtension     = @(
+                        "2.5.29.37={text}1.3.6.1.5.5.7.3.3",
+                        "2.5.29.19={text}",
+                        "2.5.29.17={text}DNS=test.example.com&DNS=*.example.com"
+                    )
+                    Type              = 'Custom'
+                }
+                $sanCert = PKI\New-SelfSignedCertificate @certParams -Subject "CN=$testPrefix-Signed" -Signer $sanCA
+
+                $publisherStore = Get-Item -Path Cert:\LocalMachine\TrustedPublisher
+                $publisherStore.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite)
+                try {
+                    $publisherStore.Add([System.Security.Cryptography.X509Certificates.X509Certificate2]::new($sanCert.RawData))
+                } finally {
+                    $publisherStore.Close()
+                }
+
+                $sanCA | Remove-Item
+                $sanCA.Thumbprint, $sanCert.Thumbprint
+            }
+        } finally {
+            $session | Remove-PSSession
+        }
+
+        $sanCARootThumbprint = $sanThumbprint[0]
+        $sanCertThumbprint = $sanThumbprint[1]
+        $sanCertificate = Get-Item -Path Cert:\CurrentUser\My\$sanCertThumbprint
+
+        try {
+            Set-Content -Path testdrive:\test.ps1 -Value 'Write-Output "Test SAN"' -Encoding UTF8NoBOM
+
+            $scriptPath = Join-Path $TestDrive test.ps1
+            $status = Set-AuthenticodeSignature -FilePath $scriptPath -Certificate $sanCertificate
+            $status.Status | Should -Be 'Valid'
+
+            $actual = Get-AuthenticodeSignature -FilePath $scriptPath
+            $actual.SubjectAlternativeName | Should -Not -BeNullOrEmpty
+            ,$actual.SubjectAlternativeName | Should -BeOfType [string[]]
+            $actual.SubjectAlternativeName.Count | Should -Be 2
+            $actual.SubjectAlternativeName[0] | Should -BeExactly 'DNS Name=test.example.com'
+            $actual.SubjectAlternativeName[1] | Should -BeExactly 'DNS Name=*.example.com'
+        } finally {
+            Remove-Item -Path "Cert:\LocalMachine\Root\$sanCARootThumbprint" -Force -ErrorAction Ignore
+            Remove-Item -Path "Cert:\LocalMachine\TrustedPublisher\$sanCertThumbprint" -Force -ErrorAction Ignore
+            Remove-Item -Path "Cert:\CurrentUser\My\$sanCertThumbprint" -Force -ErrorAction Ignore
+        }
+    }
+
+    It "Verifies SubjectAlternativeName is null when certificate has no SAN" {
+        Set-Content -Path testdrive:\test.ps1 -Value 'Write-Output "Test No SAN"' -Encoding UTF8NoBOM
+
+        $scriptPath = Join-Path $TestDrive test.ps1
+        $status = Set-AuthenticodeSignature -FilePath $scriptPath -Certificate $certificate
+        $status.Status | Should -Be 'Valid'
+
+        $actual = Get-AuthenticodeSignature -FilePath $scriptPath
+        $actual.SignerCertificate.Thumbprint | Should -Be $certificate.Thumbprint
+        $actual.Status | Should -Be 'Valid'
+        
+        # Verify that SubjectAlternativeName property exists
+        $actual.PSObject.Properties.Name | Should -Contain 'SubjectAlternativeName'
+        
+        # Verify the content is null when certificate has no SAN extension
+        $actual.SubjectAlternativeName | Should -BeNullOrEmpty
+    }
 }
diff --git a/test/powershell/engine/WildcardPattern.Tests.ps1 b/test/powershell/engine/WildcardPattern.Tests.ps1
new file mode 100644
index 00000000000..81ced10f253
--- /dev/null
+++ b/test/powershell/engine/WildcardPattern.Tests.ps1
@@ -0,0 +1,77 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "WildcardPattern.ToRegex Tests" -Tags "CI" {
+    It "Converts '<Pattern>' to regex pattern '<Expected>'" -TestCases @(
+        @{ Pattern = '*.txt'; Expected = '\.txt$' }
+        @{ Pattern = 'test?.log'; Expected = '^test.\.log$' }
+        @{ Pattern = 'file[0-9].txt'; Expected = '^file[0-9]\.txt$' }
+        @{ Pattern = 'test.log'; Expected = '^test\.log$' }
+        @{ Pattern = '*test*file*.txt'; Expected = 'test.*file.*\.txt$' }
+        @{ Pattern = 'file[0-9][a-z].txt'; Expected = '^file[0-9][a-z]\.txt$' }
+        @{ Pattern = 'test*'; Expected = '^test' }
+        @{ Pattern = '*test*'; Expected = 'test' }
+    ) {
+        param($Pattern, $Expected)
+        $wildcardPattern = [System.Management.Automation.WildcardPattern]::new($Pattern)
+        $regex = $wildcardPattern.ToRegex()
+        $regex | Should -BeOfType ([regex])
+        $regex.ToString() | Should -BeExactly $Expected
+    }
+
+    It "Converts '<Pattern>' with <OptionName> option" -TestCases @(
+        @{ Pattern = 'TEST'; OptionName = 'IgnoreCase'; Option = [System.Management.Automation.WildcardOptions]::IgnoreCase; Expected = '^TEST$'; ExpectedRegexOptions = 'IgnoreCase, Singleline'; TestString = 'test'; ExpectedMatch = $true }
+        @{ Pattern = 'test'; OptionName = 'CultureInvariant'; Option = [System.Management.Automation.WildcardOptions]::CultureInvariant; Expected = '^test$'; ExpectedRegexOptions = 'Singleline, CultureInvariant'; TestString = 'test'; ExpectedMatch = $true }
+        @{ Pattern = 'test*'; OptionName = 'Compiled'; Option = [System.Management.Automation.WildcardOptions]::Compiled; Expected = '^test'; ExpectedRegexOptions = 'Compiled, Singleline'; TestString = 'testing'; ExpectedMatch = $true }
+    ) {
+        param($Pattern, $OptionName, $Option, $Expected, $ExpectedRegexOptions, $TestString, $ExpectedMatch)
+        $wildcardPattern = [System.Management.Automation.WildcardPattern]::new($Pattern, $Option)
+        $regex = $wildcardPattern.ToRegex()
+        $regex | Should -BeOfType ([regex])
+        $regex.ToString() | Should -BeExactly $Expected
+        $regex.Options.ToString() | Should -BeExactly $ExpectedRegexOptions
+        $regex.IsMatch($TestString) | Should -Be $ExpectedMatch
+    }
+
+    It "Regex from '<Pattern>' matches '<TestString>': <ShouldMatch>" -TestCases @(
+        @{ Pattern = '*test*file*.txt'; TestString = 'mytestmyfile123.txt'; ShouldMatch = $true }
+        @{ Pattern = 'file[0-9][a-z].txt'; TestString = 'file5a.txt'; ShouldMatch = $true }
+        @{ Pattern = 'file[0-9][a-z].txt'; TestString = 'file55.txt'; ShouldMatch = $false }
+    ) {
+        param($Pattern, $TestString, $ShouldMatch)
+        $regex = [System.Management.Automation.WildcardPattern]::new($Pattern).ToRegex()
+        $regex.IsMatch($TestString) | Should -Be $ShouldMatch
+    }
+
+    Context "Edge cases" {
+        It "Handles empty pattern" {
+            $pattern = [System.Management.Automation.WildcardPattern]::new("")
+            $regex = $pattern.ToRegex()
+            $regex | Should -BeOfType ([regex])
+            $regex.ToString() | Should -Be "^$"
+        }
+
+        It "Handles pattern with only asterisk" {
+            $pattern = [System.Management.Automation.WildcardPattern]::new("*")
+            $regex = $pattern.ToRegex()
+            $regex | Should -BeOfType ([regex])
+            $regex.ToString() | Should -BeExactly ""
+            $regex.IsMatch("anything") | Should -BeTrue
+            $regex.IsMatch("") | Should -BeTrue
+        }
+
+        It "Handles escaped '<Char>' wildcard character" -TestCases @(
+            @{ Char = '*'; Pattern = 'file`*.txt'; Expected = '^file\*\.txt$' }
+            @{ Char = '?'; Pattern = 'file`?.txt'; Expected = '^file\?\.txt$' }
+            @{ Char = '['; Pattern = 'file`[.txt'; Expected = '^file\[\.txt$' }
+            @{ Char = ']'; Pattern = 'file`].txt'; Expected = '^file]\.txt$' }
+        ) {
+            param($Char, $Pattern, $Expected)
+            $wildcardPattern = [System.Management.Automation.WildcardPattern]::new($Pattern)
+            $regex = $wildcardPattern.ToRegex()
+            $regex | Should -BeOfType ([regex])
+            $regex.ToString() | Should -BeExactly $Expected
+        }
+
+    }
+}
diff --git a/test/releaseTools/releaseTools.tests.ps1 b/test/releaseTools/releaseTools.tests.ps1
new file mode 100644
index 00000000000..d27671c3c1c
--- /dev/null
+++ b/test/releaseTools/releaseTools.tests.ps1
@@ -0,0 +1,78 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+BeforeDiscovery {
+
+    $testCases = @(
+        @{
+            remoteInfo = 'upstream	git@ssh.dev.azure.com:v3/azDoOrg/PowerShellCore/PowerShell (fetch)'
+            upstreamRemote = 'upstream'
+            org = 'azDoOrg'
+            project = 'PowerShellCore'
+            UpstreamHost = 'git@ssh.dev.azure.com'
+            RemoteType = 'AzureRepo'
+        }
+        @{
+            remoteInfo = 'upstream	https://azDoOrg.visualstudio.com/PowerShell/_git/PowerShell (fetch)'
+            upstreamRemote = 'upstream'
+            org = 'azDoOrg'
+            project = 'PowerShell'
+            UpstreamHost = 'azDoOrg.visualstudio.com'
+            RemoteType = 'AzureRepo'
+        }
+        @{
+            remoteInfo = 'upstream	https://github.com/PowerShell/PowerShell.git (fetch)'
+            upstreamRemote = 'upstream'
+            org = 'PowerShell'
+            project = 'github.com'
+            UpstreamHost = 'github.com'
+            RemoteType = 'GitHub'
+        }
+        @{
+            remoteInfo = 'github	https://github.com/PowerShell/PowerShell.git (fetch)'
+            upstreamRemote = 'github'
+            org = 'PowerShell'
+            project = 'github.com'
+            UpstreamHost = 'github.com'
+            RemoteType = 'GitHub'
+        }
+        @{
+            remoteInfo = 'asonetuhasoeu	git@github.com:PowerShell/PowerShell.git (fetch)'
+            upstreamRemote = 'asonetuhasoeu'
+            org = 'PowerShell'
+            project = 'github.com'
+            UpstreamHost = 'github.com'
+            RemoteType = 'GitHub'
+        }
+
+    )
+}
+Describe "Get-UpstreamInfo" {
+    BeforeAll {
+        Import-Module $PSScriptRoot/../../tools/releaseTools.psm1 -force -Verbose
+    }
+    It "parses remote Info correctly: <RemoteInfo>" -TestCases $testCases -Test {
+        param(
+            [string]
+            $RemoteInfo,
+            [string]
+            $UpstreamRemote,
+            [string]
+            $org,
+            [string]
+            $Project,
+            [string]
+            $UpstreamHost,
+            [string]
+            $remoteType
+        )
+
+        $upstreamInfo = Get-UpstreamInfo -Upstream $RemoteInfo -UpstreamRemote $UpstreamRemote
+        $upstreamInfo | Should -Not -BeNullOrEmpty
+        $upstreamInfo.org | Should -Be $org
+        $upstreamInfo.project | Should -Be $Project
+        $upstreamInfo.repo | Should -Be 'PowerShell'
+        $upstreamInfo.host | Should -Be $UpstreamHost
+        $upstreamInfo.remoteType | Should -Be $remoteType
+    }
+}
diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index 50d6a2e668b..02588b612db 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -69,6 +69,7 @@ function Get-RandomFileName
 $SCRIPT:TesthookType = [system.management.automation.internal.internaltesthooks]
 function Test-TesthookIsSet
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingEmptyCatchBlock", '')] # , Justification = "an error message is not appropriate for this function")]
     param (
         [ValidateNotNullOrEmpty()]
         [Parameter(Mandatory=$true)]
@@ -196,6 +197,7 @@ public class TestDynamic : DynamicObject
 # Upload an artifact in VSTS
 # On other systems will just log where the file was placed
 function Send-VstsLogFile {
+    [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingWriteHost', '', Justification = "needed for VSO")]
     param (
         [parameter(Mandatory,ParameterSetName='contents')]
         [string[]]
@@ -322,6 +324,8 @@ function New-RandomHexString
 $script:CanWriteToPsHome = $null
 function Test-CanWriteToPsHome
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingEmptyCatchBlock', '', Justification = "an error message is not appropriate for this function")]
+    param ()
     if ($null -ne $script:CanWriteToPsHome) {
         return $script:CanWriteToPsHome
     }
@@ -366,7 +370,7 @@ function Get-PlatformInfo {
         return @{Platform = "windows"; Version = '' }
     }
     if ( $IsMacOS ) {
-        return @{Platform = "macos"; Version = '' }
+        return @{Platform = "macos"; Version = sw_vers -productversion }
     }
     if ( $IsLinux ) {
         $osrelease = Get-Content /etc/os-release | ConvertFrom-StringData
@@ -382,7 +386,7 @@ function Get-PlatformInfo {
 
             return @{Platform = $platform; Version = $versionId }
         }
-        return "unknown"
+        return @{ Platform = "linux"; version = "unknown" }
     }
 }
 
@@ -472,20 +476,20 @@ function Test-IsWindows2016 {
 
 # Ensure that the global:PSDefaultParameterValues variable is a hashtable
 function Initialize-PSDefaultParameterValue {
-	if ( $global:PSDefaultParameterValues -isnot [hashtable] ) {
-		$global:PSDefaultParameterValues = @{}
-	}
+    if ( $global:PSDefaultParameterValues -isnot [hashtable] ) {
+        $global:PSDefaultParameterValues = @{}
+    }
 }
 
 # reset the stack
 function Reset-DefaultParameterValueStack {
-	$script:DefaultParameterValueStack = [system.collections.generic.Stack[hashtable]]::new()
+    $script:DefaultParameterValueStack = [system.collections.generic.Stack[hashtable]]::new()
     Initialize-PSDefaultParameterValue
 }
 
 # return the current stack
 function Get-DefaultParameterValueStack {
-	$script:DefaultParameterValueStack
+    $script:DefaultParameterValueStack
 }
 
 # PSDefaultParameterValue may not have both skip and pending keys
@@ -503,35 +507,35 @@ function Test-PSDefaultParameterValue {
 # if $ht is null, then the current value of $global:PSDefaultParameterValues is pushed
 # if $NewValue is used, then $ht is used as the new value of $global:PSDefaultParameterValues
 function Push-DefaultParameterValueStack {
-	param ([hashtable]$ht, [switch]$NewValue)
+    param ([hashtable]$ht, [switch]$NewValue)
     Initialize-PSDefaultParameterValue
 
-	$script:DefaultParameterValueStack.Push($global:PSDefaultParameterValues.Clone())
-	if ( $ht ) {
-		if ( $NewValue ) {
-			$global:PSDefaultParameterValues = $ht
-		}
-		else {
-			foreach ($k in $ht.Keys) {
-				$global:PSDefaultParameterValues[$k] = $ht[$k]
-			}
-		}
+    $script:DefaultParameterValueStack.Push($global:PSDefaultParameterValues.Clone())
+    if ( $ht ) {
+        if ( $NewValue ) {
+            $global:PSDefaultParameterValues = $ht
+        }
+        else {
+            foreach ($k in $ht.Keys) {
+                $global:PSDefaultParameterValues[$k] = $ht[$k]
+            }
+        }
         if ( ! (Test-PSDefaultParameterValue)) {
             Write-Warning -Message "PSDefaultParameterValues may not have both skip and pending keys, resetting."
             Pop-DefaultParameterValueStack
         }
-	}
+    }
 }
 
 function Pop-DefaultParameterValueStack {
-	try {
-		$global:PSDefaultParameterValues = $script:DefaultParameterValueStack.Pop()
-		return $true
-	}
-	catch {
+    try {
+        $global:PSDefaultParameterValues = $script:DefaultParameterValueStack.Pop()
+        return $true
+    }
+    catch {
         Initialize-PSDefaultParameterValue
-		return $false
-	}
+        return $false
+    }
 }
 
 function Get-HelpNetworkTestCases
@@ -547,7 +551,8 @@ function Get-HelpNetworkTestCases
 
     # Command discovery does not follow symlinks to network locations for module qualified paths
     $networkBlockedError = "CommandNameNotAllowed,Microsoft.PowerShell.Commands.GetHelpCommand"
-    $scriptBlockedError = "ScriptsNotAllowed"
+    # This error may change as long as no test cases start failing for other reasons
+    $scriptBlockedError = "CommandNotFoundException"
 
     $formats = @(
         '//{0}/share/{1}'
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 41a57772fd3..911aa8da0ce 100644
--- a/test/tools/Modules/Microsoft.PowerShell.RemotingTools/Microsoft.PowerShell.RemotingTools.psm1
+++ b/test/tools/Modules/Microsoft.PowerShell.RemotingTools/Microsoft.PowerShell.RemotingTools.psm1
@@ -321,7 +321,7 @@ $typeDef = @'
 .Parameter PowerShellFilePath
     Specifies the file path to the PowerShell command used to host the SSH remoting PowerShell
     endpoint. If no value is specified then the currently running PowerShell executable path is used
-    in the subsytem command.
+    in the subsystem command.
 .Parameter Force
     When true, this cmdlet will update the sshd_config configuration file without prompting.
 #>
diff --git a/test/tools/Modules/PSSysLog/PSSysLog.psm1 b/test/tools/Modules/PSSysLog/PSSysLog.psm1
index 7289a1b8406..4c5296d6c85 100644
--- a/test/tools/Modules/PSSysLog/PSSysLog.psm1
+++ b/test/tools/Modules/PSSysLog/PSSysLog.psm1
@@ -438,7 +438,8 @@ class PSLogItem
 
             if($item.LogId -notmatch '^\[com\.microsoft\.powershell')
             {
-                Write-Verbose "Skipping logId: $($item.LogId)" -Verbose
+                # this is really a lot of output, so we'll skip it for now.
+                # Write-Verbose "Skipping logId: $($item.LogId)" -Verbose
                 $result = $null
                 break
             }
diff --git a/test/tools/Modules/WebListener/WebListener.psm1 b/test/tools/Modules/WebListener/WebListener.psm1
index 15ce1d8fe38..7f590b79b76 100644
--- a/test/tools/Modules/WebListener/WebListener.psm1
+++ b/test/tools/Modules/WebListener/WebListener.psm1
@@ -1,6 +1,10 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingPlainTextForPassword', '')]
+param()
+
 Class WebListener
 {
     [int]$HttpPort
diff --git a/test/tools/Modules/nuget.config b/test/tools/Modules/nuget.config
index b0fc73009da..388a65572dd 100644
--- a/test/tools/Modules/nuget.config
+++ b/test/tools/Modules/nuget.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="PSGallery" value="https://www.powershellgallery.com/api/v2/" />
+    <add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/test/tools/NamedPipeConnection/build.ps1 b/test/tools/NamedPipeConnection/build.ps1
index dbb390d0962..3d92df01fcd 100644
--- a/test/tools/NamedPipeConnection/build.ps1
+++ b/test/tools/NamedPipeConnection/build.ps1
@@ -36,8 +36,8 @@ param (
     [ValidateSet("Debug", "Release")]
     [string] $BuildConfiguration = "Debug",
 
-    [ValidateSet("net8.0")]
-    [string] $BuildFramework = "net8.0"
+    [ValidateSet("net11.0")]
+    [string] $BuildFramework = "net11.0"
 )
 
 $script:ModuleName = 'Microsoft.PowerShell.NamedPipeConnection'
diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
index b53f1921a73..ba216dee23e 100644
--- a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
+++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
@@ -8,13 +8,13 @@
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0</FileVersion>
     <InformationalVersion>1.0.0</InformationalVersion>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net11.0</TargetFrameworks>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Management.Automation" Version="7.4.0-preview.6" />
+    <PackageReference Include="System.Management.Automation" Version="7.6.0-preview.2" />
   </ItemGroup>
 </Project>
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index 886cc3a3d0c..e8848a15085 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -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/net8.0/win7-x64/publish",
+        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net11.0/win7-x64/publish",
         [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
         [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
         [parameter()]$PesterLogFormat = "NUnitXml",
diff --git a/test/tools/TestAlc/init/Init.cs b/test/tools/TestAlc/init/Init.cs
index 4241e56fa4e..33f6635f712 100644
--- a/test/tools/TestAlc/init/Init.cs
+++ b/test/tools/TestAlc/init/Init.cs
@@ -10,7 +10,7 @@
 
 namespace Test.Isolated.Init
 {
-    internal class CustomLoadContext : AssemblyLoadContext
+    internal sealed class CustomLoadContext : AssemblyLoadContext
     {
         private readonly string _dependencyDirPath;
 
diff --git a/test/tools/TestAlc/init/Test.Isolated.Init.csproj b/test/tools/TestAlc/init/Test.Isolated.Init.csproj
index c1a291fa550..c8d37ac959a 100644
--- a/test/tools/TestAlc/init/Test.Isolated.Init.csproj
+++ b/test/tools/TestAlc/init/Test.Isolated.Init.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\Test.Common.props"/>
+  <Import Project="..\..\..\Test.Common.props" />
 
   <PropertyGroup>
     <!-- Disable PDB generation -->
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/TestAlc/nested/NestedCommand.cs b/test/tools/TestAlc/nested/NestedCommand.cs
index 88822920138..9b2628d1aeb 100644
--- a/test/tools/TestAlc/nested/NestedCommand.cs
+++ b/test/tools/TestAlc/nested/NestedCommand.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.CommandLine;
 using System.Management.Automation;
-using Newtonsoft.Json;
 
 namespace Test.Isolated.Nested
 {
@@ -14,7 +14,7 @@ public class TestNestedCommand : PSCmdlet
 
         protected override void ProcessRecord()
         {
-            WriteObject($"{Param.Name}-{Param.Path}-{typeof(StringEscapeHandling).Assembly.FullName}");
+            WriteObject($"{Param.Name}-{Param.Path}-{typeof(RootCommand).Assembly.FullName}");
         }
     }
 
diff --git a/test/tools/TestAlc/nested/Test.Isolated.Nested.csproj b/test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
index 85ea03a9c4f..886b5f11826 100644
--- a/test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
+++ b/test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
@@ -1,23 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\Test.Common.props"/>
+  <Import Project="..\..\..\Test.Common.props" />
 
   <PropertyGroup>
+    <!-- Suppress language folders -->
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+
     <!-- Disable PDB generation -->
     <DebugSymbols>false</DebugSymbols>
     <DebugType>None</DebugType>
 
     <!-- Disable deps.json generation -->
     <GenerateDependencyFile>false</GenerateDependencyFile>
-    <NoWarn>NU1901;NU1902;NU1903;NU1904</NoWarn>
 
     <!-- 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" />
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/TestAlc/root/Test.Isolated.Root.csproj b/test/tools/TestAlc/root/Test.Isolated.Root.csproj
index ab333e0668a..2a757064167 100644
--- a/test/tools/TestAlc/root/Test.Isolated.Root.csproj
+++ b/test/tools/TestAlc/root/Test.Isolated.Root.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\Test.Common.props"/>
+  <Import Project="..\..\..\Test.Common.props" />
 
   <PropertyGroup>
     <!-- Disable PDB generation -->
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/TestExe/TestExe.cs b/test/tools/TestExe/TestExe.cs
index a91e2141b58..9230f9e6bff 100644
--- a/test/tools/TestExe/TestExe.cs
+++ b/test/tools/TestExe/TestExe.cs
@@ -8,10 +8,19 @@
 using System.Runtime.InteropServices;
 using System.IO;
 using System.Globalization;
+using System.Linq;
+using Microsoft.Win32;
 
 namespace TestExe
 {
-    internal class TestExe
+    [Flags]
+    internal enum EnvTarget
+    {
+        User = 1,
+        System = 2,
+    }
+
+    internal sealed class TestExe
     {
         private static int Main(string[] args)
         {
@@ -36,12 +45,25 @@ private static int Main(string[] args)
                     case "-stderr":
                         Console.Error.WriteLine(args[1]);
                         break;
+                    case "-stderrandout":
+                        Console.WriteLine(args[1]);
+                        Console.Error.WriteLine(new string(args[1].ToCharArray().Reverse().ToArray()));
+                        break;
                     case "-readbytes":
                         ReadBytes();
                         break;
                     case "-writebytes":
                         WriteBytes(args.AsSpan()[1..]);
                         break;
+                    case "-updateuserpath":
+                        UpdateEnvPath(EnvTarget.User);
+                        break;
+                    case "-updatesystempath":
+                        UpdateEnvPath(EnvTarget.System);
+                        break;
+                    case "-updateuserandsystempath":
+                        UpdateEnvPath(EnvTarget.User | EnvTarget.System);
+                        break;
                     case "--help":
                     case "-h":
                         PrintHelp();
@@ -149,7 +171,7 @@ private static void CreateChildProcess(string[] args)
         {
             if (args.Length > 1)
             {
-                uint num = UInt32.Parse(args[1]);
+                uint num = uint.Parse(args[1]);
                 for (uint i = 0; i < num; i++)
                 {
                     Process child = new Process();
@@ -161,6 +183,61 @@ private static void CreateChildProcess(string[] args)
             // sleep is needed so the process doesn't exit before the test case kill it
             Thread.Sleep(100000);
         }
+
+        private static void UpdateEnvPath(EnvTarget target)
+        {
+            if (!OperatingSystem.IsWindows())
+            {
+                return;
+            }
+
+            const string EnvVarName = "Path";
+            const string UserEnvRegPath = "Environment";
+            const string SysEnvRegPath = @"SYSTEM\CurrentControlSet\Control\Session Manager\Environment";
+
+            if (target.HasFlag(EnvTarget.User))
+            {
+                // Append to the User Path.
+                using RegistryKey reg = Registry.CurrentUser.OpenSubKey(UserEnvRegPath, writable: true);
+                UpdateEnvPathImpl(reg, append: true, @"X:\not-exist-user-path");
+            }
+
+            if (target.HasFlag(EnvTarget.System))
+            {
+                // Prepend to the System Path.
+                using RegistryKey reg = Registry.LocalMachine.OpenSubKey(SysEnvRegPath, writable: true);
+                UpdateEnvPathImpl(reg, append: false, @"X:\not-exist-sys-path");
+            }
+
+            static void UpdateEnvPathImpl(RegistryKey regKey, bool append, string newPathItem)
+            {
+                // Get the registry value kind.
+                RegistryValueKind kind = regKey.GetValueKind(EnvVarName);
+
+                // Get the literal registry value (not expanded) for the env var.
+                string oldValue = (string)regKey.GetValue(
+                    EnvVarName,
+                    defaultValue: string.Empty,
+                    RegistryValueOptions.DoNotExpandEnvironmentNames);
+
+                string newValue;
+                if (append)
+                {
+                    // Append to the old value.
+                    string separator = (oldValue is "" || oldValue.EndsWith(';')) ? string.Empty : ";";
+                    newValue = $"{oldValue}{separator}{newPathItem}";
+                }
+                else
+                {
+                    // Prepend to the old value.
+                    string separator = (oldValue is "" || oldValue.StartsWith(';')) ? string.Empty : ";";
+                    newValue = $"{newPathItem}{separator}{oldValue}";
+                }
+
+                // Set the new value and preserve the original value kind.
+                regKey.SetValue(EnvVarName, newValue, kind);
+            }
+        }
     }
 
     internal static partial class Interop
diff --git a/test/tools/TestMetadata.json b/test/tools/TestMetadata.json
index 66dc8572d37..19ffb93ce92 100644
--- a/test/tools/TestMetadata.json
+++ b/test/tools/TestMetadata.json
@@ -1,7 +1,6 @@
 {
   "ExperimentalFeatures": {
     "ExpTest.FeatureOne": [ "test/powershell/engine/ExperimentalFeature/ExperimentalFeature.Basic.Tests.ps1" ],
-    "PSCultureInvariantReplaceOperator": [ "test/powershell/Language/Operators/ReplaceOperator.Tests.ps1" ],
-    "Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace": [ "test/powershell/Modules/Microsoft.PowerShell.Utility/RunspaceBreakpointManagement.Tests.ps1" ]
+    "PSSerializeJSONLongEnumAsNumber": [ "test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.PSSerializeJSONLongEnumAsNumber.Tests.ps1" ]
   }
 }
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index ed5011fdc19..37b73426f6c 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\Test.Common.props"/>
+  <Import Project="..\..\Test.Common.props" />
 
   <PropertyGroup>
     <Description>Very tiny windows service to do service testing</Description>
@@ -10,10 +10,13 @@
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
+    <TargetPlatformVersion>8.0</TargetPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-rc.2.23479.10" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="11.0.0-preview.3.26207.106" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/Controllers/GetController.cs b/test/tools/WebListener/Controllers/GetController.cs
index 631886bb7e1..af563d16c2a 100644
--- a/test/tools/WebListener/Controllers/GetController.cs
+++ b/test/tools/WebListener/Controllers/GetController.cs
@@ -17,13 +17,13 @@ public JsonResult Index()
             Hashtable args = new Hashtable();
             foreach (var key in Request.Query.Keys)
             {
-                args.Add(key, string.Join(Constants.HeaderSeparator, Request.Query[key]));
+                args.Add(key, string.Join(Constants.HeaderSeparator, (string)Request.Query[key]));
             }
 
             Hashtable headers = new Hashtable();
             foreach (var key in Request.Headers.Keys)
             {
-                headers.Add(key, string.Join(Constants.HeaderSeparator, Request.Headers[key]));
+                headers.Add(key, string.Join(Constants.HeaderSeparator, (string)Request.Headers[key]));
             }
 
             Hashtable output = new Hashtable
diff --git a/test/tools/WebListener/Controllers/MultipartController.cs b/test/tools/WebListener/Controllers/MultipartController.cs
index 56e8c2003d4..5f053597791 100644
--- a/test/tools/WebListener/Controllers/MultipartController.cs
+++ b/test/tools/WebListener/Controllers/MultipartController.cs
@@ -75,7 +75,7 @@ public JsonResult Index(IFormCollection collection)
             Hashtable headers = new Hashtable();
             foreach (var key in Request.Headers.Keys)
             {
-                headers.Add(key, string.Join(Constants.HeaderSeparator, Request.Headers[key]));
+                headers.Add(key, string.Join(Constants.HeaderSeparator, (string)Request.Headers[key]));
             }
 
             Hashtable output = new Hashtable
diff --git a/test/tools/WebListener/Controllers/ResponseHeadersController.cs b/test/tools/WebListener/Controllers/ResponseHeadersController.cs
index d5bffaefb70..f8693524714 100644
--- a/test/tools/WebListener/Controllers/ResponseHeadersController.cs
+++ b/test/tools/WebListener/Controllers/ResponseHeadersController.cs
@@ -23,7 +23,7 @@ public string Index()
             Hashtable headers = new Hashtable();
             foreach (var key in Request.Query.Keys)
             {
-                headers.Add(key, string.Join(Constants.HeaderSeparator, Request.Query[key]));
+                headers.Add(key, string.Join(Constants.HeaderSeparator, (string)Request.Query[key]));
 
                 if (string.Equals("Content-Type", key, StringComparison.InvariantCultureIgnoreCase))
                 {
diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs
index a2d49a45fc5..58baf77b1d7 100644
--- a/test/tools/WebListener/Program.cs
+++ b/test/tools/WebListener/Program.cs
@@ -6,9 +6,9 @@
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.Extensions.Hosting;
 
 namespace mvc
 {
@@ -18,96 +18,112 @@ public static void Main(string[] args)
         {
             if (args.Length != 7)
             {
-                System.Console.WriteLine("Required: <CertificatePath> <CertificatePassword> <HTTPPortNumber> <HTTPSPortNumberTls12> <HTTPSPortNumberTls11> <HTTPSPortNumberTls> <HTTPSPortNumberTls12>");
+                Console.WriteLine("Required: <CertificatePath> <CertificatePassword> <HTTPPortNumber> <HTTPSPortNumberTls12> <HTTPSPortNumberTls11> <HTTPSPortNumberTls> <HTTPSPortNumberTls12>");
                 Environment.Exit(1);
             }
 
-            BuildWebHost(args).Run();
+            BuildHost(args).Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder()
-                .UseStartup<Startup>().UseKestrel(options =>
+        public static IHost BuildHost(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    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();
-
-                            // 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;
-                            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();
-
-                            // 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;
-                            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;
-                        });
+                    webBuilder.UseStartup<Startup>();
+                    webBuilder.UseKestrel(options =>
+                    {
+                        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 =>
+                            {
+#pragma warning disable SYSLIB0057
+                                var certificate = new X509Certificate2(args[0], args[1]);
+#pragma warning restore SYSLIB0057
+
+                                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 =>
+                            {
+#pragma warning disable SYSLIB0057
+                                var certificate = new X509Certificate2(args[0], args[1]);
+#pragma warning restore SYSLIB0057
+
+                                HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
+
+                                // 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;
+                                httpsOption.ServerCertificate = certificate;
+                                listenOptions.UseHttps(httpsOption);
+                                listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+                            });
+
+                        options.Listen(
+                            IPAddress.Loopback,
+                            int.Parse(args[5]),
+                            listenOptions =>
+                            {
+#pragma warning disable SYSLIB0057
+                                var certificate = new X509Certificate2(args[0], args[1]);
+#pragma warning restore SYSLIB0057
+
+                                HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
+
+                                // 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;
+                                httpsOption.ServerCertificate = certificate;
+                                listenOptions.UseHttps(httpsOption);
+                                listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+                            });
+
+                        options.Listen(
+                            IPAddress.Loopback,
+                            int.Parse(args[6]),
+                            listenOptions =>
+                            {
+#pragma warning disable SYSLIB0057
+                                var certificate = new X509Certificate2(args[0], args[1]);
+#pragma warning restore SYSLIB0057
+
+                                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/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 3d9d5a4eda6..3567cd93c68 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,12 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-rc.2.23480.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="11.0.0-preview.3.26207.106" />
   </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.1.0-*" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/xUnit/AssemblyInfo.cs b/test/xUnit/AssemblyInfo.cs
new file mode 100644
index 00000000000..7c4e92091db
--- /dev/null
+++ b/test/xUnit/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Diagnostics.CodeAnalysis;
+
+// Disable the warning 'xUnit1031': https://xunit.net/xunit.analyzers/rules/xUnit1031
+[assembly: SuppressMessage("xUnit", "xUnit1031", Justification = "Parallelization is disabled")]
diff --git a/test/xUnit/csharp/test_AstDefaultVisit.cs b/test/xUnit/csharp/test_AstDefaultVisit.cs
index 283c1f73071..41f3ff1ce56 100644
--- a/test/xUnit/csharp/test_AstDefaultVisit.cs
+++ b/test/xUnit/csharp/test_AstDefaultVisit.cs
@@ -8,17 +8,17 @@
 
 namespace PSTests.Parallel
 {
-    internal class MyICustomAstVisitor2 : ICustomAstVisitor2
+    internal sealed class MyICustomAstVisitor2 : ICustomAstVisitor2
     {
         public object DefaultVisit(Ast ast) => ast.GetType().Name;
     }
 
-    internal class MyDefaultCustomAstVisitor2 : DefaultCustomAstVisitor2
+    internal sealed class MyDefaultCustomAstVisitor2 : DefaultCustomAstVisitor2
     {
         public override object DefaultVisit(Ast ast) => ast.GetType().Name;
     }
 
-    internal class MyAstVisitor2 : AstVisitor2
+    internal sealed class MyAstVisitor2 : AstVisitor2
     {
         public List<string> Commands { get; }
 
diff --git a/test/xUnit/csharp/test_CommandLineParser.cs b/test/xUnit/csharp/test_CommandLineParser.cs
index 5025584d6ac..01f572d230d 100644
--- a/test/xUnit/csharp/test_CommandLineParser.cs
+++ b/test/xUnit/csharp/test_CommandLineParser.cs
@@ -48,6 +48,9 @@ public static void TestDefaults()
             Assert.False(cpp.ShowVersion);
             Assert.False(cpp.SkipProfiles);
             Assert.False(cpp.SocketServerMode);
+#if !UNIX
+            Assert.False(cpp.V2SocketServerMode);
+#endif
             Assert.False(cpp.SSHServerMode);
             if (Platform.IsWindows)
             {
@@ -336,6 +339,25 @@ public static void TestParameter_SocketServerMode(params string[] commandLine)
             Assert.Null(cpp.ErrorMessage);
         }
 
+#if !UNIX
+        [Theory]
+        [InlineData("-v2socketservermode", "-token", "natoheusatoehusnatoeu", "-utctimestamp", "2023-10-01T12:00:00Z")]
+        [InlineData("-v2so", "-token", "asentuhasoneuthsaoe", "-utctimestamp", "2025-06-09T12:00:00Z")]
+        public static void TestParameter_V2SocketServerMode(params string[] commandLine)
+        {
+            var cpp = new CommandLineParameterParser();
+
+            cpp.Parse(commandLine);
+
+            Assert.False(cpp.AbortStartup);
+            Assert.True(cpp.NoExit);
+            Assert.False(cpp.ShowShortHelp);
+            Assert.False(cpp.ShowBanner);
+            Assert.True(cpp.V2SocketServerMode);
+            Assert.Null(cpp.ErrorMessage);
+        }
+#endif
+
         [Theory]
         [InlineData("-servermode")]
         [InlineData("-s")]
diff --git a/test/xUnit/csharp/test_CompletionHelpers.cs b/test/xUnit/csharp/test_CompletionHelpers.cs
new file mode 100644
index 00000000000..c428213a8e6
--- /dev/null
+++ b/test/xUnit/csharp/test_CompletionHelpers.cs
@@ -0,0 +1,183 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Management.Automation;
+using Xunit;
+
+namespace PSTests.Parallel
+{
+    public class CompletionHelpersTests
+    {
+        [Theory]
+        [InlineData("", "'", "''")]
+        [InlineData("", "\"", "\"\"")]
+        [InlineData("'", "'", "''''")]
+        [InlineData("", "", "''")]
+        [InlineData("", null, "''")]
+        [InlineData("word", "'", "'word'")]
+        [InlineData("word", "\"", "\"word\"")]
+        [InlineData("word's", "'", "'word''s'")]
+        [InlineData("already 'quoted'", "'", "'already ''quoted'''")]
+        [InlineData("multiple 'quotes' in 'text'", "'", "'multiple ''quotes'' in ''text'''")]
+        [InlineData("\"word\"", "'", "'\"word\"'")]
+        [InlineData("'word'", "'", "''word''")]
+        [InlineData("word", "", "word")]
+        [InlineData("word", null, "word")]
+        [InlineData("\"word\"", "\"", "\"\"word\"\"")]
+        [InlineData("'word'", "\"", "\"'word'\"")]
+        [InlineData("word with space", "'", "'word with space'")]
+        [InlineData("word with space", "\"", "\"word with space\"")]
+        [InlineData("word\"with\"quotes", "'", "'word\"with\"quotes'")]
+        [InlineData("word'with'quotes", "\"", "\"word'with'quotes\"")]
+        [InlineData("while", "'", "'while'")]
+        [InlineData("while", "", "while")]
+        [InlineData("while", "\"", "\"while\"")]
+        [InlineData("$variable", "'", "'$variable'")]
+        [InlineData("$variable", "", "$variable")]
+        [InlineData("$variable", "\"", "\"$variable\"")]
+        [InlineData("key$word", "'", "'key$word'")]
+        [InlineData("key$word", "", "'key$word'")]
+        [InlineData("key$word", "\"", "\"key$word\"")]
+        [InlineData("`r`n", "\"", "\"`r`n\"")]
+        [InlineData("`r`n", "'", "\"`r`n\"")]
+        [InlineData("`r`n", "", "\"`r`n\"")]
+        [InlineData("`r`n    `${0}", "\"", "\"`r`n    `${0}\"")]
+        [InlineData("`r`n    `${0}", "'", "\"`r`n    `${0}\"")]
+        [InlineData("`r`n    `${0}", "", "\"`r`n    `${0}\"")]
+        [InlineData("`n", "\"", "\"`n\"")]
+        [InlineData("`n", "'", "\"`n\"")]
+        [InlineData("`n", "", "\"`n\"")]
+        [InlineData("`n    `${0}", "\"", "\"`n    `${0}\"")]
+        [InlineData("`n    `${0}", "'", "\"`n    `${0}\"")]
+        [InlineData("`n    `${0}", "", "\"`n    `${0}\"")]
+        public void TestQuoteCompletionText(
+             string completionText,
+             string quote,
+             string expected)
+        {
+            string result = CompletionHelpers.QuoteCompletionText(completionText, quote);
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData("normaltext", false)]
+        [InlineData("$variable", false)]
+        [InlineData("abc def", true)]
+        [InlineData("while", false)] // PowerShell keyword
+        [InlineData("key$word", true)]
+        [InlineData("abc`def", true)]
+        [InlineData("normal-text", false)]
+        [InlineData("\"doublequotes\"", false)]
+        [InlineData("'singlequotes'", false)]
+        [InlineData("normal 'text'", true)]
+        [InlineData("normal \"text\"", true)]
+        [InlineData("text with ' and \"", true)]
+        [InlineData("text\"with\"quotes", false)]
+        [InlineData("text'with'quotes", false)]
+        [InlineData("\"key$", true)]
+        [InlineData("\"", true)]
+        [InlineData("'", true)]
+        [InlineData("", true)]
+        [InlineData(";", true)]
+        [InlineData("; ", true)]
+        [InlineData(",", true)]
+        [InlineData(", ", true)]
+        public void TestCompletionRequiresQuotes(string completion, bool expected)
+        {
+            bool result = CompletionHelpers.CompletionRequiresQuotes(completion);
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData("", "", "")]
+        [InlineData("\"", "", "\"")]
+        [InlineData("'", "", "'")]
+        [InlineData("\"word\"", "word", "\"")]
+        [InlineData("'word'", "word", "'")]
+        [InlineData("\"word", "word", "\"")]
+        [InlineData("'word", "word", "'")]
+        [InlineData("word\"", "word\"", "")]
+        [InlineData("word'", "word'", "")]
+        [InlineData("\"word's\"", "word's", "\"")]
+        [InlineData("'word\"", "'word\"", "")]
+        [InlineData("\"word'", "\"word'", "")]
+        [InlineData("'word\"s'", "word\"s", "'")]
+        public void TestHandleDoubleAndSingleQuote(string wordToComplete, string expectedWordToComplete, string expectedQuote)
+        {
+            string quote = CompletionHelpers.HandleDoubleAndSingleQuote(ref wordToComplete);
+            Assert.Equal(expectedQuote, quote);
+            Assert.Equal(expectedWordToComplete, wordToComplete);
+        }
+
+        [Theory]
+        [InlineData("word", "word", true)]
+        [InlineData("Word", "word", true)]
+        [InlineData("word", "wor", true)]
+        [InlineData("word", "words", false)]
+        [InlineData("word`nnext", "word`n", true)]
+        [InlineData("word`r`nnext", "word`r`n", true)]
+        [InlineData("word;next", "word;", true)]
+        [InlineData("word,next", "word,", true)]
+        [InlineData("word[*]next", "word[*", true)]
+        [InlineData("word[abc]next", "word[abc", true)]
+        [InlineData("word", "word*", true)]
+        [InlineData("Word", "word*", true)]
+        [InlineData("word(Special)", "word*", true)]
+        [InlineData("testword", "test", true)]
+        [InlineData("word", "", true)]
+        [InlineData("", "word", false)]
+        public void TestDefaultMatch(string value, string wordToComplete, bool expected)
+        {
+            bool result = CompletionHelpers.DefaultMatch(value, wordToComplete);
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData("word", "word", true)]
+        [InlineData("Word", "word", true)]
+        [InlineData("word", "wor", true)]
+        [InlineData("word", "words", false)]
+        [InlineData("word`nnext", "word`n", true)]
+        [InlineData("word`r`nnext", "word`r`n", true)]
+        [InlineData("word;next", "word;", true)]
+        [InlineData("word,next", "word,", true)]
+        [InlineData("word[*]next", "word[*", true)]
+        [InlineData("word[abc]next", "word[abc", true)]
+        [InlineData("word", "word*", false)]
+        [InlineData("Word", "word*", false)]
+        [InlineData("word(Special)", "word*", false)]
+        [InlineData("testword", "test", true)]
+        [InlineData("word", "", true)]
+        [InlineData("", "word", false)]
+        public void TestWildcardPatternEscapeMatch(string value, string wordToComplete, bool expected)
+        {
+            bool result = CompletionHelpers.WildcardPatternEscapeMatch(value, wordToComplete);
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData("\n", "`n")]
+        [InlineData("\r", "`r")]
+        [InlineData("\r\n", "`r`n")]
+        [InlineData("\t", "`t")]
+        [InlineData("\0", "`0")]
+        [InlineData("\a", "`a")]
+        [InlineData("\b", "`b")]
+        [InlineData("\u001b", "`e")]
+        [InlineData("\f", "`f")]
+        [InlineData("\v", "`v")]
+        [InlineData("word\n", "word`n")]
+        [InlineData("word\r", "word`r")]
+        [InlineData("word\t", "word`t")]
+        [InlineData("word\u001b", "word`e")]
+        [InlineData("word\f", "word`f")]
+        [InlineData("word\v", "word`v")]
+        [InlineData("word\r\n", "word`r`n")]
+        public void TestNormalizeToExpandableString(string value, string expected)
+        {
+            string result = CompletionHelpers.NormalizeToExpandableString(value);
+            Assert.Equal(expected, result);
+        }
+    }
+}
diff --git a/test/xUnit/csharp/test_CryptoUtils.cs b/test/xUnit/csharp/test_CryptoUtils.cs
index 0f737a94260..6531924d437 100644
--- a/test/xUnit/csharp/test_CryptoUtils.cs
+++ b/test/xUnit/csharp/test_CryptoUtils.cs
@@ -22,7 +22,7 @@ public static void TestSessionKeyExchange()
                 string publicKey = cryptoClient.GetPublicKeyAsBase64EncodedString();
                 cryptoServer.ImportPublicKeyFromBase64EncodedString(publicKey); // sent to and imported by server
 
-                // generate, export, import session key 
+                // generate, export, import session key
                 cryptoServer.GenerateSessionKey();   // server provides the session key?
                 string sessionKey = cryptoServer.SafeExportSessionKey();
                 cryptoClient.ImportSessionKeyFromBase64EncodedString(sessionKey);
diff --git a/test/xUnit/csharp/test_Feedback.cs b/test/xUnit/csharp/test_Feedback.cs
index 2c90118be55..eba627f7b0d 100644
--- a/test/xUnit/csharp/test_Feedback.cs
+++ b/test/xUnit/csharp/test_Feedback.cs
@@ -97,7 +97,7 @@ public static void GetFeedback()
 
                 // Test the result from the 'general' feedback provider.
                 Assert.Single(feedbacks);
-                Assert.Equal("general", feedbacks[0].Name);
+                Assert.Equal("General Feedback", feedbacks[0].Name);
                 Assert.Equal(expectedCmd, feedbacks[0].Item.RecommendedActions[0]);
 
                 // Expect the result from both 'general' and the 'slow' feedback providers.
@@ -107,7 +107,7 @@ public static void GetFeedback()
                 Assert.Equal(2, feedbacks.Count);
 
                 FeedbackResult entry1 = feedbacks[0];
-                Assert.Equal("general", entry1.Name);
+                Assert.Equal("General Feedback", entry1.Name);
                 Assert.Equal(expectedCmd, entry1.Item.RecommendedActions[0]);
 
                 FeedbackResult entry2 = feedbacks[1];
diff --git a/test/xUnit/csharp/test_FileSystemProvider.cs b/test/xUnit/csharp/test_FileSystemProvider.cs
index 1bea0f84ce4..06cb43e6088 100644
--- a/test/xUnit/csharp/test_FileSystemProvider.cs
+++ b/test/xUnit/csharp/test_FileSystemProvider.cs
@@ -43,7 +43,7 @@ public void Dispose()
         {
             Dispose(true);
             GC.SuppressFinalize(this);
-        }        
+        }
 
         protected virtual void Dispose(bool disposing)
         {
diff --git a/test/xUnit/csharp/test_PSConfiguration.cs b/test/xUnit/csharp/test_PSConfiguration.cs
index 54e69da68f0..de94107fc6b 100644
--- a/test/xUnit/csharp/test_PSConfiguration.cs
+++ b/test/xUnit/csharp/test_PSConfiguration.cs
@@ -99,7 +99,7 @@ public void Dispose()
         {
             Dispose(true);
             GC.SuppressFinalize(this);
-        }        
+        }
 
         protected virtual void Dispose(bool disposing)
         {
diff --git a/test/xUnit/csharp/test_RemoteHyperV.cs b/test/xUnit/csharp/test_RemoteHyperV.cs
new file mode 100644
index 00000000000..c7cda754161
--- /dev/null
+++ b/test/xUnit/csharp/test_RemoteHyperV.cs
@@ -0,0 +1,806 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Management.Automation.Language;
+using System.Management.Automation.Subsystem;
+using System.Management.Automation.Subsystem.Prediction;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace PSTests.Sequential
+{
+    public class RemoteHyperVTests
+    {
+        private static ITestOutputHelper _output;
+
+        public RemoteHyperVTests(ITestOutputHelper output)
+        {
+            if (!System.Management.Automation.Platform.IsWindows)
+            {
+                throw new SkipException("RemoteHyperVTests are only supported on Windows.");
+            }
+
+            _output = output;
+        }
+
+        // Helper method to connect with retries
+        private static void ConnectWithRetry(Socket client, IPAddress address, int port, ITestOutputHelper output, int maxRetries = 10)
+        {
+            int retryDelayMs = 500;
+            int attempt = 0;
+            bool connected = false;
+            while (attempt < maxRetries && !connected)
+            {
+                try
+                {
+                    client.Connect(address, port);
+                    connected = true;
+                }
+                catch (SocketException)
+                {
+                    attempt++;
+                    if (attempt < maxRetries)
+                    {
+                        output?.WriteLine($"Connect attempt {attempt} failed, retrying in {retryDelayMs}ms...");
+                        Thread.Sleep(retryDelayMs);
+                        retryDelayMs *= 2;
+                    }
+                    else
+                    {
+                        output?.WriteLine($"Failed to connect after {maxRetries} attempts.  This is most likely an intermittent failure due to environmental issues.");
+                        throw;
+                    }
+                }
+            }
+        }
+
+        private static void SendResponse(string name, Socket client, Queue<(byte[] bytes, int delayMs)> serverResponses)
+        {
+            if (serverResponses.Count > 0)
+            {
+                _output.WriteLine($"Mock {name} ----------------------------------------------------");
+                var respTuple = serverResponses.Dequeue();
+                var resp = respTuple.bytes;
+
+                if (respTuple.delayMs > 0)
+                {
+                    _output.WriteLine($"Mock {name} - delaying response by {respTuple.delayMs} ms");
+                    Thread.Sleep(respTuple.delayMs);
+                }
+                if (resp.Length > 0) {
+                    client.Send(resp, resp.Length, SocketFlags.None);
+                    _output.WriteLine($"Mock {name} - sent response: " + Encoding.ASCII.GetString(resp));
+                }
+            }
+        }
+
+        private static void StartHandshakeServer(
+            string name,
+            int port,
+            IEnumerable<(string message, Encoding encoding)> expectedClientSends,
+            IEnumerable<(string message, Encoding encoding)> serverResponses,
+            bool verifyConnectionClosed,
+            CancellationToken cancellationToken,
+            bool sendFirst = false)
+        {
+            IEnumerable<(string message, Encoding encoding, int delayMs)> serverResponsesWithDelay = new List<(string message, Encoding encoding, int delayMs)>();
+            foreach (var item in serverResponses)
+            {
+                ((List<(string message, Encoding encoding, int delayMs)>)serverResponsesWithDelay).Add((item.message, item.encoding, 1));
+            }
+            StartHandshakeServer(name, port, expectedClientSends, serverResponsesWithDelay, verifyConnectionClosed, cancellationToken, sendFirst);
+        }
+
+        private static void StartHandshakeServer(
+            string name,
+            int port,
+            IEnumerable<(string message, Encoding encoding)> expectedClientSends,
+            IEnumerable<(string message, Encoding encoding, int delayMs)> serverResponses,
+            bool verifyConnectionClosed,
+            CancellationToken cancellationToken,
+            bool sendFirst = false)
+        {
+            var expectedMessages = new Queue<(string message, byte[] bytes, Encoding encoding)>();
+            foreach (var item in expectedClientSends)
+            {
+                var itemBytes = item.encoding.GetBytes(item.message);
+                expectedMessages.Enqueue((message: item.message, bytes: itemBytes, encoding: item.encoding));
+            }
+
+            var serverResponseBytes = new Queue<(byte[] bytes, int delayMs)>();
+            foreach (var item in serverResponses)
+            {
+                (byte[] bytes, int delayMs) queueItem = (item.encoding.GetBytes(item.message), item.delayMs);
+                serverResponseBytes.Enqueue(queueItem);
+            }
+
+            _output.WriteLine($"Mock {name} - starting listener on port {port} with {expectedMessages.Count} expected messages and {serverResponseBytes.Count} responses.");
+            StartHandshakeServerImplementation(name, port, expectedMessages, serverResponseBytes, verifyConnectionClosed, cancellationToken, sendFirst);
+        }
+
+        private static void StartHandshakeServerImplementation(
+            string name,
+            int port,
+            Queue<(string message, byte[] bytes, Encoding encoding)> expectedClientSends,
+            Queue<(byte[] bytes, int delayMs)> serverResponses,
+            bool verifyConnectionClosed,
+            CancellationToken cancellationToken,
+            bool sendFirst = false)
+        {
+            DateTime startTime = DateTime.UtcNow;
+            var buffer = new byte[1024];
+            var listener = new TcpListener(IPAddress.Loopback, port);
+            listener.Start();
+            try
+            {
+                using (var client = listener.AcceptSocket())
+                {
+                    if (sendFirst)
+                    {
+                        // Send the first message from the serverResponses queue
+                        SendResponse(name, client, serverResponses);
+                    }
+
+                    while (expectedClientSends.Count > 0)
+                    {
+                        _output.WriteLine($"Mock {name} - time elapsed: {(DateTime.UtcNow - startTime).TotalMilliseconds} milliseconds");
+                        client.ReceiveTimeout = 2 * 1000; // 2 seconds timeout for receiving data
+                        cancellationToken.ThrowIfCancellationRequested();
+                        var expectedMessage = expectedClientSends.Dequeue();
+                        _output.WriteLine($"Mock {name} - remaining expected messages: {expectedClientSends.Count}");
+                        var expected = expectedMessage.bytes;
+                        Array.Clear(buffer, 0, buffer.Length);
+                        int received = client.Receive(buffer);
+                        // Optionally validate received data matches expected
+                        string expectedString = expectedMessage.message;
+                        string bufferString = expectedMessage.encoding.GetString(buffer, 0, received);
+                        string alternativeEncodedString = string.Empty;
+                        if (expectedMessage.encoding == Encoding.Unicode)
+                        {
+                            alternativeEncodedString = Encoding.UTF8.GetString(buffer, 0, received);
+                        }
+                        else if (expectedMessage.encoding == Encoding.UTF8)
+                        {
+                            alternativeEncodedString = Encoding.Unicode.GetString(buffer, 0, received);
+                        }
+
+                        if (received != expected.Length)
+                        {
+                            string errorMessage = $"Mock {name} - Expected {expected.Length} bytes, but received {received} bytes: `{bufferString}`(alt encoding: `{alternativeEncodedString}`); expected: {expectedString}";
+                            _output.WriteLine(errorMessage);
+                            throw new Exception(errorMessage);
+                        }
+                        if (!string.Equals(bufferString, expectedString, StringComparison.OrdinalIgnoreCase))
+                        {
+                            string errorMessage = $"Mock {name} - Expected `{expectedString}`; length {expected.Length}, but received; length {received}; `{bufferString}`(alt encoding: `{alternativeEncodedString}`) instead.";
+                            _output.WriteLine(errorMessage);
+                            throw new Exception(errorMessage);
+                        }
+                        _output.WriteLine($"Mock {name} - received expected message: " + expectedString);
+                        SendResponse(name, client, serverResponses);
+                    }
+
+                    if (verifyConnectionClosed)
+                    {
+                        _output.WriteLine($"Mock {name} - verifying client connection is closed.");
+                        // Wait for the client to close the connection synchronously (no timeout)
+                        try
+                        {
+                            while (true)
+                            {
+                                int bytesRead = client.Receive(buffer, SocketFlags.None);
+                                if (bytesRead == 0)
+                                {
+                                    break;
+                                }
+
+                                // If we receive any data, log and throw (assume UTF8 encoding)
+                                string unexpectedData = Encoding.UTF8.GetString(buffer, 0, bytesRead);
+                                _output.WriteLine($"Mock {name} - received unexpected data after handshake: {unexpectedData}");
+                                throw new Exception($"Mock {name} - received unexpected data after handshake: {unexpectedData}");
+                            }
+                            _output.WriteLine($"Mock {name} - client closed the connection.");
+                        }
+                        catch (SocketException ex)
+                        {
+                            _output.WriteLine($"Mock {name} - socket exception while waiting for client close: {ex.Message} {ex.GetType().FullName}");
+                        }
+                        catch (ObjectDisposedException)
+                        {
+                            _output.WriteLine($"Mock {name} - socket already closed.");
+                            // Socket already closed
+                        }
+                    }
+                }
+
+                _output.WriteLine($"Mock {name} - on port {port} completed successfully.");
+            }
+            catch (Exception ex)
+            {
+                _output.WriteLine($"Mock {name} - Exception: {ex.Message} {ex.GetType().FullName}");
+                _output.WriteLine(ex.StackTrace);
+                throw;
+            }
+            finally
+            {
+                _output.WriteLine($"Mock {name} - remaining expected messages: {expectedClientSends.Count}");
+                _output.WriteLine($"Mock {name} - stopping listener on port {port}.");
+                listener.Stop();
+            }
+        }
+
+        // Helper function to create a random 4-character ASCII response
+        private static string CreateRandomAsciiResponse()
+        {
+            var rand = new Random();
+            // Randomly return either "PASS" or "FAIL"
+            return rand.Next(0, 2) == 0 ? "PASS" : "FAIL";
+        }
+
+        // Helper method to create test data
+        private static (List<(string, Encoding)> expectedClientSends, List<(string, Encoding)> serverResponses) CreateHandshakeTestData(NetworkCredential cred)
+        {
+            var expectedClientSends = new List<(string message, Encoding encoding)>
+            {
+                (message: cred.Domain, encoding: Encoding.Unicode),
+                (message: cred.UserName, encoding: Encoding.Unicode),
+                (message: "NONEMPTYPW", encoding: Encoding.ASCII),
+                (message: cred.Password, encoding: Encoding.Unicode)
+            };
+
+            var serverResponses = new List<(string message, Encoding encoding)>
+            {
+                (message: CreateRandomAsciiResponse(), encoding: Encoding.ASCII), // Response to domain
+                (message: CreateRandomAsciiResponse(), encoding: Encoding.ASCII), // Response to username
+                (message: CreateRandomAsciiResponse(), encoding: Encoding.ASCII)  // Response to non-empty password
+            };
+
+            return (expectedClientSends, serverResponses);
+        }
+
+        private static List<(string message, Encoding encoding)> CreateVersionNegotiationClientSends()
+        {
+            return new List<(string message, Encoding encoding)>
+            {
+                (message: "VERSION", encoding: Encoding.UTF8),
+                (message: "VERSION_2", encoding: Encoding.UTF8),
+            };
+        }
+
+        private static List<(string, Encoding)> CreateV2Sends(NetworkCredential cred, string configurationName)
+        {
+            var sends = CreateVersionNegotiationClientSends();
+            var password = cred.Password;
+            var emptyPassword = string.IsNullOrEmpty(password);
+
+            sends.AddRange(new List<(string message, Encoding encoding)>
+            {
+                (message: cred.Domain, encoding: Encoding.Unicode),
+                (message: cred.UserName, encoding: Encoding.Unicode)
+            });
+
+            if (!emptyPassword)
+            {
+                sends.AddRange(new List<(string message, Encoding encoding)>
+                {
+                    (message: "NONEMPTYPW", encoding: Encoding.UTF8),
+                    (message: cred.Password, encoding: Encoding.Unicode)
+                });
+            }
+            else
+            {
+                sends.Add((message: "EMPTYPW", encoding: Encoding.UTF8)); // Empty password and we don't expect a response
+            }
+
+            if (!string.IsNullOrEmpty(configurationName))
+            {
+                sends.Add((message: "NONEMPTYCF", encoding: Encoding.UTF8));
+                sends.Add((message: configurationName, encoding: Encoding.Unicode)); // Configuration string and we don't expect a response
+            }
+            else
+            {
+                sends.Add((message: "EMPTYCF", encoding: Encoding.UTF8)); // Configuration string and we don't expect a response
+            }
+
+            sends.Add((message: "PASS", encoding: Encoding.ASCII)); // Response to TOKEN
+
+            return sends;
+        }
+
+        private static List<(string, Encoding)> CreateV2Responses(string version = "VERSION_2", bool emptyConfig = false, string token = "FakeToken0+/=", bool emptyPassword = false)
+        {
+            var responses = new List<(string message, Encoding encoding)>
+            {
+                (message: version, encoding: Encoding.ASCII), // Response to VERSION
+                (message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII), // Response to domain
+                (message: "PASS", encoding: Encoding.ASCII), // Response to username
+            };
+
+            if (!emptyPassword)
+            {
+                responses.Add((message: "PASS", encoding: Encoding.ASCII));  // Response to non-empty password
+            }
+
+            responses.Add((message: "CONF", encoding: Encoding.ASCII)); // Response to configuration
+
+            if (!emptyConfig)
+            {
+                responses.Add((message: "PASS", encoding: Encoding.ASCII));  // Response to non-empty configuration
+            }
+            responses.Add((message: "TOKEN " + token, encoding: Encoding.ASCII)); // Response to with a token than uses each class of character in base 64 encoding
+
+            return responses;
+        }
+
+        // Helper method to create test data
+        private static (List<(string, Encoding)> expectedClientSends, List<(string, Encoding)> serverResponses)
+                CreateHandshakeTestDataV2(NetworkCredential cred, string version, string configurationName, string token)
+        {
+            bool emptyConfig = string.IsNullOrEmpty(configurationName);
+            bool emptyPassword = string.IsNullOrEmpty(cred.Password);
+            return (CreateV2Sends(cred, configurationName), CreateV2Responses(version, emptyConfig, token, emptyPassword));
+        }
+
+        // Helper method to create test data
+        private static (List<(string, Encoding)> expectedClientSends, List<(string, Encoding)> serverResponses) CreateHandshakeTestDataForFallback(NetworkCredential cred)
+        {
+            var expectedClientSends = new List<(string message, Encoding encoding)>
+            {
+                (message: "VERSION", encoding: Encoding.UTF8),
+                (message: @"?<PSDirectVMLegacy>", encoding: Encoding.Unicode),
+                (message: "EMPTYPW", encoding: Encoding.UTF8), // Response to domain
+                (message: "FAIL", encoding: Encoding.UTF8), // Response to domain
+            };
+
+            List<(string message, Encoding encoding)> serverResponses = new List<(string message, Encoding encoding)>
+            {
+                (message: "PASS", encoding: Encoding.ASCII), // Response to VERSION but v1 server expects domain so it says "PASS"
+                (message: "PASS", encoding: Encoding.ASCII), // Response to username
+                (message: "FAIL", encoding: Encoding.ASCII) // Response to EMPTYPW
+            };
+
+            return (expectedClientSends, serverResponses);
+        }
+
+        // Helper to create a password with at least one non-ASCII Unicode character
+        public static string CreateRandomUnicodePassword(string prefix)
+        {
+            var rand = new Random();
+            var asciiPart = new char[6 + prefix.Length];
+            // Copy prefix into asciiPart
+            Array.Copy(prefix.ToCharArray(), 0, asciiPart, 0, prefix.Length);
+            for (int i = prefix.Length; i < asciiPart.Length; i++)
+            {
+                asciiPart[i] = (char)rand.Next(33, 127); // ASCII printable
+            }
+            // Add a random Unicode character outside ASCII range (e.g., U+0100 to U+017F)
+            char unicodeChar = (char)rand.Next(0x0100, 0x017F);
+            // Insert the unicode character at a random position
+            int insertPos = rand.Next(0, asciiPart.Length + 1);
+            var passwordChars = new List<char>(asciiPart);
+            passwordChars.Insert(insertPos, unicodeChar);
+            return new string(passwordChars.ToArray());
+        }
+
+        public static NetworkCredential CreateTestCredential()
+        {
+            return new NetworkCredential(CreateRandomUnicodePassword("username"), CreateRandomUnicodePassword("password"), CreateRandomUnicodePassword("domain"));
+        }
+
+        [SkippableFact]
+        public async Task PerformCredentialAndConfigurationHandshake_V1_Pass()
+        {
+            // Arrange
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+            var cred = CreateTestCredential();
+            string configurationName = CreateRandomUnicodePassword("config");
+
+            var (expectedClientSends, serverResponses) = CreateHandshakeTestData(cred);
+            expectedClientSends.Add(("PASS", Encoding.ASCII));
+            serverResponses.Add(("PASS", Encoding.ASCII));
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+            var serverTask = Task.Run(() => StartHandshakeServer("Broker", port, expectedClientSends, serverResponses, verifyConnectionClosed: false, cts.Token), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                ConnectWithRetry(client, IPAddress.Loopback, port, _output);
+                var exchangeResult = System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient.ExchangeCredentialsAndConfiguration(cred, configurationName, client, true);
+                var result = exchangeResult.success;
+                _output.WriteLine($"Exchange result: {result}, Token: {exchangeResult.authenticationToken}");
+                System.Threading.Thread.Sleep(100); // Allow time for server to process
+                Assert.True(result, $"Expected Exchange to pass");
+            }
+
+            await serverTask;
+        }
+
+        [SkippableTheory]
+        [InlineData("VERSION_2", "configurationname1", "FakeTokenaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAA0FakeTokenaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAA0+/==")] // a fake base64 token about 512 bits long (double the size when this was spec'ed)
+        [InlineData("VERSION_10", null, "FakeTokenaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAA0+/=")] // a fake base64 token about 256 bits Long (the size when this was spec'ed)
+        public async Task PerformCredentialAndConfigurationHandshake_V2_Pass(string versionResponse, string configurationName, string token)
+        {
+            // Arrange
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+            var cred = CreateTestCredential();
+
+            var (expectedClientSends, serverResponses) = CreateHandshakeTestDataV2(cred, versionResponse, configurationName, token);
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+            var serverTask = Task.Run(() => StartHandshakeServer("Broker", port, expectedClientSends, serverResponses, verifyConnectionClosed: true, cts.Token), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                client.Connect(IPAddress.Loopback, port);
+                var exchangeResult = System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient.ExchangeCredentialsAndConfiguration(cred, configurationName, client, false);
+                var result = exchangeResult.success;
+                System.Threading.Thread.Sleep(100); // Allow time for server to process
+                Assert.True(result, $"Expected Exchange to pass for version response '{versionResponse}'");
+                Assert.Equal(token, exchangeResult.authenticationToken);
+            }
+
+            await serverTask;
+        }
+
+        [SkippableFact]
+        public async Task PerformCredentialAndConfigurationHandshake_V1_Fallback()
+        {
+            // Arrange
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+            var cred = CreateTestCredential();
+            string configurationName = CreateRandomUnicodePassword("config");
+
+            var (expectedClientSends, serverResponses) = CreateHandshakeTestDataForFallback(cred);
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+            var serverTask = Task.Run(() => StartHandshakeServer("Broker", port, expectedClientSends, serverResponses, verifyConnectionClosed: false, cts.Token), cts.Token);
+
+            bool isFallback = false;
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                _output.WriteLine("Starting handshake with V2 protocol.");
+                client.Connect(IPAddress.Loopback, port);
+                var exchangeResult = System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient.ExchangeCredentialsAndConfiguration(cred, configurationName, client, false);
+                isFallback = !exchangeResult.success;
+
+                System.Threading.Thread.Sleep(100); // Allow time for server to process
+                _output.WriteLine("Handshake indicated fallback to V1.");
+                Assert.True(isFallback, "Expected fallback to V1.");
+            }
+            _output.WriteLine("Handshake completed successfully with fallback to V1.");
+
+            await serverTask;
+        }
+
+        [SkippableFact]
+        public async Task PerformCredentialAndConfigurationHandshake_V2_InvalidResponse()
+        {
+            // Arrange
+            int port = 51000 + (int)(DateTime.Now.Ticks % 10000);
+            var cred = CreateTestCredential();
+
+            var (expectedClientSends, serverResponses) = CreateHandshakeTestData(cred);
+            //expectedClientSends.Add("FAI1");
+            serverResponses.Add(("FAI1", Encoding.ASCII));
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30));
+
+            //cts.Token.Register(() => throw new OperationCanceledException("Test timed out."));
+
+            var serverTask = Task.Run(() => StartHandshakeServer("Broker", port, expectedClientSends, serverResponses, verifyConnectionClosed: false, cts.Token), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                _output.WriteLine("connecting on port " + port);
+                ConnectWithRetry(client, IPAddress.Loopback, port, _output);
+
+                var ex = Record.Exception(() => System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient.ExchangeCredentialsAndConfiguration(cred, "config", client, true));
+
+                try
+                {
+                    await serverTask;
+                }
+                catch (AggregateException exAgg)
+                {
+                    Assert.Null(exAgg.Flatten().InnerExceptions[1].Message);
+                }
+                cts.Token.ThrowIfCancellationRequested();
+
+                Assert.NotNull(ex);
+                Assert.NotNull(ex.Message);
+                Assert.Contains("Hyper-V Broker sent an invalid Credential response", ex.Message);
+            }
+        }
+
+        [SkippableFact]
+        public async Task PerformCredentialAndConfigurationHandshake_V1_Fail()
+        {
+            // Arrange
+            int port = 51000 + (int)(DateTime.Now.Ticks % 10000);
+            var cred = CreateTestCredential();
+
+            var (expectedClientSends, serverResponses) = CreateHandshakeTestData(cred);
+            expectedClientSends.Add(("FAIL", Encoding.ASCII));
+            serverResponses.Add(("FAIL", Encoding.ASCII));
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(15));
+
+            // This scenario does not close the connection in a timely manner, so we set verifyConnectionClosed to false
+            var serverTask = Task.Run(() => StartHandshakeServer("Broker", port, expectedClientSends, serverResponses, verifyConnectionClosed: false, cts.Token), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                client.Connect(IPAddress.Loopback, port);
+
+                var ex = Record.Exception(() => System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient.ExchangeCredentialsAndConfiguration(cred, "config", client, true));
+
+                try
+                {
+                    await serverTask;
+                }
+                catch (AggregateException exAgg)
+                {
+                    Assert.Null(exAgg.Flatten().InnerExceptions[1].Message);
+                }
+
+                cts.Token.ThrowIfCancellationRequested();
+
+                Assert.NotNull(ex);
+                Assert.NotNull(ex.Message);
+                Assert.Contains("The credential is invalid.", ex.Message);
+            }
+        }
+
+        [SkippableTheory]
+        [InlineData("VERSION_2", "FakeTokenaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAA0FakeTokenaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAA0+/==")] // a fake base64 token about 512 bits long (double the size when this was spec'ed)
+        [InlineData("VERSION_10", "FakeTokenaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAA0+/=")] // a fake base64 token about 256 bits Long (the size when this was spec'ed)
+        public async Task PerformTransportVersionAndTokenExchange_Pass(string version, string token)
+        {
+            // Arrange
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+            var cred = CreateTestCredential();
+
+            var expectedClientSends = CreateVersionNegotiationClientSends();
+            expectedClientSends.Add((message: "TOKEN " + token, encoding: Encoding.ASCII));
+
+            var serverResponses = new List<(string message, Encoding encoding)>{
+                (message: version, encoding: Encoding.ASCII), // Response to VERSION
+                (message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII) // Response to token
+            };
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+            var serverTask = Task.Run(() => StartHandshakeServer("Server", port, expectedClientSends, serverResponses, verifyConnectionClosed: true, cts.Token), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                ConnectWithRetry(client, IPAddress.Loopback, port, _output);
+                System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient.PerformTransportVersionAndTokenExchange(client, token);
+                System.Threading.Thread.Sleep(100); // Allow time for server to process
+            }
+
+            await serverTask;
+        }
+
+        [SkippableTheory]
+        [InlineData(1, true)]
+        [InlineData(2, true)]
+        [InlineData(0, false)]
+        [InlineData(null, false)]
+        [System.Runtime.Versioning.SupportedOSPlatform("windows")]
+        public void IsRequirePsDirectAuthenticationEnabled(int? regValue, bool expected)
+        {
+            const string testKeyPath = @"SOFTWARE\Microsoft\TestRequirePsDirectAuthentication";
+            const string valueName = "RequirePsDirectAuthentication";
+            if (!System.Management.Automation.Platform.IsWindows)
+            {
+                throw new SkipException("RemoteHyperVTests are only supported on Windows.");
+            }
+
+            // Clean up any previous test key
+            var regHive = Microsoft.Win32.RegistryHive.CurrentUser;
+            var baseKey = Microsoft.Win32.RegistryKey.OpenBaseKey(regHive, Microsoft.Win32.RegistryView.Registry64);
+            baseKey.DeleteSubKeyTree(testKeyPath, false);
+
+            bool? result = null;
+
+            // Create the test key
+            using (var key = baseKey.CreateSubKey(testKeyPath))
+            {
+                if (regValue.HasValue)
+                {
+                    key.SetValue(valueName, regValue.Value, Microsoft.Win32.RegistryValueKind.DWord);
+                }
+                else
+                {
+                    // Ensure the value does not exist
+                    key.DeleteValue(valueName, false);
+                }
+
+                result = System.Management.Automation.Remoting.RemoteSessionHyperVSocketClient.IsRequirePsDirectAuthenticationEnabled(testKeyPath, regHive);
+            }
+
+            Assert.True(result.HasValue, "IsRequirePsDirectAuthenticationEnabled should return a value.");
+            Assert.True(expected == result.Value,
+                $"Expected IsRequirePsDirectAuthenticationEnabled to return {expected} when registry value is {(regValue.HasValue ? regValue.ToString() : "not set")}.");
+
+            return;
+        }
+
+        [SkippableTheory]
+        [InlineData("testToken", "testToken")]
+        [InlineData("testToken\0", "testToken")]
+        public async Task ValidatePassesWhenTokensMatch(string token, string expectedToken)
+        {
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+
+            var expectedClientSends = new List<(string message, Encoding encoding)>{
+                (message: "VERSION", encoding: Encoding.ASCII), // Response to VERSION
+                (message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: $"TOKEN {token}", encoding: Encoding.ASCII)
+            };
+
+            var serverResponses = new List<(string message, Encoding encoding)>{
+                (message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII) // Response to token
+            };
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+            var serverTask = Task.Run(() => StartHandshakeServer("Client", port, serverResponses, expectedClientSends, verifyConnectionClosed: true, cts.Token, sendFirst: true), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                ConnectWithRetry(client, IPAddress.Loopback, port, _output);
+                System.Management.Automation.Remoting.RemoteSessionHyperVSocketServer.ValidateToken(client, expectedToken, DateTimeOffset.UtcNow, 1);
+                System.Threading.Thread.Sleep(100); // Allow time for server to process
+            }
+
+            await serverTask;
+        }
+
+        [SkippableTheory]
+        [InlineData(5500, "A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.", "SocketException")] // test the socket timeout
+        [InlineData(3200, "canceled", "System.OperationCanceledException")] // test the cancellation token
+        [InlineData(10, "", "")]
+        public async Task ValidateTokenTimeoutFails(int timeoutMs, string expectedMessage, string expectedExceptionType = "SocketException")
+        {
+            string token = "testToken";
+            string expectedToken = token;
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+
+            var expectedClientSends = new List<(string message, Encoding encoding, int delayMs)>{
+                (message: "VERSION", encoding: Encoding.ASCII, delayMs: timeoutMs), // Response to VERSION
+                (message: "VERSION_2", encoding: Encoding.ASCII, delayMs: timeoutMs), // Response to VERSION_2
+                (message: $"TOKEN {token}", encoding: Encoding.ASCII, delayMs: 1)
+            };
+
+            var serverResponses = new List<(string message, Encoding encoding)>{
+                (message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII) // Response to token
+            };
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+            var serverTask = Task.Run(() => StartHandshakeServer("Client", port, serverResponses, expectedClientSends, verifyConnectionClosed: true, cts.Token, sendFirst: true), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                ConnectWithRetry(client, IPAddress.Loopback, port, _output);
+                if (expectedMessage.Length > 0)
+                {
+                    var exception = Record.Exception(
+                        () => System.Management.Automation.Remoting.RemoteSessionHyperVSocketServer.ValidateToken(client, expectedToken, DateTimeOffset.UtcNow, 5)); // set the timeout to  5 seconds or 5000 ms
+                    Assert.NotNull(exception);
+                    string exceptionType = exception.GetType().FullName;
+                    _output.WriteLine($"Caught exception of type {exceptionType} with message: {exception.Message}");
+                    Assert.Contains(expectedExceptionType, exceptionType, StringComparison.OrdinalIgnoreCase);
+                    Assert.Contains(expectedMessage, exception.Message, StringComparison.OrdinalIgnoreCase);
+                }
+                else
+                {
+                    System.Management.Automation.Remoting.RemoteSessionHyperVSocketServer.ValidateToken(client, expectedToken, DateTimeOffset.UtcNow, 5);
+                }
+                System.Threading.Thread.Sleep(100); // Allow time for server to process
+            }
+
+            if (expectedMessage.Length == 0)
+            {
+                await serverTask;
+            }
+        }
+
+        [SkippableFact]
+        public async Task ValidateTokenTimeoutDoesAffectSession()
+        {
+            string token = "testToken";
+            string expectedToken = token;
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+
+            var expectedClientSends = new List<(string message, Encoding encoding, int delayMs)>{
+                (message: "VERSION", encoding: Encoding.ASCII, delayMs: 1), // Response to VERSION
+                (message: "VERSION_2", encoding: Encoding.ASCII, delayMs: 1), // Response to VERSION_2
+                (message: $"TOKEN {token}", encoding: Encoding.ASCII, delayMs: 1),
+                (message: string.Empty, encoding: Encoding.ASCII, delayMs: 99), // Send some data after the handshake
+                (message: string.Empty, encoding: Encoding.ASCII, delayMs: 100), // Send some data after the handshake
+                (message: string.Empty, encoding: Encoding.ASCII, delayMs: 101),  // Send some data after the handshake
+                (message: string.Empty, encoding: Encoding.ASCII, delayMs: 102),  // Send some data after the handshake
+                (message: string.Empty, encoding: Encoding.ASCII, delayMs: 103)  // Send some data after the handshake
+            };
+
+            var serverResponses = new List<(string message, Encoding encoding)>{
+                (message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "PASS", encoding: Encoding.ASCII), // Response to token
+                (message: "PSRP-Message0", encoding: Encoding.ASCII), // Indicate server is ready to receive data
+                (message: "PSRP-Message1", encoding: Encoding.ASCII), // Indicate server is ready to receive data
+                (message: "PSRP-Message2", encoding: Encoding.ASCII),  // Indicate server is ready to receive data
+                (message: "PSRP-Message3", encoding: Encoding.ASCII),  // Indicate server is ready to receive data
+                (message: "PSRP-Message4", encoding: Encoding.ASCII)  //
+
+            };
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(2));
+            var serverTask = Task.Run(() => StartHandshakeServer("Client", port, serverResponses, expectedClientSends, verifyConnectionClosed: false, cts.Token, sendFirst: true), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                ConnectWithRetry(client, IPAddress.Loopback, port, _output);
+                System.Management.Automation.Remoting.RemoteSessionHyperVSocketServer.ValidateToken(client, expectedToken, DateTimeOffset.UtcNow, 5);
+                for (int i = 0; i < 5; i++)
+                {
+                    System.Threading.Thread.Sleep(1500);
+                    client.Send(Encoding.ASCII.GetBytes($"PSRP-Message{i}")); // Send some data after the handshake
+                }
+            }
+
+            await serverTask;
+        }
+
+        [SkippableTheory]
+        [InlineData("abc", "xyz")]
+        [InlineData("abc", "abcdef")]
+        [InlineData("abcdef", "abc")]
+        [InlineData("abc\0def", "abc")]
+        public async Task ValidateFailsWhenTokensMismatch(string token, string expectedToken)
+        {
+            int port = 50000 + (int)(DateTime.Now.Ticks % 10000);
+
+            var expectedClientSends = new List<(string message, Encoding encoding)>{
+                (message: "VERSION", encoding: Encoding.ASCII), // Initial request
+                (message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: $"TOKEN {token}", encoding: Encoding.ASCII)
+            };
+
+            var serverResponses = new List<(string message, Encoding encoding)>{
+                (message: "VERSION_2", encoding: Encoding.ASCII), // Response to VERSION
+                (message: "PASS", encoding: Encoding.ASCII), // Response to VERSION_2
+                (message: "FAIL", encoding: Encoding.ASCII) // Response to token
+            };
+
+            using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+            var serverTask = Task.Run(() => StartHandshakeServer("Client", port, serverResponses, expectedClientSends, verifyConnectionClosed: true, cts.Token, sendFirst: true), cts.Token);
+
+            using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                ConnectWithRetry(client, IPAddress.Loopback, port, _output);
+                DateTimeOffset tokenCreationTime = DateTimeOffset.UtcNow; // Token created 10 minutes ago
+                var exception = Assert.Throws<System.Management.Automation.Remoting.PSDirectException>(
+                    () => System.Management.Automation.Remoting.RemoteSessionHyperVSocketServer.ValidateToken(client, expectedToken, tokenCreationTime, 5));
+                System.Threading.Thread.Sleep(100); // Allow time for server to process
+                Assert.Contains("The credential is invalid.", exception.Message);
+            }
+
+            await serverTask;
+        }
+    }
+}
diff --git a/test/xUnit/csharp/test_Serialization.cs b/test/xUnit/csharp/test_Serialization.cs
new file mode 100644
index 00000000000..7ac520693b8
--- /dev/null
+++ b/test/xUnit/csharp/test_Serialization.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using Xunit;
+
+namespace PSTests.Parallel
+{
+    public static class SerializationTests
+    {
+        [Fact]
+        public static void TestSerializerEnumerate()
+        {
+            var source = new List<object> { 1, 2, 3 };
+            var expected = $"<Objs Version=\"1.1.0.1\" xmlns=\"http://schemas.microsoft.com/powershell/2004/04\">{Environment.NewLine}  <I32>1</I32>{Environment.NewLine}  <I32>2</I32>{Environment.NewLine}  <I32>3</I32>{Environment.NewLine}</Objs>";
+            var serialized = PSSerializer.Serialize(source, depth: 2, enumerate: true);
+            Assert.Equal(expected, serialized);
+            var deserialized = PSSerializer.Deserialize(serialized);
+            Assert.IsType<object[]>(deserialized);
+            var array = ((IEnumerable)deserialized).Cast<object>().ToArray();
+            Assert.Equal(3, array.Length);
+            Assert.Equal(1, array[0]);
+            Assert.Equal(2, array[1]);
+            Assert.Equal(3, array[2]);
+        }
+
+        [Fact]
+        public static void TestSerializerWithoutEnumerate()
+        {
+            var listAssemblyDisplayName = System.Reflection.Assembly.GetAssembly(typeof(List<object>)).FullName;
+            var source = new List<object> { 1, 2, 3 };
+            var expected = $"<Objs Version=\"1.1.0.1\" xmlns=\"http://schemas.microsoft.com/powershell/2004/04\">{Environment.NewLine}  <Obj RefId=\"0\">{Environment.NewLine}    <TN RefId=\"0\">{Environment.NewLine}      <T>System.Collections.Generic.List`1[[System.Object, {listAssemblyDisplayName}]]</T>{Environment.NewLine}      <T>System.Object</T>{Environment.NewLine}    </TN>{Environment.NewLine}    <LST>{Environment.NewLine}      <I32>1</I32>{Environment.NewLine}      <I32>2</I32>{Environment.NewLine}      <I32>3</I32>{Environment.NewLine}    </LST>{Environment.NewLine}  </Obj>{Environment.NewLine}</Objs>";
+            var serialized = PSSerializer.Serialize(source, depth: 2, enumerate: false);
+            Assert.Equal(expected, serialized);
+            var deserialized = PSSerializer.Deserialize(serialized);
+            Assert.IsType<PSObject>(deserialized);
+            var baseObject = PSObject.AsPSObject(deserialized).BaseObject;
+            Assert.IsType<ArrayList>(baseObject);
+            var arrayList = (ArrayList)baseObject;
+            Assert.Equal(3, arrayList.Count);
+            Assert.Equal(1, arrayList[0]);
+            Assert.Equal(2, arrayList[1]);
+            Assert.Equal(3, arrayList[2]);
+        }
+    }
+}
diff --git a/test/xUnit/csharp/test_Utils.cs b/test/xUnit/csharp/test_Utils.cs
index bf562f3a8a4..0c45e06dcaf 100644
--- a/test/xUnit/csharp/test_Utils.cs
+++ b/test/xUnit/csharp/test_Utils.cs
@@ -163,5 +163,17 @@ public static void TestConvertToJsonCancellation()
             string json = JsonObject.ConvertToJson(hash, in context);
             Assert.Null(json);
         }
+
+        [Fact]
+        public static void TestEmptyErrorRecordToString()
+        {
+            Assert.Equal(string.Empty, new ErrorRecord(new Exception(string.Empty), null, ErrorCategory.NotSpecified, null).ToString());
+        }
+
+        [Fact]
+        public static void TestNonEmptyErrorRecordToString()
+        {
+            Assert.Equal("test", new ErrorRecord(new Exception("test"), null, ErrorCategory.NotSpecified, null).ToString());
+        }
     }
 }
diff --git a/test/xUnit/csharp/test_WildcardPattern.cs b/test/xUnit/csharp/test_WildcardPattern.cs
index 07f4045ef11..7aa4fc8c259 100644
--- a/test/xUnit/csharp/test_WildcardPattern.cs
+++ b/test/xUnit/csharp/test_WildcardPattern.cs
@@ -25,6 +25,22 @@ public void TestEscape_Empty()
         [InlineData("a", "a")]
         [InlineData("a*", "a`*")]
         [InlineData("*?[]", "`*`?`[`]")]
+        [InlineData("`", "``")]
+        [InlineData("```", "``````")]
+        [InlineData("a`", "a``")]
+        [InlineData("abc`def", "abc``def")]
+        [InlineData("abc``def", "abc````def")]
+        [InlineData("text with `backticks", "text with ``backticks")]
+        [InlineData("ends with `", "ends with ``")]
+        [InlineData("`starts with", "``starts with")]
+        [InlineData("`in`between`", "``in``between``")]
+        [InlineData("no special characters", "no special characters")]
+        [InlineData("`*`", "```*``")]
+        [InlineData("*`?[]", "`*```?`[`]")]
+        [InlineData("`*`?`[", "```*```?```[")]
+        [InlineData("*?[]`", "`*`?`[`]``")]
+        [InlineData("nested `backticks `inside`", "nested ``backticks ``inside``")]
+        [InlineData("wildcard*with`backtick", "wildcard`*with``backtick")]
         public void TestEscape_String(string source, string expected)
         {
             Assert.Equal(WildcardPattern.Escape(source), expected);
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index a5ecd4e5296..a2a9fe041e9 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -23,11 +23,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
-    <PackageReference Include="XunitXml.TestLogger" Version="3.1.17" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.5.61" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="XunitXml.TestLogger" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/AttackSurfaceAnalyzer/README.md b/tools/AttackSurfaceAnalyzer/README.md
new file mode 100644
index 00000000000..f57bb21f8c4
--- /dev/null
+++ b/tools/AttackSurfaceAnalyzer/README.md
@@ -0,0 +1,249 @@
+# Attack Surface Analyzer Testing
+
+This directory contains tools for running Attack Surface Analyzer (ASA) tests on PowerShell MSI installations using Docker.
+
+## Overview
+
+Attack Surface Analyzer is a Microsoft tool that helps analyze changes to a system's attack surface. These scripts allow you to run ASA tests locally in a clean Windows container to analyze what changes when PowerShell is installed.
+
+## Files
+
+- **Run-AttackSurfaceAnalyzer.ps1** - PowerShell script to run ASA tests with official MSIs
+- **Summarize-AsaResults.ps1** - PowerShell script to analyze and summarize ASA results
+- **docker/Dockerfile** - Multi-stage Dockerfile for building a container image with ASA pre-installed
+- **README.md** - This documentation file
+
+## Docker Architecture
+
+The Docker implementation uses a multi-stage build to optimize the testing and result extraction process:
+
+### Multi-Stage Build Stages
+
+1. **asa-runner**: Main execution environment
+   - Base: `mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022`
+   - Contains Attack Surface Analyzer CLI tools
+   - Runs the complete test workflow
+   - Generates reports in both `C:\work` and `C:\reports` directories
+
+1. **asa-reports**: Minimal results layer
+   - Base: `mcr.microsoft.com/windows/nanoserver:ltsc2022`
+   - Contains only the test reports from the runner stage
+   - Enables clean extraction of results without container internals
+
+1. **final**: Default stage (inherits from asa-runner)
+   - Provides backward compatibility
+   - Used when no specific build target is specified
+
+### Benefits
+
+- **Clean Result Extraction**: Reports are isolated in a dedicated layer
+- **Efficient Transfer**: Only test results are copied, not the entire container filesystem
+- **Fallback Support**: Script includes fallback to volume-based extraction if needed
+- **Minimal Footprint**: Final results layer contains only the necessary output files
+
+## Prerequisites
+
+- Windows 10/11 or Windows Server
+- Docker Desktop with Windows containers enabled
+- PowerShell 5.1 or later
+- **An official signed PowerShell MSI file** from a released build
+
+### MSI Requirements
+
+**Important:** This tool now requires an official, digitally signed PowerShell MSI from Microsoft releases:
+
+- **Must be signed** by Microsoft Corporation
+- **Must be from an official release** (downloaded from [PowerShell Releases](https://github.com/PowerShell/PowerShell/releases))
+- **Local builds are not supported** - unsigned or development MSIs will be rejected
+- The script automatically verifies the digital signature before proceeding
+
+**Where to get official MSIs:**
+
+- Download from: https://github.com/PowerShell/PowerShell/releases
+- Look for files like: `PowerShell-7.x.x-win-x64.msi`
+
+## Quick Start
+
+### Option 1: Using the PowerShell Script (Recommended)
+
+The script requires an official signed PowerShell MSI file:
+
+```powershell
+# Run ASA test with official MSI (MsiPath is required)
+.\tools\AttackSurfaceAnalyzer\Run-AttackSurfaceAnalyzer.ps1 -MsiPath "C:\path\to\PowerShell-7.4.0-win-x64.msi"
+
+# Specify custom output directory for results
+.\tools\AttackSurfaceAnalyzer\Run-AttackSurfaceAnalyzer.ps1 -MsiPath ".\PowerShell-7.4.0-win-x64.msi" -OutputPath "C:\asa-results"
+
+# Keep the temporary work directory for debugging
+.\tools\AttackSurfaceAnalyzer\Run-AttackSurfaceAnalyzer.ps1 -MsiPath ".\PowerShell-7.4.0-win-x64.msi" -KeepWorkDirectory
+```
+
+The script will:
+
+1. **Verify MSI signature** - Ensures the MSI is officially signed by Microsoft Corporation
+1. Create a temporary work directory
+1. Build a custom Docker container from the static Dockerfile
+1. Start the Windows container with Attack Surface Analyzer
+1. Take a baseline snapshot
+1. Install the PowerShell MSI
+1. Take a post-installation snapshot
+1. Export comparison results
+1. Copy results back to your specified output directory
+
+**Security Note:** The script will reject any MSI that is not digitally signed by Microsoft Corporation to ensure analysis is performed only on official releases.
+
+### Option 2: Using the Dockerfile
+
+If you prefer to build and use the container image directly:
+
+```powershell
+# Build the Docker image (Dockerfile is in docker subfolder with clean context)
+docker build -f tools\AttackSurfaceAnalyzer\docker\Dockerfile -t powershell-asa-test tools\AttackSurfaceAnalyzer\docker\
+
+# Run the container with your MSI (script is built into the container)
+docker run --rm --isolation process `
+  -v "C:\path\to\msi\directory:C:\work" `
+  powershell-asa-test
+```
+
+## Output Files
+
+The test will generate output files in the `./asa-results/` directory (or your specified `-OutputPath`):
+
+- **`asa.sqlite`** - SQLite database with full analysis data (primary result file)
+- **`install.log`** - MSI installation log file
+- **`*_summary.json.txt`** - Summary of detected changes (if generated)
+- **`*_results.json.txt`** - Detailed results in JSON format (if generated)
+- **`*.sarif`** - SARIF format results (if generated, can be viewed in VS Code)
+
+## Analyzing Results
+
+### Using the Summary Script (Recommended)
+
+Use the included summary script to get a comprehensive analysis:
+
+```powershell
+# Basic summary of ASA results
+.\tools\AttackSurfaceAnalyzer\Summarize-AsaResults.ps1
+
+# Detailed analysis with rule breakdowns
+.\tools\AttackSurfaceAnalyzer\Summarize-AsaResults.ps1 -ShowDetails
+
+# Analyze results from a specific location
+.\tools\AttackSurfaceAnalyzer\Summarize-AsaResults.ps1 -Path "C:\custom\path\asa-results.json" -ShowDetails
+```
+
+The summary script provides:
+
+- **Overall statistics** - Total findings, analysis levels, category breakdowns
+- **Rule analysis** - Which security rules were triggered and how often
+- **File analysis** - Detailed breakdown of file-related security issues by rule type
+- **Category cross-reference** - Shows which rules affect which categories
+
+### Using VS Code
+
+The SARIF files can be opened directly in VS Code with the SARIF Viewer extension to see a formatted view of the findings.
+
+### Using PowerShell
+
+```powershell
+# Read the JSON results directly
+$results = Get-Content "asa-results\asa-results.json" | ConvertFrom-Json
+$results.Results.FILE_CREATED.Count  # Number of files created
+
+# Query the SQLite database (requires SQLite tools)
+# Example: List all file changes
+# sqlite3 asa.sqlite "SELECT * FROM file_system WHERE change_type != 'NONE'"
+```
+
+## Troubleshooting
+
+### Docker Not Available
+
+The script automatically handles Docker Desktop installation and startup:
+
+**If Docker Desktop is installed but not running:**
+
+- The script will automatically start Docker Desktop for you
+- It waits up to 60 seconds for Docker to become available
+- You'll be prompted for confirmation (supports `-Confirm` and `-WhatIf`)
+
+**If Docker Desktop is not installed:**
+
+- The script will prompt you to install it automatically using winget
+- After installation completes, start Docker Desktop and run the script again
+
+**Manual Installation:**
+
+1. Install Docker Desktop from https://www.docker.com/products/docker-desktop
+1. Ensure Docker is running
+1. Switch to Windows containers (right-click Docker tray icon → "Switch to Windows containers")
+
+### Container Fails to Start
+
+- Ensure you have enough disk space (containers can be large)
+- Check that Windows containers are enabled in Docker settings
+- Try pulling the base image manually: `docker pull mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022`
+
+### MSI Signature Verification Fails
+
+If you get signature verification errors:
+
+- **Ensure you're using an official MSI** from [PowerShell Releases](https://github.com/PowerShell/PowerShell/releases)
+- **Do not use local builds** - only signed release MSIs are supported  
+- **Check certificate validity** - very old MSIs may have expired certificates
+- **Verify file integrity** - redownload the MSI if it may be corrupted
+
+### No Results Generated
+
+- Check the install.log file for MSI installation errors
+- Run with `-KeepWorkDirectory` to inspect the temporary work directory
+- Verify the MSI file is valid and not corrupted
+
+## Advanced Usage
+
+### Parameters
+
+The `Run-AttackSurfaceAnalyzer.ps1` script supports these parameters:
+
+- **`-MsiPath`** (Required) - Path to the official signed PowerShell MSI file
+- **`-OutputPath`** (Optional) - Directory for results (defaults to `./asa-results`)
+- **`-ContainerImage`** (Optional) - Custom container base image
+- **`-KeepWorkDirectory`** (Optional) - Keep temp directory for debugging
+
+Example with custom container image:
+
+```powershell
+.\tools\AttackSurfaceAnalyzer\Run-AttackSurfaceAnalyzer.ps1 `
+  -MsiPath ".\PowerShell-7.4.0-win-x64.msi" `
+  -ContainerImage "mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022"
+```
+
+### Debugging
+
+To debug issues, keep the work directory and examine the files:
+
+```powershell
+.\tools\AttackSurfaceAnalyzer\Run-AttackSurfaceAnalyzer.ps1 -KeepWorkDirectory
+
+# The script will print the work directory path
+# You can then examine:
+# - run-asa.ps1 - The script that runs in the container
+# - install.log - MSI installation log
+# - Any other generated files
+```
+
+## Integration with CI/CD
+
+These tools were extracted from the GitHub Actions workflow to allow local testing. If you need to integrate ASA testing back into a CI/CD pipeline, you can:
+
+1. Use the PowerShell script directly in your pipeline
+1. Build and push the Docker image to a registry
+1. Use the Dockerfile as a base for custom testing scenarios
+
+## More Information
+
+- [Attack Surface Analyzer on GitHub](https://github.com/microsoft/AttackSurfaceAnalyzer)
+- [Docker for Windows Documentation](https://docs.docker.com/desktop/windows/)
+- [SARIF Documentation](https://sarifweb.azurewebsites.net/)
diff --git a/tools/AttackSurfaceAnalyzer/Run-AttackSurfaceAnalyzer.ps1 b/tools/AttackSurfaceAnalyzer/Run-AttackSurfaceAnalyzer.ps1
new file mode 100644
index 00000000000..2f7e502bff6
--- /dev/null
+++ b/tools/AttackSurfaceAnalyzer/Run-AttackSurfaceAnalyzer.ps1
@@ -0,0 +1,590 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+<#
+.SYNOPSIS
+    Run Attack Surface Analyzer test locally using Docker to analyze PowerShell MSI installation.
+
+.DESCRIPTION
+    This script runs Attack Surface Analyzer in a clean Windows container to analyze
+    the attack surface changes when installing PowerShell MSI. It takes a baseline
+    snapshot, installs the MSI, takes a post-installation snapshot, and exports the
+    comparison results.
+
+.PARAMETER MsiPath
+    Path to the official signed PowerShell MSI file to test. This must be a released,
+    signed MSI from the official PowerShell releases.
+
+.PARAMETER OutputPath
+    Directory where results will be saved. Defaults to './asa-results' subdirectory.
+
+.PARAMETER ContainerImage
+    Docker container image to use. Defaults to mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022
+
+.PARAMETER KeepWorkDirectory
+    If specified, keeps the temporary work directory after the test completes.
+
+.EXAMPLE
+    .\Run-AttackSurfaceAnalyzer.ps1 -MsiPath "C:\path\to\PowerShell-7.4.0-win-x64.msi"
+
+.EXAMPLE
+    .\Run-AttackSurfaceAnalyzer.ps1 -MsiPath ".\PowerShell-7.4.0-win-x64.msi" -OutputPath "C:\asa-results"
+
+.NOTES
+    Requires Docker Desktop with Windows containers enabled.
+    Requires an official signed PowerShell MSI file from a released build.
+
+    Docker Desktop Handling:
+    - If Docker Desktop is installed but not running, the script will start it automatically
+    - If Docker Desktop is not installed, the script will prompt to install it using winget
+    - Waits up to 60 seconds for Docker to become available after starting
+
+    MSI Requirements:
+    - The MSI must be digitally signed by Microsoft Corporation
+    - The MSI must be from an official PowerShell release
+    - Local builds or unsigned MSIs are not supported
+
+    Supports -WhatIf and -Confirm for Docker installation and startup.
+#>
+
+[CmdletBinding(SupportsShouldProcess)]
+param(
+    [Parameter(Mandatory)]
+    [string]$MsiPath,
+
+    [Parameter()]
+    [string]$OutputPath = (Join-Path $PWD "asa-results"),
+
+    [Parameter()]
+    [string]$ContainerImage = "mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022",
+
+    [Parameter()]
+    [switch]$KeepWorkDirectory
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+function Write-Log {
+    param([string]$Message, [string]$Level = "INFO")
+    $timestamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
+    $color = switch ($Level) {
+        "ERROR" { "Red" }
+        "WARNING" { "Yellow" }
+        "SUCCESS" { "Green" }
+        default { "White" }
+    }
+    Write-Host "[$timestamp] [$Level] $Message" -ForegroundColor $color
+}
+
+function Test-MsiSignature {
+    param(
+        [Parameter(Mandatory)]
+        [string]$MsiPath
+    )
+
+    Write-Log "Verifying MSI signature..." -Level INFO
+
+    try {
+        # Get the digital signature information
+        $signature = Get-AuthenticodeSignature -FilePath $MsiPath
+
+        if ($signature.Status -ne 'Valid') {
+            Write-Log "MSI signature is not valid. Status: $($signature.Status)" -Level ERROR
+            return $false
+        }
+
+        # Check if signed by Microsoft Corporation
+        $signerCertificate = $signature.SignerCertificate
+        if (-not $signerCertificate) {
+            Write-Log "No signer certificate found" -Level ERROR
+            return $false
+        }
+
+        $subject = $signerCertificate.Subject
+        Write-Log "Certificate subject: $subject" -Level INFO
+
+        # Check for Microsoft Corporation in the subject
+        if ($subject -notmatch "Microsoft Corporation" -and $subject -notmatch "CN=Microsoft Corporation") {
+            Write-Log "MSI is not signed by Microsoft Corporation" -Level ERROR
+            Write-Log "Expected: Microsoft Corporation" -Level ERROR
+            Write-Log "Found: $subject" -Level ERROR
+            return $false
+        }
+
+        # Check certificate validity
+        $validFrom = $signerCertificate.NotBefore
+        $validTo = $signerCertificate.NotAfter
+        $now = Get-Date
+
+        if ($now -lt $validFrom -or $now -gt $validTo) {
+            Write-Log "Certificate is not valid for current date" -Level ERROR
+            Write-Log "Valid from: $validFrom to: $validTo" -Level ERROR
+            return $false
+        }
+
+        Write-Log "MSI signature verification passed" -Level SUCCESS
+        Write-Log "Signed by: $($signerCertificate.Subject)" -Level SUCCESS
+        Write-Log "Valid from: $validFrom to: $validTo" -Level SUCCESS
+
+        return $true
+    }
+    catch {
+        Write-Log "Error verifying MSI signature: $_" -Level ERROR
+        return $false
+    }
+}
+
+function Test-DockerAvailable {
+    try {
+        $null = docker version 2>&1
+        return $true
+    }
+    catch {
+        return $false
+    }
+}
+
+function Test-DockerDesktopInstalled {
+    # Check if Docker Desktop executable exists
+    $dockerDesktopPaths = @(
+        "${env:ProgramFiles}\Docker\Docker\Docker Desktop.exe",
+        "${env:ProgramFiles(x86)}\Docker\Docker\Docker Desktop.exe",
+        "${env:LOCALAPPDATA}\Programs\Docker\Docker Desktop.exe"
+    )
+
+    foreach ($path in $dockerDesktopPaths) {
+        if (Test-Path $path) {
+            return $path
+        }
+    }
+    return $null
+}
+
+function Test-DockerDesktopRunning {
+    $process = Get-Process -Name "Docker Desktop" -ErrorAction SilentlyContinue
+    return $null -ne $process
+}
+
+function Start-DockerDesktopApp {
+    [CmdletBinding(SupportsShouldProcess)]
+    param()
+
+    $dockerDesktopPath = Test-DockerDesktopInstalled
+
+    if (-not $dockerDesktopPath) {
+        Write-Log "Docker Desktop executable not found." -Level ERROR
+        return $false
+    }
+
+    if (Test-DockerDesktopRunning) {
+        Write-Log "Docker Desktop is already running." -Level SUCCESS
+        return $true
+    }
+
+    if ($PSCmdlet.ShouldProcess("Docker Desktop", "Start application")) {
+        Write-Log "Starting Docker Desktop..." -Level SUCCESS
+        Write-Log "This may take a minute for Docker to fully start..."
+
+        try {
+            Start-Process -FilePath $dockerDesktopPath -WindowStyle Hidden
+
+            # Wait for Docker to become available (up to 60 seconds)
+            $maxWaitSeconds = 60
+            $waitedSeconds = 0
+
+            while ($waitedSeconds -lt $maxWaitSeconds) {
+                Start-Sleep -Seconds 5
+                $waitedSeconds += 5
+                Write-Log "Waiting for Docker to start... ($waitedSeconds/$maxWaitSeconds seconds)"
+
+                if (Test-DockerAvailable) {
+                    Write-Log "Docker Desktop started successfully!" -Level SUCCESS
+                    return $true
+                }
+            }
+
+            Write-Log "Docker Desktop was started but is not responding yet. Please wait a moment and try again." -Level WARNING
+            return $false
+        }
+        catch {
+            Write-Log "Error starting Docker Desktop: $_" -Level ERROR
+            return $false
+        }
+    }
+    else {
+        Write-Log "Starting Docker Desktop cancelled by user." -Level WARNING
+        return $false
+    }
+}
+
+function Test-WingetAvailable {
+    try {
+        $null = Get-Command winget -ErrorAction Stop
+        return $true
+    }
+    catch {
+        return $false
+    }
+}
+
+function Install-DockerDesktop {
+    [CmdletBinding(SupportsShouldProcess, ConfirmImpact="High")]
+    param()
+
+    if (-not (Test-WingetAvailable)) {
+        Write-Log "winget is not available. Please install winget (App Installer from Microsoft Store) or install Docker Desktop manually from https://www.docker.com/products/docker-desktop" -Level ERROR
+        return $false
+    }
+
+    if ($PSCmdlet.ShouldProcess("Docker Desktop", "Install using winget")) {
+        Write-Log "Installing Docker Desktop using winget..." -Level SUCCESS
+        Write-Log "This may take several minutes..."
+
+        try {
+            winget install docker.dockerdesktop --accept-package-agreements --accept-source-agreements
+
+            if ($LASTEXITCODE -eq 0) {
+                Write-Log "Docker Desktop installed successfully!" -Level SUCCESS
+                Write-Log "Please restart Docker Desktop and ensure Windows containers are enabled, then run this script again." -Level SUCCESS
+                return $true
+            }
+            else {
+                Write-Log "Docker Desktop installation failed with exit code: $LASTEXITCODE" -Level ERROR
+                return $false
+            }
+        }
+        catch {
+            Write-Log "Error installing Docker Desktop: $_" -Level ERROR
+            return $false
+        }
+    }
+    else {
+        Write-Log "Docker Desktop installation cancelled by user." -Level WARNING
+        return $false
+    }
+}
+
+# Verify Docker is available
+Write-Log "Checking Docker availability..."
+if (-not (Test-DockerAvailable)) {
+    Write-Log "Docker is not responding." -Level WARNING
+
+    # Check if Docker Desktop is installed but not running
+    if (Test-DockerDesktopInstalled) {
+        Write-Log "Docker Desktop is installed but not running." -Level WARNING
+
+        if (Start-DockerDesktopApp) {
+            Write-Log "Docker Desktop is now running and ready." -Level SUCCESS
+        }
+        else {
+            Write-Log "Failed to start Docker Desktop or it's taking longer than expected." -Level ERROR
+            Write-Log "Please start Docker Desktop manually and ensure Windows containers are enabled, then run this script again." -Level ERROR
+            exit 1
+        }
+    }
+    else {
+        # Docker Desktop is not installed
+        Write-Log "Docker Desktop is not installed." -Level WARNING
+        Write-Log "Docker Desktop is required to run Attack Surface Analyzer tests in containers." -Level WARNING
+
+        if (Install-DockerDesktop) {
+            Write-Log "Docker Desktop has been installed. Please restart Docker Desktop and run this script again." -Level SUCCESS
+            exit 0
+        }
+        else {
+            Write-Log "Please install Docker Desktop manually from https://www.docker.com/products/docker-desktop and ensure it's running with Windows containers enabled." -Level ERROR
+            exit 1
+        }
+    }
+}
+
+# Verify MSI exists and is properly signed
+if (-not (Test-Path $MsiPath)) {
+    Write-Log "MSI file not found: $MsiPath" -Level ERROR
+    exit 1
+}
+
+$MsiPath = Resolve-Path $MsiPath
+Write-Log "Using MSI: $MsiPath"
+
+# Verify MSI signature
+if (-not (Test-MsiSignature -MsiPath $MsiPath)) {
+    Write-Log "MSI signature verification failed. Only official signed PowerShell MSIs are supported." -Level ERROR
+    Write-Log "Please download an official PowerShell MSI from: https://github.com/PowerShell/PowerShell/releases" -Level ERROR
+    exit 1
+}
+
+# Create output directory
+$OutputPath = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($OutputPath)
+if (-not (Test-Path $OutputPath)) {
+    New-Item -ItemType Directory -Path $OutputPath -Force | Out-Null
+    Write-Log "Created output directory: $OutputPath"
+}
+
+# Create container work directory
+$containerWorkDir = Join-Path $env:TEMP "asa-container-work-$(Get-Date -Format 'yyyyMMdd-HHmmss')"
+New-Item -ItemType Directory -Force -Path $containerWorkDir | Out-Null
+Write-Log "Created container work directory: $containerWorkDir"
+
+try {
+    # Use the static Dockerfile from the docker subfolder
+    $dockerContextPath = Join-Path $PSScriptRoot "docker"
+
+    # Copy MSI to Docker build context
+    $msiFileName = Split-Path $MsiPath -Leaf
+    $destMsiPath = Join-Path $dockerContextPath $msiFileName
+    Write-Log "Copying MSI to Docker build context..."
+    Copy-Item $MsiPath -Destination $destMsiPath
+    $staticDockerfilePath = Join-Path $dockerContextPath "Dockerfile"
+    Write-Log "Using static Dockerfile: $staticDockerfilePath"
+
+    if (-not (Test-Path $staticDockerfilePath)) {
+        Write-Log "Static Dockerfile not found at: $staticDockerfilePath" -Level ERROR
+        exit 1
+    }
+
+    Write-Log "Docker build context: $dockerContextPath"
+
+    # Build custom container image from static Dockerfile
+    Write-Log "=========================================" -Level SUCCESS
+    Write-Log "Building custom Attack Surface Analyzer container..." -Level SUCCESS
+    Write-Log "=========================================" -Level SUCCESS
+
+    Write-Log "=========================================" -Level SUCCESS
+    Write-Log "Building ASA test container..." -Level SUCCESS
+    Write-Log "=========================================" -Level SUCCESS
+    Write-Log "This may take several minutes..."
+
+    # Build the asa-reports stage specifically
+    $reportsImageName = "powershell-asa-reports:latest"
+    docker build --target asa-reports -t $reportsImageName -f $staticDockerfilePath $dockerContextPath
+
+    if ($LASTEXITCODE -ne 0) {
+        Write-Log "Docker build failed with exit code: $LASTEXITCODE" -Level ERROR
+        exit 1
+    }
+
+    Write-Log "Build completed successfully" -Level SUCCESS
+
+    # Extract reports from the built image
+    Write-Log "=========================================" -Level SUCCESS
+    Write-Log "Extracting reports to: $OutputPath" -Level SUCCESS
+    Write-Log "=========================================" -Level SUCCESS
+
+    $tempContainerName = "asa-reports-extract-$(Get-Date -Format 'yyyyMMdd-HHmmss')"
+
+    try {
+        # Create a container from the reports image (but don't run it)
+        docker create --name $tempContainerName $reportsImageName
+
+        if ($LASTEXITCODE -ne 0) {
+            Write-Log "Failed to create temporary container for extraction" -Level ERROR
+            exit 1
+        }
+
+        # Try to extract known report file patterns individually
+        Write-Log "Extracting report files..." -Level INFO
+
+        # Extract standardized report files directly (no file listing needed)
+        # Extract files with standardized names (no wildcards needed)
+        Write-Log "Extracting standardized report files..." -Level INFO
+        $reportFilePatterns = @(
+            "asa.sqlite",
+            "asa-results.json",
+            "install.log"
+        )
+
+        $extractedAny = $false
+
+        foreach ($filename in $reportFilePatterns) {
+            try {
+                Write-Log "Trying to extract file: $filename" -Level INFO
+                docker cp "${tempContainerName}:/$filename" $OutputPath 2>$null
+
+                if ($LASTEXITCODE -eq 0) {
+                    Write-Log "Successfully extracted: $filename" -Level SUCCESS
+                    $extractedAny = $true
+                } else {
+                    Write-Log "File not found: $filename" -Level INFO
+                }
+            }
+            catch {
+                Write-Log "Error extracting file $filename : $_" -Level WARNING
+            }
+        }
+
+        # Alternative approach: extract the entire reports directory if individual files don't work
+        if (-not $extractedAny) {
+            Write-Log "Trying to extract entire directory..." -Level INFO
+            docker cp "${tempContainerName}:/" "$OutputPath/reports" 2>$null
+
+            if ($LASTEXITCODE -eq 0) {
+                Write-Log "Successfully extracted reports directory" -Level SUCCESS
+                $extractedAny = $true
+            }
+        }
+
+        if ($extractedAny) {
+            Write-Log "Report extraction completed successfully" -Level SUCCESS
+        } else {
+            Write-Log "No reports could be extracted - this may be normal if no issues were found" -Level WARNING
+        }
+    }
+    finally {
+        # Clean up the temporary container
+        docker rm $tempContainerName -f 2>$null
+    }
+
+    # Check what files were extracted
+    Write-Host ""
+    Write-Log "=========================================" -Level SUCCESS
+    Write-Log "Checking extracted results..." -Level SUCCESS
+    Write-Log "=========================================" -Level SUCCESS
+
+    $resultFiles = Get-ChildItem -Path $OutputPath -ErrorAction SilentlyContinue
+    $copiedCount = $resultFiles.Count
+
+    if ($copiedCount -eq 0) {
+        Write-Log "Warning: No result files found in extracted output" -Level WARNING
+    }
+    else {
+        Write-Log "Successfully extracted $copiedCount file(s):" -Level SUCCESS
+        $resultFiles | ForEach-Object {
+            if ($_.PSIsContainer) {
+                Write-Log "  - $($_.Name) (directory)" -Level SUCCESS
+            } else {
+                Write-Log "  - $($_.Name) ($([math]::Round($_.Length/1KB, 2)) KB)" -Level SUCCESS
+            }
+        }
+    }
+
+    Write-Host ""
+    Write-Log "=========================================" -Level SUCCESS
+    Write-Log "Attack Surface Analyzer test completed!" -Level SUCCESS
+    Write-Log "=========================================" -Level SUCCESS
+    Write-Log "Results saved to: $OutputPath" -Level SUCCESS
+
+    # Check for ASA GUI availability and launch interactive analysis
+    $dbPath = Join-Path $OutputPath "asa.sqlite"
+    $jsonPath = Join-Path $OutputPath "asa-results.json"
+
+    if (Test-Path $dbPath) {
+        # Check if ASA CLI is available
+        $asaAvailable = $false
+        try {
+            $asaVersion = asa --version 2>$null
+            if ($LASTEXITCODE -eq 0) {
+                $asaAvailable = $true
+                Write-Log "Attack Surface Analyzer CLI detected: $($asaVersion.Trim())" -Level INFO
+            }
+        }
+        catch {
+            # ASA not available via PATH
+        }
+
+        # Try dotnet tool global path if ASA not found in PATH
+        if (-not $asaAvailable) {
+            $globalToolsPath = "$env:USERPROFILE\.dotnet\tools\asa.exe"
+            if (Test-Path $globalToolsPath) {
+                try {
+                    $asaVersion = & $globalToolsPath --version 2>$null
+                    if ($LASTEXITCODE -eq 0) {
+                        $asaAvailable = $true
+                        Write-Log "Attack Surface Analyzer found in global tools: $($asaVersion.Trim())" -Level INFO
+                        # Use full path for subsequent commands
+                        $asaCommand = $globalToolsPath
+                    }
+                }
+                catch {
+                    # Global tools ASA not working
+                }
+            }
+        } else {
+            $asaCommand = "asa"
+        }
+
+        if ($asaAvailable) {
+            Write-Log "Launching Attack Surface Analyzer GUI for interactive analysis..." -Level SUCCESS
+            try {
+                # Launch ASA GUI with the database file
+                $asaProcess = Start-Process -FilePath $asaCommand -ArgumentList "gui", "--databasefilename", "`"$dbPath`"" -PassThru -NoNewWindow:$false
+
+                if ($asaProcess) {
+                    Write-Log "ASA GUI launched successfully (PID: $($asaProcess.Id))" -Level SUCCESS
+                    Write-Log "Interactive analysis interface is now available" -Level INFO
+                } else {
+                    Write-Log "Failed to launch ASA GUI" -Level WARNING
+                }
+            }
+            catch {
+                Write-Log "Error launching ASA GUI: $_" -Level WARNING
+                Write-Log "You can manually launch the GUI with: asa gui --databasefilename `"$dbPath`"" -Level INFO
+            }
+        } else {
+            Write-Log "Attack Surface Analyzer CLI not found" -Level INFO
+            Write-Log "Install ASA globally to enable GUI analysis: dotnet tool install -g Microsoft.CST.AttackSurfaceAnalyzer.CLI" -Level INFO
+            Write-Log "Then launch GUI manually with: asa gui --databasefilename `"$dbPath`"" -Level INFO
+        }
+    } else {
+        Write-Log "Database file not found - cannot launch ASA GUI" -Level WARNING
+    }
+
+    # Also check for VS Code integration for JSON analysis
+    if (Test-Path $jsonPath) {
+        # Detect if running in VS Code
+        $isVSCode = $false
+
+        if ($env:VSCODE_PID -or $env:TERM_PROGRAM -eq "vscode" -or $env:VSCODE_INJECTION -eq "1") {
+            $isVSCode = $true
+        }
+
+        # Check if 'code' command is available
+        if (-not $isVSCode) {
+            try {
+                $null = & code --version 2>$null
+                if ($LASTEXITCODE -eq 0) {
+                    $isVSCode = $true
+                }
+            }
+            catch {
+                # 'code' command not available
+            }
+        }
+
+        if ($isVSCode) {
+            Write-Log "VS Code detected - opening JSON results for analysis..." -Level INFO
+            try {
+                & code $jsonPath
+                if ($LASTEXITCODE -eq 0) {
+                    Write-Log "JSON results file opened in VS Code: $jsonPath" -Level SUCCESS
+                } else {
+                    Write-Log "Failed to open JSON file in VS Code" -Level WARNING
+                }
+            }
+            catch {
+                Write-Log "Error opening JSON file in VS Code: $_" -Level WARNING
+            }
+        } else {
+            Write-Log "JSON analysis results available at: $jsonPath" -Level INFO
+            Write-Log "Open this file in VS Code or any JSON viewer for detailed analysis" -Level INFO
+        }
+    }
+}
+finally {
+    # Cleanup
+    if (-not $KeepWorkDirectory) {
+        Write-Log "Cleaning up temporary work directory..."
+        Remove-Item -Path $containerWorkDir -Recurse -Force -ErrorAction SilentlyContinue
+        Write-Log "Cleanup completed"
+    }
+    else {
+        Write-Log "Work directory preserved at: $containerWorkDir" -Level SUCCESS
+    }
+
+    # Always cleanup MSI file from Docker build context
+    if ($destMsiPath -and (Test-Path $destMsiPath)) {
+        Write-Log "Cleaning up MSI file from Docker context..."
+        Remove-Item -Path $destMsiPath -Force -ErrorAction SilentlyContinue
+    }
+}
diff --git a/tools/AttackSurfaceAnalyzer/Summarize-AsaResults.ps1 b/tools/AttackSurfaceAnalyzer/Summarize-AsaResults.ps1
new file mode 100644
index 00000000000..00f27014037
--- /dev/null
+++ b/tools/AttackSurfaceAnalyzer/Summarize-AsaResults.ps1
@@ -0,0 +1,636 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+#Requires -Version 5.1
+<#
+.SYNOPSIS
+    Summarizes Attack Surface Analyzer (ASA) results from a JSON file.
+
+.DESCRIPTION
+    This script analyzes ASA JSON results and provides a comprehensive summary of security findings,
+    including counts by category, analysis levels, and detailed breakdowns of security issues.
+
+.PARAMETER Path
+    Path to the ASA results JSON file. Defaults to 'asa-results\asa-results.json' in the current directory.
+
+.PARAMETER ShowDetails
+    Shows detailed information about each finding category.
+
+.PARAMETER IncludeInformationalEvent
+    Includes informational events in the analysis. By default, only WARNING and ERROR events are processed.
+
+.PARAMETER IncludeDebugEvent
+    Includes debug events in the analysis. By default, only WARNING and ERROR events are processed.
+
+.EXAMPLE
+    .\Summarize-AsaResults.ps1
+
+    Summarizes the ASA results with basic statistics, showing only WARNING and ERROR events.
+
+.EXAMPLE
+    .\Summarize-AsaResults.ps1 -ShowDetails
+
+    Shows detailed breakdown of findings by category, filtering out informational and debug events.
+
+.EXAMPLE
+    .\Summarize-AsaResults.ps1 -IncludeInformationalEvent
+
+    Includes informational events along with WARNING and ERROR events in the analysis..NOTES
+    Author: GitHub Copilot
+    Version: 1.0
+    Created for PowerShell ASA Analysis
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter()]
+    [string]$Path = "asa-results\asa-results.json",
+
+    [Parameter()]
+    [switch]$ShowDetails,
+
+    [Parameter()]
+    [switch]$IncludeInformationalEvent,
+
+    [Parameter()]
+    [switch]$IncludeDebugEvent
+)
+
+function Get-AsaSummary {
+    param(
+        [Parameter(Mandatory)]
+        $AsaData,
+
+        [Parameter()]
+        [switch]$IncludeInformationalEvent,
+
+        [Parameter()]
+        [switch]$IncludeDebugEvent
+    )
+
+    # Extract metadata
+    $metadata = $AsaData["Metadata"]
+    $results = $AsaData["Results"]
+
+    # Initialize counters
+    $summary = @{
+        Metadata = @{
+            Version = $metadata["compare-version"]
+            OS = $metadata["compare-os"]
+            OSVersion = $metadata["compare-osversion"]
+            BaseRunId = ""
+            CompareRunId = ""
+        }
+        Categories = @{}
+        TotalFindings = 0
+        AnalysisLevels = @{
+            WARNING = 0
+            ERROR = 0
+            INFORMATION = 0
+            DEBUG = 0
+        }
+        RuleTypes = @{}
+        FileIssuesByRule = @{}
+        FileExtensionSummary = @{}
+        TimeSpan = $null
+    }
+
+    # Process each category
+    foreach ($categoryName in $results.Keys) {
+        $categoryData = $results[$categoryName]
+
+        $summary.Categories[$categoryName] = @{
+            Count = 0
+            Items = @()
+        }
+
+        # Process items in category with filtering
+        foreach ($item in $categoryData) {
+            # Filter events based on analysis level
+            $analysisLevel = $item["Analysis"]
+            if ($analysisLevel) {
+                # Skip informational events unless explicitly included
+                if ($analysisLevel -eq "INFORMATION" -and -not $IncludeInformationalEvent) {
+                    continue
+                }
+                # Skip debug events unless explicitly included
+                if ($analysisLevel -eq "DEBUG" -and -not $IncludeDebugEvent) {
+                    continue
+                }
+
+                $summary.AnalysisLevels[$analysisLevel]++
+            }            # If we reach here, the item passed the filter
+            $summary.Categories[$categoryName].Count++
+            $summary.TotalFindings++
+
+            # Extract run IDs and calculate timespan
+            if ($item["BaseRunId"]) {
+                $summary.Metadata.BaseRunId = $item["BaseRunId"]
+            }
+            if ($item["CompareRunId"]) {
+                $summary.Metadata.CompareRunId = $item["CompareRunId"]
+            }
+
+            # Process rules
+            foreach ($rule in $item["Rules"]) {
+                $ruleName = $rule["Name"]
+                if (-not $summary.RuleTypes.ContainsKey($ruleName)) {
+                    $summary.RuleTypes[$ruleName] = @{
+                        Count = 0
+                        Description = $rule["Description"]
+                        Flag = $rule["Flag"]
+                        Platforms = $rule["Platforms"]
+                        Categories = @{}
+                    }
+                }
+                $summary.RuleTypes[$ruleName].Count++
+
+                # Track which categories this rule appears in
+                if (-not $summary.RuleTypes[$ruleName].Categories.ContainsKey($categoryName)) {
+                    $summary.RuleTypes[$ruleName].Categories[$categoryName] = 0
+                }
+                $summary.RuleTypes[$ruleName].Categories[$categoryName]++
+
+                # For file-related categories, track file extension if available
+                if ($categoryName -like "*FILE*" -and $item["Identity"]) {
+                    $fileExtension = [System.IO.Path]::GetExtension($item["Identity"]).ToLower()
+                    if (-not $fileExtension) { $fileExtension = "(no extension)" }
+
+                    # Track by rule and extension
+                    if (-not $summary.FileIssuesByRule.ContainsKey($ruleName)) {
+                        $summary.FileIssuesByRule[$ruleName] = @{}
+                    }
+                    if (-not $summary.FileIssuesByRule[$ruleName].ContainsKey($fileExtension)) {
+                        $summary.FileIssuesByRule[$ruleName][$fileExtension] = 0
+                    }
+                    $summary.FileIssuesByRule[$ruleName][$fileExtension]++
+
+                    # Track overall file extension summary
+                    if (-not $summary.FileExtensionSummary.ContainsKey($fileExtension)) {
+                        $summary.FileExtensionSummary[$fileExtension] = @{
+                            Count = 0
+                            Rules = @{}
+                            Categories = @{}
+                        }
+                    }
+                    $summary.FileExtensionSummary[$fileExtension].Count++
+
+                    # Track which rules affect this extension
+                    if (-not $summary.FileExtensionSummary[$fileExtension].Rules.ContainsKey($ruleName)) {
+                        $summary.FileExtensionSummary[$fileExtension].Rules[$ruleName] = 0
+                    }
+                    $summary.FileExtensionSummary[$fileExtension].Rules[$ruleName]++
+
+                    # Track which categories this extension appears in
+                    if (-not $summary.FileExtensionSummary[$fileExtension].Categories.ContainsKey($categoryName)) {
+                        $summary.FileExtensionSummary[$fileExtension].Categories[$categoryName] = 0
+                    }
+                    $summary.FileExtensionSummary[$fileExtension].Categories[$categoryName]++
+                }
+            }
+
+            # Store item details for detailed view
+            $summary.Categories[$categoryName].Items += @{
+                Identity = $item["Identity"]
+                Analysis = $item["Analysis"]
+                Rules = $item["Rules"]
+                Compare = $item["Compare"]
+            }
+        }
+    }
+
+    # Calculate timespan if we have both run IDs
+    if ($summary.Metadata.BaseRunId -and $summary.Metadata.CompareRunId) {
+        try {
+            $baseTime = [DateTime]::Parse($summary.Metadata.BaseRunId)
+            $compareTime = [DateTime]::Parse($summary.Metadata.CompareRunId)
+            $summary.TimeSpan = $compareTime - $baseTime
+        }
+        catch {
+            $summary.TimeSpan = "Unable to calculate"
+        }
+    }
+
+    return $summary
+}
+
+function Write-ConsoleSummary {
+    param(
+        [Parameter(Mandatory)]
+        [hashtable]$Summary,
+
+        [Parameter()]
+        [switch]$ShowDetails,
+
+        [Parameter()]
+        [switch]$IncludeInformationalEvent,
+
+        [Parameter()]
+        [switch]$IncludeDebugEvent
+    )
+
+    # Header
+    Write-Host ("=" * 80) -ForegroundColor Cyan
+    Write-Host "Attack Surface Analyzer Results Summary" -ForegroundColor Cyan
+    Write-Host ("=" * 80) -ForegroundColor Cyan
+    Write-Host ""
+
+    # Metadata
+    Write-Host "Analysis Metadata:" -ForegroundColor Yellow
+    Write-Host "  ASA Version:    $($Summary.Metadata.Version)" -ForegroundColor White
+    Write-Host "  Operating System: $($Summary.Metadata.OS) ($($Summary.Metadata.OSVersion))" -ForegroundColor White
+    if ($Summary.TimeSpan -and $Summary.TimeSpan -ne "Unable to calculate") {
+        Write-Host "  Analysis Duration: $($Summary.TimeSpan.ToString())" -ForegroundColor White
+    }
+    Write-Host ""
+
+    # Overall Statistics
+    Write-Host "Overall Statistics:" -ForegroundColor Yellow
+    Write-Host "  Total Findings: $($Summary.TotalFindings)" -ForegroundColor White
+
+    # Show filtering information
+    $filterInfo = @()
+    if (-not $IncludeInformationalEvent) { $filterInfo += "INFORMATION events excluded" }
+    if (-not $IncludeDebugEvent) { $filterInfo += "DEBUG events excluded" }
+    if ($filterInfo.Count -gt 0) {
+        Write-Host "  Filtering: $($filterInfo -join ', ')" -ForegroundColor DarkYellow
+    }
+
+    # Analysis Levels
+    Write-Host "  Analysis Levels:" -ForegroundColor White
+    foreach ($level in $Summary.AnalysisLevels.Keys | Sort-Object) {
+        $count = $Summary.AnalysisLevels[$level]
+        $color = switch ($level) {
+            'ERROR' { 'Red' }
+            'WARNING' { 'Yellow' }
+            'INFORMATION' { 'Green' }
+            'DEBUG' { 'DarkGray' }
+            default { 'White' }
+        }
+        Write-Host "    $level`: $count" -ForegroundColor $color
+    }
+    Write-Host ""
+
+    # Category Breakdown
+    Write-Host "Findings by Category:" -ForegroundColor Yellow
+    $sortedCategories = $Summary.Categories.GetEnumerator() | Sort-Object { $_.Value.Count } -Descending
+
+    foreach ($category in $sortedCategories) {
+        $categoryName = $category.Key
+        $count = $category.Value.Count
+
+        if ($count -gt 0) {
+            Write-Host "  $categoryName`: $count items" -ForegroundColor Cyan
+        }
+        else {
+            Write-Host "  $categoryName`: $count items" -ForegroundColor DarkGray
+        }
+    }
+    Write-Host ""
+
+    # Rule Types Summary
+    Write-Host "Top Security Rules Triggered:" -ForegroundColor Yellow
+    $topRules = $Summary.RuleTypes.GetEnumerator() |
+                Sort-Object { $_.Value.Count } -Descending |
+                Select-Object -First 10
+
+    foreach ($rule in $topRules) {
+        $ruleName = $rule.Key
+        $count = $rule.Value.Count
+        $flag = $rule.Value.Flag
+
+        $color = switch ($flag) {
+            'ERROR' { 'Red' }
+            'WARNING' { 'Yellow' }
+            'INFORMATION' { 'Green' }
+            'DEBUG' { 'DarkGray' }
+            default { 'White' }
+        }
+
+        Write-Host "  [$flag] $ruleName`: $count occurrences" -ForegroundColor $color
+        if ($ShowDetails) {
+            Write-Host "    Description: $($rule.Value.Description)" -ForegroundColor DarkGray
+            Write-Host "    Platforms: $($rule.Value.Platforms -join ', ')" -ForegroundColor DarkGray
+
+            # Show breakdown by category for this rule
+            if ($rule.Value.Categories.Count -gt 0) {
+                Write-Host "    Categories:" -ForegroundColor DarkGray
+                foreach ($cat in $rule.Value.Categories.GetEnumerator() | Sort-Object { $_.Value } -Descending) {
+                    Write-Host "      $($cat.Key): $($cat.Value) occurrences" -ForegroundColor Gray
+                }
+            }
+        }
+    }
+
+    # File Extension Summary
+    if ($Summary.FileExtensionSummary.Count -gt 0) {
+        Write-Host ""
+        Write-Host "File Extension Analysis:" -ForegroundColor Yellow
+
+        $sortedExtensions = $Summary.FileExtensionSummary.GetEnumerator() |
+                           Sort-Object { $_.Value.Count } -Descending |
+                           Select-Object -First 15
+
+        foreach ($extEntry in $sortedExtensions) {
+            $extension = $extEntry.Key
+            $count = $extEntry.Value.Count
+            $displayExt = if ($extension -eq "(no extension)") { $extension } else { "*$extension" }
+
+            Write-Host "  $displayExt`: $count files" -ForegroundColor Cyan
+
+            if ($ShowDetails) {
+                # Show top rules for this extension
+                $topRulesForExt = $extEntry.Value.Rules.GetEnumerator() |
+                                 Sort-Object { $_.Value } -Descending |
+                                 Select-Object -First 3
+
+                foreach ($ruleEntry in $topRulesForExt) {
+                    $ruleName = $ruleEntry.Key
+                    $ruleCount = $ruleEntry.Value
+                    Write-Host "    $ruleName`: $ruleCount files" -ForegroundColor Gray
+                }
+            }
+        }
+    }
+
+    # Detailed Rule Analysis by Category
+    if ($ShowDetails) {
+        Write-Host ""
+        Write-Host "Detailed Rule Analysis by Category:" -ForegroundColor Yellow
+
+        # Focus on file-related categories
+        $fileCategories = $Summary.Categories.GetEnumerator() | Where-Object { $_.Key -like "*FILE*" -and $_.Value.Count -gt 0 }
+
+        foreach ($category in $fileCategories) {
+            $categoryName = $category.Key
+            Write-Host ""
+            Write-Host "  $categoryName Rules Breakdown:" -ForegroundColor Cyan
+
+            # Get rules that appear in this category
+            $categoryRules = $Summary.RuleTypes.GetEnumerator() |
+                           Where-Object { $_.Value.Categories.ContainsKey($categoryName) } |
+                           Sort-Object { $_.Value.Categories[$categoryName] } -Descending
+
+            foreach ($ruleEntry in $categoryRules) {
+                $ruleName = $ruleEntry.Key
+                $count = $ruleEntry.Value.Categories[$categoryName]
+                $flag = $ruleEntry.Value.Flag
+
+                $color = switch ($flag) {
+                    'ERROR' { 'Red' }
+                    'WARNING' { 'Yellow' }
+                    'INFORMATION' { 'Green' }
+                    'DEBUG' { 'DarkGray' }
+                    default { 'White' }
+                }
+
+                Write-Host "    [$flag] $ruleName`: $count files" -ForegroundColor $color
+            }
+        }
+
+        # Show file extension breakdown if available
+        if ($Summary.FileIssuesByRule.Count -gt 0) {
+            Write-Host ""
+            Write-Host "File Issues by Rule and Extension:" -ForegroundColor Yellow
+
+            foreach ($ruleEntry in $Summary.FileIssuesByRule.GetEnumerator()) {
+                $ruleName = $ruleEntry.Key
+                Write-Host ""
+                Write-Host "  $ruleName`:" -ForegroundColor Cyan
+
+                $sortedExtensions = $ruleEntry.Value.GetEnumerator() | Sort-Object { $_.Value } -Descending
+                foreach ($extEntry in $sortedExtensions) {
+                    $extension = $extEntry.Key
+                    $count = $extEntry.Value
+                    Write-Host "    $extension`: $count files" -ForegroundColor White
+                }
+            }
+        }
+    }
+
+    # Detailed Category Information
+    if ($ShowDetails) {
+        Write-Host ""
+        Write-Host "Detailed Category Breakdown:" -ForegroundColor Yellow
+
+        foreach ($category in $sortedCategories | Where-Object { $_.Value.Count -gt 0 }) {
+            $categoryName = $category.Key
+            $items = $category.Value.Items
+
+            Write-Host ""
+            Write-Host "  $categoryName ($($items.Count) items):" -ForegroundColor Cyan
+
+            # Group by analysis level
+            $groupedByAnalysis = $items | Group-Object Analysis
+            foreach ($group in $groupedByAnalysis) {
+                $level = $group.Name
+                $count = $group.Count
+
+                $color = switch ($level) {
+                    'ERROR' { 'Red' }
+                    'WARNING' { 'Yellow' }
+                    'INFORMATION' { 'Green' }
+                    'DEBUG' { 'DarkGray' }
+                    default { 'White' }
+                }
+
+                Write-Host "    $level`: $count items" -ForegroundColor $color
+            }
+
+            # Show individual file details for file-related categories
+            if ($categoryName -like "*FILE*" -and $items.Count -gt 0) {
+                # Check if this category contains files with expired signatures
+                $expiredSigItems = $items | Where-Object {
+                    $_.Rules -and ($_.Rules | Where-Object { $_.Name -eq 'Binaries with expired signatures' })
+                }
+
+                if ($expiredSigItems.Count -gt 0) {
+                    Write-Host ""
+                    Write-Host "    Files with Expired Signatures (grouped by Issuer):" -ForegroundColor DarkCyan
+
+                    # Group by issuer only
+                    $groupedByIssuer = @{}
+                    foreach ($item in $expiredSigItems) {
+                        if ($item.Compare -and $item.Compare.SignatureStatus -and $item.Compare.SignatureStatus.SigningCertificate) {
+                            $cert = $item.Compare.SignatureStatus.SigningCertificate
+                            $issuer = $cert.Issuer
+                            $notAfter = $cert.NotAfter
+                            $identity = $item.Identity
+
+                            if (-not $groupedByIssuer.ContainsKey($issuer)) {
+                                $groupedByIssuer[$issuer] = @()
+                            }
+                            $groupedByIssuer[$issuer] += [PSCustomObject]@{
+                                Identity = $identity
+                                NotAfter = $notAfter
+                            }
+                        }
+                    }
+
+                    # Display grouped results
+                    $sortedIssuers = $groupedByIssuer.GetEnumerator() | Sort-Object Name
+
+                    foreach ($issuerGroup in $sortedIssuers) {
+                        $issuer = $issuerGroup.Name
+                        $files = $issuerGroup.Value
+                        $fileCount = $files.Count
+
+                        Write-Host ""
+                        Write-Host "      Issuer: $issuer" -ForegroundColor Yellow
+                        Write-Host "      Files ($fileCount):" -ForegroundColor White
+
+                        # Sort files by full file path
+                        $sortedFiles = $files | Sort-Object Identity
+
+                        # Show all files
+                        foreach ($file in $sortedFiles) {
+                            # Get identity - handle both hashtable and PSCustomObject
+                            $filePath = if ($file -is [hashtable]) { $file['Identity'] } else { $file.Identity }
+
+                            # Format date without time
+                            $expirationDate = 'Unknown'
+                            $notAfterValue = if ($file -is [hashtable]) { $file['NotAfter'] } else { $file.NotAfter }
+                            if ($notAfterValue) {
+                                try {
+                                    $expirationDate = ([DateTime]::Parse($notAfterValue)).ToString('yyyy-MM-dd')
+                                }
+                                catch {
+                                    $expirationDate = 'Unknown'
+                                }
+                            }
+                            Write-Host "        [Expired: $expirationDate] $filePath" -ForegroundColor Gray
+                        }
+                    }
+
+                    # Show other files (non-expired signature issues)
+                    $otherFiles = $items | Where-Object {
+                        -not ($_.Rules -and ($_.Rules | Where-Object { $_.Name -eq 'Binaries with expired signatures' }))
+                    }
+
+                    if ($otherFiles.Count -gt 0) {
+                        Write-Host ""
+                        Write-Host "    Other Files:" -ForegroundColor DarkCyan
+
+                        $displayLimit = [Math]::Min(20, $otherFiles.Count)
+                        for ($i = 0; $i -lt $displayLimit; $i++) {
+                            $item = $otherFiles[$i]
+                            $identity = $item.Identity
+                            $analysis = $item.Analysis
+
+                            $color = switch ($analysis) {
+                                'ERROR' { 'Red' }
+                                'WARNING' { 'Yellow' }
+                                'INFORMATION' { 'Green' }
+                                'DEBUG' { 'DarkGray' }
+                                default { 'Gray' }
+                            }
+
+                            if ($item.Rules -and $item.Rules.Count -gt 0) {
+                                $ruleNames = $item.Rules | ForEach-Object { $_.Name }
+                                Write-Host "      [$analysis] $identity" -ForegroundColor $color
+                                Write-Host "          Rules: $($ruleNames -join ', ')" -ForegroundColor DarkGray
+                            }
+                            else {
+                                Write-Host "      [$analysis] $identity" -ForegroundColor $color
+                            }
+                        }
+
+                        if ($otherFiles.Count -gt $displayLimit) {
+                            Write-Host "      ... and $($otherFiles.Count - $displayLimit) more files" -ForegroundColor DarkGray
+                        }
+                    }
+                }
+                else {
+                    # No expired signatures, show standard file listing
+                    Write-Host ""
+                    Write-Host "    Files:" -ForegroundColor DarkCyan
+
+                    $displayLimit = [Math]::Min(50, $items.Count)
+                    for ($i = 0; $i -lt $displayLimit; $i++) {
+                        $item = $items[$i]
+                        $identity = $item.Identity
+                        $analysis = $item.Analysis
+
+                        $color = switch ($analysis) {
+                            'ERROR' { 'Red' }
+                            'WARNING' { 'Yellow' }
+                            'INFORMATION' { 'Green' }
+                            'DEBUG' { 'DarkGray' }
+                            default { 'Gray' }
+                        }
+
+                        # Show triggered rules for this file
+                        if ($item.Rules -and $item.Rules.Count -gt 0) {
+                            $ruleNames = $item.Rules | ForEach-Object { $_.Name }
+                            Write-Host "      [$analysis] $identity" -ForegroundColor $color
+                            Write-Host "          Rules: $($ruleNames -join ', ')" -ForegroundColor DarkGray
+                        }
+                        else {
+                            Write-Host "      [$analysis] $identity" -ForegroundColor $color
+                        }
+                    }
+
+                    if ($items.Count -gt $displayLimit) {
+                        Write-Host "      ... and $($items.Count - $displayLimit) more files" -ForegroundColor DarkGray
+                    }
+                }
+            }
+            # Show details for non-file categories (users, groups, etc.)
+            elseif ($items.Count -gt 0) {
+                Write-Host ""
+                Write-Host "    Items:" -ForegroundColor DarkCyan
+
+                $displayLimit = [Math]::Min(20, $items.Count)
+                for ($i = 0; $i -lt $displayLimit; $i++) {
+                    $item = $items[$i]
+                    $identity = $item.Identity
+                    $analysis = $item.Analysis
+
+                    $color = switch ($analysis) {
+                        'ERROR' { 'Red' }
+                        'WARNING' { 'Yellow' }
+                        'INFORMATION' { 'Green' }
+                        'DEBUG' { 'DarkGray' }
+                        default { 'Gray' }
+                    }
+
+                    Write-Host "      [$analysis] $identity" -ForegroundColor $color
+                }
+
+                if ($items.Count -gt $displayLimit) {
+                    Write-Host "      ... and $($items.Count - $displayLimit) more items" -ForegroundColor DarkGray
+                }
+            }
+        }
+    }
+
+    Write-Host ""
+    Write-Host ("=" * 80) -ForegroundColor Cyan
+}
+
+# Main execution
+try {
+    # Validate input file
+    if (-not (Test-Path $Path)) {
+        Write-Error "ASA results file not found: $Path"
+        exit 1
+    }
+
+    Write-Verbose "Reading ASA results from: $Path"
+
+    # Load and parse JSON
+    $jsonContent = Get-Content -Path $Path -Raw -Encoding UTF8
+    $asaData = $jsonContent | ConvertFrom-Json -AsHashtable
+
+    # Generate summary
+    Write-Verbose "Analyzing ASA results..."
+    $summary = Get-AsaSummary -AsaData $asaData -IncludeInformationalEvent:$IncludeInformationalEvent -IncludeDebugEvent:$IncludeDebugEvent
+
+    # Output results to console
+    Write-ConsoleSummary -Summary $summary -ShowDetails:$ShowDetails -IncludeInformationalEvent:$IncludeInformationalEvent -IncludeDebugEvent:$IncludeDebugEvent
+}
+catch {
+    Write-Error "Error processing ASA results: $($_.Exception.Message)"
+    Write-Error $_.ScriptStackTrace
+    exit 1
+}
diff --git a/tools/AttackSurfaceAnalyzer/docker/Dockerfile b/tools/AttackSurfaceAnalyzer/docker/Dockerfile
new file mode 100644
index 00000000000..3e4aaa3b717
--- /dev/null
+++ b/tools/AttackSurfaceAnalyzer/docker/Dockerfile
@@ -0,0 +1,134 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Multi-stage Dockerfile for Attack Surface Analyzer Testing
+# Stage 1: Build and run ASA tests
+# Stage 2: Extract reports to scratch layer
+
+# Stage 1: Test execution environment
+FROM mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022@sha256:28f3a59216a7f91dfc4730ea47e236e2ffbb519975725bf8231f57e69dab3ca8 AS asa-runner
+
+# Set shell to PowerShell for easier scripting
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# Install Attack Surface Analyzer as a global .NET tool
+RUN dotnet tool install -g Microsoft.CST.AttackSurfaceAnalyzer.CLI --version 2.3.328
+
+# Add .NET tools directory to PATH
+RUN $env:PATH += ';C:/Users/ContainerAdministrator/.dotnet/tools'; \
+    [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
+
+# Set working directory and create reports directory
+WORKDIR C:/work
+RUN New-Item -ItemType Directory -Path C:\reports -Force | Out-Null
+
+# Take baseline snapshot before installation
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Taking baseline snapshot..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    asa collect -f -r -u -l --directories 'C:\Program Files\PowerShell,C:\Program Files (x86)\PowerShell' --runid before; \
+    if ($LASTEXITCODE -ne 0) { Write-Error "Failed to take baseline snapshot"; exit 1 }
+
+# Copy the PowerShell MSI file from build context
+COPY *.msi ./powershell.msi
+
+# Install PowerShell MSI
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Installing PowerShell MSI..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    Write-Host "MSI file: C:\work\powershell.msi"; \
+    $argumentList = '/i C:\work\powershell.msi /quiet /norestart /l*vx C:\work\install.log ADD_PATH=1'; \
+    Write-Host "Running: msiexec $argumentList"; \
+    $msiProcess = Start-Process msiexec.exe -ArgumentList $argumentList -Wait -NoNewWindow -PassThru; \
+    if ($msiProcess.ExitCode -ne 0) { \
+        Write-Host "MSI installation failed with exit code: $($msiProcess.ExitCode)"; \
+        throw "MSI installation failed. Check install.log for details" \
+    }
+
+# Take post-installation snapshot
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Taking post-installation snapshot..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    asa collect -f -r -u -l --directories 'C:\Program Files\PowerShell,C:\Program Files (x86)\PowerShell' --runid after; \
+    if ($LASTEXITCODE -ne 0) { Write-Error "Failed to take post-installation snapshot"; exit 1 }
+
+# Export comparison results
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Exporting comparison results..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    asa export-collect --savetodatabase --resultlevels WARNING,ERROR,FATAL --firstrunid before --secondrunid after; \
+    if ($LASTEXITCODE -ne 0) { Write-Warning "Failed to export results with exit code: $LASTEXITCODE" }
+
+# Export comparison results
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Exporting comparison results..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    asa export-collect --readfromsavedcomparisons; \
+    if ($LASTEXITCODE -ne 0) { Write-Warning "Failed to export results with exit code: $LASTEXITCODE" }
+
+
+# Copy and standardize JSON result files
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Processing JSON result files..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    $jsonFiles = Get-ChildItem -Path "*.json.txt" -ErrorAction SilentlyContinue; \
+    if ($jsonFiles.Count -eq 0) { \
+        Write-Warning 'No JSON.TXT files found - checking for .json files...'; \
+        $jsonFiles = Get-ChildItem -Path "*.json" -ErrorAction SilentlyContinue \
+    }; \
+    if ($jsonFiles.Count -eq 0) { \
+        throw 'No JSON files found - ASA may not have generated results' \
+    } else { \
+        $jsonFiles | ForEach-Object { \
+            Write-Host "Found JSON file: $($_.Name)"; \
+            if (-not (Test-Path $_.FullName)) { \
+                throw "JSON file not accessible: $($_.FullName)" \
+            }; \
+            Write-Host "Copying to standard name: asa-results.json"; \
+            Copy-Item -Path $_.FullName -Destination C:\work\asa-results.json -ErrorAction Stop; \
+            Copy-Item -Path $_.FullName -Destination C:\reports\asa-results.json -ErrorAction Stop; \
+        } \
+    }
+
+# Copy SQLite database file if it exists
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Copying SQLite database..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    if (Test-Path "asa.sqlite") { \
+        Write-Host "Copying: asa.sqlite"; \
+        Copy-Item -Path "asa.sqlite" -Destination C:\reports\ -ErrorAction Stop \
+    } else { \
+        throw 'SQLite database (asa.sqlite) not found - this may indicate ASA export issues' \
+    }
+
+# Copy installation log file
+RUN Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Copying installation log..." -ForegroundColor Green; \
+    Write-Host "========================================="; \
+    if (-not (Test-Path "C:\work\install.log")) { \
+        throw "Required installation log file not found: C:\work\install.log" \
+    }; \
+    Copy-Item -Path "C:\work\install.log" -Destination C:\reports\ -ErrorAction Stop; \
+    Write-Host "Attack Surface Analyzer test completed!" -ForegroundColor Green
+
+# Default command shows completion message
+CMD Write-Host "=========================================" -ForegroundColor Green; \
+    Write-Host "Container ready. Reports available in C:\reports\" -ForegroundColor Cyan; \
+    Write-Host "========================================="
+
+# Stage 2: Reports-only layer using minimal Windows base
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022@sha256:307874138e4dc064d0538b58c6f028419ab82fb15fcabaf6d5378ba32c235266 AS asa-reports
+
+# Set working directory to root
+WORKDIR /
+
+# Copy only the report files from the runner stage to root level
+COPY --from=asa-runner C:/reports/ ./
+
+# Stage 3: Final stage (defaults to the runner for backward compatibility)
+FROM asa-runner AS final
+
+# Label for documentation
+LABEL description="Windows container for running Attack Surface Analyzer tests on PowerShell MSI installations"
+LABEL version="1.0"
+LABEL maintainer="PowerShell Team"
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 339153bcf0c..f62a16cfe14 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -9,9 +9,6 @@ param (
     [Parameter()]
     [switch]$UseNuGetOrg,
 
-    [Parameter()]
-    [switch]$UpdateMSIPackaging,
-
     [Parameter()]
     [string]$RuntimeSourceFeed,
 
@@ -366,31 +363,6 @@ if ($dotnetUpdate.ShouldUpdate) {
 
     Write-Verbose -Message "Updating project files completed." -Verbose
 
-    if ($UpdateMSIPackaging) {
-        if (-not $environment.IsWindows) {
-            throw "UpdateMSIPackaging can only be done on Windows"
-        }
-
-        Import-Module "$PSScriptRoot/../build.psm1" -Force
-        Import-Module "$PSScriptRoot/packaging" -Force
-        Start-PSBootstrap -Package
-        Start-PSBuild -Clean -Configuration Release -InteractiveAuth:$InteractiveAuth
-
-        $publishPath = Split-Path (Get-PSOutput)
-        Remove-Item -Path "$publishPath\*.pdb"
-
-        try {
-            Start-PSPackage -Type msi -SkipReleaseChecks -InformationVariable wxsData
-        } catch {
-            if ($_.Exception.Message -like "Current files to not match *") {
-                Copy-Item -Path $($wxsData.MessageData.NewFile) -Destination ($wxsData.MessageData.FilesWxsPath)
-                Write-Verbose -Message "Updating files.wxs file completed." -Verbose
-            } else {
-                throw $_
-            }
-        }
-    }
-
     Update-DevContainer
 }
 else {
diff --git a/tools/WindowsCI.psm1 b/tools/WindowsCI.psm1
index 57d506bda8b..685882546c2 100644
--- a/tools/WindowsCI.psm1
+++ b/tools/WindowsCI.psm1
@@ -15,6 +15,8 @@ function New-LocalUser
     .OUTPUTS
     .NOTES
   #>
+  [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingUsernameAndPasswordParams', '')]
+  [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingPlainTextForPassword', '')]
   param(
     [Parameter(Mandatory=$true)]
     [string] $username,
diff --git a/tools/buildCommon/startNativeExecution.ps1 b/tools/buildCommon/startNativeExecution.ps1
index ee7b00d04cd..2e44d86bd6a 100644
--- a/tools/buildCommon/startNativeExecution.ps1
+++ b/tools/buildCommon/startNativeExecution.ps1
@@ -16,6 +16,8 @@ function script:Start-NativeExecution {
     $ErrorActionPreference = "Continue"
     Write-Verbose "Executing: $ScriptBlock"
     try {
+        $cwd = Get-Location
+
         if ($VerboseOutputOnError.IsPresent) {
             $output = & $ScriptBlock 2>&1
         } else {
@@ -36,10 +38,10 @@ function script:Start-NativeExecution {
                 $callerFile = $callerLocationParts[0]
                 $callerLine = $callerLocationParts[1]
 
-                $errorMessage = "Execution of {$ScriptBlock} by ${callerFile}: line $callerLine failed with exit code $LASTEXITCODE"
+                $errorMessage = "Execution of {$ScriptBlock} in '$cwd' by ${callerFile}: line $callerLine failed with exit code $LASTEXITCODE"
                 throw $errorMessage
             }
-            throw "Execution of {$ScriptBlock} failed with exit code $LASTEXITCODE"
+            throw "Execution of {$ScriptBlock} in '$cwd' failed with exit code $LASTEXITCODE"
         }
     } finally {
         $ErrorActionPreference = $backupEAP
diff --git a/tools/cgmanifest.json b/tools/cgmanifest/main/cgmanifest.json
similarity index 76%
rename from tools/cgmanifest.json
rename to tools/cgmanifest/main/cgmanifest.json
index eae3f77df33..5d2de074cae 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest/main/cgmanifest.json
@@ -24,8 +24,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "JetBrains.Annotations",
-          "Version": "2021.2.0"
+          "Name": "Humanizer.Core",
+          "Version": "2.14.1"
         }
       },
       "DevelopmentDependency": false
@@ -35,7 +35,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Json.More.Net",
-          "Version": "1.9.0"
+          "Version": "2.1.1"
         }
       },
       "DevelopmentDependency": false
@@ -45,7 +45,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "JsonPointer.Net",
-          "Version": "3.0.3"
+          "Version": "5.3.1"
         }
       },
       "DevelopmentDependency": false
@@ -55,7 +55,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "JsonSchema.Net",
-          "Version": "5.2.6"
+          "Version": "7.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Markdig.Signed",
-          "Version": "0.33.0"
+          "Version": "1.1.2"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.ApplicationInsights",
-          "Version": "2.21.0"
+          "Version": "2.23.0"
         }
       },
       "DevelopmentDependency": false
@@ -85,7 +85,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Bcl.AsyncInterfaces",
-          "Version": "5.0.0"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -95,7 +95,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Analyzers",
-          "Version": "3.3.4"
+          "Version": "3.11.0"
         }
       },
       "DevelopmentDependency": true
@@ -105,7 +105,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.7.0"
+          "Version": "5.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -115,7 +115,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.7.0"
+          "Version": "5.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -125,17 +125,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Extensions.ObjectPool",
-          "Version": "5.0.10"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "Microsoft.Management.Infrastructure.Runtime.Unix",
-          "Version": "3.0.0"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -150,16 +140,6 @@
       },
       "DevelopmentDependency": true
     },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "Microsoft.Management.Infrastructure",
-          "Version": "3.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
     {
       "Component": {
         "Type": "nuget",
@@ -170,22 +150,12 @@
       },
       "DevelopmentDependency": false
     },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "Microsoft.PowerShell.Native",
-          "Version": "7.4.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Security.Extensions",
-          "Version": "1.3.0"
+          "Version": "1.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -195,17 +165,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.Registry.AccessControl",
-          "Version": "7.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "Microsoft.Win32.Registry",
-          "Version": "4.7.0"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -215,7 +175,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.SystemEvents",
-          "Version": "7.0.0"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -225,7 +185,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Windows.Compatibility",
-          "Version": "7.0.5"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -235,7 +195,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Newtonsoft.Json",
-          "Version": "13.0.3"
+          "Version": "13.0.4"
         }
       },
       "DevelopmentDependency": false
@@ -244,8 +204,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
-          "Version": "7.0.0"
+          "Name": "runtime.android-arm.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -254,8 +214,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
-          "Version": "7.0.0"
+          "Name": "runtime.android-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -264,8 +224,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
-          "Version": "7.0.0"
+          "Name": "runtime.android-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -274,8 +234,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.7.0"
+          "Name": "runtime.android-x86.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -284,8 +244,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.native.System.IO.Ports",
-          "Version": "7.0.0"
+          "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -294,8 +254,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
-          "Version": "7.0.0"
+          "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -304,8 +264,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
-          "Version": "7.0.0"
+          "Name": "runtime.linux-bionic-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -314,8 +274,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.linux-bionic-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -324,8 +284,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.linux-musl-arm.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -334,8 +294,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.linux-musl-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -344,28 +304,28 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "StyleCop.Analyzers.Unstable",
-          "Version": "1.2.0.507"
+          "Name": "runtime.linux-musl-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "StyleCop.Analyzers",
-          "Version": "1.1.118"
+          "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.CodeDom",
-          "Version": "7.0.0"
+          "Name": "runtime.maccatalyst-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -374,8 +334,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Collections.Immutable",
-          "Version": "7.0.0"
+          "Name": "runtime.maccatalyst-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -384,8 +344,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ComponentModel.Composition.Registration",
-          "Version": "7.0.0"
+          "Name": "runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -394,8 +354,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ComponentModel.Composition",
-          "Version": "7.0.0"
+          "Name": "runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -404,8 +364,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Configuration.ConfigurationManager",
-          "Version": "7.0.0"
+          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -414,8 +374,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Data.Odbc",
-          "Version": "7.0.0"
+          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -424,8 +384,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Data.OleDb",
-          "Version": "7.0.0"
+          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -434,8 +394,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Data.SqlClient",
-          "Version": "4.8.5"
+          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -444,8 +404,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.DiagnosticSource",
-          "Version": "7.0.2"
+          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -454,28 +414,28 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.EventLog",
-          "Version": "7.0.0"
+          "Name": "StyleCop.Analyzers.Unstable",
+          "Version": "1.2.0.556"
         }
       },
-      "DevelopmentDependency": false
+      "DevelopmentDependency": true
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.PerformanceCounter",
-          "Version": "7.0.0"
+          "Name": "StyleCop.Analyzers",
+          "Version": "1.1.118"
         }
       },
-      "DevelopmentDependency": false
+      "DevelopmentDependency": true
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.DirectoryServices.AccountManagement",
-          "Version": "7.0.1"
+          "Name": "System.CodeDom",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -484,8 +444,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.DirectoryServices.Protocols",
-          "Version": "7.0.1"
+          "Name": "System.ComponentModel.Composition.Registration",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -494,8 +454,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.DirectoryServices",
-          "Version": "7.0.1"
+          "Name": "System.ComponentModel.Composition",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -504,8 +464,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Drawing.Common",
-          "Version": "7.0.0"
+          "Name": "System.Configuration.ConfigurationManager",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -514,8 +474,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Formats.Asn1",
-          "Version": "7.0.0"
+          "Name": "System.Data.Odbc",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -524,8 +484,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.IO.Packaging",
-          "Version": "7.0.0"
+          "Name": "System.Data.OleDb",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -534,8 +494,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.IO.Ports",
-          "Version": "7.0.0"
+          "Name": "System.Data.SqlClient",
+          "Version": "4.9.1"
         }
       },
       "DevelopmentDependency": false
@@ -544,8 +504,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Management",
-          "Version": "7.0.2"
+          "Name": "System.Diagnostics.EventLog",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -554,8 +514,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Net.Http.WinHttpHandler",
-          "Version": "7.0.0"
+          "Name": "System.Diagnostics.PerformanceCounter",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -564,8 +524,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Numerics.Vectors",
-          "Version": "4.5.0"
+          "Name": "System.DirectoryServices.AccountManagement",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -574,8 +534,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Private.ServiceModel",
-          "Version": "4.10.3"
+          "Name": "System.DirectoryServices.Protocols",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -584,8 +544,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Context",
-          "Version": "7.0.0"
+          "Name": "System.DirectoryServices",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -594,8 +554,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.DispatchProxy",
-          "Version": "4.7.1"
+          "Name": "System.Drawing.Common",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -604,8 +564,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Metadata",
-          "Version": "7.0.0"
+          "Name": "System.IO.Packaging",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -614,8 +574,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Runtime.Caching",
-          "Version": "7.0.0"
+          "Name": "System.IO.Ports",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -624,8 +584,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Runtime.CompilerServices.Unsafe",
-          "Version": "6.0.0"
+          "Name": "System.Management",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -634,8 +594,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Security.AccessControl",
-          "Version": "6.0.0"
+          "Name": "System.Net.Http.WinHttpHandler",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -644,8 +604,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Security.Cryptography.Pkcs",
-          "Version": "7.0.3"
+          "Name": "System.Reflection.Context",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -654,8 +614,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Security.Cryptography.ProtectedData",
-          "Version": "7.0.1"
+          "Name": "System.Runtime.Caching",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -664,8 +624,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Security.Cryptography.Xml",
-          "Version": "7.0.1"
+          "Name": "System.Security.Cryptography.Pkcs",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -674,8 +634,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Security.Permissions",
-          "Version": "7.0.0"
+          "Name": "System.Security.Cryptography.ProtectedData",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -684,8 +644,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Security.Principal.Windows",
-          "Version": "5.0.0"
+          "Name": "System.Security.Cryptography.Xml",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -694,8 +654,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ServiceModel.Duplex",
-          "Version": "4.10.3"
+          "Name": "System.Security.Permissions",
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -705,7 +665,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Http",
-          "Version": "4.10.3"
+          "Version": "10.0.652802"
         }
       },
       "DevelopmentDependency": false
@@ -714,8 +674,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ServiceModel.NetTcp",
-          "Version": "4.10.3"
+          "Name": "System.ServiceModel.NetFramingBase",
+          "Version": "10.0.652802"
         }
       },
       "DevelopmentDependency": false
@@ -724,8 +684,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ServiceModel.Primitives",
-          "Version": "4.10.3"
+          "Name": "System.ServiceModel.NetTcp",
+          "Version": "10.0.652802"
         }
       },
       "DevelopmentDependency": false
@@ -734,8 +694,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ServiceModel.Security",
-          "Version": "4.10.3"
+          "Name": "System.ServiceModel.Primitives",
+          "Version": "10.0.652802"
         }
       },
       "DevelopmentDependency": false
@@ -745,7 +705,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Syndication",
-          "Version": "7.0.0"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -755,7 +715,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceProcess.ServiceController",
-          "Version": "7.0.1"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -765,47 +725,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Speech",
-          "Version": "7.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Text.Encoding.CodePages",
-          "Version": "7.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Text.Encodings.Web",
-          "Version": "7.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Text.Json",
-          "Version": "6.0.2"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Threading.AccessControl",
-          "Version": "7.0.1"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
@@ -815,7 +735,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Web.Services.Description",
-          "Version": "4.10.0"
+          "Version": "8.1.2"
         }
       },
       "DevelopmentDependency": false
@@ -825,7 +745,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Windows.Extensions",
-          "Version": "7.0.0"
+          "Version": "10.0.6"
         }
       },
       "DevelopmentDependency": false
diff --git a/tools/cgmanifest/tpn/cgmanifest.json b/tools/cgmanifest/tpn/cgmanifest.json
new file mode 100644
index 00000000000..a0746028a56
--- /dev/null
+++ b/tools/cgmanifest/tpn/cgmanifest.json
@@ -0,0 +1,755 @@
+{
+  "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": "Humanizer.Core",
+          "Version": "2.14.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Json.More.Net",
+          "Version": "2.1.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "JsonPointer.Net",
+          "Version": "5.3.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "JsonSchema.Net",
+          "Version": "7.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Markdig.Signed",
+          "Version": "0.45.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.ApplicationInsights",
+          "Version": "2.23.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Bcl.AsyncInterfaces",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.Analyzers",
+          "Version": "3.11.0"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.Common",
+          "Version": "5.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.CSharp",
+          "Version": "5.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Extensions.ObjectPool",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Management.Infrastructure.Runtime.Win",
+          "Version": "3.0.0"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.PowerShell.MarkdownRender",
+          "Version": "7.2.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Security.Extensions",
+          "Version": "1.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Win32.Registry.AccessControl",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Win32.SystemEvents",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Windows.Compatibility",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Newtonsoft.Json",
+          "Version": "13.0.4"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.android-arm.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.android-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.android-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.android-x86.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-bionic-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-bionic-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-musl-arm.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-musl-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-musl-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.maccatalyst-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.maccatalyst-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "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": "StyleCop.Analyzers.Unstable",
+          "Version": "1.2.0.556"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "StyleCop.Analyzers",
+          "Version": "1.1.118"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.CodeDom",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ComponentModel.Composition.Registration",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ComponentModel.Composition",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Configuration.ConfigurationManager",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Data.Odbc",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Data.OleDb",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Data.SqlClient",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Diagnostics.EventLog",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Diagnostics.PerformanceCounter",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.DirectoryServices.AccountManagement",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.DirectoryServices.Protocols",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.DirectoryServices",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Drawing.Common",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.IO.Packaging",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.IO.Ports",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Management",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Net.Http.WinHttpHandler",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Context",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.Caching",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Cryptography.Pkcs",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Cryptography.ProtectedData",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Cryptography.Xml",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Permissions",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Http",
+          "Version": "10.0.652802"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.NetFramingBase",
+          "Version": "10.0.652802"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.NetTcp",
+          "Version": "10.0.652802"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Primitives",
+          "Version": "10.0.652802"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Syndication",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceProcess.ServiceController",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Speech",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Web.Services.Description",
+          "Version": "8.1.2"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Windows.Extensions",
+          "Version": "10.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    }
+  ],
+  "$schema": "https://json.schemastore.org/component-detection-manifest.json"
+}
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index 060519d30a6..33700ac9024 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -1,6 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingConvertToSecureStringWithPlainText', '')]
+param()
+
 Set-StrictMode -Version 3.0
 
 $ErrorActionPreference = 'continue'
@@ -17,8 +20,15 @@ if(Test-Path $dotNetPath)
 
 # import build into the global scope so it can be used by packaging
 # 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
+Write-Verbose "Importing build.psm1" -Verbose
+Import-Module (Join-Path $repoRoot 'build.psm1') -Scope Global -ArgumentList $true
+$buildCommands = Get-Command -Module build
+Write-Verbose "Imported build.psm1 commands: $($buildCommands.Count)" -Verbose
+
+Write-Verbose "Importing packaging.psm1" -Verbose
+Import-Module (Join-Path $repoRoot 'tools\packaging') -Scope Global
+$packagingCommands = Get-Command -Module packaging
+Write-Verbose "Imported packaging.psm1 commands: $($packagingCommands.Count)" -Verbose
 
 # import the windows specific functcion only in Windows PowerShell or on Windows
 if($PSVersionTable.PSEdition -eq 'Desktop' -or $IsWindows)
@@ -91,6 +101,11 @@ function Invoke-CIFull
 # Implements the CI 'build_script' step
 function Invoke-CIBuild
 {
+    param(
+        [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis')]
+        [string]$Configuration = 'Release'
+    )
+
     $releaseTag = Get-ReleaseTag
     # check to be sure our test tags are correct
     $result = Get-PesterTag
@@ -105,7 +120,7 @@ function Invoke-CIBuild
         Start-PSBuild -Configuration 'CodeCoverage' -PSModuleRestore -CI -ReleaseTag $releaseTag
     }
 
-    Start-PSBuild -PSModuleRestore -Configuration 'Release' -CI -ReleaseTag $releaseTag
+    Start-PSBuild -PSModuleRestore -Configuration $Configuration -CI -ReleaseTag $releaseTag -UseNuGetOrg
     Save-PSOptions
 
     $options = (Get-PSOptions)
@@ -128,6 +143,10 @@ function Invoke-CIInstall
         [switch]
         $SkipUser
     )
+
+    # Switch to public sources in CI
+    Switch-PSNugetConfig -Source Public
+
     # Make sure we have all the tags
     Sync-PSTags -AddRemoteIfMissing
 
@@ -177,8 +196,6 @@ function Invoke-CIInstall
     }
 
     Set-BuildVariable -Name TestPassed -Value False
-    Write-Verbose -Verbose -Message "Calling Start-PSBootstrap from Invoke-CIInstall"
-    Start-PSBootstrap
 }
 
 function Invoke-CIxUnit
@@ -211,6 +228,45 @@ function Invoke-CIxUnit
     }
 }
 
+# Install Pester module if not already installed with a compatible version
+function Install-CIPester
+{
+    [CmdletBinding()]
+    param(
+        [string]$MinimumVersion = '5.0.0',
+        [string]$MaximumVersion = '5.99.99',
+        [switch]$Force
+    )
+
+    Write-Verbose "Checking for Pester module (required: $MinimumVersion - $MaximumVersion)" -Verbose
+
+    # Check if a compatible version of Pester is already installed
+    $installedPester = Get-Module -Name Pester -ListAvailable |
+        Where-Object { $_.Version -ge $MinimumVersion -and $_.Version -le $MaximumVersion } |
+        Sort-Object -Property Version -Descending |
+        Select-Object -First 1
+
+    if ($installedPester -and -not $Force) {
+        Write-Host "Pester version $($installedPester.Version) is already installed and meets requirements" -ForegroundColor Green
+        return
+    }
+
+    if ($Force) {
+        Write-Host "Installing Pester module (forced)" -ForegroundColor Yellow
+    } else {
+        Write-Host "Installing Pester module" -ForegroundColor Yellow
+    }
+
+    try {
+        Install-Module -Name Pester -Force -SkipPublisherCheck -MaximumVersion $MaximumVersion -ErrorAction Stop
+        Write-Host "Successfully installed Pester module" -ForegroundColor Green
+    }
+    catch {
+        Write-Error "Failed to install Pester module: $_"
+        throw
+    }
+}
+
 # Implement CI 'Test_script'
 function Invoke-CITest
 {
@@ -220,9 +276,12 @@ function Invoke-CITest
         [string] $Purpose,
         [ValidateSet('CI', 'Others')]
         [string] $TagSet,
-        [string] $TitlePrefix
+        [string] $TitlePrefix,
+        [string] $OutputFormat = "NUnitXml"
     )
 
+    Write-Verbose -Verbose "CI test: OutputFormat: $OutputFormat"
+
     # Set locale correctly for Linux CIs
     Set-CorrectLocale
 
@@ -245,7 +304,7 @@ function Invoke-CITest
 
     if($IsLinux -or $IsMacOS)
     {
-        return Invoke-LinuxTestsCore -Purpose $Purpose -ExcludeTag $ExcludeTag -TagSet $TagSet -TitlePrefix $TitlePrefix
+        return Invoke-LinuxTestsCore -Purpose $Purpose -ExcludeTag $ExcludeTag -TagSet $TagSet -TitlePrefix $TitlePrefix -OutputFormat $OutputFormat
     }
 
     # CoreCLR
@@ -277,12 +336,14 @@ function Invoke-CITest
             Terse = $true
             Tag = @()
             ExcludeTag = $ExcludeTag + 'RequireAdminOnWindows'
+            OutputFormat = $OutputFormat
         }
 
         $title = "Pester Unelevated - $TagSet"
         if ($TitlePrefix) {
             $title = "$TitlePrefix - $title"
         }
+        Write-Verbose -Verbose "Starting Pester with output format $($arguments.OutputFormat)"
         Start-PSPester @arguments -Title $title
 
         # Fail the build, if tests failed
@@ -310,7 +371,10 @@ function Invoke-CITest
             if ($TitlePrefix) {
                 $title = "$TitlePrefix - $title"
             }
-            Start-PSPester @arguments -Title $title
+
+            # We just built the test tools, we don't need to rebuild them
+            Write-Verbose -Verbose "Starting Pester with output format $($arguments.OutputFormat)"
+            Start-PSPester @arguments -Title $title -SkipTestToolBuild
 
             # Fail the build, if tests failed
             Test-PSPesterResults -TestResultsFile $expFeatureTestResultFile
@@ -324,12 +388,15 @@ function Invoke-CITest
             OutputFile = $testResultsAdminFile
             Tag = @('RequireAdminOnWindows')
             ExcludeTag = $ExcludeTag
+            OutputFormat = $OutputFormat
         }
 
         $title = "Pester Elevated - $TagSet"
         if ($TitlePrefix) {
             $title = "$TitlePrefix - $title"
         }
+
+        Write-Verbose -Verbose "Starting Pester with output format $($arguments.OutputFormat)"
         Start-PSPester @arguments -Title $title
 
         # Fail the build, if tests failed
@@ -360,7 +427,10 @@ function Invoke-CITest
             if ($TitlePrefix) {
                 $title = "$TitlePrefix - $title"
             }
-            Start-PSPester @arguments -Title $title
+
+            Write-Verbose -Verbose "Starting Pester with output format $($arguments.OutputFormat)"
+            # We just built the test tools, we don't need to rebuild them
+            Start-PSPester @arguments -Title $title -SkipTestToolBuild
 
             # Fail the build, if tests failed
             Test-PSPesterResults -TestResultsFile $expFeatureTestResultFile
@@ -377,8 +447,6 @@ function New-CodeCoverageAndTestPackage
 
     if (Test-DailyBuild)
     {
-        Start-PSBootstrap -Verbose
-
         Start-PSBuild -Configuration 'CodeCoverage' -Clean
 
         $codeCoverageOutput = Split-Path -Parent (Get-PSOutput)
@@ -433,6 +501,18 @@ function Push-Artifact
     if ($env:TF_BUILD) {
         # In Azure DevOps
         Write-Host "##vso[artifact.upload containerfolder=$artifactName;artifactname=$artifactName;]$Path"
+    } elseif ($env:GITHUB_WORKFLOW -and $env:RUNNER_WORKSPACE) {
+        # In GitHub Actions
+        $destinationPath = Join-Path -Path $env:RUNNER_WORKSPACE -ChildPath $artifactName
+
+        # Create the folder if it does not exist
+        if (!(Test-Path -Path $destinationPath)) {
+            $null = New-Item -ItemType Directory -Path $destinationPath -Force
+        }
+
+        Copy-Item -Path $Path -Destination $destinationPath -Force -Verbose
+    } else {
+        Write-Warning "Push-Artifact is not supported in this environment."
     }
 }
 
@@ -480,6 +560,9 @@ function Invoke-CIFinish
         [string[]] $Stage = ('Build','Package')
     )
 
+    # Switch to public sources in CI
+    Switch-PSNugetConfig -Source Public
+
     if ($PSEdition -eq 'Core' -and ($IsLinux -or $IsMacOS) -and $Stage -contains 'Build') {
         return New-LinuxPackage
     }
@@ -533,17 +616,9 @@ function Invoke-CIFinish
             Restore-PSOptions -PSOptionsPath "${buildFolder}/psoptions.json"
             $preReleaseVersion = $env:CI_FINISH_RELASETAG
 
-            # Build packages	            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
-            switch -regex ($Runtime){
-                default {
-                    $runPackageTest = $true
-                    $packageTypes = 'msi', 'nupkg', 'zip', 'zip-pdb', 'msix'
-                }
-                'win-arm.*' {
-                    $runPackageTest = $false
-                    $packageTypes = 'zip', 'zip-pdb', 'msix'
-                }
-            }
+            # Build packages
+            $packageTypes = 'zip', 'zip-pdb', 'msix'
+
             $packages = Start-PSPackage -Type $packageTypes -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime
 
             foreach ($package in $packages) {
@@ -555,48 +630,9 @@ function Invoke-CIFinish
 
                 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)
-                }
-            }
-
-            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
-
-                $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
-
-                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)"
                 }
             }
 
-            # 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) {
-                    $artifacts.AddRange(@($nugetArtifacts))
-                }
-            }
         }
     } catch {
         Get-Error -InputObject $_
@@ -620,6 +656,43 @@ function Invoke-CIFinish
     }
 }
 
+function Set-Path
+{
+    param
+    (
+        [Parameter(Mandatory)]
+        [string]
+        $Path,
+
+        [Parameter(Mandatory)]
+        [switch]
+        $Append
+    )
+
+    $machinePathString = [System.Environment]::GetEnvironmentVariable('path',[System.EnvironmentVariableTarget]::Machine)
+    $machinePath = $machinePathString -split ';'
+
+    if($machinePath -inotcontains $path)
+    {
+        $newPath = "$machinePathString;$path"
+        Write-Verbose "Adding $path to path..." -Verbose
+        [System.Environment]::SetEnvironmentVariable('path',$newPath,[System.EnvironmentVariableTarget]::Machine)
+        Write-Verbose "Added $path to path." -Verbose
+    }
+    else
+    {
+        Write-Verbose "$path already in path." -Verbose
+    }
+}
+
+# Display environment variables in a log group for GitHub Actions
+function Show-Environment
+{
+    Write-LogGroupStart -Title 'Environment'
+    Get-ChildItem -Path env: | Out-String -width 9999 -Stream | Write-Verbose -Verbose
+    Write-LogGroupEnd -Title 'Environment'
+}
+
 # Bootstrap script for Linux and macOS
 function Invoke-BootstrapStage
 {
@@ -627,7 +700,7 @@ function Invoke-BootstrapStage
     Write-Log -Message "Executing ci.psm1 Bootstrap Stage"
     # Make sure we have all the tags
     Sync-PSTags -AddRemoteIfMissing
-    Start-PSBootstrap -Package:$createPackages
+    Start-PSBootstrap -Scenario Package:$createPackages
 }
 
 # Run pester tests for Linux and macOS
@@ -639,7 +712,8 @@ function Invoke-LinuxTestsCore
         [string] $Purpose = 'All',
         [string[]] $ExcludeTag = @('Slow', 'Feature', 'Scenario'),
         [string] $TagSet = 'CI',
-        [string] $TitlePrefix
+        [string] $TitlePrefix,
+        [string] $OutputFormat = "NUnitXml"
     )
 
     $output = Split-Path -Parent (Get-PSOutput -Options (Get-PSOptions))
@@ -652,12 +726,13 @@ function Invoke-LinuxTestsCore
     $sudoResultsWithExpFeatures = $null
 
     $noSudoPesterParam = @{
-        'BinDir'     = $output
-        'PassThru'   = $true
-        'Terse'      = $true
-        'Tag'        = @()
-        'ExcludeTag' = $testExcludeTag
-        'OutputFile' = $testResultsNoSudo
+        'BinDir'       = $output
+        'PassThru'     = $true
+        'Terse'        = $true
+        'Tag'          = @()
+        'ExcludeTag'   = $testExcludeTag
+        'OutputFile'   = $testResultsNoSudo
+        'OutputFormat' = $OutputFormat
     }
 
     # Get the experimental feature names and the tests associated with them
@@ -695,7 +770,7 @@ function Invoke-LinuxTestsCore
             if ($TitlePrefix) {
                 $title = "$TitlePrefix - $title"
             }
-            $passThruResult = Start-PSPester @noSudoPesterParam -Title $title
+            $passThruResult = Start-PSPester @noSudoPesterParam -Title $title -SkipTestToolBuild
 
             $noSudoResultsWithExpFeatures += $passThruResult
         }
@@ -710,6 +785,7 @@ function Invoke-LinuxTestsCore
         $sudoPesterParam['ExcludeTag'] = $ExcludeTag
         $sudoPesterParam['Sudo'] = $true
         $sudoPesterParam['OutputFile'] = $testResultsSudo
+        $sudoPesterParam['OutputFormat'] = $OutputFormat
 
         $title = "Pester Sudo - $TagSet"
         if ($TitlePrefix) {
@@ -742,7 +818,9 @@ function Invoke-LinuxTestsCore
             if ($TitlePrefix) {
                 $title = "$TitlePrefix - $title"
             }
-            $passThruResult = Start-PSPester @sudoPesterParam -Title $title
+
+            # We just built the test tools for the main test run, we don't need to rebuild them
+            $passThruResult = Start-PSPester @sudoPesterParam -Title $title -SkipTestToolBuild
 
             $sudoResultsWithExpFeatures += $passThruResult
         }
@@ -806,16 +884,36 @@ function New-LinuxPackage
             $packageObj = $package
         }
 
-        Write-Log -message "Artifacts directory: ${env:BUILD_ARTIFACTSTAGINGDIRECTORY}"
-        Copy-Item $packageObj.FullName -Destination "${env:BUILD_ARTIFACTSTAGINGDIRECTORY}" -Force
+        # Determine artifacts directory (GitHub Actions or Azure DevOps)
+        $artifactsDir = if ($env:GITHUB_ACTIONS -eq 'true') {
+            "${env:GITHUB_WORKSPACE}/../packages"
+        } else {
+            "${env:BUILD_ARTIFACTSTAGINGDIRECTORY}"
+        }
+
+        # Ensure artifacts directory exists
+        if (-not (Test-Path $artifactsDir)) {
+            New-Item -ItemType Directory -Path $artifactsDir -Force | Out-Null
+        }
+
+        Write-Log -message "Artifacts directory: $artifactsDir"
+        Copy-Item $packageObj.FullName -Destination $artifactsDir -Force
     }
 
     if ($IsLinux)
     {
+        # Determine artifacts directory (GitHub Actions or Azure DevOps)
+        $artifactsDir = if ($env:GITHUB_ACTIONS -eq 'true') {
+            "${env:GITHUB_WORKSPACE}/../packages"
+        } else {
+            "${env:BUILD_ARTIFACTSTAGINGDIRECTORY}"
+        }
+
         # Create and package Raspbian .tgz
+        # Build must be clean for Raspbian
         Start-PSBuild -PSModuleRestore -Clean -Runtime linux-arm -Configuration 'Release'
         $armPackage = Start-PSPackage @packageParams -Type tar-arm -SkipReleaseChecks
-        Copy-Item $armPackage -Destination "${env:BUILD_ARTIFACTSTAGINGDIRECTORY}" -Force
+        Copy-Item $armPackage -Destination $artifactsDir -Force
     }
 }
 
@@ -832,11 +930,17 @@ function Invoke-InitializeContainerStage {
 
     # 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
     }
 
+    # cut down to 32 bits and keep the most varying parts, which are lower bits
+    if ($seed -ge [Int32]::MaxValue) {
+        $seed = [int]($seed -band [int]::MaxValue)
+    }
+
     Write-Verbose "Seed: $seed" -Verbose
 
     # Get the latest image matrix JSON for preview
@@ -870,3 +974,226 @@ function Invoke-InitializeContainerStage {
       Write-Host "##vso[build.addbuildtag]$($selectedImage.JobName)"
     }
 }
+
+Function Test-MergeConflictMarker
+{
+    <#
+    .SYNOPSIS
+        Checks files for Git merge conflict markers and outputs results for GitHub Actions.
+    .DESCRIPTION
+        Scans the specified files for Git merge conflict markers (<<<<<<<, =======, >>>>>>>)
+        and generates console output, GitHub Actions outputs, and job summary.
+        Designed for use in GitHub Actions workflows.
+    .PARAMETER File
+        Array of file paths (relative or absolute) to check for merge conflict markers.
+    .PARAMETER WorkspacePath
+        Base workspace path for resolving relative paths. Defaults to current directory.
+    .PARAMETER OutputPath
+        Path to write GitHub Actions outputs. Defaults to $env:GITHUB_OUTPUT.
+    .PARAMETER SummaryPath
+        Path to write GitHub Actions job summary. Defaults to $env:GITHUB_STEP_SUMMARY.
+    .EXAMPLE
+        Test-MergeConflictMarker -File @('file1.txt', 'file2.cs') -WorkspacePath $env:GITHUB_WORKSPACE
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter()]
+        [AllowEmptyCollection()]
+        [string[]] $File = @(),
+
+        [Parameter()]
+        [string] $WorkspacePath = $PWD,
+
+        [Parameter()]
+        [string] $OutputPath = $env:GITHUB_OUTPUT,
+
+        [Parameter()]
+        [string] $SummaryPath = $env:GITHUB_STEP_SUMMARY
+    )
+
+    Write-Host "Starting merge conflict marker check..." -ForegroundColor Cyan
+
+    # Helper function to write outputs when no files to check
+    function Write-NoFilesOutput {
+        param(
+            [string]$Message,
+            [string]$OutputPath,
+            [string]$SummaryPath
+        )
+
+        # Output results to GitHub Actions
+        if ($OutputPath) {
+            "files-checked=0" | Out-File -FilePath $OutputPath -Append -Encoding utf8
+            "conflicts-found=0" | Out-File -FilePath $OutputPath -Append -Encoding utf8
+        }
+
+        # Create GitHub Actions job summary
+        if ($SummaryPath) {
+            $summaryContent = @"
+# Merge Conflict Marker Check Results
+
+## Summary
+- **Files Checked:** 0
+- **Files with Conflicts:** 0
+
+## ℹ️ No Files to Check
+
+$Message
+
+"@
+            $summaryContent | Out-File -FilePath $SummaryPath -Encoding utf8
+        }
+    }
+
+    # Handle empty file list (e.g., when PR only deletes files)
+    if ($File.Count -eq 0) {
+        Write-Host "No files to check (empty file list)" -ForegroundColor Yellow
+        Write-NoFilesOutput -Message "No files were provided for checking (this can happen when a PR only deletes files)." -OutputPath $OutputPath -SummaryPath $SummaryPath
+        return
+    }
+
+    # Filter out *.cs files from merge conflict checking
+    $filesToCheck = @($File | Where-Object { $_ -notlike "*.cs" })
+    $filteredCount = $File.Count - $filesToCheck.Count
+
+    if ($filteredCount -gt 0) {
+        Write-Host "Filtered out $filteredCount *.cs file(s) from merge conflict checking" -ForegroundColor Yellow
+    }
+
+    if ($filesToCheck.Count -eq 0) {
+        Write-Host "No files to check after filtering (all files were *.cs)" -ForegroundColor Yellow
+        Write-NoFilesOutput -Message "All $filteredCount file(s) were filtered out (*.cs files are excluded from merge conflict checking)." -OutputPath $OutputPath -SummaryPath $SummaryPath
+        return
+    }
+
+    Write-Host "Checking $($filesToCheck.Count) changed files for merge conflict markers" -ForegroundColor Cyan
+
+    # Convert relative paths to absolute paths for processing
+    $absolutePaths = $filesToCheck | ForEach-Object {
+        if ([System.IO.Path]::IsPathRooted($_)) {
+            $_
+        } else {
+            Join-Path $WorkspacePath $_
+        }
+    }
+
+    $filesWithConflicts = @()
+    $filesChecked = 0
+
+    foreach ($filePath in $absolutePaths) {
+        # Check if file exists (might be deleted)
+        if (-not (Test-Path $filePath)) {
+            Write-Verbose "  Skipping deleted file: $filePath"
+            continue
+        }
+
+        # Skip binary files and directories
+        if ((Get-Item $filePath) -is [System.IO.DirectoryInfo]) {
+            continue
+        }
+
+        $filesChecked++
+
+        # Get relative path for display
+        $relativePath = if ($WorkspacePath -and $filePath.StartsWith($WorkspacePath)) {
+            $filePath.Substring($WorkspacePath.Length).TrimStart([System.IO.Path]::DirectorySeparatorChar, [System.IO.Path]::AltDirectorySeparatorChar)
+        } else {
+            $filePath
+        }
+
+        Write-Host "  Checking: $relativePath" -ForegroundColor Gray
+
+        # Search for conflict markers using Select-String
+        try {
+            # Git conflict markers are 7 characters followed by a space or end of line
+            # Regex pattern breakdown:
+            #   ^            - Matches the start of a line
+            #   (<{7}|={7}|>{7}) - Matches exactly 7 consecutive '<', '=', or '>' characters (Git conflict markers)
+            #   (\s|$)       - Ensures the marker is followed by whitespace or end of line
+            $pattern = '^(<{7}|={7}|>{7})(\s|$)'
+            $matchedLines = Select-String -Path $filePath -Pattern $pattern -AllMatches -ErrorAction Stop
+
+            if ($matchedLines) {
+                # Collect marker details with line numbers (Select-String provides LineNumber automatically)
+                $markerDetails = @()
+
+                foreach ($match in $matchedLines) {
+                    $markerDetails += [PSCustomObject]@{
+                        Marker = $match.Matches[0].Groups[1].Value
+                        Line = $match.LineNumber
+                    }
+                }
+
+                $filesWithConflicts += [PSCustomObject]@{
+                    File = $relativePath
+                    MarkerDetails = $markerDetails
+                }
+
+                Write-Host "  ❌ CONFLICT MARKERS FOUND in $relativePath" -ForegroundColor Red
+                foreach ($detail in $markerDetails) {
+                    Write-Host "     Line $($detail.Line): $($detail.Marker)" -ForegroundColor Red
+                }
+            }
+        }
+        catch {
+            # Skip files that can't be read (likely binary)
+            Write-Verbose "  Skipping unreadable file: $relativePath"
+        }
+    }
+
+    # Output results to GitHub Actions
+    if ($OutputPath) {
+        "files-checked=$filesChecked" | Out-File -FilePath $OutputPath -Append -Encoding utf8
+        "conflicts-found=$($filesWithConflicts.Count)" | Out-File -FilePath $OutputPath -Append -Encoding utf8
+    }
+
+    Write-Host "`nSummary:" -ForegroundColor Cyan
+    Write-Host "  Files checked: $filesChecked" -ForegroundColor Cyan
+    Write-Host "  Files with conflicts: $($filesWithConflicts.Count)" -ForegroundColor Cyan
+
+    # Create GitHub Actions job summary
+    if ($SummaryPath) {
+        $summaryContent = @"
+# Merge Conflict Marker Check Results
+
+## Summary
+- **Files Checked:** $filesChecked
+- **Files with Conflicts:** $($filesWithConflicts.Count)
+
+"@
+
+        if ($filesWithConflicts.Count -gt 0) {
+            Write-Host "`n❌ Merge conflict markers detected in the following files:" -ForegroundColor Red
+
+            $summaryContent += "`n## ❌ Conflicts Detected`n`n"
+            $summaryContent += "The following files contain merge conflict markers:`n`n"
+
+            foreach ($fileInfo in $filesWithConflicts) {
+                Write-Host "  - $($fileInfo.File)" -ForegroundColor Red
+
+                $summaryContent += "### 📄 ``$($fileInfo.File)```n`n"
+                $summaryContent += "| Line | Marker |`n"
+                $summaryContent += "|------|--------|`n"
+
+                foreach ($detail in $fileInfo.MarkerDetails) {
+                    Write-Host "     Line $($detail.Line): $($detail.Marker)" -ForegroundColor Red
+                    $summaryContent += "| $($detail.Line) | ``$($detail.Marker)`` |`n"
+                }
+                $summaryContent += "`n"
+            }
+
+            $summaryContent += "`n**Action Required:** Please resolve these conflicts before merging.`n"
+            Write-Host "`nPlease resolve these conflicts before merging." -ForegroundColor Red
+        } else {
+            Write-Host "`n✅ No merge conflict markers found" -ForegroundColor Green
+            $summaryContent += "`n## ✅ No Conflicts Found`n`nAll checked files are free of merge conflict markers.`n"
+        }
+
+        $summaryContent | Out-File -FilePath $SummaryPath -Encoding utf8
+    }
+
+    # Exit with error if conflicts found
+    if ($filesWithConflicts.Count -gt 0) {
+        throw "Merge conflict markers detected in $($filesWithConflicts.Count) file(s)"
+    }
+}
diff --git a/tools/clearlyDefined/ClearlyDefined.ps1 b/tools/clearlyDefined/ClearlyDefined.ps1
index 1830c2969e5..c5303b8622b 100644
--- a/tools/clearlyDefined/ClearlyDefined.ps1
+++ b/tools/clearlyDefined/ClearlyDefined.ps1
@@ -21,7 +21,7 @@ if ($ForceModuleReload) {
 
 Import-Module -Name "$PSScriptRoot/src/ClearlyDefined" @extraParams
 
-$cgManfest = Get-Content "$PSScriptRoot/../cgmanifest.json" | ConvertFrom-Json
+$cgManfest = Get-Content "$PSScriptRoot/../cgmanifest/main/cgmanifest.json" | ConvertFrom-Json
 $fullCgList = $cgManfest.Registrations.Component |
     ForEach-Object {
         [Pscustomobject]@{
diff --git a/tools/clearlyDefined/Find-LastHarvestedVersion.ps1 b/tools/clearlyDefined/Find-LastHarvestedVersion.ps1
new file mode 100644
index 00000000000..a989a3e1fc4
--- /dev/null
+++ b/tools/clearlyDefined/Find-LastHarvestedVersion.ps1
@@ -0,0 +1,156 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+<#
+.SYNOPSIS
+    Find the last harvested version of a NuGet package from ClearlyDefined.
+
+.DESCRIPTION
+    Searches for the last harvested version of a package by checking versions
+    backwards from the specified current version. This is useful for reverting
+    to a known-good harvested version when a newer version hasn't been harvested yet.
+
+.PARAMETER Name
+    The NuGet package name to search for.
+
+.PARAMETER CurrentVersion
+    The version to start searching backwards from. Version comparison uses semantic versioning.
+
+.PARAMETER PackageSourceName
+    The NuGet package source name to use when searching for available versions.
+    Default is 'findMissingNoticesNugetOrg' if not specified.
+
+.EXAMPLE
+    Find-LastHarvestedVersion -Name "Microsoft.Windows.Compatibility" -CurrentVersion "8.0.24"
+
+    # This will return "8.0.22" if that's the last harvested version
+
+.NOTES
+    Requires the ClearlyDefined module to be imported:
+    Import-Module ".\clearlyDefined\src\ClearlyDefined" -Force
+#>
+
+function Find-LastHarvestedVersion {
+    [CmdletBinding()]
+    param(
+        [parameter(Mandatory)]
+        [string]$Name,
+
+        [parameter(Mandatory)]
+        [string]$CurrentVersion,
+
+        [string]$PackageSourceName = 'findMissingNoticesNugetOrg'
+    )
+
+    try {
+        Write-Verbose "Finding last harvested version for $Name starting from v$CurrentVersion..."
+
+        # Parse the current version
+        try {
+            [System.Management.Automation.SemanticVersion]$currentSemVer = $CurrentVersion
+        } catch {
+            [Version]$currentSemVer = $CurrentVersion
+        }
+
+        # First try the ClearlyDefined search API (more efficient)
+        try {
+            Write-Verbose "Searching ClearlyDefined API for versions of $Name (sorted by release date)..."
+            # Get versions sorted by release date descending (newest first) for efficiency
+            $versions = Get-ClearlyDefinedPackageVersions -PackageName $Name
+
+            if ($versions -and $versions.Count -gt 0) {
+                # Results are already sorted by release date newest first
+                # Filter to versions <= current version
+                foreach ($versionInfo in $versions) {
+                    try {
+                        $versionObj = [System.Management.Automation.SemanticVersion]$versionInfo.Version
+                        if ($versionObj -le $currentSemVer) {
+                            # Check harvest status
+                            if ($versionInfo.Harvested) {
+                                Write-Verbose "Found harvested version: v$($versionInfo.Version)"
+                                return $versionInfo.Version
+                            } else {
+                                Write-Verbose "v$($versionInfo.Version) - Not harvested, continuing..."
+                            }
+                        }
+                    } catch {
+                        # Skip versions that can't be parsed
+                    }
+                }
+
+                Write-Verbose "No harvested version found in ClearlyDefined results"
+                return $null
+            }
+        } catch {
+            Write-Verbose "ClearlyDefined search API failed ($_), falling back to NuGet search..."
+        }
+
+        # Fallback: Get all available versions from NuGet and check individually
+        Write-Verbose "Falling back to NuGet source search..."
+
+        # Ensure package source exists
+        if (!(Get-PackageSource -Name $PackageSourceName -ErrorAction SilentlyContinue)) {
+            Write-Verbose "Registering package source: $PackageSourceName"
+            $null = Register-PackageSource -Name $PackageSourceName -Location https://www.nuget.org/api/v2 -ProviderName NuGet
+        }
+
+        # Get all available versions from NuGet
+        try {
+            $allVersions = Find-Package -Name $Name -AllowPrereleaseVersions -source $PackageSourceName -AllVersions -ErrorAction SilentlyContinue | ForEach-Object {
+                try {
+                    $packageVersion = [System.Management.Automation.SemanticVersion]$_.Version
+                } catch {
+                    $packageVersion = [Version]$_.Version
+                }
+                $_ | Add-Member -Name SemVer -MemberType NoteProperty -Value $packageVersion -PassThru
+            } | Where-Object { $_.SemVer -le $currentSemVer } | Sort-Object -Property SemVer -Descending | ForEach-Object { $_.Version }
+        } catch {
+            Write-Warning "Failed to get versions for $Name : $_"
+            return $null
+        }
+
+        if (!$allVersions) {
+            Write-Verbose "No versions found for $Name"
+            return $null
+        }
+
+        # Check each version backwards until we find one that's harvested
+        foreach ($version in $allVersions) {
+            $pkg = [PSCustomObject]@{
+                type           = "nuget"
+                Name           = $Name
+                PackageVersion = $version
+            }
+
+            try {
+                $result = $pkg | Get-ClearlyDefinedData
+                if ($result -and $result.harvested) {
+                    Write-Verbose "Found harvested version: v$version"
+                    return $version
+                } else {
+                    Write-Verbose "v$version - Not harvested, continuing..."
+                }
+            } catch {
+                Write-Verbose "Error checking v$version : $_" -Verbose
+            }
+        }
+
+        Write-Verbose "No harvested version found for $Name"
+        return $null
+    } finally {
+        Save-ClearlyDefinedCache
+    }
+}
+
+# If this script is called directly (not sourced), run a test
+if ($MyInvocation.InvocationName -eq '.' -or $MyInvocation.Line -like '. "*Find-LastHarvestedVersion*') {
+    # Script was sourced, just load the function
+} else {
+    # Script was called directly
+    Write-Host "Testing Find-LastHarvestedVersion function..."
+    Write-Host "Ensure ClearlyDefined module is loaded first:"
+    Write-Host '  Import-Module ".\clearlydefined\src\ClearlyDefined" -Force'
+    Write-Host ""
+    Write-Host "Example usage:"
+    Write-Host '  Find-LastHarvestedVersion -Name "Microsoft.Windows.Compatibility" -CurrentVersion "8.0.24"'
+}
diff --git a/tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1 b/tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1
index 2a9434c9cbe..88fc1f7cabd 100644
--- a/tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1
+++ b/tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1
@@ -2,6 +2,9 @@
 # Licensed under the MIT License.
 
 # Start the collection (known as harvest) of ClearlyDefined data for a package
+
+$retryIntervalSec = 90
+$maxRetryCount = 5
 function Start-ClearlyDefinedHarvest {
     [CmdletBinding()]
     param(
@@ -27,7 +30,9 @@ function Start-ClearlyDefinedHarvest {
         $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
+        Start-job -ScriptBlock {
+            Invoke-WebRequest -Method Post  -Uri 'https://api.clearlydefined.io/harvest' -Body $using:body -ContentType 'application/json' -MaximumRetryCount $using:maxRetryCount -RetryIntervalSec $using:retryIntervalSec
+        }
     }
 }
 
@@ -35,19 +40,30 @@ function ConvertFrom-ClearlyDefinedCoordinates {
     [CmdletBinding()]
     param(
         [parameter(mandatory = $true, ValueFromPipeline = $true)]
-        [string]
+        [object]
         $Coordinates
     )
 
     Begin {}
     Process {
-        $parts = $Coordinates.Split('/')
-        [PSCustomObject]@{
-            type = $parts[0]
-            provider = $parts[1]
-            namespace = $parts[2]
-            name = $parts[3]
-            revision = $parts[4]
+        if ($Coordinates -is [string]) {
+            $parts = $Coordinates.Split('/')
+            [PSCustomObject]@{
+                type = $parts[0]
+                provider = $parts[1]
+                namespace = $parts[2]
+                name = $parts[3]
+                revision = $parts[4]
+            }
+        } else {
+            # Coordinates is already an object (e.g., from ClearlyDefined API response)
+            [PSCustomObject]@{
+                type = $Coordinates.type
+                provider = $Coordinates.provider
+                namespace = $Coordinates.namespace
+                name = $Coordinates.name
+                revision = $Coordinates.revision
+            }
         }
     }
     End {}
@@ -74,6 +90,207 @@ Function Get-ClearlyDefinedCoordinates {
 # Cache of ClearlyDefined data
 $cdCache = @{}
 
+function Test-ClearlyDefinedCachePersistenceAllowed {
+    [CmdletBinding()]
+    param()
+
+    if ($env:TF_BUILD -or $env:ADO_BUILD_ID -or $env:BUILD_BUILDID) {
+        return $false
+    }
+
+    if ($env:GITHUB_ACTIONS -or $env:GITHUB_RUN_ID) {
+        return $false
+    }
+
+    return $true
+}
+
+function Get-ClearlyDefinedCachePath {
+    [CmdletBinding()]
+    param()
+
+    $tempPath = [System.IO.Path]::GetTempPath()
+    return (Join-Path -Path $tempPath -ChildPath 'clearlydefined-cache.json')
+}
+
+function Save-ClearlyDefinedCache {
+    [CmdletBinding()]
+    param()
+
+    if (-not (Test-ClearlyDefinedCachePersistenceAllowed)) {
+        Write-Verbose 'Skipping cache persistence for CI environment.'
+        return
+    }
+
+    if ($cdCache.Count -eq 0) {
+        Write-Verbose 'No cache entries to persist.'
+        return
+    }
+
+    $cachePath = Get-ClearlyDefinedCachePath
+    $entries = foreach ($key in $cdCache.Keys) {
+        [PSCustomObject]@{
+            coordinates = $key
+            data = $cdCache[$key]
+        }
+    }
+
+    $cachePayload = @{
+        savedAtUtc = (Get-Date).ToUniversalTime()
+        entries = $entries
+    } | ConvertTo-Json -Depth 20
+
+    $cachePayload | Set-Content -Path $cachePath -Encoding UTF8
+    Write-Verbose "Persisted cache to $cachePath"
+}
+
+function Import-ClearlyDefinedCache {
+    [CmdletBinding()]
+    param()
+
+    if (-not (Test-ClearlyDefinedCachePersistenceAllowed)) {
+        Write-Verbose 'Skipping cache import for CI environment.'
+        return
+    }
+
+    $cachePath = Get-ClearlyDefinedCachePath
+    if (-not (Test-Path -Path $cachePath)) {
+        Write-Verbose 'No persisted cache found.'
+        return
+    }
+
+    try {
+        $payload = Get-Content -Path $cachePath -Raw | ConvertFrom-Json
+    } catch {
+        Write-Verbose "Failed to read cache file: $cachePath"
+        return
+    }
+
+    if (-not $payload.entries) {
+        Write-Verbose 'Cache file did not contain entries.'
+        return
+    }
+
+    foreach ($entry in $payload.entries) {
+        if (-not $entry.coordinates -or -not $entry.data) {
+            continue
+        }
+
+        try {
+            $entry.data.cachedTime = [datetime]$entry.data.cachedTime
+        } catch {
+            continue
+        }
+
+        $cdCache[$entry.coordinates] = $entry.data
+    }
+
+    Write-Verbose "Imported $($cdCache.Count) cache entries from $cachePath"
+}
+
+# Search for packages in ClearlyDefined
+Function Search-ClearlyDefined {
+    [CmdletBinding()]
+    param(
+        [string]$Type = 'nuget',
+        [string]$Provider = 'nuget',
+        [string]$Namespace,
+        [string]$Name,
+        [string]$Pattern,
+        [datetime]$ReleasedAfter,
+        [datetime]$ReleasedBefore,
+        [ValidateSet('releaseDate', 'name')]
+        [string]$Sort,
+        [switch]$SortDesc
+    )
+
+    $queryParams = @()
+    if ($Type) { $queryParams += "type=$([System.Uri]::EscapeDataString($Type))" }
+    if ($Provider) { $queryParams += "provider=$([System.Uri]::EscapeDataString($Provider))" }
+    if ($Namespace) { $queryParams += "namespace=$([System.Uri]::EscapeDataString($Namespace))" }
+    if ($Name) { $queryParams += "name=$([System.Uri]::EscapeDataString($Name))" }
+    if ($Pattern) { $queryParams += "pattern=$([System.Uri]::EscapeDataString($Pattern))" }
+    if ($ReleasedAfter) { $queryParams += "releasedAfter=$($ReleasedAfter.ToString('o'))" }
+    if ($ReleasedBefore) { $queryParams += "releasedBefore=$($ReleasedBefore.ToString('o'))" }
+    if ($Sort) { $queryParams += "sort=$([System.Uri]::EscapeDataString($Sort))" }
+    if ($SortDesc) { $queryParams += "sortDesc=true" }
+
+    $searchUri = "https://api.clearlydefined.io/definitions?" + ($queryParams -join '&')
+    Write-Verbose "Searching ClearlyDefined: $searchUri"
+
+    try {
+        $results = Invoke-RestMethod -Uri $searchUri -MaximumRetryCount $maxRetryCount -RetryIntervalSec $retryIntervalSec
+        return $results
+    } catch {
+        if ($retryIntervalSec -lt 300) {
+            $retryIntervalSec++
+        }
+
+        Write-Warning "Failed to search ClearlyDefined: $_"
+        return $null
+    }
+}
+
+# Get available versions for a NuGet package with harvest status
+Function Get-ClearlyDefinedPackageVersions {
+    [CmdletBinding()]
+    param(
+        [parameter(mandatory = $true)]
+        [string]
+        $PackageName,
+
+        [validateset('nuget')]
+        [string]
+        $PackageType = 'nuget'
+    )
+
+    # Search for all definitions of this package, sorted by release date (newest first)
+    Write-Verbose "Fetching versions of $PackageName from ClearlyDefined..."
+
+    $results = Search-ClearlyDefined -Type $PackageType -Provider nuget -Name $PackageName -Sort releaseDate -SortDesc
+
+    if (!$results) {
+        Write-Verbose "No results found for $PackageName"
+        return @()
+    }
+
+    # Convert results to version info objects
+    $versions = @()
+
+    # API returns results in different formats depending on the query
+    $dataArray = $null
+    if ($results.data) {
+        $dataArray = $results.data
+    } elseif ($results -is [array]) {
+        $dataArray = $results
+    } elseif ($results.PSObject.Properties.Count -gt 0) {
+        # If it's an object with properties, try to extract the actual results
+        foreach ($prop in $results.PSObject.Properties) {
+            if ($prop.Value -is [object] -and $prop.Value.revision) {
+                $dataArray += $prop.Value
+            }
+        }
+    }
+
+    if ($dataArray) {
+        foreach ($item in $dataArray) {
+            if ($item.revision) {
+                $harvested = if ($item.licensed -and $item.licensed.declared) { $true } else { $false }
+
+                $versions += [PSCustomObject]@{
+                    Name      = $item.name
+                    Version   = $item.revision
+                    Harvested = $harvested
+                    Licensed  = $item.licensed.declared
+                }
+            }
+        }
+    }
+
+    # Results are already sorted by API, no need to re-sort
+    return $versions
+}
+
 # Get the ClearlyDefined data for a package
 Function Get-ClearlyDefinedData {
     [CmdletBinding()]
@@ -96,8 +313,9 @@ Function Get-ClearlyDefinedData {
     )
 
     Begin {
-        $cacheMinutes = 60
-        $cacheCutoff = (get-date).AddMinutes(-$cacheMinutes)
+        # Different TTLs for different cache types
+        $harvestedCacheMinutes = 60      # Cache positive results for 60 minutes
+        $nonHarvestedCacheMinutes = 30   # Cache negative results for 30 minutes (less aggressive)
         $coordinateList = @()
     }
 
@@ -111,19 +329,55 @@ Function Get-ClearlyDefinedData {
         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
+
+            if ($containsKey) {
+                $cached = $cdCache[$coordinates]
+                # Check if cache entry is still valid based on its type
+                $cacheCutoff = if ($cached.harvestedResult) {
+                    (get-date).AddMinutes(-$harvestedCacheMinutes)
+                } else {
+                    (get-date).AddMinutes(-$nonHarvestedCacheMinutes)
+                }
+
+                if ($cached.cachedTime -gt $cacheCutoff) {
+                    Write-Progress -Activity "Getting ClearlyDefined data" -Status "Getting data for $coordinates - cache hit" -PercentComplete (($completed / $total) * 100)
+                    Write-Verbose "Returning cached data for $coordinates (harvested: $($cached.harvestedResult))"
+                    Write-Output $cached
+                    $completed++
+                    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] = $_
+            Write-Progress -Activity "Getting ClearlyDefined data" -Status "Getting data for $coordinates - cache miss" -PercentComplete (($completed / $total) * 100)
+
+            try {
+                Invoke-RestMethod -Uri "https://api.clearlydefined.io/definitions/$coordinates" -MaximumRetryCount $maxRetryCount -RetryIntervalSec $retryIntervalSec | ForEach-Object {
+                    [bool] $harvested = if ($_.licensed.declared) { $true } else { $false }
+                    # Always cache, with harvestedResult property to distinguish for TTL purposes
+                    Add-Member -NotePropertyName cachedTime -NotePropertyValue (get-date) -InputObject $_ -PassThru |
+                        Add-Member -NotePropertyName harvested -NotePropertyValue $harvested -PassThru |
+                        Add-Member -NotePropertyName harvestedResult -NotePropertyValue $harvested -PassThru |
+                        ForEach-Object {
+                            Write-Verbose "Caching data for $coordinates (harvested: $($_.harvested))"
+                            $cdCache[$coordinates] = $_
+                            Write-Output $_
+                        }
+                }
+            } catch {
+                if ($retryIntervalSec -lt 300) {
+                    $retryIntervalSec++
+                }
+
+                Write-Warning "Failed to get ClearlyDefined data for $coordinates : $_"
+                # Return a minimal object indicating failure/not harvested so the pipeline continues
+                $failedResult = [PSCustomObject]@{
+                    coordinates = $coordinates
+                    harvested = $false
+                    harvestedResult = $false
+                    cachedTime = (get-date)
+                    licensed = @{ declared = $null }
                 }
+                Write-Output $failedResult
             }
             $completed++
         }
@@ -134,4 +388,10 @@ Export-ModuleMember -Function @(
     'Start-ClearlyDefinedHarvest'
     'Get-ClearlyDefinedData'
     'ConvertFrom-ClearlyDefinedCoordinates'
+    'Search-ClearlyDefined'
+    'Get-ClearlyDefinedPackageVersions'
+    'Save-ClearlyDefinedCache'
+    'Import-ClearlyDefinedCache'
+    'Test-ClearlyDefinedCachePersistenceAllowed'
+    'Get-ClearlyDefinedCachePath'
 )
diff --git a/tools/download.sh b/tools/download.sh
index 6a6c6436b4b..f1e8c42cdc3 100644
--- a/tools/download.sh
+++ b/tools/download.sh
@@ -1 +1,3 @@
-bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh)
+# Pin to specific commit for security (OpenSSF Scorecard requirement)
+# Pinned commit: 26bb188c8 - "Improve ValidateLength error message consistency and refactor validation tests" (2025-10-12)
+bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/26bb188c8be0cda6cb548ce1a12840ebf67e1331/tools/install-powershell.sh)
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 6e372c0ede9..5ed931c5caa 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -7,12 +7,53 @@
 
 param(
     [switch] $Fix,
-    [switch] $IsStable
+    [switch] $IsStable,
+    [switch] $ForceHarvestedOnly
 )
 
 Import-Module dotnet.project.assets
 Import-Module "$PSScriptRoot\..\.github\workflows\GHWorkflowHelper" -Force
 . "$PSScriptRoot\..\tools\buildCommon\startNativeExecution.ps1"
+. "$PSScriptRoot\clearlyDefined\Find-LastHarvestedVersion.ps1"
+
+$targetsConfigPath = Join-Path -Path $PSScriptRoot -ChildPath 'findMissingNotices.targets.json'
+if (-not (Test-Path -LiteralPath $targetsConfigPath)) {
+    throw "Missing target framework config file '$targetsConfigPath'. Add '/tools/findMissingNotices.targets.json' with 'dotnetTargetName' and 'windowsTargetNames' entries."
+}
+
+try {
+    $targetsConfig = Get-Content -LiteralPath $targetsConfigPath -Raw -ErrorAction Stop | ConvertFrom-Json -AsHashtable -ErrorAction Stop
+} catch {
+    throw "Failed to load target framework config from '$targetsConfigPath'. Ensure the file contains valid JSON. Error: $($_.Exception.Message)"
+}
+
+if ($targetsConfig -isnot [hashtable]) {
+    throw "Invalid target framework config '$targetsConfigPath': expected a JSON object with 'dotnetTargetName' and 'windowsTargetNames'."
+}
+
+if (-not $targetsConfig.ContainsKey('dotnetTargetName') -or [string]::IsNullOrWhiteSpace($targetsConfig['dotnetTargetName'])) {
+    throw "Invalid target framework config '$targetsConfigPath': 'dotnetTargetName' must be a non-empty string."
+}
+
+if (-not $targetsConfig.ContainsKey('windowsTargetNames')) {
+    throw "Invalid target framework config '$targetsConfigPath': 'windowsTargetNames' must be present and must be an array."
+}
+
+if ($null -eq $targetsConfig['windowsTargetNames'] -or $targetsConfig['windowsTargetNames'] -isnot [array]) {
+    throw "Invalid target framework config '$targetsConfigPath': 'windowsTargetNames' must be an array (empty array is allowed)."
+}
+
+$script:dotnetTargetName = [string]$targetsConfig['dotnetTargetName']
+$script:windowsTargetNames = @()
+foreach ($windowsTargetName in $targetsConfig['windowsTargetNames']) {
+    if ($windowsTargetName -isnot [string] -or [string]::IsNullOrWhiteSpace($windowsTargetName)) {
+        throw "Invalid target framework config '$targetsConfigPath': every entry in 'windowsTargetNames' must be a non-empty string."
+    }
+
+    $script:windowsTargetNames += $windowsTargetName
+}
+
+# Empty windowsTargetNames is valid and means "use base target fallback only".
 
 $packageSourceName = 'findMissingNoticesNugetOrg'
 if (!(Get-PackageSource -Name $packageSourceName -ErrorAction SilentlyContinue)) {
@@ -20,13 +61,15 @@ if (!(Get-PackageSource -Name $packageSourceName -ErrorAction SilentlyContinue))
 }
 
 $existingRegistrationTable = @{}
-$cgManifestPath = (Resolve-Path -Path $PSScriptRoot\..\tools\cgmanifest.json).ProviderPath
+$cgManifestPath = (Resolve-Path -Path $PSScriptRoot\cgmanifest\main\cgmanifest.json).ProviderPath
 $existingRegistrationsJson = Get-Content $cgManifestPath | ConvertFrom-Json -AsHashtable
 $existingRegistrationsJson.Registrations | ForEach-Object {
     $registration = [Registration]$_
     if ($registration.Component) {
         $name = $registration.Component.Name()
-        $existingRegistrationTable.Add($name, $registration)
+        if (!$existingRegistrationTable.ContainsKey($name)) {
+            $existingRegistrationTable.Add($name, $registration)
+        }
     }
 }
 
@@ -88,6 +131,28 @@ if (!$IsWindows) {
     Write-Warning "Always using $winDesktopSdk since this is not windows!!!"
 }
 
+function ConvertTo-SemVer {
+    param(
+        [String] $Version
+    )
+
+    [System.Management.Automation.SemanticVersion]$desiredVersion = [System.Management.Automation.SemanticVersion]::Empty
+
+    try {
+        $desiredVersion = $Version
+    } catch {
+        <#
+            Json.More.Net broke the rules and published 2.0.1.2 as 2.0.1.
+            So, I'm making the logic work for that scenario by
+            thorwing away any part that doesn't match non-pre-release semver portion
+        #>
+        $null = $Version -match '^(\d+\.\d+\.\d+).*'
+        $desiredVersion = $matches[1]
+    }
+
+    return $desiredVersion
+}
+
 function New-NugetComponent {
     param(
         [string]$name,
@@ -125,23 +190,15 @@ function Get-NuGetPublicVersion {
         return $nugetPublicVersionCache[$Name]
     }
 
-    try {
-        [System.Management.Automation.SemanticVersion]$desiredVersion = $Version
-    } catch {
-        [Version]$desiredVersion = $Version
-    }
+    [System.Management.Automation.SemanticVersion]$desiredVersion = ConvertTo-SemVer -Version $Version
 
     $publicVersion = $null
     $publicVersion = Find-Package -Name $Name -AllowPrereleaseVersions -source $packageSourceName -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
-        }
-
+        [System.Management.Automation.SemanticVersion]$packageVersion = ConvertTo-SemVer -Version $_.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
+    } | 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"
@@ -177,8 +234,7 @@ function Get-CGRegistrations {
 
     $registrationChanged = $false
 
-    $dotnetTargetName = 'net8.0'
-    $dotnetTargetNameWin7 = 'net8.0-windows8.0'
+    $baseTargetName = $script:dotnetTargetName
     $unixProjectName = 'powershell-unix'
     $windowsProjectName = 'powershell-win-core'
     $actualRuntime = $Runtime
@@ -186,29 +242,30 @@ function Get-CGRegistrations {
     switch -regex ($Runtime) {
         "alpine-.*" {
             $folder = $unixProjectName
-            $target = "$dotnetTargetName|$Runtime"
+            $target = "$baseTargetName|$Runtime"
+            $neutralTarget = "$baseTargetName"
         }
         "linux-.*" {
             $folder = $unixProjectName
-            $target = "$dotnetTargetName|$Runtime"
+            $target = "$baseTargetName|$Runtime"
+            $neutralTarget = "$baseTargetName"
         }
         "osx-.*" {
             $folder = $unixProjectName
-            $target = "$dotnetTargetName|$Runtime"
-        }
-        "win-x*" {
-            $sdkToUse = $winDesktopSdk
-            $folder = $windowsProjectName
-            $target = "$dotnetTargetNameWin7|$Runtime"
+            $target = "$baseTargetName|$Runtime"
+            $neutralTarget = "$baseTargetName"
         }
         "win-.*" {
+            $sdkToUse = $winDesktopSdk
             $folder = $windowsProjectName
-            $target = "$dotnetTargetNameWin7|$Runtime"
+            $target = "$baseTargetName|$actualRuntime"
+            $neutralTarget = "$baseTargetName"
         }
         "modules" {
             $folder = "modules"
             $actualRuntime = 'linux-x64'
-            $target = "$dotnetTargetName|$actualRuntime"
+            $target = "$baseTargetName|$actualRuntime"
+            $neutralTarget = "$baseTargetName"
         }
         Default {
             throw "Invalid runtime name: $Runtime"
@@ -223,8 +280,53 @@ function Get-CGRegistrations {
             dotnet restore --runtime $actualRuntime  "/property:SDKToUse=$sdkToUse"
         }
         $null = New-PADrive -Path $PSScriptRoot\..\src\$folder\obj\project.assets.json -Name $folder
+
+        if ($Runtime -like "win-*") {
+            # Windows target selection is optional and ordered:
+            # 1. Try full Windows TFMs from config in order.
+            # 2. Fall back to the base non-Windows TFM if present.
+            try {
+                $availableTargets = @(Get-ChildItem -Path "${folder}:/targets" -ErrorAction Stop | Select-Object -ExpandProperty Name)
+            } catch {
+                throw "Unable to enumerate available targets for runtime '$Runtime' in '$folder'. Ensure dotnet restore succeeded and project.assets.json contains target data. Error: $($_.Exception.Message)"
+            }
+
+            $selectedTargetName = $null
+
+            foreach ($windowsTargetName in $script:windowsTargetNames) {
+                if ($windowsTargetName -in $availableTargets) {
+                    $selectedTargetName = $windowsTargetName
+                    break
+                }
+            }
+
+            if (-not $selectedTargetName -and $baseTargetName -in $availableTargets) {
+                Write-Verbose "No configured windows target matched for '$Runtime'. Falling back to base target '$baseTargetName'." -Verbose
+                $selectedTargetName = $baseTargetName
+            }
+
+            if (-not $selectedTargetName) {
+                Write-Verbose "Available targets for '$folder': $($availableTargets -join ', ')" -Verbose
+                if ($script:windowsTargetNames.Count -eq 0) {
+                    throw "Unable to find a target for '$Runtime'. Tried fallback base target '$baseTargetName' (no windowsTargetNames configured). Ensure project.assets.json contains this target or update dotnetTargetName in '$targetsConfigPath'."
+                }
+
+                throw "Unable to find a target for '$Runtime'. Tried configured windowsTargetNames '$($script:windowsTargetNames -join "', '")' and fallback base target '$baseTargetName'. Update '$targetsConfigPath' with a valid windows target from the available list."
+            }
+
+            $target = "$selectedTargetName|$actualRuntime"
+            $neutralTarget = $selectedTargetName
+        }
+
+        # Defensive check: non-Windows paths set targets in the switch block,
+        # Windows path may override them after inspecting available assets targets.
+        if (-not $target -or -not $neutralTarget) {
+            throw "Unable to determine restore targets for runtime '$Runtime'."
+        }
+
         try {
             $targets = Get-ChildItem -Path "${folder}:/targets/$target" -ErrorAction Stop | Where-Object { $_.Type -eq 'package' }  | select-object -ExpandProperty name
+            $targets += Get-ChildItem -Path "${folder}:/targets/$neutralTarget" -ErrorAction Stop | Where-Object { $_.Type -eq 'project' }  | select-object -ExpandProperty name
         } catch {
             Get-ChildItem -Path "${folder}:/targets" | Out-String | Write-Verbose -Verbose
             throw
@@ -234,27 +336,53 @@ function Get-CGRegistrations {
         Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
     }
 
+    # Name to skip for TPN generation
+    $skipNames = @(
+        "Microsoft.PowerShell.Native"
+        "Microsoft.Management.Infrastructure.Runtime.Unix"
+        "Microsoft.Management.Infrastructure"
+        "Microsoft.PowerShell.Commands.Diagnostics"
+        "Microsoft.PowerShell.Commands.Management"
+        "Microsoft.PowerShell.Commands.Utility"
+        "Microsoft.PowerShell.ConsoleHost"
+        "Microsoft.PowerShell.SDK"
+        "Microsoft.PowerShell.Security"
+        "Microsoft.Management.Infrastructure.CimCmdlets"
+        "Microsoft.WSMan.Management"
+        "Microsoft.WSMan.Runtime"
+        "System.Management.Automation"
+        "Microsoft.PowerShell.GraphicalHost"
+        "Microsoft.PowerShell.CoreCLR.Eventing"
+    )
+
+    Write-Verbose "Found $($targets.Count) targets to process..." -Verbose
     $targets | ForEach-Object {
         $target = $_
         $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 $publicVersion) {
-                $registrationChanged = $true
-            }
-            if ($existingRegistrationTable.ContainsKey($name) -and $existingRegistrationTable.$name.DevelopmentDependency) {
-                $DevelopmentDependency = $true
-            }
 
-            $registration = New-NugetComponent -Name $name -Version $publicVersion -DevelopmentDependency:$DevelopmentDependency
-            $RegistrationTable.Add($target, $registration)
+        if ($name -in $skipNames) {
+            Write-Verbose "Skipping $name..."
+
+        } else {
+            $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 $publicVersion) {
+                    $registrationChanged = $true
+                }
+                if ($existingRegistrationTable.ContainsKey($name) -and $existingRegistrationTable.$name.DevelopmentDependency) {
+                    $DevelopmentDependency = $true
+                }
+
+                $registration = New-NugetComponent -Name $name -Version $publicVersion -DevelopmentDependency:$DevelopmentDependency
+                $RegistrationTable.Add($target, $registration)
+            }
         }
     }
 
@@ -286,8 +414,91 @@ if ($IsStable) {
 }
 
 $count = $newRegistrations.Count
+$registrationsToSave = $newRegistrations
+$tpnRegistrationsToSave = $null
+
+# If -ForceHarvestedOnly is specified with -Fix, only include harvested packages
+# and revert non-harvested packages to their previous versions
+if ($Fix -and $ForceHarvestedOnly) {
+    Write-Verbose "Checking harvest status and filtering to harvested packages with reversion..." -Verbose
+
+    # Import ClearlyDefined module to check harvest status
+    Import-Module -Name "$PSScriptRoot/clearlyDefined/src/ClearlyDefined" -Force
+
+    # Import cache from previous runs to speed up lookups
+    Import-ClearlyDefinedCache
+
+    # Get harvest data for all registrations
+    $fullCgList = $newRegistrations |
+        ForEach-Object {
+            [PSCustomObject]@{
+                type           = $_.Component.Type
+                Name           = $_.Component.Nuget.Name
+                PackageVersion = $_.Component.Nuget.Version
+            }
+        }
+
+    $fullList = $fullCgList | Get-ClearlyDefinedData
+
+    # Build a lookup table of harvest status by package name + version
+    $harvestStatus = @{}
+    foreach ($item in $fullList) {
+        $key = "$($item.Name)|$($item.PackageVersion)"
+        $harvestStatus[$key] = $item.harvested
+    }
+
+    # Build a lookup table of old versions from existing manifest
+    $oldVersions = @{}
+    foreach ($registration in $existingRegistrationsJson.Registrations) {
+        $name = $registration.Component.Nuget.Name
+        if (!$oldVersions.ContainsKey($name)) {
+            $oldVersions[$name] = $registration
+        }
+    }
+
+    # Process each new registration: keep harvested, revert non-harvested
+    $tpnRegistrationsToSave = @()
+    $harvestedCount = 0
+    $revertedCount = 0
+
+    foreach ($reg in $newRegistrations) {
+        $name = $reg.Component.Nuget.Name
+        $version = $reg.Component.Nuget.Version
+        $key = "$name|$version"
+
+        if ($harvestStatus.ContainsKey($key) -and $harvestStatus[$key]) {
+            # Package is harvested, include it
+            $tpnRegistrationsToSave += $reg
+            $harvestedCount++
+        } else {
+            # Package not harvested, find last harvested version
+            $lastHarvestedVersion = Find-LastHarvestedVersion -Name $name -CurrentVersion $version
+
+            # Use last harvested version if found, otherwise use old version as fallback
+            if ($lastHarvestedVersion) {
+                if ($lastHarvestedVersion -ne $version) {
+                    $revertedReg = New-NugetComponent -Name $name -Version $lastHarvestedVersion -DevelopmentDependency:$reg.DevelopmentDependency
+                    $tpnRegistrationsToSave += $revertedReg
+                    $revertedCount++
+                    Write-Verbose "Reverted $name from v$version to last harvested v$lastHarvestedVersion" -Verbose
+                } else {
+                    $tpnRegistrationsToSave += $reg
+                }
+            } elseif ($oldVersions.ContainsKey($name)) {
+                $tpnRegistrationsToSave += $oldVersions[$name]
+                $revertedCount++
+                Write-Verbose "Reverted $name to previous version (no harvested version found)" -Verbose
+            } else {
+                Write-Warning "$name v$version not harvested and no previous version found. Excluding from manifest."
+            }
+        }
+    }
+
+    Write-Verbose "Completed filtering for TPN: $harvestedCount harvested + $revertedCount reverted = $($tpnRegistrationsToSave.Count) total" -Verbose
+}
+
 $newJson = @{
-    Registrations = $newRegistrations
+    Registrations = $registrationsToSave
      '$schema' = "https://json.schemastore.org/component-detection-manifest.json"
 } | ConvertTo-Json -depth 99
 
@@ -296,6 +507,149 @@ if ($Fix -and $registrationChanged) {
     Set-GWVariable -Name CGMANIFEST_PATH -Value $cgManifestPath
 }
 
+# If -ForceHarvestedOnly was used, write the TPN manifest with filtered registrations
+if ($Fix -and $ForceHarvestedOnly -and $tpnRegistrationsToSave.Count -gt 0) {
+    $tpnManifestDir = Join-Path -Path $PSScriptRoot -ChildPath "cgmanifest\tpn"
+    New-Item -ItemType Directory -Path $tpnManifestDir -Force | Out-Null
+    $tpnManifestPath = Join-Path -Path $tpnManifestDir -ChildPath "cgmanifest.json"
+
+    $tpnManifest = @{
+        Registrations = @($tpnRegistrationsToSave)
+        '$schema'     = "https://json.schemastore.org/component-detection-manifest.json"
+    }
+
+    $tpnJson = $tpnManifest | ConvertTo-Json -depth 99
+    $tpnJson | Set-Content $tpnManifestPath -Encoding utf8NoBOM
+    Write-Verbose "TPN manifest created/updated with $($tpnRegistrationsToSave.Count) registrations (filtered for harvested packages)" -Verbose
+}
+
+# Skip legacy TPN update when -ForceHarvestedOnly already produced a filtered manifest
+if ($Fix -and $registrationChanged -and -not $ForceHarvestedOnly) {
+    # Import ClearlyDefined module to check harvest status
+    Write-Verbose "Checking harvest status for newly added packages..." -Verbose
+    Import-Module -Name "$PSScriptRoot/clearlyDefined/src/ClearlyDefined" -Force
+
+    # Get harvest data for all registrations
+    $fullCgList = $newRegistrations |
+        ForEach-Object {
+            [PSCustomObject]@{
+                type           = $_.Component.Type
+                Name           = $_.Component.Nuget.Name
+                PackageVersion = $_.Component.Nuget.Version
+            }
+        }
+
+    $fullList = $fullCgList | Get-ClearlyDefinedData
+    $needHarvest = $fullList | Where-Object { !$_.harvested }
+
+    if ($needHarvest.Count -gt 0) {
+        Write-Verbose "Found $($needHarvest.Count) packages that need harvesting. Starting harvest..." -Verbose
+        $needHarvest | Select-Object -ExpandProperty coordinates | ConvertFrom-ClearlyDefinedCoordinates | Start-ClearlyDefinedHarvest
+    } else {
+        Write-Verbose "All packages are already harvested." -Verbose
+    }
+
+    # After manifest update and harvest, update TPN manifest with individual package status
+    Write-Verbose "Updating TPN manifest with individual package harvest status..." -Verbose
+    $tpnManifestDir = Join-Path -Path $PSScriptRoot -ChildPath "cgmanifest\tpn"
+    $tpnManifestPath = Join-Path -Path $tpnManifestDir -ChildPath "cgmanifest.json"
+
+    # Load current TPN manifest to get previous versions
+    $currentTpnManifest = @()
+    if (Test-Path $tpnManifestPath) {
+        $currentTpnJson = Get-Content $tpnManifestPath | ConvertFrom-Json -AsHashtable
+        $currentTpnManifest = $currentTpnJson.Registrations
+    }
+
+    # Build a lookup table of old versions
+    $oldVersions = @{}
+    foreach ($registration in $currentTpnManifest) {
+        $name = $registration.Component.Nuget.Name
+        if (!$oldVersions.ContainsKey($name)) {
+            $oldVersions[$name] = $registration
+        }
+    }
+
+    # Note: Do not recheck harvest status here. Harvesting is an async process that takes a significant amount of time.
+    # Use the harvest data from the initial check. Newly triggered harvests will be captured
+    # on the next run of this script after harvesting completes.
+    $finalHarvestData = $fullList
+
+    # Update packages individually based on harvest status
+    $tpnRegistrations = @()
+    $harvestedCount = 0
+    $restoredCount = 0
+
+    foreach ($item in $finalHarvestData) {
+        $matchingNewRegistration = $newRegistrations | Where-Object {
+            $_.Component.Nuget.Name -eq $item.Name -and
+            $_.Component.Nuget.Version -eq $item.PackageVersion
+        }
+
+        if ($matchingNewRegistration) {
+            if ($item.harvested) {
+                # Use new harvested version
+                $tpnRegistrations += $matchingNewRegistration
+                $harvestedCount++
+            } else {
+                # Package not harvested - find the last harvested version from ClearlyDefined API
+                Write-Verbose "Finding last harvested version for $($item.Name)..." -Verbose
+
+                $lastHarvestedVersion = $null
+                try {
+                    # Search through all versions of this package to find the last harvested one
+                    # Create a list of versions we know about from all runtimes
+                    $packageVersionsToCheck = $newRegistrations | Where-Object {
+                        $_.Component.Nuget.Name -eq $item.Name
+                    } | ForEach-Object { $_.Component.Nuget.Version } | Sort-Object -Unique -Descending
+
+                    foreach ($versionToCheck in $packageVersionsToCheck) {
+                        $versionCheckList = [PSCustomObject]@{
+                            type           = "nuget"
+                            Name           = $item.Name
+                            PackageVersion = $versionToCheck
+                        }
+
+                        $versionStatus = $versionCheckList | Get-ClearlyDefinedData
+                        if ($versionStatus -and $versionStatus.harvested) {
+                            $lastHarvestedVersion = $versionToCheck
+                            break  # Found the most recent harvested version
+                        }
+                    }
+                } catch {
+                    Write-Verbose "Error checking harvested versions for $($item.Name): $_" -Verbose
+                }
+
+                # Use last harvested version if found, otherwise use old version as fallback
+                if ($lastHarvestedVersion) {
+                    $revertedReg = New-NugetComponent -Name $item.Name -Version $lastHarvestedVersion -DevelopmentDependency:$matchingNewRegistration.DevelopmentDependency
+                    $tpnRegistrations += $revertedReg
+                    $restoredCount++
+                    Write-Verbose "Reverted $($item.Name) from v$($item.PackageVersion) to last harvested v$lastHarvestedVersion" -Verbose
+                } elseif ($oldVersions.ContainsKey($item.Name)) {
+                    $tpnRegistrations += $oldVersions[$item.Name]
+                    $restoredCount++
+                    Write-Verbose "Reverted $($item.Name) to previous version in TPN (no harvested version found)" -Verbose
+                } else {
+                    Write-Warning "$($item.Name) v$($item.PackageVersion) not harvested and no harvested version found. Excluding from TPN manifest."
+                }
+            }
+        }
+    }
+
+    # Save updated TPN manifest
+    if ($tpnRegistrations.Count -gt 0) {
+        $tpnManifest = @{
+            Registrations = @($tpnRegistrations)
+            '$schema'     = "https://json.schemastore.org/component-detection-manifest.json"
+        }
+
+        $tpnJson = $tpnManifest | ConvertTo-Json -depth 99
+        $tpnJson | Set-Content $tpnManifestPath -Encoding utf8NoBOM
+        Write-Verbose "TPN manifest updated: $harvestedCount new harvested + $restoredCount reverted to last harvested versions" -Verbose
+    }
+}
+
 if (!$Fix -and $registrationChanged) {
     $temp = Get-GWTempPath
 
diff --git a/tools/findMissingNotices.targets.json b/tools/findMissingNotices.targets.json
new file mode 100644
index 00000000000..a347ee4c3be
--- /dev/null
+++ b/tools/findMissingNotices.targets.json
@@ -0,0 +1,5 @@
+{
+  "dotnetTargetName": "net11.0",
+  "windowsTargetNames": [
+  ]
+}
diff --git a/tools/install-powershell.ps1 b/tools/install-powershell.ps1
index b6c8f595ccb..414f0b35bb3 100644
--- a/tools/install-powershell.ps1
+++ b/tools/install-powershell.ps1
@@ -268,7 +268,6 @@ try {
     if ($Daily) {
         $metadata = Invoke-RestMethod 'https://aka.ms/pwsh-buildinfo-daily'
         $release = $metadata.ReleaseTag -replace '^v'
-        $blobName = $metadata.BlobName
 
         # Get version from currently installed PowerShell Daily if available.
         $pwshPath = if ($IsWinEnv) {Join-Path $Destination "pwsh.exe"} else {Join-Path $Destination "pwsh"}
@@ -297,8 +296,7 @@ try {
             throw "The OS architecture is '$architecture'. However, we currently only support daily package for x64."
         }
 
-
-        $downloadURL = "https://pscoretestdata.blob.core.windows.net/${blobName}/${packageName}"
+        $downloadURL = "https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/install/$($metadata.ReleaseTag)/$packageName"
         Write-Verbose "About to download package from '$downloadURL'" -Verbose
 
         $packagePath = Join-Path -Path $tempDir -ChildPath $packageName
@@ -352,11 +350,7 @@ try {
 
         if ($IsWinEnv) {
             if ($UseMSI) {
-                if ($architecture -eq "arm64") {
-                    $packageName = "PowerShell-${release}-win-${architecture}.msix"
-                } else {
-                    $packageName = "PowerShell-${release}-win-${architecture}.msi"
-                }
+                $packageName = "PowerShell-${release}-win-${architecture}.msi"
             } else {
                 $packageName = "PowerShell-${release}-win-${architecture}.zip"
             }
@@ -388,9 +382,7 @@ try {
 
         $null = New-Item -ItemType Directory -Path $contentPath -ErrorAction SilentlyContinue
         if ($IsWinEnv) {
-            if ($UseMSI -and $architecture -eq "arm64") {
-                Add-AppxPackage -Path $packagePath
-            } elseif ($UseMSI -and $Quiet) {
+            if ($UseMSI -and $Quiet) {
                 Write-Verbose "Performing quiet install"
                 $ArgumentList=@("/i", $packagePath, "/quiet")
                 if($MSIArguments) {
diff --git a/tools/install-powershell.sh b/tools/install-powershell.sh
index dbe9206c460..91425c183a8 100755
--- a/tools/install-powershell.sh
+++ b/tools/install-powershell.sh
@@ -26,7 +26,9 @@ install(){
     #gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution
 
     local VERSION="1.2.0"
-    local gitreposubpath="PowerShell/PowerShell/master"
+    # Pin to specific commit for security (OpenSSF Scorecard requirement)
+    # Pinned commit: 26bb188c8 - "Improve ValidateLength error message consistency and refactor validation tests" (2025-10-12)
+    local gitreposubpath="PowerShell/PowerShell/26bb188c8be0cda6cb548ce1a12840ebf67e1331"
     local gitreposcriptroot="https://raw.githubusercontent.com/$gitreposubpath/tools"
     local gitscriptname="install-powershell.psh"
 
@@ -103,6 +105,10 @@ install(){
                 DistroBasedOn='mandrake'
                 PSUEDONAME=$( (sed s/.*\(// | sed s/\)//) < /etc/mandrake-release )
                 REV=$( (sed s/.*release\ // | sed s/\ .*//) < /etc/mandrake-release )
+            elif [ -f /etc/azurelinux-release ] ; then
+                DistroBasedOn='mariner'
+                PSUEDONAME=$( (sed s/.*\(// | sed s/\)//) < /etc/azurelinux-release )
+                REV=$( (sed s/.*release\ // | sed s/\ .*//) < /etc/azurelinux-release )
             elif [ -f /etc/debian_version ] ; then
                 DistroBasedOn='debian'
                 DIST=$(. /etc/os-release && echo $NAME)
@@ -121,7 +127,7 @@ install(){
 			if [[ $osname = *SUSE* ]]; then
 				DistroBasedOn='suse'
 				REV=$(source /etc/os-release; echo $VERSION_ID)
-			fi			
+			fi
             OS=$(lowercase $OS)
             DistroBasedOn=$(lowercase $DistroBasedOn)
         fi
diff --git a/tools/metadata.json b/tools/metadata.json
index b548546b249..57433aec4c6 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,10 +1,10 @@
 {
-  "StableReleaseTag": "v7.4.0",
-  "PreviewReleaseTag": "v7.4.0-rc.1",
+  "StableReleaseTag": "v7.6.0",
+  "PreviewReleaseTag": "v7.6.0-rc.1",
   "ServicingReleaseTag": "v7.0.13",
-  "ReleaseTag": "v7.4.0",
-  "LTSReleaseTag" : ["v7.2.17", "v7.4.0"],
-  "NextReleaseTag": "v7.5.0-preview.1",
-  "LTSRelease": { "Latest": false, "Package": false },
-  "StableRelease":  { "Latest": false, "Package": false }
+  "ReleaseTag": "v7.6.0",
+  "LTSReleaseTag": ["v7.4.14", "v7.6.0"],
+  "NextReleaseTag": "v7.7.0-preview.1",
+  "LTSRelease": { "PublishToChannels": false, "Package": false },
+  "StableRelease":  { "PublishToChannels": false, "Package": false }
 }
diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index f9d673d5482..7cb212ffee3 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -22,14 +22,14 @@
           "PackageFormat": "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
       },
       {
-          "url": "microsoft-rhel7.3-prod",
+          "url": "microsoft-rhel10-prod",
           "distribution": [
-              "trusty"
+              "stable"
           ],
           "PackageFormat": "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
       },
       {
-        "url": "cbl-mariner-2.0-prod-Microsoft-aarch64",
+        "url": "azurelinux-3.0-prod-ms-oss-aarch64",
         "distribution": [
             "bionic"
         ],
@@ -37,7 +37,7 @@
         "channel": "stable"
       },
       {
-          "url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
+          "url": "azurelinux-3.0-prod-ms-oss-x86_64",
           "distribution": [
               "bionic"
           ],
@@ -45,7 +45,7 @@
           "channel": "stable"
       },
       {
-          "url": "cbl-mariner-2.0-preview-Microsoft-aarch64",
+          "url": "azurelinux-3.0-preview-ms-oss-aarch64",
           "distribution": [
               "bionic"
           ],
@@ -53,7 +53,7 @@
           "channel": "preview"
       },
       {
-          "url": "cbl-mariner-2.0-preview-Microsoft-x86_64",
+          "url": "azurelinux-3.0-preview-ms-oss-x86_64",
           "distribution": [
               "bionic"
           ],
@@ -75,39 +75,60 @@
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
       {
-          "url": "microsoft-ubuntu-bionic-prod",
+          "url": "microsoft-debian-bullseye-prod",
           "distribution": [
-              "bionic"
+              "bullseye"
           ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
       {
-          "url": "microsoft-ubuntu-jammy-prod",
+          "url": "microsoft-debian-bookworm-prod",
           "distribution": [
-              "jammy"
+              "bookworm"
           ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
       {
-          "url": "microsoft-ubuntu-focal-prod",
+          "url": "microsoft-debian-trixie-prod",
           "distribution": [
-              "focal"
+              "trixie"
           ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
       {
-          "url": "microsoft-ubuntu-xenial-prod",
+          "url": "microsoft-ubuntu-bionic-prod",
           "distribution": [
-              "xenial"
+              "bionic"
           ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
       {
-          "url": "microsoft-debian-bullseye-prod",
+          "url": "microsoft-ubuntu-jammy-prod",
           "distribution": [
-              "bullseye"
+              "jammy"
+          ],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "url": "microsoft-ubuntu-focal-prod",
+          "distribution": [
+              "focal"
           ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
-      }
+      },
+      {
+        "url": "microsoft-ubuntu-noble-prod",
+        "distribution": [
+            "noble"
+        ],
+        "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+    },
+    {
+        "url": "microsoft-ubuntu-xenial-prod",
+        "distribution": [
+            "xenial"
+        ],
+        "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+    }
   ]
 }
diff --git a/tools/packaging/boms/linux.json b/tools/packaging/boms/linux.json
index 9f5f886a4ca..db29e47a290 100644
--- a/tools/packaging/boms/linux.json
+++ b/tools/packaging/boms/linux.json
@@ -2442,5 +2442,15 @@
   {
     "Pattern": "System.Management.Automation.dll",
     "FileType": "Product"
+  },
+  {
+    "Pattern": "pwsh.profile.dsc.resource.json",
+    "FileType": "Product",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pwsh.profile.resource.ps1",
+    "FileType": "Product",
+    "Architecture": null
   }
 ]
diff --git a/tools/packaging/boms/mac.json b/tools/packaging/boms/mac.json
index a4b5bc2bffb..af4fcb0c967 100644
--- a/tools/packaging/boms/mac.json
+++ b/tools/packaging/boms/mac.json
@@ -2218,5 +2218,15 @@
   {
     "Pattern": "System.Management.Automation.dll",
     "FileType": "Product"
+  },
+  {
+    "Pattern": "pwsh.profile.dsc.resource.json",
+    "FileType": "Product",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pwsh.profile.resource.ps1",
+    "FileType": "Product",
+    "Architecture": null
   }
 ]
diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index 4ec63b872c2..8d8154e7445 100644
--- a/tools/packaging/boms/windows.json
+++ b/tools/packaging/boms/windows.json
@@ -1,3458 +1,4624 @@
 [
   {
     "Pattern": "_manifest\\spdx_2.2\\bsi.json",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "_manifest\\spdx_2.2\\manifest.cat",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Accessibility.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "build.manifest",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "build.manifest.sig",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "clretwrc.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "clrgc.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "clrgcexp.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "clrjit.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "coreclr.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "createdump.exe",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "cs/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "cs/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "cs\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "cs\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "cs\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "cs\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "D3DCompiler_47_cor3.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": [
+      "x64, x86"
+    ]
   },
   {
     "Pattern": "de/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "de/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "de/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "de\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "de\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "de\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "de\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "DirectWriteForwarder.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "en-US/default.help.txt",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "es/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "es/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "es\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "es\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "es\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "es\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "fr/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "fr/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "fr\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "fr\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "fr\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "fr\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "getfilesiginforedist.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "getfilesiginforedistwrapper.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "hostfxr.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "hostpolicy.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Humanizer.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "it/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "it/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "it\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "it\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "it\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "it\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ja/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ja/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "JetBrains.Annotations.dll",
-    "FileType": "NonProduct"
+    "Pattern": "ja\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ja\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ja\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ja\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Json.More.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "JsonPointer.Net.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "JsonSchema.Net.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ko/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ko/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "Markdig.Signed.dll",
-    "FileType": "NonProduct"
+    "Pattern": "ko\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "mi.dll",
-    "FileType": "NonProduct"
+    "Pattern": "ko\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ko\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ko\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Markdig.Signed.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.ApplicationInsights.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Bcl.AsyncInterfaces.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.CodeAnalysis.CSharp.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.CodeAnalysis.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.CSharp.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Extensions.ObjectPool.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Management.Infrastructure.CimCmdlets.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Management.Infrastructure.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Management.Infrastructure.Native.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Management.Infrastructure.Native.Unmanaged.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Commands.Diagnostics.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Commands.Management.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Commands.Utility.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.ConsoleHost.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.CoreCLR.Eventing.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.GraphicalHost.dll.config",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.GraphicalHost.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.MarkdownRender.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.SDK.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Security.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.VisualBasic.Core.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.VisualBasic.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.VisualBasic.Forms.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Win32.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Win32.Registry.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Win32.Registry.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Win32.SystemEvents.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.WSMan.Management.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.WSMan.Runtime.xml",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "miutils.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "Modules/*.json",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "Modules/*.sha256",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Archive/*.cat",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Archive/*.ps?1",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/_manifest/spdx_2.2/manifest.cat",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/LICENSE",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.psd1",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.psm1",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Notice.txt",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/PSGet.Format.ps1xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PackageManagement/*.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PackageManagement/*.mof",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PackageManagement/*.ps?1",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PackageManagement/*.ps1xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PowerShellGet/*.mfl",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PowerShellGet/*.mof",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PowerShellGet/*.ps?1",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PowerShellGet/*.ps1xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PSReadLine/*.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PSReadLine/*.ps?1",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PSReadLine/*.ps1",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PSReadLine/*.ps1xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PSReadLine/*.txt",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\.signature.p7s",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\Microsoft.PowerShell.PSResourceGet.pdb",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\PSResourceRepository.adml",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\PSResourceRepository.admx",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\.signature.p7s",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\en-us\\Microsoft.PowerShell.ThreadJob.dll-Help.xml",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "Modules/ThreadJob/*.dll",
-    "FileType": "NonProduct"
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\LICENSE",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "Modules/ThreadJob/*.psd1",
-    "FileType": "NonProduct"
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\ThirdPartyNotices.txt",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "Modules\\PSReadLine\\_manifest\\spdx_2.2\\manifest.cat",
-    "FileType": "NonProduct"
+    "Pattern": "Modules\\PSReadLine\\.signature.p7s",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "mscordaccore_*.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "mscordaccore.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "mscordbi.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "mscorlib.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "mscorrc.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "msquic.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "netstandard.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Newtonsoft.Json.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PenImc_cor3.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pl/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pl/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pl\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pl\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pl\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pl\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "powershell.config.json",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PowerShell.Core.Instrumentation.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PowerShell.Core.Instrumentation.man",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PowerShellCoreExecutionPolicy.adml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PowerShellCoreExecutionPolicy.admx",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationCore.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework-SystemCore.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework-SystemData.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework-SystemDrawing.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework-SystemXml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework-SystemXmlLinq.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework.Aero.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework.Aero2.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework.AeroLite.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework.Classic.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "PresentationFramework.Fluent.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework.Luna.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationFramework.Royale.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationNative_cor3.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "PresentationUI.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "preview/pwsh-preview.cmd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "psoptions.json",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pt-BR/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pt-BR/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pt-BR\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pt-BR\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pt-BR\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "pt-BR\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pwrshplugin.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pwsh.deps.json",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pwsh.runtimeconfig.json",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "pwsh.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ReachFramework.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/Microsoft.CSharp.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/Microsoft.VisualBasic.Core.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/Microsoft.VisualBasic.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/Microsoft.Win32.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/Microsoft.Win32.Registry.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/mscorlib.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/netstandard.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.AppContext.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Buffers.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Collections.Concurrent.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Collections.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Collections.Immutable.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Collections.NonGeneric.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Collections.Specialized.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ComponentModel.Annotations.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ComponentModel.DataAnnotations.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ComponentModel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ComponentModel.EventBasedAsync.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ComponentModel.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ComponentModel.TypeConverter.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Configuration.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Console.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Core.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Data.Common.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Data.DataSetExtensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Data.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.Contracts.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.Debug.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.DiagnosticSource.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.FileVersionInfo.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.Process.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.StackTrace.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.TextWriterTraceListener.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.Tools.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.TraceSource.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Diagnostics.Tracing.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Drawing.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Drawing.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Dynamic.Runtime.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Formats.Asn1.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Formats.Tar.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Globalization.Calendars.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Globalization.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Globalization.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.Compression.Brotli.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.Compression.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.Compression.FileSystem.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.Compression.ZipFile.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.FileSystem.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.FileSystem.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.FileSystem.DriveInfo.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.FileSystem.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.FileSystem.Watcher.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.IsolatedStorage.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.MemoryMappedFiles.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.Pipes.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.Pipes.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.IO.UnmanagedMemoryStream.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Linq.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Linq.Expressions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Linq.Parallel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Linq.Queryable.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Memory.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Http.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Http.Json.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.HttpListener.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Mail.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.NameResolution.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.NetworkInformation.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Ping.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Quic.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Requests.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Security.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.ServicePoint.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.Sockets.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.WebClient.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.WebHeaderCollection.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.WebProxy.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.WebSockets.Client.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Net.WebSockets.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Numerics.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Numerics.Vectors.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ObjectModel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.DispatchProxy.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.Emit.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.Emit.ILGeneration.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.Emit.Lightweight.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.Metadata.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Reflection.TypeExtensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Resources.Reader.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Resources.ResourceManager.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Resources.Writer.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.CompilerServices.Unsafe.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.CompilerServices.VisualC.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Handles.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.InteropServices.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.InteropServices.JavaScript.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.InteropServices.RuntimeInformation.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Intrinsics.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Loader.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Numerics.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Serialization.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Serialization.Formatters.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Serialization.Json.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Serialization.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Runtime.Serialization.Xml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Claims.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.Algorithms.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.Cng.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.Csp.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.Encoding.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.OpenSsl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Cryptography.X509Certificates.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Principal.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.Principal.Windows.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Security.SecureString.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ServiceModel.Web.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ServiceProcess.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Text.Encoding.CodePages.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Text.Encoding.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Text.Encoding.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Text.Encodings.Web.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Text.Json.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Text.RegularExpressions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Channels.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Overlapped.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Tasks.Dataflow.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Tasks.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Tasks.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Tasks.Parallel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Thread.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.ThreadPool.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Threading.Timer.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Transactions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Transactions.Local.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.ValueTuple.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Web.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Web.HttpUtility.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Windows.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.Linq.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.ReaderWriter.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.Serialization.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.XDocument.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.XmlDocument.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.XmlSerializer.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.XPath.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/System.Xml.XPath.XDocument.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ref/WindowsBase.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ref\\System.IO.Compression.Zstandard.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ref\\System.IO.Pipelines.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ref\\System.Linq.AsyncEnumerable.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ref\\System.Net.ServerSentEvents.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ref\\System.Threading.AccessControl.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ru/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ru/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ru\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ru\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ru\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "ru\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/base.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/baseConditional.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/block.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/blockCommon.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/blockSoftware.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/command.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/conditionSet.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developer.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerCommand.rld",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerCommand.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerDscResource.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManaged.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedClass.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedConstructor.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedDelegate.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedEnumeration.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedEvent.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedField.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedInterface.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedMethod.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedNamespace.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedOperator.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedOverload.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedProperty.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerManagedStructure.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerReference.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerStructure.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/developerXaml.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/endUser.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/hierarchy.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/inline.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/inlineCommon.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/inlineSoftware.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/inlineUi.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/ITPro.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/Maml_HTML_Style.xsl",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/Maml_HTML.xsl",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/Maml.rld",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/Maml.tbr",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/Maml.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/Maml.xsx",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/ManagedDeveloper.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/ManagedDeveloperStructure.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/ProviderHelp.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/shellExecute.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/structure.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/structureGlossary.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/structureList.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/structureProcedure.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/structureTable.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/structureTaskExecution.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/task.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "Schemas/PSMaml/troubleshooting.xsd",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "sni.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.AppContext.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Buffers.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.CodeDom.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Collections.Concurrent.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Collections.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Collections.Immutable.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Collections.NonGeneric.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Collections.Specialized.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.Annotations.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.Composition.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.Composition.Registration.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.DataAnnotations.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.EventBasedAsync.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ComponentModel.TypeConverter.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Configuration.ConfigurationManager.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Configuration.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Console.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Core.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Data.Common.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Data.DataSetExtensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Data.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Data.Odbc.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Data.OleDb.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Data.SqlClient.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Design.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.Contracts.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.Debug.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.DiagnosticSource.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.EventLog.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.EventLog.Messages.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.FileVersionInfo.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.PerformanceCounter.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.Process.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.StackTrace.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.TextWriterTraceListener.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.Tools.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.TraceSource.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Diagnostics.Tracing.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.DirectoryServices.AccountManagement.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.DirectoryServices.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.DirectoryServices.Protocols.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Drawing.Common.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Drawing.Design.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Drawing.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Drawing.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Dynamic.Runtime.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Formats.Asn1.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.Formats.Nrbf.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Formats.Tar.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Globalization.Calendars.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Globalization.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Globalization.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Compression.Brotli.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Compression.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Compression.FileSystem.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Compression.Native.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Compression.ZipFile.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.IO.Compression.Zstandard.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.FileSystem.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.FileSystem.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.FileSystem.DriveInfo.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.FileSystem.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.FileSystem.Watcher.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.IsolatedStorage.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.MemoryMappedFiles.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Packaging.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.IO.Pipelines.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Pipes.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Pipes.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.Ports.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.IO.UnmanagedMemoryStream.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.Linq.AsyncEnumerable.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Linq.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Linq.Expressions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Linq.Parallel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Linq.Queryable.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Management.Automation.xml",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Management.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Memory.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Http.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Http.Json.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Http.WinHttpHandler.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.HttpListener.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Mail.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.NameResolution.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.NetworkInformation.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Ping.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Quic.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Requests.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Security.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.Net.ServerSentEvents.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.ServicePoint.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.Sockets.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.WebClient.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.WebHeaderCollection.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.WebProxy.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.WebSockets.Client.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Net.WebSockets.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Numerics.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Numerics.Vectors.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ObjectModel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Printing.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Private.CoreLib.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Private.DataContractSerialization.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "System.Private.ServiceModel.dll",
-    "FileType": "NonProduct"
+    "Pattern": "System.Private.Uri.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
-    "Pattern": "System.Private.Uri.dll",
-    "FileType": "NonProduct"
+    "Pattern": "System.Private.Windows.Core.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.Private.Windows.GdiPlus.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Private.Xml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Private.Xml.Linq.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.Context.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.DispatchProxy.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.Emit.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.Emit.ILGeneration.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.Emit.Lightweight.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.Metadata.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Reflection.TypeExtensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Resources.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Resources.Reader.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Resources.ResourceManager.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Resources.Writer.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Caching.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.CompilerServices.Unsafe.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.CompilerServices.VisualC.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Handles.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.InteropServices.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.InteropServices.JavaScript.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.InteropServices.RuntimeInformation.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Intrinsics.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Loader.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Numerics.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Serialization.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Serialization.Formatters.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Serialization.Json.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Serialization.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Runtime.Serialization.Xml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Claims.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.Algorithms.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.Cng.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.Csp.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.Encoding.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.OpenSsl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.Pkcs.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.ProtectedData.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.X509Certificates.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Cryptography.Xml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Permissions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Principal.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.Principal.Windows.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Security.SecureString.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.Duplex.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.Http.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.ServiceModel.NetFramingBase.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.NetTcp.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.Security.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.Syndication.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceModel.Web.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceProcess.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ServiceProcess.ServiceController.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Speech.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Text.Encoding.CodePages.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Text.Encoding.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Text.Encoding.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Text.Encodings.Web.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Text.Json.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Text.RegularExpressions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.AccessControl.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Channels.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Overlapped.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Tasks.Dataflow.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Tasks.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Tasks.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Tasks.Parallel.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Thread.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.ThreadPool.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Threading.Timer.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Transactions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Transactions.Local.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.ValueTuple.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Web.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Web.HttpUtility.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Web.Services.Description.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Controls.Ribbon.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Extensions.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Forms.Design.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Forms.Design.Editors.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Forms.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Forms.Primitives.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Input.Manipulations.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Windows.Presentation.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "System.Windows.Primitives.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xaml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.Linq.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.ReaderWriter.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.Serialization.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.XDocument.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.XmlDocument.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.XmlSerializer.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.XPath.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "System.Xml.XPath.XDocument.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "ThirdPartyNotices.txt",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "tr/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "tr/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "tr\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "tr\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "tr\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "tr\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "UIAutomationClient.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "UIAutomationClientSideProviders.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "UIAutomationProvider.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "UIAutomationTypes.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "vcruntime140_cor3.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "WindowsBase.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "WindowsFormsIntegration.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "wpfgfx_cor3.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hans/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hans/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hans\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hans\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hans\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hans\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/Microsoft.CodeAnalysis.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/Microsoft.VisualBasic.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/PresentationCore.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/PresentationFramework.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/PresentationUI.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/ReachFramework.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hant/System.Private.ServiceModel.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/System.Web.Services.Description.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/System.Windows.Controls.Ribbon.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/System.Windows.Forms.Design.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/System.Windows.Forms.Primitives.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/System.Windows.Forms.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/System.Windows.Input.Manipulations.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/System.Xaml.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/UIAutomationClient.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/UIAutomationClientSideProviders.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/UIAutomationProvider.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/UIAutomationTypes.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/WindowsBase.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "zh-Hant/WindowsFormsIntegration.resources.dll",
-    "FileType": "NonProduct"
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hant\\System.ServiceModel.Http.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hant\\System.ServiceModel.NetFramingBase.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hant\\System.ServiceModel.NetTcp.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
+  },
+  {
+    "Pattern": "zh-Hant\\System.ServiceModel.Primitives.resources.dll",
+    "FileType": "NonProduct",
+    "Architecture": null
   },
   {
     "Pattern": "_manifest/spdx_2.2/manifest.spdx.json",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "_manifest/spdx_2.2/manifest.spdx.json.sha256",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "assets/Powershell_av_colors.ico",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "assets/Powershell_avatar.ico",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "assets/Powershell_black.ico",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "assets/ps_black_32x32.ico",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Install-PowerShellRemoting.ps1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "InstallPSCorePolicyDefinitions.ps1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "LICENSE.txt",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.Management.Infrastructure.CimCmdlets.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Commands.Diagnostics.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Commands.Management.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Commands.Utility.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.ConsoleHost.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.CoreCLR.Eventing.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.GraphicalHost.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.SDK.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.PowerShell.Security.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.WSMan.Management.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Microsoft.WSMan.Runtime.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/CimCmdlets/CimCmdlets.psd1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.PowerShell.Security/Security.types.ps1xml",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/Microsoft.WSMan.Management/WSMan.format.ps1xml",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PSDiagnostics/PSDiagnostics.psd1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "Modules/PSDiagnostics/PSDiagnostics.psm1",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\InstallPSResourceGetPolicyDefinitions.ps1",
+    "FileType": "Product",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\Microsoft.PowerShell.ThreadJob.dll",
+    "FileType": "Product",
+    "Architecture": null
+  },
+  {
+    "Pattern": "Modules\\Microsoft.PowerShell.ThreadJob\\Microsoft.PowerShell.ThreadJob.psd1",
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "pwsh.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "pwsh.exe",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   },
   {
-    "Pattern": "RegisterManifest.ps1",
-    "FileType": "Product"
+    "Pattern": "pwsh.profile.dsc.resource.json",
+    "FileType": "Product",
+    "Architecture": null
   },
   {
-    "Pattern": "RegisterMicrosoftUpdate.ps1",
-    "FileType": "Product"
+    "Pattern": "pwsh.profile.resource.ps1",
+    "FileType": "Product",
+    "Architecture": null
+  },
+  {
+    "Pattern": "RegisterManifest.ps1",
+    "FileType": "Product",
+    "Architecture": null
   },
   {
     "Pattern": "System.Management.Automation.dll",
-    "FileType": "Product"
+    "FileType": "Product",
+    "Architecture": null
   }
 ]
diff --git a/tools/packaging/packaging.psd1 b/tools/packaging/packaging.psd1
index 0053428a481..b72c14b80f1 100644
--- a/tools/packaging/packaging.psd1
+++ b/tools/packaging/packaging.psd1
@@ -7,13 +7,10 @@
     PowerShellVersion = "5.0"
     CmdletsToExport   = @()
     FunctionsToExport = @(
-        'Compress-ExePackageEngine'
-        'Expand-ExePackageEngine'
         'Expand-PSSignedBuild'
         'Invoke-AzDevOpsLinuxPackageBuild'
         'Invoke-AzDevOpsLinuxPackageCreation'
         'New-DotnetSdkContainerFxdPackage'
-        'New-ExePackage'
         'Start-PrepForGlobalToolNupkg'
         'New-GlobalToolNupkgSource'
         'New-GlobalToolNupkgFromSource'
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index e3868ecc744..a551a483c8d 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1,6 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+. "$PSScriptRoot\..\buildCommon\startNativeExecution.ps1"
+
 $Environment = Get-EnvironmentInformation
 $RepoRoot = (Resolve-Path -Path "$PSScriptRoot/../..").Path
 
@@ -16,7 +18,7 @@ $AllDistributions = @()
 $AllDistributions += $DebianDistributions
 $AllDistributions += $RedhatDistributions
 $AllDistributions += 'macOs'
-$script:netCoreRuntime = 'net8.0'
+$script:netCoreRuntime = 'net11.0'
 $script:iconFileName = "Powershell_black_64.png"
 $script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve
 
@@ -50,7 +52,7 @@ function Start-PSPackage {
         [string]$Name = "powershell",
 
         # Ubuntu, CentOS, Fedora, macOS, and Windows packages are supported
-        [ValidateSet("msix", "deb", "osxpkg", "rpm", "rpm-fxdependent", "rpm-fxdependent-arm64", "msi", "zip", "zip-pdb", "nupkg", "tar", "tar-arm", "tar-arm64", "tar-alpine", "fxdependent", "fxdependent-win-desktop", "min-size", "tar-alpine-fxdependent")]
+        [ValidateSet("msix", "deb", "osxpkg", "rpm", "rpm-fxdependent", "rpm-fxdependent-arm64", "zip", "zip-pdb", "tar", "tar-arm", "tar-arm64", "tar-alpine", "fxdependent", "fxdependent-win-desktop", "min-size", "tar-alpine-fxdependent")]
         [string[]]$Type,
 
         # Generate windows downlevel package
@@ -61,6 +63,8 @@ function Start-PSPackage {
         [ValidateScript({$Environment.IsMacOS})]
         [string] $MacOSRuntime,
 
+        [string] $PackageBinPath,
+
         [switch] $Private,
 
         [Switch] $Force,
@@ -245,7 +249,14 @@ function Start-PSPackage {
             $Version = (git --git-dir="$RepoRoot/.git" describe) -Replace '^v'
         }
 
-        $Source = Split-Path -Path $Script:Options.Output -Parent
+        $Source = if ($PackageBinPath) {
+            $PackageBinPath
+        }
+        else {
+            Split-Path -Path $Script:Options.Output -Parent
+        }
+
+        Write-Verbose -Verbose "Source: $Source"
 
         # Copy the ThirdPartyNotices.txt so it's part of the package
         Copy-Item "$RepoRoot/ThirdPartyNotices.txt" -Destination $Source -Force
@@ -273,6 +284,18 @@ function Start-PSPackage {
                 $createdSpdxPathSha = New-Item -Path $manifestSpdxPathSha -Force
                 Write-Verbose -Verbose "Created manifest.spdx.json.sha256 file: $createdSpdxPathSha"
             }
+
+            $bsiJsonPath = (Join-Path -Path $Source "_manifest\spdx_2.2\bsi.json")
+            if (-not (Test-Path -Path $bsiJsonPath)) {
+                $createdBsiJsonPath = New-Item -Path $bsiJsonPath -Force
+                Write-Verbose -Verbose "Created bsi.json file: $createdBsiJsonPath"
+            }
+
+            $manifestCatPath = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.cat")
+            if (-not (Test-Path -Path $manifestCatPath)) {
+                $createdCatPath = New-Item -Path $manifestCatPath -Force
+                Write-Verbose -Verbose "Created manifest.cat file: $createdCatPath"
+            }
         }
 
         # If building a symbols package, we add a zip of the parent to publish
@@ -312,18 +335,18 @@ function Start-PSPackage {
         if (-not $Type) {
             $Type = if ($Environment.IsLinux) {
                 if ($Environment.LinuxInfo.ID -match "ubuntu") {
-                    "deb", "nupkg", "tar"
+                    "deb", "tar"
                 } elseif ($Environment.IsRedHatFamily) {
-                    "rpm", "nupkg"
+                    "rpm"
                 } elseif ($Environment.IsSUSEFamily) {
-                    "rpm", "nupkg"
+                    "rpm"
                 } else {
                     throw "Building packages for $($Environment.LinuxInfo.PRETTY_NAME) is unsupported!"
                 }
             } elseif ($Environment.IsMacOS) {
-                "osxpkg", "nupkg", "tar"
+                "osxpkg", "tar"
             } elseif ($Environment.IsWindows) {
-                "msi", "nupkg", "msix"
+                "zip", "msix"
             }
             Write-Warning "-Type was not specified, continuing with $Type!"
         }
@@ -470,28 +493,6 @@ function Start-PSPackage {
                     }
                 }
             }
-            "msi" {
-                $TargetArchitecture = "x64"
-                $r2rArchitecture = "amd64"
-                if ($Runtime -match "-x86") {
-                    $TargetArchitecture = "x86"
-                    $r2rArchitecture = "i386"
-                }
-                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
@@ -500,26 +501,13 @@ function Start-PSPackage {
                     Architecture = $WindowsRuntime.Split('-')[1]
                     Force = $Force
                     Private = $Private
+                    LTS = $LTS
                 }
 
                 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
@@ -886,20 +874,91 @@ function Update-PSSignedBuildFolder
         [string]$BuildPath,
         [Parameter(Mandatory)]
         [string]$SignedFilesPath,
-        [string[]] $RemoveFilter = ('*.pdb', '*.zip', '*.r2rmap')
+        [string[]] $RemoveFilter = ('*.pdb', '*.zip', '*.r2rmap'),
+        [bool]$OfficialBuild = $true
     )
 
+    $BuildPathNormalized = (Get-Item $BuildPath).FullName
+    $SignedFilesPathNormalized = (Get-Item $SignedFilesPath).FullName
+
+    Write-Verbose -Verbose "BuildPath = $BuildPathNormalized"
+    Write-Verbose -Verbose "SignedFilesPath = $signedFilesPath"
+
     # Replace unsigned binaries with signed
-    $signedFilesFilter = Join-Path -Path $SignedFilesPath -ChildPath '*'
-    Get-ChildItem -Path $signedFilesFilter -Recurse -File | Select-Object -ExpandProperty FullName | ForEach-Object -Process {
-        $relativePath = $_.ToLowerInvariant().Replace($SignedFilesPath.ToLowerInvariant(),'')
-        $destination = Join-Path -Path $BuildPath -ChildPath $relativePath
-        Write-Log "replacing $destination with $_"
-        Copy-Item -Path $_ -Destination $destination -Force
+    $signedFilesFilter = Join-Path -Path $SignedFilesPathNormalized -ChildPath '*'
+    Write-Verbose -Verbose "signedFilesFilter = $signedFilesFilter"
+
+    $signedFilesList = Get-ChildItem -Path $signedFilesFilter -Recurse -File
+    foreach ($signedFileObject in $signedFilesList) {
+        # completely skip replacing pwsh on non-windows systems (there is no .exe extension here)
+        # and it may not be signed correctly
+
+        # The Shim will not be signed in CI.
+
+        if ($signedFileObject.Name -eq "pwsh" -or ($signedFileObject.Name -eq "Microsoft.PowerShell.GlobalTool.Shim.exe" -and $env:BUILD_REASON -eq 'PullRequest')) {
+            Write-Verbose -Verbose "Skipping $signedFileObject"
+            continue
+        }
+
+        $signedFilePath = $signedFileObject.FullName
+        Write-Verbose -Verbose "Processing $signedFilePath"
+
+        # Agents seems to be on a case sensitive file system
+        if ($IsLinux) {
+            $relativePath = $signedFilePath.Replace($SignedFilesPathNormalized, '')
+        } else {
+            $relativePath = $signedFilePath.ToLowerInvariant().Replace($SignedFilesPathNormalized.ToLowerInvariant(), '')
+        }
+
+        Write-Verbose -Verbose "relativePath = $relativePath"
+        $destination = (Get-Item (Join-Path -Path $BuildPathNormalized -ChildPath $relativePath)).FullName
+        Write-Verbose -Verbose "destination = $destination"
+        Write-Log "replacing $destination with $signedFilePath"
+
+        if (-not (Test-Path $destination)) {
+            $parent = Split-Path -Path $destination -Parent
+            $exists = Test-Path -Path $parent
+
+            if ($exists) {
+                Write-Verbose -Verbose "Parent:"
+                Get-ChildItem -Path $parent | Select-Object -ExpandProperty FullName | Write-Verbose -Verbose
+            }
+
+            Write-Error "File not found: $destination, parent - $parent exists: $exists"
+        }
+
+        # Get-AuthenticodeSignature will only work on Windows
+        if ($IsWindows)
+        {
+            $signature = Get-AuthenticodeSignature -FilePath $signedFilePath
+
+            if ($signature.Status -ne 'Valid' -and $OfficialBuild) {
+                Write-Host "Certificate Issuer: $($signature.SignerCertificate.Issuer)"
+                Write-Host "Certificate Subject: $($signature.SignerCertificate.Subject)"
+                Write-Error "Invalid signature for $signedFilePath"
+            } elseif ($OfficialBuild -eq $false) {
+                if ($signature.Status -eq 'NotSigned') {
+                    Write-Warning "File is not signed: $signedFilePath"
+                } elseif ($signature.SignerCertificate.Issuer -notmatch '^CN=(Microsoft|TestAzureEngBuildCodeSign|Windows Internal Build Tools).*') {
+                    Write-Warning "File signed with test certificate: $signedFilePath"
+                    Write-Host "Certificate Issuer: $($signature.SignerCertificate.Issuer)"
+                    Write-Host "Certificate Subject: $($signature.SignerCertificate.Subject)"
+                } else {
+                    Write-Verbose -Verbose "File properly signed: $signedFilePath"
+                }
+            }
+        }
+        else
+        {
+            Write-Verbose -Verbose "Skipping certificate check of $signedFilePath on non-Windows"
+        }
+
+        Copy-Item -Path $signedFilePath -Destination $destination -Force
+
     }
 
     foreach($filter in $RemoveFilter) {
-        $removePath = Join-Path -Path $BuildPath -ChildPath $filter
+        $removePath = Join-Path -Path $BuildPathNormalized -ChildPath $filter
         Remove-Item -Path $removePath -Recurse -Force
     }
 }
@@ -996,7 +1055,7 @@ function New-UnixPackage {
     DynamicParam {
         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.
+            # The '-Distribution' parameter can be used to indicate which Debian distro this package is targeting.
             $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
             if($type -eq 'deb')
             {
@@ -1027,7 +1086,7 @@ function New-UnixPackage {
         switch ($Type) {
             "deb" {
                 $packageVersion = Get-LinuxPackageSemanticVersion -Version $Version
-                if (!$Environment.IsUbuntu -and !$Environment.IsDebian) {
+                if (!$Environment.IsUbuntu -and !$Environment.IsDebian -and !$Environment.IsMariner) {
                     throw ($ErrorMessage -f "Ubuntu or Debian")
                 }
 
@@ -1074,11 +1133,12 @@ function New-UnixPackage {
         # Determine if the version is a preview version
         $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS
 
-        # Preview versions have preview in the name
+        # For deb/rpm packages, use the '-lts' and '-preview' channel suffix variants to match existing names on packages.microsoft.com.
+        # For osxpkg package, only LTS packages get a channel suffix in the name.
         $Name = if($LTS) {
             "powershell-lts"
         }
-        elseif ($IsPreview) {
+        elseif ($IsPreview -and $Type -ne "osxpkg") {
             "powershell-preview"
         }
         else {
@@ -1124,20 +1184,6 @@ function New-UnixPackage {
             # 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
 
@@ -1172,41 +1218,151 @@ function New-UnixPackage {
         # Setup package dependencies
         $Dependencies = @(Get-PackageDependencies @packageDependenciesParams)
 
-        $Arguments = @()
-
-
-        $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 `
-            -HostArchitecture $HostArchitecture `
-            -ErrorAction Stop
-
         # Build package
         try {
-            if ($PSCmdlet.ShouldProcess("Create $type package")) {
-                Write-Log "Creating package with fpm $Arguments..."
-                try {
-                    $Output = Start-NativeExecution { fpm $Arguments }
+            if ($Type -eq 'rpm') {
+                # Use rpmbuild directly for RPM packages
+                if ($PSCmdlet.ShouldProcess("Create RPM package with rpmbuild")) {
+                    Write-Log "Creating RPM package with rpmbuild..."
+
+                    # Create rpmbuild directory structure
+                    $rpmBuildRoot = Join-Path $env:HOME "rpmbuild"
+                    $specsDir = Join-Path $rpmBuildRoot "SPECS"
+                    $rpmsDir = Join-Path $rpmBuildRoot "RPMS"
+
+                    New-Item -ItemType Directory -Path $specsDir -Force | Out-Null
+                    New-Item -ItemType Directory -Path $rpmsDir -Force | Out-Null
+
+                    # Generate RPM spec file
+                    $specContent = New-RpmSpec `
+                        -Name $Name `
+                        -Version $packageVersion `
+                        -Iteration $Iteration `
+                        -Description $Description `
+                        -Dependencies $Dependencies `
+                        -AfterInstallScript $AfterScriptInfo.AfterInstallScript `
+                        -AfterRemoveScript $AfterScriptInfo.AfterRemoveScript `
+                        -Staging $Staging `
+                        -Destination $Destination `
+                        -ManGzipFile $ManGzipInfo.GzipFile `
+                        -ManDestination $ManGzipInfo.ManFile `
+                        -LinkInfo $Links `
+                        -Distribution $DebDistro `
+                        -HostArchitecture $HostArchitecture
+
+                    $specFile = Join-Path $specsDir "$Name.spec"
+                    $specContent | Out-File -FilePath $specFile -Encoding ascii
+                    Write-Verbose "Generated spec file: $specFile" -Verbose
+
+                    # Log the spec file content
+                    if ($env:GITHUB_ACTIONS -eq 'true') {
+                        Write-Host "::group::RPM Spec File Content"
+                        Write-Host $specContent
+                        Write-Host "::endgroup::"
+                    } else {
+                        Write-Verbose "RPM Spec File Content:`n$specContent" -Verbose
+                    }
+
+                    # Build RPM package
+                    try {
+                        # Use bash to properly handle rpmbuild arguments
+                        # Add --target for cross-architecture builds
+                        $targetArch = ""
+                        if ($HostArchitecture -ne "x86_64" -and $HostArchitecture -ne "noarch") {
+                            $targetArch = "--target $HostArchitecture"
+                        }
+                        $buildCmd = "rpmbuild -bb --quiet $targetArch --define '_topdir $rpmBuildRoot' --buildroot '$rpmBuildRoot/BUILDROOT' '$specFile'"
+                        Write-Verbose "Running: $buildCmd" -Verbose
+                        $Output = bash -c $buildCmd 2>&1
+                        $exitCode = $LASTEXITCODE
+
+                        if ($exitCode -ne 0) {
+                            throw "rpmbuild failed with exit code $exitCode"
+                        }
+
+                        # Find the generated RPM
+                        $rpmFile = Get-ChildItem -Path (Join-Path $rpmsDir $HostArchitecture) -Filter "*.rpm" -ErrorAction Stop |
+                            Sort-Object -Property LastWriteTime -Descending |
+                            Select-Object -First 1
+
+                        if ($rpmFile) {
+                            # Copy RPM to current location
+                            Copy-Item -Path $rpmFile.FullName -Destination $CurrentLocation -Force
+                            $Output = @("Created package {:path=>""$($rpmFile.Name)""}")
+                        } else {
+                            throw "RPM file not found after build"
+                        }
+                    }
+                    catch {
+                        Write-Verbose -Message "!!!Handling error in rpmbuild!!!" -Verbose -ErrorAction SilentlyContinue
+                        if ($Output) {
+                            Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue
+                        }
+                        Get-Error -InputObject $_
+                        throw
+                    }
                 }
-                catch {
-                    Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue
-                    Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue
-                    Get-Error -InputObject $_
-                    throw
+            } elseif ($Type -eq 'deb') {
+                # Use native DEB package builder
+                if ($PSCmdlet.ShouldProcess("Create DEB package natively")) {
+                    Write-Log "Creating DEB package natively..."
+                    try {
+                        $result = New-NativeDeb `
+                            -Name $Name `
+                            -Version $packageVersion `
+                            -Iteration $Iteration `
+                            -Description $Description `
+                            -Staging $Staging `
+                            -Destination $Destination `
+                            -ManGzipFile $ManGzipInfo.GzipFile `
+                            -ManDestination $ManGzipInfo.ManFile `
+                            -LinkInfo $Links `
+                            -Dependencies $Dependencies `
+                            -AfterInstallScript $AfterScriptInfo.AfterInstallScript `
+                            -AfterRemoveScript $AfterScriptInfo.AfterRemoveScript `
+                            -HostArchitecture $HostArchitecture `
+                            -CurrentLocation $CurrentLocation
+
+                        $Output = @("Created package {:path=>""$($result.PackageName)""}")
+                    }
+                    catch {
+                        Write-Verbose -Message "!!!Handling error in native DEB creation!!!" -Verbose -ErrorAction SilentlyContinue
+                    }
+                }
+            } elseif ($Type -eq 'osxpkg') {
+                # Use native macOS packaging tools
+                if ($PSCmdlet.ShouldProcess("Create macOS package with pkgbuild/productbuild")) {
+                    Write-Log "Creating macOS package with native tools..."
+
+                    $macPkgArgs = @{
+                        Name = $Name
+                        Version = $packageVersion
+                        Iteration = $Iteration
+                        Staging = $Staging
+                        Destination = $Destination
+                        ManGzipFile = $ManGzipInfo.GzipFile
+                        ManDestination = $ManGzipInfo.ManFile
+                        LinkInfo = $Links
+                        AfterInstallScript = $AfterScriptInfo.AfterInstallScript
+                        AppsFolder = $AppsFolder
+                        HostArchitecture = $HostArchitecture
+                        CurrentLocation = $CurrentLocation
+                        LTS = $LTS
+                    }
+
+                    try {
+                        $packageFile = New-MacOSPackage @macPkgArgs
+                        $Output = @("Created package {:path=>""$($packageFile.Name)""}")
+                    }
+                    catch {
+                        Write-Verbose -Message "!!!Handling error in macOS packaging!!!" -Verbose -ErrorAction SilentlyContinue
+                        Get-Error -InputObject $_
+                        throw
+                    }
                 }
+            } else {
+                # Nothing should reach here
+                throw "Unknown package type: $Type"
             }
         } finally {
             if ($Environment.IsMacOS) {
@@ -1215,13 +1371,17 @@ function New-UnixPackage {
                 {
                     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
+            # Clean up rpmbuild directory if it was created
+            if ($Type -eq 'rpm') {
+                $rpmBuildRoot = Join-Path $env:HOME "rpmbuild"
+                if (Test-Path $rpmBuildRoot) {
+                    Write-Verbose "Cleaning up rpmbuild directory: $rpmBuildRoot" -Verbose
+                    Remove-Item -Path $rpmBuildRoot -Recurse -Force -ErrorAction SilentlyContinue
                 }
             }
+
             if ($AfterScriptInfo.AfterInstallScript) {
                 Remove-Item -ErrorAction 'silentlycontinue' $AfterScriptInfo.AfterInstallScript -Force
             }
@@ -1234,12 +1394,8 @@ function New-UnixPackage {
         # 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 -HostArchitecture $HostArchitecture -IsPreview:$IsPreview
-            }
-        }
+        # For macOS with native tools, the package is already in the correct format
+        # For other platforms, the package name from dpkg-deb/rpmbuild is sufficient
 
         if (Test-Path $createdPackage)
         {
@@ -1284,14 +1440,27 @@ Function New-LinkInfo
 
 function New-MacOsDistributionPackage
 {
+    [CmdletBinding(SupportsShouldProcess=$true)]
     param(
-        [Parameter(Mandatory,HelpMessage='The FileInfo of the file created by FPM')]
-        [System.IO.FileInfo]$FpmPackage,
+        [Parameter(Mandatory,HelpMessage='The FileInfo of the component package')]
+        [System.IO.FileInfo]$ComponentPackage,
+
+        [Parameter(Mandatory,HelpMessage='Package name for the output file')]
+        [string]$PackageName,
+
+        [Parameter(Mandatory,HelpMessage='Package version')]
+        [string]$Version,
+
+        [Parameter(Mandatory,HelpMessage='Output directory for the final package')]
+        [string]$OutputDirectory,
 
         [Parameter(HelpMessage='x86_64 for Intel or arm64 for Apple Silicon')]
         [ValidateSet("x86_64", "arm64")]
         [string] $HostArchitecture = "x86_64",
 
+        [Parameter(HelpMessage='Package identifier')]
+        [string]$PackageIdentifier,
+
         [Switch] $IsPreview
     )
 
@@ -1300,64 +1469,88 @@ function New-MacOsDistributionPackage
         throw 'New-MacOsDistributionPackage is only supported on macOS!'
     }
 
-    $packageName = Split-Path -Leaf -Path $FpmPackage
-
     # Create a temp directory to store the needed files
     $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) ([System.IO.Path]::GetRandomFileName())
     New-Item -ItemType Directory -Path $tempDir -Force > $null
 
     $resourcesDir = Join-Path -Path $tempDir -ChildPath 'resources'
     New-Item -ItemType Directory -Path $resourcesDir -Force > $null
-    #Copy background file to temp directory
-    $backgroundFile = "$RepoRoot/assets/macDialog.png"
-    Copy-Item -Path $backgroundFile -Destination $resourcesDir
-    # Move the current package to the temp directory
-    $tempPackagePath = Join-Path -Path $tempDir -ChildPath $packageName
-    Move-Item -Path $FpmPackage -Destination $tempPackagePath -Force
-
-    # Add the OS information to the macOS package file name.
-    $packageExt = [System.IO.Path]::GetExtension($FpmPackage.Name)
-
-    # get the package name from fpm without the extension, but replace powershell-preview at the beginning of the name with powershell.
-    $packageNameWithoutExt = [System.IO.Path]::GetFileNameWithoutExtension($FpmPackage.Name) -replace '^powershell\-preview' , 'powershell'
 
-    $newPackageName = "{0}-{1}{2}" -f $packageNameWithoutExt, $script:Options.Runtime, $packageExt
-    $newPackagePath = Join-Path $FpmPackage.DirectoryName $newPackageName
-
-    # -Force is not deleting the NewName if it exists, so delete it if it does
-    if ($Force -and (Test-Path -Path $newPackagePath))
-    {
-        Remove-Item -Force $newPackagePath
+    # Copy background file to temp directory
+    $backgroundFile = "$RepoRoot/assets/macDialog.png"
+    if (Test-Path $backgroundFile) {
+        Copy-Item -Path $backgroundFile -Destination $resourcesDir -Force
     }
 
+    # Copy the component package to temp directory
+    $componentFileName = Split-Path -Leaf -Path $ComponentPackage
+    $tempComponentPath = Join-Path -Path $tempDir -ChildPath $componentFileName
+    Copy-Item -Path $ComponentPackage -Destination $tempComponentPath -Force
+
     # Create the distribution xml
     $distributionXmlPath = Join-Path -Path $tempDir -ChildPath 'powershellDistribution.xml'
 
-    $packageId = Get-MacOSPackageId -IsPreview:$IsPreview.IsPresent
+    # Get package ID if not provided
+    if (-not $PackageIdentifier) {
+        if ($IsPreview.IsPresent) {
+            $PackageIdentifier = 'com.microsoft.powershell-preview'
+        }
+        else {
+            $PackageIdentifier = 'com.microsoft.powershell'
+        }
+    }
+
+    # Minimum OS version
+    $minOSVersion = "11.0"  # macOS Big Sur minimum
 
     # format distribution template with:
     # 0 - title
     # 1 - version
-    # 2 - package path
+    # 2 - package path (component package filename)
     # 3 - minimum os version
     # 4 - Package Identifier
     # 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
+    $PackagingStrings.OsxDistributionTemplate -f $PackageName, $Version, $componentFileName, $minOSVersion, $PackageIdentifier, $HostArchitecture | Out-File -Encoding utf8 -FilePath $distributionXmlPath -Force
 
-    Write-Log "Applying distribution.xml to package..."
-    Push-Location $tempDir
-    try
-    {
-        # productbuild is an xcode command line tool, and those tools are installed when you install brew
-        Start-NativeExecution -sb {productbuild --distribution $distributionXmlPath --resources $resourcesDir $newPackagePath} -VerboseOutputOnError
+    # Build final package path
+    # Rename x86_64 to x64 for compatibility
+    $packageArchName = if ($HostArchitecture -eq "x86_64") { "x64" } else { $HostArchitecture }
+    $finalPackagePath = Join-Path $OutputDirectory "$PackageName-$Version-osx-$packageArchName.pkg"
+
+    # Remove existing package if it exists
+    if (Test-Path $finalPackagePath) {
+        Write-Warning "Removing existing package: $finalPackagePath"
+        Remove-Item $finalPackagePath -Force
     }
-    finally
-    {
-        Pop-Location
-        Remove-Item -Path $tempDir -Recurse -Force
+
+    if ($PSCmdlet.ShouldProcess("Build product package with productbuild")) {
+        Write-Log "Applying distribution.xml to package..."
+        Push-Location $tempDir
+        try
+        {
+            # productbuild is an xcode command line tool
+            Start-NativeExecution -VerboseOutputOnError {
+                productbuild --distribution $distributionXmlPath `
+                    --package-path $tempDir `
+                    --resources $resourcesDir `
+                    $finalPackagePath
+            }
+
+            if (Test-Path $finalPackagePath) {
+                Write-Log "Successfully created macOS package: $finalPackagePath"
+            }
+            else {
+                throw "Package was not created at expected location: $finalPackagePath"
+            }
+        }
+        finally
+        {
+            Pop-Location
+            Remove-Item -Path $tempDir -Recurse -Force -ErrorAction SilentlyContinue
+        }
     }
 
-    return (Get-Item $newPackagePath)
+    return (Get-Item $finalPackagePath)
 }
 
 Class LinkInfo
@@ -1366,7 +1559,7 @@ Class LinkInfo
     [string] $Destination
 }
 
-function Get-FpmArguments
+function New-RpmSpec
 {
     param(
         [Parameter(Mandatory,HelpMessage='Package Name')]
@@ -1381,11 +1574,6 @@ function Get-FpmArguments
         [Parameter(Mandatory,HelpMessage='Package description')]
         [String]$Description,
 
-        # From start-PSPackage without modification, already validated
-        # Values: deb, rpm, osxpkg
-        [Parameter(Mandatory,HelpMessage='Installer Type')]
-        [String]$Type,
-
         [Parameter(Mandatory,HelpMessage='Staging folder for installation files')]
         [String]$Staging,
 
@@ -1401,109 +1589,499 @@ function Get-FpmArguments
         [Parameter(Mandatory,HelpMessage='Symlink to powershell executable')]
         [LinkInfo[]]$LinkInfo,
 
-        [Parameter(HelpMessage='Packages required to install this package.  Not applicable for MacOS.')]
-        [ValidateScript({
-            if (!$Environment.IsMacOS -and $_.Count -eq 0)
-            {
-                throw "Must not be null or empty on this environment."
-            }
-            return $true
-        })]
+        [Parameter(Mandatory,HelpMessage='Packages required to install this package')]
         [String[]]$Dependencies,
 
-        [Parameter(HelpMessage='Script to run after the package installation.')]
-        [AllowNull()]
-        [ValidateScript({
-            if (!$Environment.IsMacOS -and !$_)
-            {
-                throw "Must not be null on this environment."
-            }
-            return $true
-        })]
+        [Parameter(Mandatory,HelpMessage='Script to run after the package installation.')]
         [String]$AfterInstallScript,
 
-        [Parameter(HelpMessage='Script to run after the package removal.')]
-        [AllowNull()]
-        [ValidateScript({
-            if (!$Environment.IsMacOS -and !$_)
-            {
-                throw "Must not be null on this environment."
-            }
-            return $true
-        })]
+        [Parameter(Mandatory,HelpMessage='Script to run after the package removal.')]
         [String]$AfterRemoveScript,
 
-        [Parameter(HelpMessage='AppsFolder used to add macOS launcher')]
-        [AllowNull()]
-        [ValidateScript({
-            if ($Environment.IsMacOS -and !$_)
-            {
-                throw "Must not be null on this environment."
-            }
-            return $true
-        })]
-        [String]$AppsFolder,
         [String]$Distribution = 'rhel.7',
         [string]$HostArchitecture
     )
 
-    $Arguments = @(
-        "--force", "--verbose",
-        "--name", $Name,
-        "--version", $Version,
-        "--iteration", $Iteration,
-        "--maintainer", "PowerShell Team <PowerShellTeam@hotmail.com>",
-        "--vendor", "Microsoft Corporation",
-        "--url", "https://microsoft.com/powershell",
-        "--description", $Description,
-        "--architecture", $HostArchitecture,
-        "--category", "shells",
-        "-t", $Type,
-        "-s", "dir"
-    )
-    if ($Distribution -in $script:RedHatDistributions) {
-        $Arguments += @("--rpm-digest", "sha256")
-        $Arguments += @("--rpm-dist", $Distribution)
-        $Arguments += @("--rpm-os", "linux")
-        $Arguments += @("--license", "MIT")
-        $Arguments += @("--rpm-rpmbuild-define", "_build_id_links none")
+    # RPM doesn't allow hyphens in version, so convert them to underscores
+    # e.g., "7.6.0-preview.6" becomes Version: 7.6.0_preview.6
+    $rpmVersion = $Version -replace '-', '_'
+
+    # Build Release field with distribution suffix (e.g., "1.cm" or "1.rh")
+    # Don't use RPM macros - build the full release string in PowerShell
+    $rpmRelease = "$Iteration.$Distribution"
+
+    $specContent = @"
+# RPM spec file for PowerShell
+# Generated by PowerShell build system
+
+Name:           $Name
+Version:        $rpmVersion
+Release:        $rpmRelease
+Summary:        PowerShell - Cross-platform automation and configuration tool/framework
+License:        MIT
+URL:            https://microsoft.com/powershell
+AutoReq:        no
+
+"@
+
+    # Only add BuildArch if not doing cross-architecture build
+    # For cross-arch builds, we'll rely on --target option
+    if ($HostArchitecture -eq "x86_64" -or $HostArchitecture -eq "noarch") {
+        $specContent += "BuildArch:      $HostArchitecture`n`n"
     } else {
-        $Arguments += @("--license", "MIT License")
-    }
+        # For cross-architecture builds, don't specify BuildArch in spec
+        # The --target option will handle the architecture
 
-    if ($Environment.IsMacOS) {
-        $Arguments += @("--osxpkg-identifier-prefix", "com.microsoft")
+        # Disable automatic binary stripping for cross-arch builds
+        # The native /bin/strip on x86_64 cannot process ARM64 binaries and would fail with:
+        # "Unable to recognise the format of the input file"
+        # See: https://rpm-software-management.github.io/rpm/manual/macros.html
+        # __strip: This macro controls the command used for stripping binaries during the build process.
+        # /bin/true: A command that does nothing and always exits successfully, effectively bypassing the stripping process.
+        $specContent += "%define __strip /bin/true`n"
+
+        # Disable debug package generation to prevent strip-related errors
+        # Debug packages require binary stripping which fails for cross-arch builds
+        # See: https://rpm-packaging-guide.github.io/#debugging
+        # See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Debuginfo/#_useless_or_incomplete_debuginfo_packages_due_to_other_reasons
+        $specContent += "%global debug_package %{nil}`n`n"
     }
 
-    foreach ($Dependency in $Dependencies) {
-        $Arguments += @("--depends", $Dependency)
+    # Add dependencies
+    foreach ($dep in $Dependencies) {
+        $specContent += "Requires:       $dep`n"
     }
 
-    if ($AfterInstallScript) {
-        $Arguments += @("--after-install", $AfterInstallScript)
+    $specContent += @"
+
+%description
+$Description
+
+%prep
+# No prep needed - files are already staged
+
+%build
+# No build needed - binaries are pre-built
+
+%install
+rm -rf `$RPM_BUILD_ROOT
+mkdir -p `$RPM_BUILD_ROOT$Destination
+mkdir -p `$RPM_BUILD_ROOT$(Split-Path -Parent $ManDestination)
+
+# Copy all files from staging to destination
+cp -r $Staging/* `$RPM_BUILD_ROOT$Destination/
+
+# Copy man page
+cp $ManGzipFile `$RPM_BUILD_ROOT$ManDestination
+
+"@
+
+    # Add symlinks - we need to get the target of the temp symlink
+    foreach ($link in $LinkInfo) {
+        $linkDir = Split-Path -Parent $link.Destination
+        $specContent += "mkdir -p `$RPM_BUILD_ROOT$linkDir`n"
+        # For RPM, we copy the symlink itself.
+        # The symlink at $link.Source points to the actual target, so we'll copy it.
+        # The -P flag preserves symlinks rather than copying their targets, which is critical for this operation.
+        $specContent += "cp -P $($link.Source) `$RPM_BUILD_ROOT$($link.Destination)`n"
     }
 
-    if ($AfterRemoveScript) {
-        $Arguments += @("--after-remove", $AfterRemoveScript)
+    # Post-install script
+    $postInstallContent = Get-Content -Path $AfterInstallScript -Raw
+    $specContent += "`n%post`n"
+    $specContent += $postInstallContent
+    $specContent += "`n"
+
+    # Post-uninstall script
+    $postUninstallContent = Get-Content -Path $AfterRemoveScript -Raw
+    $specContent += "%postun`n"
+    $specContent += $postUninstallContent
+    $specContent += "`n"
+
+    # Files section
+    $specContent += "%files`n"
+    $specContent += "%defattr(-,root,root,-)`n"
+    $specContent += "$Destination/*`n"
+    $specContent += "$ManDestination`n"
+
+    # Add symlinks to files
+    foreach ($link in $LinkInfo) {
+        $specContent += "$($link.Destination)`n"
     }
 
-    $Arguments += @(
-        "$Staging/=$Destination/",
-        "$ManGzipFile=$ManDestination"
+    # Changelog with correct date format for RPM
+    $changelogDate = Get-Date -Format "ddd MMM dd yyyy"
+    $specContent += "`n%changelog`n"
+    $specContent += "* $changelogDate PowerShell Team <PowerShellTeam@hotmail.com> - $rpmVersion-$rpmRelease`n"
+    $specContent += "- Automated build`n"
+
+    return $specContent
+}
+
+function New-NativeDeb
+{
+    param(
+        [Parameter(Mandatory, HelpMessage='Package Name')]
+        [String]$Name,
+
+        [Parameter(Mandatory, HelpMessage='Package Version')]
+        [String]$Version,
+
+        [Parameter(Mandatory)]
+        [String]$Iteration,
+
+        [Parameter(Mandatory, HelpMessage='Package description')]
+        [String]$Description,
+
+        [Parameter(Mandatory, HelpMessage='Staging folder for installation files')]
+        [String]$Staging,
+
+        [Parameter(Mandatory, HelpMessage='Install path on target machine')]
+        [String]$Destination,
+
+        [Parameter(Mandatory, HelpMessage='The built and gzipped man file.')]
+        [String]$ManGzipFile,
+
+        [Parameter(Mandatory, HelpMessage='The destination of the man file')]
+        [String]$ManDestination,
+
+        [Parameter(Mandatory, HelpMessage='Symlink to powershell executable')]
+        [LinkInfo[]]$LinkInfo,
+
+        [Parameter(HelpMessage='Packages required to install this package.')]
+        [String[]]$Dependencies,
+
+        [Parameter(HelpMessage='Script to run after the package installation.')]
+        [String]$AfterInstallScript,
+
+        [Parameter(HelpMessage='Script to run after the package removal.')]
+        [String]$AfterRemoveScript,
+
+        [string]$HostArchitecture,
+
+        [string]$CurrentLocation
     )
 
-    foreach($link in $LinkInfo)
-    {
-        $linkArgument = "$($link.Source)=$($link.Destination)"
-        $Arguments += $linkArgument
-    }
+    Write-Log "Creating native DEB package..."
 
-    if ($AppsFolder)
-    {
-        $Arguments += "$AppsFolder=/"
+    # Create temporary build directory
+    $debBuildRoot = Join-Path $env:HOME "debbuild-$(Get-Random)"
+    $debianDir = Join-Path $debBuildRoot "DEBIAN"
+    $dataDir = Join-Path $debBuildRoot "data"
+
+    try {
+        New-Item -ItemType Directory -Path $debianDir -Force | Out-Null
+        New-Item -ItemType Directory -Path $dataDir -Force | Out-Null
+
+        # Calculate installed size (in KB)
+        $installedSize = 0
+        Get-ChildItem -Path $Staging -Recurse -File | ForEach-Object { $installedSize += $_.Length }
+        $installedSize += (Get-Item $ManGzipFile).Length
+        $installedSizeKB = [Math]::Ceiling($installedSize / 1024)
+
+        # Create control file with all fields in proper order
+        # Description must be single line (first line) followed by extended description with leading space
+        $descriptionLines = $Description -split "`n"
+        $shortDescription = $descriptionLines[0]
+        $extendedDescription = if ($descriptionLines.Count -gt 1) {
+            ($descriptionLines[1..($descriptionLines.Count-1)] | ForEach-Object { " $_" }) -join "`n"
+        }
+
+        $controlContent = @"
+Package: $Name
+Version: $Version-$Iteration
+Architecture: $HostArchitecture
+Maintainer: PowerShell Team <PowerShellTeam@hotmail.com>
+Installed-Size: $installedSizeKB
+Priority: optional
+Section: shells
+Homepage: https://microsoft.com/powershell
+Depends: $(if ($Dependencies) { $Dependencies -join ', ' })
+Description: $shortDescription
+$(if ($extendedDescription) { $extendedDescription + "`n" })
+"@
+
+        $controlFile = Join-Path $debianDir "control"
+        $controlContent | Out-File -FilePath $controlFile -Encoding ascii -NoNewline
+
+        Write-Verbose "Control file created: $controlFile" -Verbose
+        Write-LogGroup -Title "DEB Control File Content" -Message $controlContent
+
+        # Copy postinst script if provided
+        if ($AfterInstallScript -and (Test-Path $AfterInstallScript)) {
+            $postinstFile = Join-Path $debianDir "postinst"
+            Copy-Item -Path $AfterInstallScript -Destination $postinstFile -Force
+            Start-NativeExecution { chmod 755 $postinstFile }
+            Write-Verbose "Postinst script copied to: $postinstFile" -Verbose
+        }
+
+        # Copy postrm script if provided
+        if ($AfterRemoveScript -and (Test-Path $AfterRemoveScript)) {
+            $postrmFile = Join-Path $debianDir "postrm"
+            Copy-Item -Path $AfterRemoveScript -Destination $postrmFile -Force
+            Start-NativeExecution { chmod 755 $postrmFile }
+            Write-Verbose "Postrm script copied to: $postrmFile" -Verbose
+        }
+
+        # Copy staging files to data directory
+        $targetPath = Join-Path $dataDir $Destination.TrimStart('/')
+        New-Item -ItemType Directory -Path $targetPath -Force | Out-Null
+        Copy-Item -Path "$Staging/*" -Destination $targetPath -Recurse -Force
+        Write-Verbose "Copied staging files to: $targetPath" -Verbose
+
+        # Copy man page
+        $manDestPath = Join-Path $dataDir $ManDestination.TrimStart('/')
+        $manDestDir = Split-Path $manDestPath -Parent
+        New-Item -ItemType Directory -Path $manDestDir -Force | Out-Null
+        Copy-Item -Path $ManGzipFile -Destination $manDestPath -Force
+        Write-Verbose "Copied man page to: $manDestPath" -Verbose
+
+        # Copy symlinks from temporary locations
+        foreach ($link in $LinkInfo) {
+            $linkPath = Join-Path $dataDir $link.Destination.TrimStart('/')
+            $linkDir = Split-Path $linkPath -Parent
+            New-Item -ItemType Directory -Path $linkDir -Force | Out-Null
+
+            # Copy the temporary symlink file that was created by New-LinkInfo
+            # The Source contains a temporary symlink that points to the correct target
+            if (Test-Path $link.Source) {
+                # Use cp to preserve the symlink
+                Start-NativeExecution { cp -P $link.Source $linkPath }
+                Write-Verbose "Copied symlink: $linkPath (from $($link.Source))" -Verbose
+            } else {
+                Write-Warning "Symlink source not found: $($link.Source)"
+            }
+        }
+
+        # Set proper permissions
+        Write-Verbose "Setting file permissions..." -Verbose
+        # 755 = rwxr-xr-x (owner can read/write/execute, group and others can read/execute)
+        Get-ChildItem $dataDir -Directory -Recurse | ForEach-Object {
+            Start-NativeExecution { chmod 755 $_.FullName }
+        }
+        # 644 = rw-r--r-- (owner can read/write, group and others can read only)
+        # Exclude symlinks to avoid "cannot operate on dangling symlink" error
+        Get-ChildItem $dataDir -File -Recurse |
+            Where-Object { -not $_.Target } |
+            ForEach-Object {
+                Start-NativeExecution { chmod 644 $_.FullName }
+            }
+
+        # Set executable permission for pwsh if it exists
+        # 755 = rwxr-xr-x (executable permission)
+        $pwshPath = "$targetPath/pwsh"
+        if (Test-Path $pwshPath) {
+            Start-NativeExecution { chmod 755 $pwshPath }
+        }
+
+        # Calculate md5sums for all files in data directory (excluding symlinks)
+        $md5sumsFile = Join-Path $debianDir "md5sums"
+        $md5Content = ""
+        Get-ChildItem -Path $dataDir -Recurse -File |
+            Where-Object { -not $_.Target } |
+            ForEach-Object {
+                $relativePath = $_.FullName.Substring($dataDir.Length + 1)
+                $md5Hash = (Get-FileHash -Path $_.FullName -Algorithm MD5).Hash.ToLower()
+                $md5Content += "$md5Hash  $relativePath`n"
+            }
+        $md5Content | Out-File -FilePath $md5sumsFile -Encoding ascii -NoNewline
+        Write-Verbose "MD5 sums file created: $md5sumsFile" -Verbose
+
+        # Build the package using dpkg-deb
+        $debFileName = "${Name}_${Version}-${Iteration}_${HostArchitecture}.deb"
+        $debFilePath = Join-Path $CurrentLocation $debFileName
+
+        Write-Verbose "Building DEB package: $debFileName" -Verbose
+
+        # Copy DEBIAN directory and data files to build root
+        $buildDir = Join-Path $debBuildRoot "build"
+        New-Item -ItemType Directory -Path $buildDir -Force | Out-Null
+
+        Write-Verbose "debianDir: $debianDir" -Verbose
+        Write-Verbose "dataDir: $dataDir" -Verbose
+        Write-Verbose "buildDir: $buildDir" -Verbose
+
+        # Use cp to preserve symlinks
+        Start-NativeExecution { cp -a $debianDir "$buildDir/DEBIAN" }
+        Start-NativeExecution { cp -a $dataDir/* $buildDir }
+
+        # Build package with dpkg-deb
+        Start-NativeExecution -VerboseOutputOnError {
+            dpkg-deb --build $buildDir $debFilePath
+        }
+
+        if (Test-Path $debFilePath) {
+            Write-Log "Successfully created DEB package: $debFileName"
+            return @{
+                PackagePath = $debFilePath
+                PackageName = $debFileName
+            }
+        } else {
+            throw "DEB package file not found after build: $debFilePath"
+        }
+    }
+    finally {
+        # Cleanup temporary directory
+        if (Test-Path $debBuildRoot) {
+            Write-Verbose "Cleaning up temporary build directory: $debBuildRoot" -Verbose
+            Remove-Item -Path $debBuildRoot -Recurse -Force -ErrorAction SilentlyContinue
+        }
     }
+}
+
+function New-MacOSPackage
+{
+    [CmdletBinding(SupportsShouldProcess=$true)]
+    param(
+        [Parameter(Mandatory)]
+        [string]$Name,
+
+        [Parameter(Mandatory)]
+        [string]$Version,
+
+        [Parameter(Mandatory)]
+        [string]$Iteration,
+
+        [Parameter(Mandatory)]
+        [string]$Staging,
+
+        [Parameter(Mandatory)]
+        [string]$Destination,
+
+        [Parameter(Mandatory)]
+        [string]$ManGzipFile,
 
-    return $Arguments
+        [Parameter(Mandatory)]
+        [string]$ManDestination,
+
+        [Parameter(Mandatory)]
+        [LinkInfo[]]$LinkInfo,
+
+        [Parameter(Mandatory)]
+        [string]$AfterInstallScript,
+
+        [Parameter(Mandatory)]
+        [string]$AppsFolder,
+
+        [Parameter(Mandatory)]
+        [string]$HostArchitecture,
+
+        [string]$CurrentLocation = (Get-Location),
+
+        [switch]$LTS
+    )
+
+    Write-Log "Creating macOS package using pkgbuild and productbuild..."
+
+    # Create a temporary directory for package building
+    $tempRoot = New-TempFolder
+    $componentPkgPath = Join-Path $tempRoot "component.pkg"
+    $scriptsDir = Join-Path $tempRoot "scripts"
+    $resourcesDir = Join-Path $tempRoot "resources"
+    $distributionFile = Join-Path $tempRoot "distribution.xml"
+
+    try {
+        # Create scripts directory
+        New-Item -ItemType Directory -Path $scriptsDir -Force | Out-Null
+
+        # Copy and prepare the postinstall script
+        $postInstallPath = Join-Path $scriptsDir "postinstall"
+        Copy-Item -Path $AfterInstallScript -Destination $postInstallPath -Force
+        Start-NativeExecution {
+            chmod 755 $postInstallPath
+        }
+
+        # Create a temporary directory for the package root
+        $pkgRoot = Join-Path $tempRoot "pkgroot"
+        New-Item -ItemType Directory -Path $pkgRoot -Force | Out-Null
+
+        # Copy staging files to destination path in package root
+        $destInPkg = Join-Path $pkgRoot $Destination
+        New-Item -ItemType Directory -Path $destInPkg -Force | Out-Null
+        Write-Verbose "Copying staging files from $Staging to $destInPkg" -Verbose
+        Copy-Item -Path "$Staging/*" -Destination $destInPkg -Recurse -Force
+
+        # Create man page directory structure
+        $manDir = Join-Path $pkgRoot (Split-Path $ManDestination -Parent)
+        New-Item -ItemType Directory -Path $manDir -Force | Out-Null
+        Copy-Item -Path $ManGzipFile -Destination (Join-Path $pkgRoot $ManDestination) -Force
+
+        # Create symlinks in package root
+        # The LinkInfo contains Source (a temp file that IS a symlink) and Destination (where to install it)
+        foreach ($link in $LinkInfo) {
+            $linkDestDir = Join-Path $pkgRoot (Split-Path $link.Destination -Parent)
+            New-Item -ItemType Directory -Path $linkDestDir -Force | Out-Null
+            $finalLinkPath = Join-Path $pkgRoot $link.Destination
+
+            Write-Verbose "Creating symlink at $finalLinkPath" -Verbose
+
+            # Remove if exists
+            if (Test-Path $finalLinkPath) {
+                Remove-Item $finalLinkPath -Force
+            }
+
+            # Get the target of the original symlink and recreate it in the package root
+            if (Test-Path $link.Source) {
+                $linkTarget = (Get-Item $link.Source).Target
+                if ($linkTarget) {
+                    Write-Verbose "Creating symlink to target: $linkTarget" -Verbose
+                    New-Item -ItemType SymbolicLink -Path $finalLinkPath -Target $linkTarget -Force | Out-Null
+                } else {
+                    Write-Warning "Could not determine target for symlink at $($link.Source), copying file instead"
+                    Copy-Item -Path $link.Source -Destination $finalLinkPath -Force
+                }
+            } else {
+                Write-Warning "Source symlink $($link.Source) does not exist"
+            }
+        }
+
+        # Copy launcher app folder if provided
+        if ($AppsFolder) {
+            $appsInPkg = Join-Path $pkgRoot "Applications"
+            New-Item -ItemType Directory -Path $appsInPkg -Force | Out-Null
+            Write-Verbose "Copying launcher app from $AppsFolder to $appsInPkg" -Verbose
+            Copy-Item -Path "$AppsFolder/*" -Destination $appsInPkg -Recurse -Force
+        }
+
+        # Get package identifier info based on version and LTS flag
+        $packageInfo = Get-MacOSPackageIdentifierInfo -Version $Version -LTS:$LTS
+        $IsPreview = $packageInfo.IsPreview
+        $pkgIdentifier = $packageInfo.PackageIdentifier
+
+        if ($PSCmdlet.ShouldProcess("Build component package with pkgbuild")) {
+            Write-Log "Running pkgbuild to create component package..."
+
+            Start-NativeExecution -VerboseOutputOnError {
+                pkgbuild --root $pkgRoot `
+                    --identifier $pkgIdentifier `
+                    --version $Version `
+                    --scripts $scriptsDir `
+                    --install-location "/" `
+                    $componentPkgPath
+            }
+
+            Write-Verbose "Component package created: $componentPkgPath" -Verbose
+        }
+
+        # Create the final distribution package using the refactored function
+        $distributionPackage = New-MacOsDistributionPackage `
+            -ComponentPackage (Get-Item $componentPkgPath) `
+            -PackageName $Name `
+            -Version $Version `
+            -OutputDirectory $CurrentLocation `
+            -HostArchitecture $HostArchitecture `
+            -PackageIdentifier $pkgIdentifier `
+            -IsPreview:$IsPreview
+
+        return $distributionPackage
+    }
+    finally {
+        # Clean up temporary directory
+        if (Test-Path $tempRoot) {
+            Write-Verbose "Cleaning up temporary directory: $tempRoot" -Verbose
+            Remove-Item -Path $tempRoot -Recurse -Force -ErrorAction SilentlyContinue
+        }
+    }
 }
 
 function Get-PackageDependencies
@@ -1512,7 +2090,7 @@ function Get-PackageDependencies
     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.
+        # The '-Distribution' parameter can be used to indicate which Debian distro this package is targeting.
         $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
         $ParameterAttr.Mandatory = $true
         $ValidateSetAttr = New-Object "System.Management.Automation.ValidateSetAttribute" -ArgumentList $Script:AllDistributions
@@ -1533,6 +2111,22 @@ function Get-PackageDependencies
 
         # These should match those in the Dockerfiles, but exclude tools like Git, which, and curl
         $Dependencies = @()
+
+        # ICU version range follows .NET runtime policy.
+        # See: https://github.com/dotnet/runtime/blob/3fe8518d51bbcaa179bbe275b2597fbe1b88bc5a/src/native/libs/System.Globalization.Native/pal_icushim.c#L235-L243
+        #
+        # Version range rationale:
+        # - The runtime supports ICU versions >= the version it was built against
+        #   and <= that version + 30, to allow sufficient headroom for future releases.
+        # - ICU typically releases about twice per year, so +30 provides roughly
+        #   15 years of forward compatibility.
+        # - On some platforms, the minimum supported version may be lower
+        #   than the build version and we know that older versions just works.
+        #
+        $MinICUVersion = 60                    # runtime minimum supported
+        $BuildICUVersion = 76                  # current build version
+        $MaxICUVersion = $BuildICUVersion + 30 # headroom
+
         if ($Distribution -eq 'deb') {
             $Dependencies = @(
                 "libc6",
@@ -1540,10 +2134,9 @@ function Get-PackageDependencies
                 "libgssapi-krb5-2",
                 "libstdc++6",
                 "zlib1g",
-                "libicu72|libicu71|libicu70|libicu69|libicu68|libicu67|libicu66|libicu65|libicu63|libicu60|libicu57|libicu55|libicu52",
+                (($MaxICUVersion..$MinICUVersion).ForEach{ "libicu$_" } -join '|'),
                 "libssl3|libssl1.1|libssl1.0.2|libssl1.0.0"
             )
-
         } elseif ($Distribution -eq 'rh') {
             $Dependencies = @(
                 "openssl-libs",
@@ -1563,7 +2156,7 @@ function Get-PackageDependencies
             )
             if($Script:Options.Runtime -like 'fx*') {
                 $Dependencies += @(
-                    "dotnet-runtime-8.0"
+                    "dotnet-runtime-10.0"
                 )
             }
         } elseif ($Distribution -eq 'macOS') {
@@ -1578,25 +2171,25 @@ function Get-PackageDependencies
 
 function Test-Dependencies
 {
-    foreach ($Dependency in "fpm", "ronn") {
-        if (!(precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Package")) {
-            # These tools are not added to the path automatically on OpenSUSE 13.2
-            # try adding them to the path and re-tesing first
-            [string] $gemsPath = $null
-            [string] $depenencyPath = $null
-            $gemsPath = Get-ChildItem -Path /usr/lib64/ruby/gems | Sort-Object -Property LastWriteTime -Descending | Select-Object -First 1 -ExpandProperty FullName
-            if ($gemsPath) {
-                $depenencyPath  = Get-ChildItem -Path (Join-Path -Path $gemsPath -ChildPath "gems" -AdditionalChildPath $Dependency) -Recurse | Sort-Object -Property LastWriteTime -Descending | Select-Object -First 1 -ExpandProperty DirectoryName
-                $originalPath = $env:PATH
-                $env:PATH = $ENV:PATH +":" + $depenencyPath
-                if ((precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Package")) {
-                    continue
-                }
-                else {
-                    $env:PATH = $originalPath
-                }
-            }
+    # RPM packages use rpmbuild directly.
+    # DEB packages use dpkg-deb directly.
+    # macOS packages use pkgbuild and productbuild from Xcode Command Line Tools.
+    $Dependencies = @()
+
+    # Check for 'rpmbuild' and 'dpkg-deb' on Azure Linux.
+    if ($Environment.IsMariner) {
+        $Dependencies += "dpkg-deb"
+        $Dependencies += "rpmbuild"
+    }
 
+    # Check for macOS packaging tools
+    if ($Environment.IsMacOS) {
+        $Dependencies += "pkgbuild"
+        $Dependencies += "productbuild"
+    }
+
+    foreach ($Dependency in $Dependencies) {
+        if (!(precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Scenario Package")) {
             throw "Dependency precheck failed!"
         }
     }
@@ -1626,7 +2219,7 @@ function New-AfterScripts
         $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) {
+    elseif ($Environment.IsDebianFamily -or $Environment.IsSUSEFamily -or $Distribution -in $script:DebianDistributions) {
         $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
@@ -1656,34 +2249,28 @@ function New-ManGzip
     )
 
     Write-Log "Creating man gz..."
-    # run ronn to convert man page to roff
-    $RonnFile = "$RepoRoot/assets/pwsh.1.ronn"
 
-    if ($IsPreview.IsPresent -or $IsLTS.IsPresent)
-    {
-        $prodName = if ($IsLTS) { 'pwsh-lts' } else { 'pwsh-preview' }
-        $newRonnFile = $RonnFile -replace 'pwsh', $prodName
-        Copy-Item -Path $RonnFile -Destination $newRonnFile -Force
-        $RonnFile = $newRonnFile
-    }
+    # run roff to convert man page to roff
+    $RoffFile = "$RepoRoot/assets/manpage/pwsh.1"
 
-    $RoffFile = $RonnFile -replace "\.ronn$"
-
-    # Run ronn on assets file
-    Write-Log "Creating man gz - running ronn..."
-    Start-NativeExecution { ronn --roff $RonnFile }
-
-    if ($IsPreview.IsPresent)
-    {
-        Remove-Item $RonnFile
+    if ($IsPreview.IsPresent -or $IsLTS.IsPresent) {
+        $prodName = if ($IsLTS) { 'pwsh-lts' } else { 'pwsh-preview' }
+        $newRoffFile = $RoffFile -replace 'pwsh', $prodName
+        Copy-Item -Path $RoffFile -Destination $newRoffFile -Force -Verbose
+        $RoffFile = $newRoffFile
     }
 
     # gzip in assets directory
     $GzipFile = "$RoffFile.gz"
     Write-Log "Creating man gz - running gzip..."
-    Start-NativeExecution { gzip -f $RoffFile } -VerboseOutputOnError
+    Start-NativeExecution { gzip -kf $RoffFile } -VerboseOutputOnError
 
-    $ManFile = Join-Path "/usr/local/share/man/man1" (Split-Path -Leaf $GzipFile)
+    if($Environment.IsMacOS) {
+        $ManFile = Join-Path "/usr/local/share/man/man1" (Split-Path -Leaf $GzipFile)
+    }
+    else {
+        $ManFile = Join-Path "/usr/share/man/man1" (Split-Path -Leaf $GzipFile)
+    }
 
     return [PSCustomObject ] @{
         GZipFile = $GzipFile
@@ -1691,20 +2278,44 @@ function New-ManGzip
     }
 }
 
-# Returns the macOS Package Identifier
-function Get-MacOSPackageId
+<#
+    .SYNOPSIS
+        Determines the package identifier and preview status for macOS packages.
+    .DESCRIPTION
+        This function determines if a package is a preview build based on the version string
+        and LTS flag, then returns the appropriate package identifier.
+    .PARAMETER Version
+        The version string (e.g., "7.6.0-preview.6" or "7.6.0")
+    .PARAMETER LTS
+        Whether this is an LTS build
+    .OUTPUTS
+        Hashtable with IsPreview (boolean) and PackageIdentifier (string) properties
+    .EXAMPLE
+        Get-MacOSPackageIdentifierInfo -Version "7.6.0-preview.6" -LTS:$false
+        Returns @{ IsPreview = $true; PackageIdentifier = "com.microsoft.powershell-preview" }
+#>
+function Get-MacOSPackageIdentifierInfo
 {
     param(
-        [switch]
-        $IsPreview
+        [Parameter(Mandatory)]
+        [string]$Version,
+
+        [switch]$LTS
     )
-    if ($IsPreview.IsPresent)
-    {
-        return 'com.microsoft.powershell-preview'
+
+    $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS
+
+    # Determine package identifier based on preview status
+    if ($IsPreview) {
+        $PackageIdentifier = 'com.microsoft.powershell-preview'
     }
-    else
-    {
-        return 'com.microsoft.powershell'
+    else {
+        $PackageIdentifier = 'com.microsoft.powershell'
+    }
+
+    return @{
+        IsPreview = $IsPreview
+        PackageIdentifier = $PackageIdentifier
     }
 }
 
@@ -1718,8 +2329,9 @@ function New-MacOSLauncher
         [switch]$LTS
     )
 
-    $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS
-    $packageId = Get-MacOSPackageId -IsPreview:$IsPreview
+    $packageInfo = Get-MacOSPackageIdentifierInfo -Version $Version -LTS:$LTS
+    $IsPreview = $packageInfo.IsPreview
+    $packageId = $packageInfo.PackageIdentifier
 
     # Define folder for launcher application.
     $suffix = if ($IsPreview) { "-preview" } elseif ($LTS) { "-lts" }
@@ -1757,10 +2369,12 @@ function New-MacOSLauncher
     # Set permissions for plist and shell script.
     Start-NativeExecution {
         chmod 644 $plist
+    }
+    Start-NativeExecution {
         chmod 755 $shellscript
     }
 
-    # Add app folder to fpm paths.
+    # Return the app folder path for packaging
     $appsfolder = (Resolve-Path -Path "$macosapp/..").Path
 
     return $appsfolder
@@ -2238,7 +2852,6 @@ function New-ILNugetPackageSource
         [Parameter(Mandatory = $true)]
         [string] $RefAssemblyPath,
 
-        [Parameter(Mandatory = $true)]
         [string] $CGManifestPath
 
     )
@@ -2295,9 +2908,15 @@ function New-ILNugetPackageSource
 
     CreateNugetPlatformFolder -FileName $FileName -Platform 'win' -PackageRuntimesFolder $packageRuntimesFolderPath -PlatformBinPath $WinFxdBinPath
 
+    Write-Verbose -Verbose "Done creating Windows runtime assemblies for $FileName"
+
     if ($linuxExceptionList -notcontains $FileName )
     {
         CreateNugetPlatformFolder -FileName $FileName -Platform 'unix' -PackageRuntimesFolder $packageRuntimesFolderPath -PlatformBinPath $LinuxFxdBinPath
+        Write-Verbose -Verbose "Done creating Linux runtime assemblies for $FileName"
+    }
+    else {
+        Write-Verbose -Verbose "Skipping creating Linux runtime assemblies for $FileName"
     }
 
     if ($FileName -eq "Microsoft.PowerShell.SDK.dll")
@@ -2346,6 +2965,14 @@ function New-ILNugetPackageSource
 
         Write-Log "Copied the built-in modules to contentFiles for the SDK package"
     }
+    else {
+        Write-Verbose -Verbose "Skipping copying the built-in modules and reference assemblies for $FileName"
+    }
+
+    if (-not $PSBoundParameters.ContainsKey("CGManifestPath")) {
+        Write-Verbose -Verbose "CGManifestPath is not provided. Skipping CGManifest creation."
+        return
+    }
 
     # Create a CGManifest file that lists all dependencies for this package, which is used when creating the SBOM.
     if (! (Test-Path -Path $CGManifestPath)) {
@@ -2951,109 +3578,20 @@ function Publish-NugetToMyGet
         [Parameter(Mandatory = $true)]
         [string] $PackagePath,
 
-        [Parameter(Mandatory = $true)]
-        [string] $ApiKey
-    )
-
-    $nuget = Get-Command -Type Application nuget -ErrorAction SilentlyContinue
-
-    if ($null -eq $nuget)
-    {
-        throw 'nuget application is not available in PATH'
-    }
-
-    Get-ChildItem $PackagePath | ForEach-Object {
-        Write-Log "Pushing $_ to PowerShell Myget"
-        Start-NativeExecution { nuget push $_.FullName -Source 'https://powershell.myget.org/F/powershell-core/api/v2/package' -ApiKey $ApiKey } > $null
-    }
-}
-
-<#
-.SYNOPSIS
-The function creates a nuget package for daily feed.
-
-.DESCRIPTION
-The nuget package created is a content package and has all the binaries laid out in a flat structure.
-This package is used by install-powershell.ps1
-#>
-function New-NugetContentPackage
-{
-    [CmdletBinding(SupportsShouldProcess=$true)]
-    param (
-
-        # Name of the Product
-        [ValidateNotNullOrEmpty()]
-        [string] $PackageName = 'powershell',
-
-        # Suffix of the Name
-        [string] $PackageNameSuffix,
-
-        # Version of the Product
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string] $PackageVersion,
-
-        # Runtime of the Product
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string] $PackageRuntime,
-
-        # Configuration of the Product
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string] $PackageConfiguration,
-
-        # Source Path to the Product Files - required to package the contents into an Zip
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string] $PackageSourcePath,
-
-        [Switch]
-        $Force
-    )
-
-    Write-Log "PackageVersion: $PackageVersion"
-    $nugetSemanticVersion = Get-NugetSemanticVersion -Version $PackageVersion
-    Write-Log "nugetSemanticVersion: $nugetSemanticVersion"
-
-    $nugetFolder = New-SubFolder -Path $PSScriptRoot -ChildPath 'nugetOutput' -Clean
-
-    $nuspecPackageName = $PackageName
-    if ($PackageNameSuffix)
-    {
-        $nuspecPackageName += '-' + $PackageNameSuffix
-    }
-
-    # Setup staging directory so we don't change the original source directory
-    $stagingRoot = New-SubFolder -Path $PSScriptRoot -ChildPath 'nugetStaging' -Clean
-    $contentFolder = Join-Path -Path $stagingRoot -ChildPath 'content'
-    if ($PSCmdlet.ShouldProcess("Create staging folder")) {
-        New-StagingFolder -StagingPath $contentFolder -PackageSourcePath $PackageSourcePath
-    }
-
-    $projectFolder = Join-Path $PSScriptRoot 'projects/nuget'
-
-    $arguments = @('pack')
-    $arguments += @('--output',$nugetFolder)
-    $arguments += @('--configuration',$PackageConfiguration)
-    $arguments += "/p:StagingPath=$stagingRoot"
-    $arguments += "/p:RID=$PackageRuntime"
-    $arguments += "/p:SemVer=$nugetSemanticVersion"
-    $arguments += "/p:PackageName=$nuspecPackageName"
-    $arguments += $projectFolder
+        [Parameter(Mandatory = $true)]
+        [string] $ApiKey
+    )
 
-    Write-Log "Running dotnet $arguments"
-    Write-Log "Use -verbose to see output..."
-    Start-NativeExecution -sb {dotnet $arguments} | ForEach-Object {Write-Verbose $_}
+    $nuget = Get-Command -Type Application nuget -ErrorAction SilentlyContinue
 
-    $nupkgFile = "${nugetFolder}\${nuspecPackageName}-${packageRuntime}.${nugetSemanticVersion}.nupkg"
-    if (Test-Path $nupkgFile)
+    if ($null -eq $nuget)
     {
-        Get-Item $nupkgFile
+        throw 'nuget application is not available in PATH'
     }
-    else
-    {
-        throw "Failed to create $nupkgFile"
+
+    Get-ChildItem $PackagePath | ForEach-Object {
+        Write-Log "Pushing $_ to PowerShell Myget"
+        Start-NativeExecution { nuget push $_.FullName -Source 'https://powershell.myget.org/F/powershell-core/api/v2/package' -ApiKey $ApiKey } > $null
     }
 }
 
@@ -3203,418 +3741,6 @@ function Get-NugetSemanticVersion
     $packageSemanticVersion
 }
 
-# Get the paths to various WiX tools
-function Get-WixPath
-{
-    $wixToolsetBinPath = "${env:ProgramFiles(x86)}\WiX Toolset *\bin"
-
-    Write-Verbose "Ensure Wix Toolset is present on the machine @ $wixToolsetBinPath"
-    if (-not (Test-Path $wixToolsetBinPath))
-    {
-        throw "The latest version of Wix Toolset 3.11 is required to create MSI package. Please install it from https://github.com/wixtoolset/wix3/releases"
-    }
-
-    ## Get the latest if multiple versions exist.
-    $wixToolsetBinPath = (Get-ChildItem $wixToolsetBinPath).FullName | Sort-Object -Descending | Select-Object -First 1
-
-    Write-Verbose "Initialize Wix executables..."
-    $wixHeatExePath = Join-Path $wixToolsetBinPath "heat.exe"
-    $wixMeltExePath = Join-Path $wixToolsetBinPath "melt.exe"
-    $wixTorchExePath = Join-Path $wixToolsetBinPath "torch.exe"
-    $wixPyroExePath = Join-Path $wixToolsetBinPath "pyro.exe"
-    $wixCandleExePath = Join-Path $wixToolsetBinPath "Candle.exe"
-    $wixLightExePath = Join-Path $wixToolsetBinPath "Light.exe"
-    $wixInsigniaExePath = Join-Path $wixToolsetBinPath "Insignia.exe"
-
-    return [PSCustomObject] @{
-        WixHeatExePath     = $wixHeatExePath
-        WixMeltExePath     = $wixMeltExePath
-        WixTorchExePath    = $wixTorchExePath
-        WixPyroExePath     = $wixPyroExePath
-        WixCandleExePath   = $wixCandleExePath
-        WixLightExePath    = $wixLightExePath
-        WixInsigniaExePath = $wixInsigniaExePath
-    }
-
-}
-
-<#
-    .Synopsis
-        Creates a Windows installer MSI package and assumes that the binaries are already built using 'Start-PSBuild'.
-        This only works on a Windows machine due to the usage of WiX.
-    .EXAMPLE
-        # 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\net8.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
-#>
-function New-MSIPackage
-{
-    [CmdletBinding()]
-    param (
-
-        # Name of the Product
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductName = 'PowerShell',
-
-        # Suffix of the Name
-        [string] $ProductNameSuffix,
-
-        # Version of the Product
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductVersion,
-
-        # Source Path to the Product Files - required to package the contents into an MSI
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductSourcePath,
-
-        # File describing the MSI Package creation semantics
-        [ValidateNotNullOrEmpty()]
-        [ValidateScript( {Test-Path $_})]
-        [string] $ProductWxsPath = "$RepoRoot\assets\wix\Product.wxs",
-
-        # File describing the MSI Package creation semantics
-        [ValidateNotNullOrEmpty()]
-        [ValidateScript({Test-Path $_})]
-        [string] $BundleWxsPath = "$RepoRoot\assets\wix\bundle.wxs",
-
-        # Path to Assets folder containing artifacts such as icons, images
-        [ValidateNotNullOrEmpty()]
-        [ValidateScript( {Test-Path $_})]
-        [string] $AssetsPath = "$RepoRoot\assets",
-
-        # Architecture to use when creating the MSI
-        [Parameter(Mandatory = $true)]
-        [ValidateSet("x86", "x64")]
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductTargetArchitecture,
-
-        # Force overwrite of package
-        [Switch] $Force,
-
-        [string] $CurrentLocation = (Get-Location)
-    )
-
-    $wixPaths = Get-WixPath
-
-    $windowsNames = Get-WindowsNames -ProductName $ProductName -ProductNameSuffix $ProductNameSuffix -ProductVersion $ProductVersion
-    $productSemanticVersionWithName = $windowsNames.ProductSemanticVersionWithName
-    $ProductSemanticVersion = $windowsNames.ProductSemanticVersion
-    $packageName = $windowsNames.PackageName
-    $ProductVersion = $windowsNames.ProductVersion
-    Write-Verbose "Create MSI for Product $productSemanticVersionWithName" -Verbose
-    Write-Verbose "ProductSemanticVersion =  $productSemanticVersion" -Verbose
-    Write-Verbose "packageName =  $packageName" -Verbose
-    Write-Verbose "ProductVersion =  $ProductVersion" -Verbose
-
-    $simpleProductVersion = [string]([Version]$ProductVersion).Major
-    $isPreview = Test-IsPreview -Version $ProductSemanticVersion
-    if ($isPreview)
-    {
-        $simpleProductVersion += '-preview'
-    }
-
-    $staging = "$PSScriptRoot/staging"
-    New-StagingFolder -StagingPath $staging -PackageSourcePath $ProductSourcePath
-
-    $assetsInSourcePath = Join-Path $staging 'assets'
-
-    New-Item $assetsInSourcePath -type directory -Force | Write-Verbose
-
-    Write-Verbose "Place dependencies such as icons to $assetsInSourcePath"
-    Copy-Item "$AssetsPath\*.ico" $assetsInSourcePath -Force
-
-
-
-    $fileArchitecture = 'amd64'
-    $ProductProgFilesDir = "ProgramFiles64Folder"
-    if ($ProductTargetArchitecture -eq "x86")
-    {
-        $fileArchitecture = 'x86'
-        $ProductProgFilesDir = "ProgramFilesFolder"
-    }
-
-    $wixFragmentPath = Join-Path $env:Temp "Fragment.wxs"
-
-    # cleanup any garbage on the system
-    Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force
-
-    $msiLocationPath = Join-Path $CurrentLocation "$packageName.msi"
-    $msiPdbLocationPath = Join-Path $CurrentLocation "$packageName.wixpdb"
-
-    if (!$Force.IsPresent -and (Test-Path -Path $msiLocationPath)) {
-        Write-Error -Message "Package already exists, use -Force to overwrite, path:  $msiLocationPath" -ErrorAction Stop
-    }
-
-    Write-Log "Generating wxs file manifest..."
-    $arguments = @{
-        IsPreview              = $isPreview
-        ProductSourcePath      = $staging
-        ProductName            = $ProductName
-        ProductVersion         = $ProductVersion
-        SimpleProductVersion   = $simpleProductVersion
-        ProductSemanticVersion = $ProductSemanticVersion
-        ProductVersionWithName = $productVersionWithName
-        ProductProgFilesDir    = $ProductProgFilesDir
-        FileArchitecture       = $fileArchitecture
-    }
-
-    $buildArguments = New-MsiArgsArray -Argument $arguments
-
-    Test-Bom -Path $staging -BomName windows
-    Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixHeatExePath dir $staging -dr  VersionFolder -cg ApplicationFiles -ag -sfrag -srd -scom -sreg -out $wixFragmentPath -var var.ProductSourcePath $buildArguments -v}
-
-    Send-AzdoFile -Path $wixFragmentPath
-
-    $wixObjFragmentPath = Join-Path $env:Temp "Fragment.wixobj"
-
-    # cleanup any garbage on the system
-    Remove-Item -ErrorAction SilentlyContinue $wixObjFragmentPath -Force
-
-    Start-MsiBuild -WxsFile $ProductWxsPath, $wixFragmentPath -ProductTargetArchitecture $ProductTargetArchitecture -Argument $arguments -MsiLocationPath $msiLocationPath -MsiPdbLocationPath $msiPdbLocationPath
-
-    Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force
-
-    if ((Test-Path $msiLocationPath) -and (Test-Path $msiPdbLocationPath))
-    {
-        Write-Verbose "You can find the WixPdb @ $msiPdbLocationPath" -Verbose
-        Write-Verbose "You can find the MSI @ $msiLocationPath" -Verbose
-        [pscustomobject]@{
-            msi=$msiLocationPath
-            wixpdb=$msiPdbLocationPath
-        }
-    }
-    else
-    {
-        $errorMessage = "Failed to create $msiLocationPath"
-        throw $errorMessage
-    }
-}
-
-function Get-WindowsNames {
-    param(
-        # Name of the Product
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductName = 'PowerShell',
-
-        # Suffix of the Name
-        [string] $ProductNameSuffix,
-
-        # Version of the Product
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductVersion
-    )
-
-    Write-Verbose -Message "Getting Windows Names for ProductName: $ProductName; ProductNameSuffix: $ProductNameSuffix; ProductVersion: $ProductVersion" -Verbose
-
-    $ProductSemanticVersion = Get-PackageSemanticVersion -Version $ProductVersion
-    $ProductVersion = Get-PackageVersionAsMajorMinorBuildRevision -Version $ProductVersion -IncrementBuildNumber
-
-    $productVersionWithName = $ProductName + '_' + $ProductVersion
-    $productSemanticVersionWithName = $ProductName + '-' + $ProductSemanticVersion
-
-    $packageName = $productSemanticVersionWithName
-    if ($ProductNameSuffix) {
-        $packageName += "-$ProductNameSuffix"
-    }
-
-    return [PSCustomObject]@{
-        PackageName                    = $packageName
-        ProductVersionWithName         = $productVersionWithName
-        ProductSemanticVersion         = $ProductSemanticVersion
-        ProductSemanticVersionWithName = $productSemanticVersionWithName
-        ProductVersion                 = $ProductVersion
-    }
-}
-
-function New-ExePackage {
-    param(
-        # Name of the Product
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductName = 'PowerShell',
-
-        # Version of the Product
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullOrEmpty()]
-
-        [string] $ProductVersion,
-
-        # File describing the MSI Package creation semantics
-        [ValidateNotNullOrEmpty()]
-        [ValidateScript({Test-Path $_})]
-        [string] $BundleWxsPath = "$RepoRoot\assets\wix\bundle.wxs",
-
-        # Architecture to use when creating the MSI
-        [Parameter(Mandatory = $true)]
-        [ValidateSet("x86", "x64")]
-        [ValidateNotNullOrEmpty()]
-        [string] $ProductTargetArchitecture,
-
-        # Location of the signed MSI
-        [Parameter(Mandatory = $true)]
-        [string]
-        $MsiLocationPath,
-
-        [string] $CurrentLocation = (Get-Location)
-    )
-
-    $productNameSuffix = "win-$ProductTargetArchitecture"
-
-    $windowsNames = Get-WindowsNames -ProductName $ProductName -ProductNameSuffix $productNameSuffix -ProductVersion $ProductVersion
-    $productSemanticVersionWithName = $windowsNames.ProductSemanticVersionWithName
-    $packageName = $windowsNames.PackageName
-    $isPreview = Test-IsPreview -Version $windowsNames.ProductSemanticVersion
-
-    Write-Verbose "Create EXE for Product $productSemanticVersionWithName" -verbose
-    Write-Verbose "packageName =  $packageName" -Verbose
-
-    $exeLocationPath = Join-Path $CurrentLocation "$packageName.exe"
-    $exePdbLocationPath = Join-Path $CurrentLocation "$packageName.exe.wixpdb"
-    $windowsVersion = Get-WindowsVersion -packageName $packageName
-
-    Start-MsiBuild -WxsFile $BundleWxsPath -ProductTargetArchitecture $ProductTargetArchitecture -Argument @{
-        IsPreview      = $isPreview
-        TargetPath     = $MsiLocationPath
-        WindowsVersion = $windowsVersion
-    }  -MsiLocationPath $exeLocationPath -MsiPdbLocationPath $exePdbLocationPath
-
-    return $exeLocationPath
-}
-
-<#
-Allows you to extract the engine of exe package, mainly for signing
-Any existing signature will be removed.
- #>
-function Expand-ExePackageEngine {
-    param(
-        # Location of the unsigned EXE
-        [Parameter(Mandatory = $true)]
-        [string]
-        $ExePath,
-
-        # Location to put the expanded engine.
-        [Parameter(Mandatory = $true)]
-        [string]
-        $EnginePath
-    )
-
-    <#
-    2. detach the engine from TestInstaller.exe:
-    insignia -ib TestInstaller.exe -o engine.exe
-    #>
-
-    $wixPaths = Get-WixPath
-
-    $resolvedExePath = (Resolve-Path -Path $ExePath).ProviderPath
-    $resolvedEnginePath = [System.IO.Path]::GetFullPath($EnginePath)
-
-    Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixInsigniaExePath -ib $resolvedExePath -o $resolvedEnginePath}
-}
-
-<#
-Allows you to replace the engine (installer) in the exe package.
-Used to replace the engine with a signed version
-#>
-function Compress-ExePackageEngine {
-    param(
-        # Location of the unsigned EXE
-        [Parameter(Mandatory = $true)]
-        [string]
-        $ExePath,
-
-        # Location of the signed engine
-        [Parameter(Mandatory = $true)]
-        [string]
-        $EnginePath
-    )
-
-
-    <#
-    4. re-attach the signed engine.exe to the bundle:
-    insignia -ab engine.exe TestInstaller.exe -o TestInstaller.exe
-    #>
-
-    $wixPaths = Get-WixPath
-
-    $resolvedEnginePath = (Resolve-Path -Path $EnginePath).ProviderPath
-    $resolvedExePath = (Resolve-Path -Path $ExePath).ProviderPath
-
-    Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixInsigniaExePath -ab $resolvedEnginePath $resolvedExePath -o $resolvedExePath}
-}
-
-function New-MsiArgsArray {
-    param(
-        [Parameter(Mandatory)]
-        [Hashtable]$Argument
-    )
-
-    $buildArguments = @()
-    foreach ($key in $Argument.Keys) {
-        $buildArguments += "-d$key=$($Argument.$key)"
-    }
-
-    return $buildArguments
-}
-
-function Start-MsiBuild {
-    param(
-        [string[]] $WxsFile,
-        [string[]] $Extension = @('WixUIExtension', 'WixUtilExtension', 'WixBalExtension'),
-        [string] $ProductTargetArchitecture,
-        [Hashtable] $Argument,
-        [string] $MsiLocationPath,
-        [string] $MsiPdbLocationPath
-    )
-
-    $outDir = $env:Temp
-
-    $wixPaths = Get-WixPath
-
-    $extensionArgs = @()
-    foreach ($extensionName in $Extension) {
-        $extensionArgs += '-ext'
-        $extensionArgs += $extensionName
-    }
-
-    $buildArguments = New-MsiArgsArray -Argument $Argument
-
-    $objectPaths = @()
-    foreach ($file in $WxsFile) {
-        $fileName = [system.io.path]::GetFileNameWithoutExtension($file)
-        $objectPaths += Join-Path $outDir -ChildPath "${filename}.wixobj"
-    }
-
-    foreach ($file in $objectPaths) {
-        Remove-Item -ErrorAction SilentlyContinue $file -Force
-        Remove-Item -ErrorAction SilentlyContinue $file -Force
-    }
-
-    $resolvedWxsFiles = @()
-    foreach ($file in $WxsFile) {
-        $resolvedWxsFiles += (Resolve-Path -Path $file).ProviderPath
-    }
-
-    Write-Verbose "$resolvedWxsFiles" -Verbose
-
-    Write-Log "running candle..."
-    Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixCandleExePath $resolvedWxsFiles -out "$outDir\\" $extensionArgs -arch $ProductTargetArchitecture $buildArguments -v}
-
-    Write-Log "running light..."
-    # suppress ICE61, because we allow same version upgrades
-    # suppress ICE57, this suppresses an error caused by our shortcut not being installed per user
-    # suppress ICE40, REINSTALLMODE is defined in the Property table.
-    Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE40 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $objectPaths $extensionArgs }
-
-    foreach($file in $objectPaths)
-    {
-        Remove-Item -ErrorAction SilentlyContinue $file -Force
-        Remove-Item -ErrorAction SilentlyContinue $file -Force
-    }
-}
-
 <#
     .Synopsis
         Creates a Windows AppX MSIX package and assumes that the binaries are already built using 'Start-PSBuild'.
@@ -3655,6 +3781,9 @@ function New-MSIXPackage
         # Produce private package for testing in Store
         [Switch] $Private,
 
+        # Produce LTS package
+        [Switch] $LTS,
+
         # Force overwrite of package
         [Switch] $Force,
 
@@ -3680,18 +3809,8 @@ function New-MSIXPackage
 
     $makepri = Get-Item (Join-Path $makeappx.Directory "makepri.exe") -ErrorAction Stop
 
+    $displayName = $ProductName
     $ProductSemanticVersion = Get-PackageSemanticVersion -Version $ProductVersion
-    $productSemanticVersionWithName = $ProductName + '-' + $ProductSemanticVersion
-    $packageName = $productSemanticVersionWithName
-    if ($Private) {
-        $ProductNameSuffix = 'Private'
-    }
-
-    if ($ProductNameSuffix) {
-        $packageName += "-$ProductNameSuffix"
-    }
-
-    $displayName = $productName
 
     if ($Private) {
         $ProductName = 'PowerShell-Private'
@@ -3699,25 +3818,54 @@ function New-MSIXPackage
     } elseif ($ProductSemanticVersion.Contains('-')) {
         $ProductName += 'Preview'
         $displayName += ' Preview'
+    } elseif ($LTS) {
+        $ProductName += '-LTS'
+        $displayName += ' LTS'
     }
 
     Write-Verbose -Verbose "ProductName: $productName"
     Write-Verbose -Verbose "DisplayName: $displayName"
 
+    $packageName = $ProductName + '-' + $ProductSemanticVersion
+
+    # Appends Architecture to the package name
+    if ($ProductNameSuffix) {
+        $packageName += "-$ProductNameSuffix"
+    }
+
     $ProductVersion = Get-WindowsVersion -PackageName $packageName
 
+    # Any app that is submitted to the Store must have a PhoneIdentity in its appxmanifest.
+    # If you submit a package without this information to the Store, the Store will silently modify your package to include it.
+    # To find the PhoneProductId value, you need to run a package through the Store certification process,
+    # and use the PhoneProductId value from the Store certified package to update the manifest in your source code.
+    # This is the PhoneProductId for the "Microsoft.PowerShell" package.
+    $PhoneProductId = "5b3ae196-2df7-446e-8060-94b4ad878387"
+
     $isPreview = Test-IsPreview -Version $ProductSemanticVersion
     if ($isPreview) {
+        # This is the PhoneProductId for the "Microsoft.PowerShellPreview" package.
+        $PhoneProductId = "67859fd2-b02a-45be-8fb5-62c569a3e8bf"
         Write-Verbose "Using Preview assets" -Verbose
+    } elseif ($LTS) {
+        # This is the PhoneProductId for the "Microsoft.PowerShell-LTS" package.
+        $PhoneProductId = "b7a4b003-3704-47a9-b018-cfcc9801f4fc"
+        Write-Verbose "Using LTS assets" -Verbose
     }
 
-    # Appx manifest needs to be in root of source path, but the embedded version needs to be updated
-    # cp-459155 is 'CN=Microsoft Windows Store Publisher (Store EKU), O=Microsoft Corporation, L=Redmond, S=Washington, C=US'
+    # Appx manifest needs to be in root of source path, but the embedded version needs to be updated.
     # authenticodeFormer is 'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'
     $releasePublisher = 'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'
 
     $appxManifest = Get-Content "$RepoRoot\assets\AppxManifest.xml" -Raw
-    $appxManifest = $appxManifest.Replace('$VERSION$', $ProductVersion).Replace('$ARCH$', $Architecture).Replace('$PRODUCTNAME$', $productName).Replace('$DISPLAYNAME$', $displayName).Replace('$PUBLISHER$', $releasePublisher)
+    $appxManifest = $appxManifest.
+        Replace('$VERSION$', $ProductVersion).
+        Replace('$ARCH$', $Architecture).
+        Replace('$PRODUCTNAME$', $productName).
+        Replace('$DISPLAYNAME$', $displayName).
+        Replace('$PUBLISHER$', $releasePublisher).
+        Replace('$PHONEPRODUCTID$', $PhoneProductId)
+
     $xml = [xml]$appxManifest
     if ($isPreview) {
         Write-Verbose -Verbose "Adding pwsh-preview.exe alias"
@@ -3747,7 +3895,6 @@ function New-MSIXPackage
         else {
             Copy-Item -Path "$RepoRoot\assets\$_.png" -Destination "$ProductSourcePath\assets\"
         }
-
     }
 
     if ($PSCmdlet.ShouldProcess("Create .msix package?")) {
@@ -3760,6 +3907,7 @@ function New-MSIXPackage
         Write-Verbose "Creating msix package" -Verbose
         Start-NativeExecution -VerboseOutputOnError { & $makeappx pack /o /v /h SHA256 /d $ProductSourcePath /p (Join-Path -Path $CurrentLocation -ChildPath "$packageName.msix") }
         Write-Verbose "Created $packageName.msix" -Verbose
+        Join-Path -Path $CurrentLocation -ChildPath "$packageName.msix"
     }
 }
 
@@ -4119,7 +4267,8 @@ function New-GlobalToolNupkgSource
         [Parameter(Mandatory)] [string] $WindowsBinPath,
         [Parameter(Mandatory)] [string] $WindowsDesktopBinPath,
         [Parameter(Mandatory)] [string] $AlpineBinPath,
-        [Parameter(Mandatory)] [string] $PackageVersion
+        [Parameter(Mandatory)] [string] $PackageVersion,
+        [Parameter()] [switch] $SkipCGManifest
     )
 
     if ($PackageType -ne "Unified")
@@ -4240,20 +4389,22 @@ function New-GlobalToolNupkgSource
             $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
         }
 
-        "PowerShell.Windows.x64"
-        {
-            $PackageName = "PowerShell.Windows.x64"
-            $RootFolder = New-TempFolder
+        # Due to needing a signed shim for the global tool, we build the global tool in build instead of packaging.
+        # keeping the code for reference.
+        # "PowerShell.Windows.x64"
+        # {
+        #     $PackageName = "PowerShell.Windows.x64"
+        #     $RootFolder = New-TempFolder
 
-            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
+        #     Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
 
-            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
+        #     $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"
-        }
+        #     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"
         {
@@ -4283,15 +4434,24 @@ function New-GlobalToolNupkgSource
     # Set VSTS environment variable for package NuSpec source path.
     $pkgNuSpecSourcePathVar = "GlobalToolNuSpecSourcePath"
     Write-Log "New-GlobalToolNupkgSource: Creating NuSpec source path VSTS variable: $pkgNuSpecSourcePathVar"
+    Write-Verbose -Verbose "sending: [task.setvariable variable=$pkgNuSpecSourcePathVar]$RootFolder"
     Write-Host "##vso[task.setvariable variable=$pkgNuSpecSourcePathVar]$RootFolder"
+    $global:GlobalToolNuSpecSourcePath = $RootFolder
 
     # Set VSTS environment variable for package Name.
     $pkgNameVar = "GlobalToolPkgName"
     Write-Log "New-GlobalToolNupkgSource: Creating current package name variable: $pkgNameVar"
+    Write-Verbose -Verbose "sending: vso[task.setvariable variable=$pkgNameVar]$PackageName"
     Write-Host "##vso[task.setvariable variable=$pkgNameVar]$PackageName"
+    $global:GlobalToolPkgName = $PackageName
+
+    if ($SkipCGManifest.IsPresent) {
+        Write-Verbose -Verbose "New-GlobalToolNupkgSource: Skipping CGManifest creation."
+        return
+    }
 
     # Set VSTS environment variable for CGManifest file path.
-    $globalToolCGManifestPFilePath = Join-Path -Path "$env:REPOROOT" -ChildPath "tools\cgmanifest.json"
+    $globalToolCGManifestPFilePath = Join-Path -Path "$env:REPOROOT" -ChildPath "tools/cgmanifest/main/cgmanifest.json"
     $globalToolCGManifestFilePath = Resolve-Path -Path $globalToolCGManifestPFilePath -ErrorAction SilentlyContinue
     if (($null -eq $globalToolCGManifestFilePath) -or (! (Test-Path -Path $globalToolCGManifestFilePath)))
     {
@@ -4331,7 +4491,7 @@ function New-GlobalToolNupkgFromSource
         [Parameter(Mandatory)] [string] $PackageNuSpecPath,
         [Parameter(Mandatory)] [string] $PackageName,
         [Parameter(Mandatory)] [string] $DestinationPath,
-        [Parameter(Mandatory)] [string] $CGManifestPath
+        [Parameter()] [string] $CGManifestPath
     )
 
     if (! (Test-Path -Path $PackageNuSpecPath))
@@ -4345,6 +4505,12 @@ function New-GlobalToolNupkgFromSource
     Write-Log "New-GlobalToolNupkgFromSource: Removing GlobalTool NuSpec source directory: $PackageNuSpecPath"
     Remove-Item -Path $PackageNuSpecPath -Recurse -Force -ErrorAction SilentlyContinue
 
+    if (-not ($PSBoundParameters.ContainsKey('CGManifestPath')))
+    {
+        Write-Verbose -Verbose "New-GlobalToolNupkgFromSource: CGManifest file path not provided."
+        return
+    }
+
     Write-Log "New-GlobalToolNupkgFromSource: Removing GlobalTool CGManifest source directory: $CGManifestPath"
     if (! (Test-Path -Path $CGManifestPath))
     {
@@ -4949,8 +5115,24 @@ function Send-AzdoFile {
         Copy-Item -Path $Path -Destination $logFile
     }
 
-    Write-Host "##vso[artifact.upload containerfolder=$newName;artifactname=$newName]$logFile"
-    Write-Verbose "Log file captured as $newName" -Verbose
+    Write-Verbose "Capture the log file as '$newName'" -Verbose
+    if($env:TF_BUILD) {
+        ## In Azure DevOps
+        Write-Host "##vso[artifact.upload containerfolder=$newName;artifactname=$newName]$logFile"
+    } elseif ($env:GITHUB_WORKFLOW -and $env:SYSTEM_ARTIFACTSDIRECTORY) {
+        ## In GitHub Actions
+        $destinationPath = $env:SYSTEM_ARTIFACTSDIRECTORY
+        Write-Verbose "Upload '$logFile' to '$destinationPath' in GitHub Action" -Verbose
+
+        # Create the folder if it does not exist
+        if (!(Test-Path -Path $destinationPath)) {
+            $null = New-Item -ItemType Directory -Path $destinationPath -Force
+        }
+
+        Copy-Item -Path $logFile -Destination $destinationPath -Force -Verbose
+    } else {
+        Write-Warning "This environment is neither Azure Devops nor GitHub Actions. Cannot capture the log file in this environment."
+    }
 }
 
 # Class used for serializing and deserialing a BOM into Json
@@ -4963,6 +5145,9 @@ class BomRecord {
     [string]
     $FileType = "NonProduct"
 
+    [string[]]
+    $Architecture
+
     # Add methods to normalize Pattern to use `/` as the directory separator,
     # but give a Pattern that is usable on the current platform
     [string]
@@ -4992,6 +5177,13 @@ class BomRecord {
         # If the directory separator character is a slash, then set the pattern as-is
         $this.Pattern = $Pattern
     }
+
+    [void]
+    EnsureArchitecture([string[]]$DefaultArchitecture = @("x64","x86","arm64")) {
+        if (-not $this.PSObject.Properties.Match("Architecture")) {
+            $this.Architecture = $DefaultArchitecture
+        }
+    }
 }
 
 # Verify a folder based on a BOM json.
@@ -5005,7 +5197,9 @@ function Test-Bom {
         [string]
         $Path,
         [switch]
-        $Fix
+        $Fix,
+        [string]
+        $Architecture
     )
 
     Write-Log "verifying no unauthorized files have been added or removed..."
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index 39afb75a96b..0bf14ff0dbe 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="net8.0"></group>
+            <group targetFramework="net11.0"></group>
         </dependencies>
     </metadata>
 </package>
@@ -193,6 +193,29 @@ open {0}
         </packageTypes>
     </metadata>
 </package>
+'@
+
+    WindowsX64GlobalToolNuspec = @'
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+    <metadata>
+        <id>PowerShelll.Windows.x64</id>
+        <version>{0}</version>
+        <authors>Microsoft</authors>
+        <owners>Microsoft,PowerShell</owners>
+        <projectUrl>https://github.com/PowerShell/PowerShell</projectUrl>
+        <icon>Powershell_64.png</icon>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>PowerShell global tool</description>
+        <license type="expression">MIT</license>
+        <tags>PowerShell</tags>
+        <language>en-US</language>
+        <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
+        <packageTypes>
+            <packageType name="DotnetTool" />
+        </packageTypes>
+    </metadata>
+</package>
 '@
 
     GlobalToolSettingsFile = @'
diff --git a/tools/packaging/projects/nuget/package.csproj b/tools/packaging/projects/nuget/package.csproj
deleted file mode 100644
index 390283c5ef1..00000000000
--- a/tools/packaging/projects/nuget/package.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!--
-    Due to https://github.com/dotnet/sdk/issues/1021
-    When packaging we must build something.
-    So, we are building an empty assembly called NotUsed, and discarding it.
-  -->
-  <PropertyGroup>
-    <AssemblyName>NotUsed</AssemblyName>
-    <Description>PowerShell nuget package with .NET CLI host including everything needed to run it.</Description>
-    <NuspecFile>powershell.nuspec</NuspecFile>
-    <NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
-    <NuspecBasePath>$(StagingPath)</NuspecBasePath>
-    <IsTool>True</IsTool>
-    <TargetFramework>net8.0</TargetFramework>
-  </PropertyGroup>
-</Project>
diff --git a/tools/packaging/projects/nuget/powershell.nuspec b/tools/packaging/projects/nuget/powershell.nuspec
deleted file mode 100644
index 5c191e911e5..00000000000
--- a/tools/packaging/projects/nuget/powershell.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>$PackageName$-$runtime$</id>
-    <version>$version$</version>
-    <title>PowerShell for $runtime$</title>
-    <authors>PowerShell</authors>
-    <owners>PowerShell</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/powershell/powershell</projectUrl>
-    <iconUrl>https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_64.png</iconUrl>
-    <description>This package contains PowerShell for $runtime$.</description>
-    <copyright>Copyright (c) Microsoft Corporation.</copyright>
-    <tags>PowerShell</tags>
-
-    <contentFiles>
-      <files include="**" buildAction="None" copyToOutput="true" flatten="false"/>
-    </contentFiles>
-  </metadata>
-</package>
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 64875719138..34ead3a2dc5 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,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net11.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Management.Automation">
@@ -14,7 +14,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
+    <!-- Removing System.Security.AccessControl as per NU1510 -->
+    <!-- PackageReference Include="System.Security.AccessControl" Version="6.0.0" /-->
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
   </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 777d98d2fe6..378ca59ff95 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,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net11.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Management.Automation">
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 910a5ae576b..8f80aa50a3d 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,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net11.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
+    <!-- PackageReference Include="System.Security.AccessControl" Version="6.0.0" /-->
+    <!-- PackageReference Include="System.Security.AccessControl" Version="6.0.0" /-->
   </ItemGroup>
 </Project>
diff --git a/tools/performance/README.md b/tools/performance/README.md
index c598fca5f28..e0c79659de2 100644
--- a/tools/performance/README.md
+++ b/tools/performance/README.md
@@ -3,7 +3,7 @@
 
 This directory contains useful scripts and related files for analyzing PowerShell performance.
 
-If you use the [Windows Performance Toolkit](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk), you can use the following to collect data and analyze a trace.
+If you use the [Windows Performance Toolkit](https://learn.microsoft.com/windows-hardware/test/wpt/), you can use the following to collect data and analyze a trace.
 
 ```PowerShell
 $PowerShellGitRepo = "D:\PowerShell"
diff --git a/tools/releaseBuild/.gitignore b/tools/releaseBuild/.gitignore
deleted file mode 100644
index 0ff566888a7..00000000000
--- a/tools/releaseBuild/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-PSRelease/
diff --git a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
deleted file mode 100644
index 2475dce7d89..00000000000
--- a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# PowerShell Script to build and package PowerShell from specified form and branch
-# Script is intented to use in Docker containers
-# Ensure PowerShell is available in the provided image
-
-param (
-    [string] $location = "/powershell",
-
-    # Destination location of the package on docker host
-    [string] $destination = '/mnt',
-
-    [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
-    [ValidateNotNullOrEmpty()]
-    [string]$ReleaseTag,
-
-    [switch]$TarX64,
-    [switch]$TarArm,
-    [switch]$TarArm64,
-    [switch]$TarMinSize,
-    [switch]$FxDependent,
-    [switch]$Alpine
-)
-
-$releaseTagParam = @{}
-if ($ReleaseTag)
-{
-    $releaseTagParam = @{ 'ReleaseTag' = $ReleaseTag }
-}
-
-#Remove the initial 'v' from the ReleaseTag
-$version = $ReleaseTag -replace '^v'
-$semVersion = [System.Management.Automation.SemanticVersion] $version
-
-$metadata = Get-Content "$location/tools/metadata.json" -Raw | ConvertFrom-Json
-
-$LTS = $metadata.LTSRelease.Package
-
-Write-Verbose -Verbose -Message "LTS is set to: $LTS"
-
-function BuildPackages {
-    param(
-        [switch] $LTS
-    )
-
-    Push-Location
-    try {
-        Set-Location $location
-        Import-Module "$location/build.psm1"
-        Import-Module "$location/tools/packaging"
-
-        Start-PSBootstrap -Package -NoSudo
-
-        $buildParams = @{ Configuration = 'Release'; PSModuleRestore = $true; Restore = $true }
-
-        if ($FxDependent.IsPresent) {
-            $projectAssetsZipName = 'linuxFxDependantProjectAssetssymbols.zip'
-            $buildParams.Add("Runtime", "fxdependent")
-        } elseif ($Alpine.IsPresent) {
-            $projectAssetsZipName = 'linuxAlpineProjectAssetssymbols.zip'
-            $buildParams.Add("Runtime", 'musl-x64')
-        } else {
-            # make the artifact name unique
-            $projectAssetsZipName = "linuxProjectAssets-$((Get-Date).Ticks)-symbols.zip"
-        }
-
-        Start-PSBuild @buildParams @releaseTagParam
-        $options = Get-PSOptions
-
-        if ($FxDependent) {
-            Start-PSPackage -Type 'fxdependent' @releaseTagParam -LTS:$LTS
-        } elseif ($Alpine) {
-            Start-PSPackage -Type 'tar-alpine' @releaseTagParam -LTS:$LTS
-        } else {
-            Start-PSPackage @releaseTagParam -LTS:$LTS
-        }
-
-        if ($TarX64) { Start-PSPackage -Type tar @releaseTagParam -LTS:$LTS }
-
-        if ($TarMinSize) {
-            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'
-            Write-Verbose -Verbose "Remove $binDir, to get a clean build for min-size package"
-            Remove-Item -Path $binDir -Recurse -Force
-
-            ## Build 'min-size' and create 'tar.gz' package for it.
-            $buildParams['ForMinimalSize'] = $true
-            Start-PSBuild @buildParams @releaseTagParam
-            Start-PSPackage -Type min-size @releaseTagParam -LTS:$LTS
-        }
-
-        if ($TarArm) {
-            ## Build 'linux-arm' and create 'tar.gz' package for it.
-            ## Note that 'linux-arm' can only be built on Ubuntu environment.
-            Start-PSBuild -Configuration Release -Restore -Runtime linux-arm -PSModuleRestore @releaseTagParam
-            Start-PSPackage -Type tar-arm @releaseTagParam -LTS:$LTS
-        }
-
-        if ($TarArm64) {
-            Start-PSBuild -Configuration Release -Restore -Runtime linux-arm64 -PSModuleRestore @releaseTagParam
-            Start-PSPackage -Type tar-arm64 @releaseTagParam -LTS:$LTS
-        }
-    } finally {
-        Pop-Location
-    }
-}
-
-BuildPackages
-
-if ($LTS) {
-    Write-Verbose -Verbose "Packaging LTS"
-    BuildPackages -LTS
-}
-
-$linuxPackages = Get-ChildItem "$location/powershell*" -Include *.deb,*.rpm,*.tar.gz
-
-foreach ($linuxPackage in $linuxPackages)
-{
-    $filePath = $linuxPackage.FullName
-    Write-Verbose "Copying $filePath to $destination" -Verbose
-    Copy-Item -Path $filePath -Destination $destination -Force
-}
-
-Write-Verbose "Exporting project.assets files ..." -Verbose
-
-$projectAssetsCounter = 1
-$projectAssetsFolder = Join-Path -Path $destination -ChildPath 'projectAssets'
-$projectAssetsZip = Join-Path -Path $destination -ChildPath $projectAssetsZipName
-Get-ChildItem $location\project.assets.json -Recurse | ForEach-Object {
-    $subfolder = $_.FullName.Replace($location,'')
-    $subfolder.Replace('project.assets.json','')
-    $itemDestination = Join-Path -Path $projectAssetsFolder -ChildPath $subfolder
-    New-Item -Path $itemDestination -ItemType Directory -Force
-    $file = $_.FullName
-    Write-Verbose "Copying $file to $itemDestination" -Verbose
-    Copy-Item -Path $file -Destination "$itemDestination\" -Force
-    $projectAssetsCounter++
-}
-
-Compress-Archive -Path $projectAssetsFolder -DestinationPath $projectAssetsZip
-Remove-Item -Path $projectAssetsFolder -Recurse -Force -ErrorAction SilentlyContinue
diff --git a/tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile
deleted file mode 100644
index e0a3946c3c4..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo
-
-FROM mcr.microsoft.com/powershell:centos-7
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
-
-# Install dependencies and clean up
-RUN yum install -y \
-        glibc \
-        libcurl \
-        ca-certificates \
-        libgcc \
-        libicu \
-        openssl \
-        libstdc++ \
-        ncurses-base \
-        libunwind \
-        uuid \
-        zlib \
-        which \
-        curl \
-        git \
-        wget \
-    && yum clean all
-
-COPY PowerShellPackage.ps1 /
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Use PowerShell as the default shell
-ENTRYPOINT [ "pwsh" ]
diff --git a/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile
deleted file mode 100644
index 401af92128a..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-
-FROM mcr.microsoft.com/powershell:ubuntu-16.04
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-	apt-utils \
-	apt-utils \
-        libc6 \
-        libcurl3 \
-        ca-certificates \
-        libgcc1 \
-        libicu55 \
-        libssl1.0.0 \
-        libstdc++6 \
-        libtinfo5 \
-        libunwind8 \
-        libuuid1 \
-	libcroco3 \
-	libgraphite2-3 \
-        zlib1g \
-        curl \
-        git \
-	apt-transport-https \
-	locales \
-	wget \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY PowerShellPackage.ps1 /
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Use PowerShell as the default shell
-ENTRYPOINT [ "pwsh" ]
diff --git a/tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile
deleted file mode 100644
index f8049e9de1c..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-
-FROM mcr.microsoft.com/powershell:ubuntu-18.04
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-	apt-utils \
-	apt-utils \
-        libc6 \
-        libcurl4 \
-        ca-certificates \
-        libgcc1 \
-        libicu60 \
-        libssl1.0.0 \
-        libstdc++6 \
-        libtinfo5 \
-        libunwind8 \
-        libuuid1 \
-	libcroco3 \
-	libgraphite2-3 \
-        zlib1g \
-        curl \
-        git \
-	apt-transport-https \
-	locales \
-	wget \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY PowerShellPackage.ps1 /
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Use PowerShell as the default shell
-ENTRYPOINT [ "pwsh" ]
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/Dockerfile
deleted file mode 100644
index ef24e3aa7e9..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# escape=`
-#0.3.6 (no powershell 6)
-FROM mcr.microsoft.com/powershell:windowsservercore
-LABEL maintainer='PowerShell Team <powershellteam@hotmail.com>'
-LABEL description="This Dockerfile for Windows Server Core with git installed via chocolatey."
-
-SHELL ["C:\\Program Files\\PowerShell\\latest\\pwsh.exe", "-command"]
-# Install Git, and NuGet
-# Git installs to C:\Program Files\Git
-# nuget installs to C:\ProgramData\chocolatey\bin\NuGet.exe
-COPY dockerInstall.psm1 containerFiles/dockerInstall.psm1
-RUN Import-Module ./containerFiles/dockerInstall.psm1; `
-    Install-ChocolateyPackage -PackageName git -Executable git.exe; `
-    Install-ChocolateyPackage -PackageName nuget.commandline -Executable nuget.exe  -Cleanup
-
-# Install WIX
-ADD https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip /wix.zip
-COPY wix.psm1 containerFiles/wix.psm1
-RUN Import-Module ./containerFiles/wix.psm1; `
-    Install-WixZip -zipPath \wix.Zip
-
-# Install makeappx and makepri
-ADD https://pscoretestdata.blob.core.windows.net/build-files/makeappx/makeappx.zip?sp=r&st=2019-04-05T18:02:52Z&se=2020-04-06T02:02:52Z&spr=https&sv=2018-03-28&sig=t07uC1K3uFLtINQsmorHobgPh%2B%2BBgjFnmHEJGNZT6Hk%3D&sr=b /makeappx.zip
-RUN Expand-Archive /makeappx.zip
-
-COPY PowerShellPackage.ps1 /
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-ENTRYPOINT ["C:\\Program Files\\PowerShell\\latest\\pwsh.exe", "-command"]
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
deleted file mode 100644
index ae0bc4f2b10..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-[cmdletbinding(DefaultParameterSetName='default')]
-# PowerShell Script to clone, build and package PowerShell from specified fork and branch
-param (
-    [string] $fork = 'powershell',
-
-    [string] $branch = 'master',
-
-    [string] $location = "$PWD\powershell",
-
-    [string] $destination = "$env:WORKSPACE",
-
-    [ValidateSet("win7-x64", "win7-x86", "win-arm", "win-arm64", "fxdependent", "fxdependent-win-desktop")]
-    [string] $Runtime = 'win7-x64',
-
-    [switch] $ForMinimalSize,
-
-    [switch] $Wait,
-
-    [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
-    [ValidateNotNullOrEmpty()]
-    [string] $ReleaseTag,
-
-    [Parameter(Mandatory,ParameterSetName='IncludeSymbols')]
-    [switch] $Symbols,
-
-    [Parameter(Mandatory,ParameterSetName='packageSigned')]
-    [ValidatePattern("-signed.zip$")]
-    [string] $BuildZip,
-
-    [Parameter(Mandatory,ParameterSetName='ComponentRegistration')]
-    [switch] $ComponentRegistration
-)
-
-$releaseTagParam = @{}
-if ($ReleaseTag)
-{
-    $releaseTagParam = @{ 'ReleaseTag' = $ReleaseTag }
-}
-
-if (-not $env:homedrive)
-{
-    Write-Verbose "fixing empty home paths..." -Verbose
-    $profileParts = $env:userprofile -split ':'
-    $env:homedrive = $profileParts[0]+':'
-    $env:homepath = $profileParts[1]
-}
-
-if (! (Test-Path $destination))
-{
-    Write-Verbose "Creating destination $destination" -Verbose
-    $null = New-Item -Path $destination -ItemType Directory
-}
-
-Write-Verbose "homedrive : ${env:homedrive}"
-Write-Verbose "homepath : ${env:homepath}"
-
-# Don't use CIM_PhysicalMemory, docker containers may cache old values
-$memoryMB = (Get-CimInstance win32_computersystem).TotalPhysicalMemory /1MB
-$requiredMemoryMB = 2048
-if ($memoryMB -lt $requiredMemoryMB)
-{
-    throw "Building powershell requires at least $requiredMemoryMB MiB of memory and only $memoryMB MiB is present."
-}
-Write-Verbose "Running with $memoryMB MB memory." -Verbose
-
-try
-{
-    Set-Location $location
-
-    Import-Module "$location\build.psm1" -Force
-    Import-Module "$location\tools\packaging" -Force
-    $env:platform = $null
-
-    Write-Verbose "Sync'ing Tags..." -Verbose
-    Sync-PSTags -AddRemoteIfMissing
-
-    Write-Verbose "Bootstrapping powershell build..." -Verbose
-    Start-PSBootstrap -Force -Package -ErrorAction Stop
-
-    if ($PSCmdlet.ParameterSetName -eq 'packageSigned')
-    {
-        Write-Verbose "Expanding signed build..." -Verbose
-        if($Runtime -like 'fxdependent*')
-        {
-            Expand-PSSignedBuild -BuildZip $BuildZip -SkipPwshExeCheck
-        }
-        else
-        {
-            Expand-PSSignedBuild -BuildZip $BuildZip
-        }
-
-        Remove-Item -Path $BuildZip
-    }
-    else
-    {
-        Write-Verbose "Starting powershell build for RID: $Runtime and ReleaseTag: $ReleaseTag ..." -Verbose
-        $buildParams = @{
-            ForMinimalSize = $ForMinimalSize
-        }
-
-        if($Symbols)
-        {
-            $buildParams['NoPSModuleRestore'] = $true
-        }
-        else
-        {
-            $buildParams['PSModuleRestore'] = $true
-        }
-
-        Start-PSBuild -Clean -Runtime $Runtime -Configuration Release @releaseTagParam @buildParams
-    }
-
-    if ($ComponentRegistration)
-    {
-        Write-Verbose "Exporting project.assets files ..." -Verbose
-
-        $projectAssetsCounter = 1
-        $projectAssetsFolder = Join-Path -Path $destination -ChildPath 'projectAssets'
-        $projectAssetsZip = Join-Path -Path $destination -ChildPath 'windowsProjectAssetssymbols.zip'
-        Get-ChildItem $location\project.assets.json -Recurse | ForEach-Object {
-            $subfolder = $_.FullName.Replace($location,'')
-            $subfolder.Replace('project.assets.json','')
-            $itemDestination = Join-Path -Path $projectAssetsFolder -ChildPath $subfolder
-            New-Item -Path $itemDestination -ItemType Directory -Force > $null
-            $file = $_.FullName
-            Write-Verbose "Copying $file to $itemDestination" -Verbose
-            Copy-Item -Path $file -Destination "$itemDestination\" -Force
-            $projectAssetsCounter++
-        }
-
-        Compress-Archive -Path $projectAssetsFolder -DestinationPath $projectAssetsZip
-        Remove-Item -Path $projectAssetsFolder -Recurse -Force -ErrorAction SilentlyContinue
-
-        return
-    }
-
-    if ($Runtime -like 'fxdependent*')
-    {
-        $pspackageParams = @{'Type' = $Runtime}
-    }
-    else
-    {
-        ## Set the default package type.
-        $pspackageParams = @{'Type' = 'msi'; 'WindowsRuntime' = $Runtime}
-        if ($ForMinimalSize)
-        {
-            ## Special case for the minimal size self-contained package.
-            $pspackageParams['Type'] = 'min-size'
-        }
-    }
-
-    if (!$Symbols -and $Runtime -notlike 'fxdependent*' -and !$ForMinimalSize)
-    {
-        if ($Runtime -notmatch 'arm')
-        {
-            Write-Verbose "Starting powershell packaging(msi)..." -Verbose
-            Start-PSPackage @pspackageParams @releaseTagParam
-        }
-
-        $pspackageParams['Type']='msix'
-        Write-Verbose "Starting powershell packaging(msix)..." -Verbose
-        Start-PSPackage @pspackageParams @releaseTagParam
-    }
-
-    if ($Runtime -like 'fxdependent*' -or $ForMinimalSize)
-    {
-        ## Add symbols for just like zip package.
-        $pspackageParams['IncludeSymbols']=$Symbols
-        Start-PSPackage @pspackageParams @releaseTagParam
-
-        ## Copy the fxdependent Zip package to destination.
-        Get-ChildItem $location\PowerShell-*.zip | ForEach-Object {
-            $file = $_.FullName
-            Write-Verbose "Copying $file to $destination" -Verbose
-            Copy-Item -Path $file -Destination "$destination\" -Force
-        }
-    }
-    else
-    {
-        if (!$Symbols) {
-            $pspackageParams['Type'] = 'zip-pdb'
-            Write-Verbose "Starting powershell symbols packaging(zip)..." -Verbose
-            Start-PSPackage @pspackageParams @releaseTagParam
-        }
-
-        $pspackageParams['Type']='zip'
-        $pspackageParams['IncludeSymbols']=$Symbols
-        Write-Verbose "Starting powershell packaging(zip)..." -Verbose
-        Start-PSPackage @pspackageParams @releaseTagParam
-
-        Write-Verbose "Exporting packages ..." -Verbose
-
-        Get-ChildItem $location\*.msi,$location\*.zip,$location\*.wixpdb,$location\*.msix,$location\*.exe | ForEach-Object {
-            $file = $_.FullName
-            Write-Verbose "Copying $file to $destination" -Verbose
-            Copy-Item -Path $file -Destination "$destination\" -Force
-        }
-    }
-}
-finally
-{
-    Write-Verbose "Beginning build clean-up..." -Verbose
-    if ($Wait)
-    {
-        $path = Join-Path $PSScriptRoot -ChildPath 'delete-to-continue.txt'
-        $null = New-Item -Path $path -ItemType File
-        Write-Verbose "Computer name: $env:COMPUTERNAME" -Verbose
-        Write-Verbose "Delete $path to exit." -Verbose
-        while(Test-Path -LiteralPath $path)
-        {
-            Start-Sleep -Seconds 60
-        }
-    }
-}
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/dockerInstall.psm1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/dockerInstall.psm1
deleted file mode 100644
index 311fed7e169..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/dockerInstall.psm1
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-function Install-ChocolateyPackage
-{
-    param(
-        [Parameter(Mandatory=$true)]
-        [string]
-        $PackageName,
-
-        [Parameter(Mandatory=$false)]
-        [string]
-        $Executable,
-
-        [string[]]
-        $ArgumentList,
-
-        [switch]
-        $Cleanup,
-
-        [int]
-        $ExecutionTimeout = 2700,
-
-        [string]
-        $Version
-    )
-
-    if(-not(Get-Command -Name Choco -ErrorAction SilentlyContinue))
-    {
-        Write-Verbose "Installing Chocolatey provider..." -Verbose
-        Invoke-WebRequest https://chocolatey.org/install.ps1 -UseBasicParsing | Invoke-Expression
-    }
-
-    Write-Verbose "Installing $PackageName..." -Verbose
-    $extraCommand = @()
-    if($Version)
-    {
-        $extraCommand += '--version', $version
-    }
-    choco install -y $PackageName --no-progress --execution-timeout=$ExecutionTimeout $ArgumentList $extraCommands
-
-    if($executable)
-    {
-        Write-Verbose "Verifing $Executable is in path..." -Verbose
-        $exeSource = $null
-        $exeSource = Get-ChildItem -Path "$env:ProgramFiles\$Executable" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-        if(!$exeSource)
-        {
-            Write-Verbose "Falling back to x86 program files..." -Verbose
-            $exeSource = Get-ChildItem -Path "${env:ProgramFiles(x86)}\$Executable" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-        }
-
-        # Don't search the chocolatey program data until more official locations have been searched
-        if(!$exeSource)
-        {
-            Write-Verbose "Falling back to chocolatey..." -Verbose
-            $exeSource = Get-ChildItem -Path "$env:ProgramData\chocolatey\$Executable" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-        }
-
-        # all obvious locations are exhausted, use brute force and search from the root of the filesystem
-        if(!$exeSource)
-        {
-            Write-Verbose "Falling back to the root of the drive..." -Verbose
-            $exeSource = Get-ChildItem -Path "/$Executable" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-        }
-
-        if(!$exeSource)
-        {
-            throw "$Executable not found"
-        }
-
-        $exePath = Split-Path -Path $exeSource
-        Append-Path -path $exePath
-    }
-
-    if($Cleanup.IsPresent)
-    {
-        Remove-Folder -Folder "$env:temp\chocolatey"
-    }
-}
-
-function Append-Path
-{
-    param
-    (
-        $path
-    )
-    $machinePathString = [System.Environment]::GetEnvironmentVariable('path',[System.EnvironmentVariableTarget]::Machine)
-    $machinePath = $machinePathString -split ';'
-
-    if($machinePath -inotcontains $path)
-    {
-        $newPath = "$machinePathString;$path"
-        Write-Verbose "Adding $path to path..." -Verbose
-        [System.Environment]::SetEnvironmentVariable('path',$newPath,[System.EnvironmentVariableTarget]::Machine)
-        Write-Verbose "Added $path to path." -Verbose
-    }
-    else
-    {
-        Write-Verbose "$path already in path." -Verbose
-    }
-}
-
-function Remove-Folder
-{
-    param(
-        [string]
-        $Folder
-    )
-
-    Write-Verbose "Cleaning up $Folder..." -Verbose
-    $filter = Join-Path -Path $Folder -ChildPath *
-    [int]$measuredCleanupMB = (Get-ChildItem $filter -Recurse | Measure-Object -Property Length -Sum).Sum / 1MB
-    Remove-Item -Recurse -Force $filter -ErrorAction SilentlyContinue
-    Write-Verbose "Cleaned up $measuredCleanupMB MB from $Folder" -Verbose
-}
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/wix.psm1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/wix.psm1
deleted file mode 100644
index e2b446cb7b7..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/wix.psm1
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-Import-Module "$PSScriptRoot\dockerInstall.psm1"
-
-# Install using Wix Zip because the MSI requires an older version of dotnet
-# which was large and unstable in docker
-function Install-WixZip
-{
-    param($zipPath)
-
-    $targetRoot = "${env:ProgramFiles(x86)}\WiX Toolset xcopy"
-    $binPath = Join-Path -Path $targetRoot -ChildPath 'bin'
-    Write-Verbose "Expanding $zipPath to $binPath ..." -Verbose
-    Expand-Archive -Path $zipPath -DestinationPath $binPath -Force
-    $docExpandPath = Join-Path -Path $binPath -ChildPath 'doc'
-    $sdkExpandPath = Join-Path -Path $binPath -ChildPath 'sdk'
-    $docTargetPath = Join-Path -Path $targetRoot -ChildPath 'doc'
-    $sdkTargetPath = Join-Path -Path $targetRoot -ChildPath 'sdk'
-    Write-Verbose "Fixing folder structure ..." -Verbose
-    Move-Item -Path $docExpandPath -Destination $docTargetPath
-    Move-Item -Path $sdkExpandPath -Destination $sdkTargetPath
-    Append-Path -path $binPath
-    Write-Verbose "Done installing WIX!"
-}
diff --git a/tools/releaseBuild/README.md b/tools/releaseBuild/README.md
deleted file mode 100644
index 9b78e742b5f..00000000000
--- a/tools/releaseBuild/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Azure Dev Ops Release Builds
-
-## Requirements
-
-Docker must be installed to run any of the release builds.
-
-## Running Windows Release Builds Locally
-
-From PowerShell on Windows, run `.\vstsbuild.ps1 -ReleaseTag <tag> -Name <buildName>`.
-
-For the package builds, run `.\vstsbuild.ps1 -ReleaseTag <tag> -Name <buildName> -BuildPath <path to extracted zip from build step> -SignedFilesPath <path to extracted 'symbol' zip from build step>`
-
-Windows Build Names:
-
-* `win7-x64-symbols`
-    * Builds the Windows x64 Zip with symbols
-* `win7-x86-symbols`
-    * Builds the Windows x86 Zip with symbols
-* `win7-arm-symbols`
-    * Builds the Windows ARM Zip with symbols
-* `win7-arm64-symbols`
-    * Builds the Windows ARM64 Zip with symbols
-* `win7-fxdependent-symbols`
-    * Builds the Windows FxDependent Zip with symbols
-* `win7-x64-package`
-    * Builds the Windows x64 packages
-* `win7-x86-package`
-    * Builds the Windows x86 packages
-* `win7-arm-package`
-    * Builds the Windows ARM packages
-* `win7-arm64-package`
-    * Builds the Windows ARM64 packages
-* `win7-fxdependent-package`
-    * Builds the Windows FxDependent packages
-
-## Running Linux Release Builds Locally
-
-From PowerShell on Linux or macOS, run `.\vstsbuild.ps1 -ReleaseTag <tag> -Name <buildName>`.
-
-Linux Build Names:
-
-* `deb`
-    * Builds the Debian Packages, ARM32 and ARM64.
-* `alpine`
-    * Builds the Alpine Package
-* `rpm`
-    * Builds the RedHat variant Package
-
-## Azure Dev Ops Build
-
-The release build is fairly complicated.  The definition is at `./azureDevOps/releaseBuild.yml`.
-
-Here is a diagram of the build:
-
-[![Release Build diagram](https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/releaseBuild/azureDevOps/diagram.svg?sanitize=true)](https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/releaseBuild/azureDevOps/diagram.svg?sanitize=true)
diff --git a/tools/releaseBuild/azureDevOps/AzArtifactFeed/PSGalleryToAzArtifacts.yml b/tools/releaseBuild/azureDevOps/AzArtifactFeed/PSGalleryToAzArtifacts.yml
deleted file mode 100644
index ff8dbd6d720..00000000000
--- a/tools/releaseBuild/azureDevOps/AzArtifactFeed/PSGalleryToAzArtifacts.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Sync packages from PSGallery to Azure DevOps Artifacts feed
-
-resources:
-- repo: self
-  clean: true
-
-pool:
-  name: 1es
-  demands:
-    - ImageOverride -equals PSMMS2019-Minimal
-
-steps:
-  - pwsh: |
-      $minVer = [version]"2.2.3"
-      $curVer = Get-Module PowerShellGet -ListAvailable | Select-Object -First 1 | ForEach-Object Version
-      if (-not $curVer -or $curVer -lt $minVer) {
-        Install-Module -Name PowerShellGet -MinimumVersion 2.2.3 -Force
-      }
-    displayName: Update PSGet and PackageManagement
-    condition: succeededOrFailed()
-
-  - pwsh: |
-      Import-Module -Force "$(Build.SourcesDirectory)/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1"
-      SyncGalleryToAzArtifacts -AzDevOpsFeedUserName $(AzDevOpsFeedUserName) -AzDevOpsPAT $(AzDevOpsFeedPAT2) -Destination $(Build.ArtifactStagingDirectory)
-    displayName: Download packages from PSGallery that need to be updated
-    condition: succeededOrFailed()
-
-  - pwsh: |
-      Write-Verbose -Verbose "Packages to upload"
-      if(Test-Path $(Build.ArtifactStagingDirectory)) { Get-ChildItem "$(Build.ArtifactStagingDirectory)/*.nupkg" | ForEach-Object { $_.FullName }}
-    displayName: List packages to upload
-    condition: succeededOrFailed()
-
-  - task: NuGetCommand@2
-    displayName: 'NuGet push'
-    inputs:
-      command: push
-      publishVstsFeed: 'pscore-release'
-      publishFeedCredentials: 'AzArtifactsFeed'
diff --git a/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1 b/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1
deleted file mode 100644
index d0aeac9da54..00000000000
--- a/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-<#
-.SYNOPSIS
-Downloads to packages from PowerShell Gallery which are missing from the Azure DevOps Artifacts feed.
-
-.PARAMETER AzureDevOpsPAT
-PAT for the username used for authenticating to the Azure DevOps Artifacts feed.
-
-.PARAMETER Destination
-Path to the folder where the packages should be stored for uploading to Azure DevOps Artifacts feed.
-
-#>
-function SyncGalleryToAzArtifacts {
-    param(
-        [Parameter(Mandatory = $true)] [string] $AzDevOpsFeedUserName,
-        [Parameter(Mandatory = $true)] [string] $AzDevOpsPAT,
-        [Parameter(Mandatory = $true)] [string] $Destination
-    )
-
-    $csproj = [xml] (Get-Content 'src/Modules/PSGalleryModules.csproj')
-    $packages = @($csproj.Project.ItemGroup.PackageReference | ForEach-Object { [ordered] @{Name = $_.Include; Version = $_.Version }})
-
-    $galleryPackages = @()
-    $azArtifactsPackages = @()
-    $modulesToUpdate = @()
-
-    $galleryUrl = 'https://www.powershellgallery.com/api/v2/'
-    $azArtifactsUrl = 'https://mscodehub.pkgs.visualstudio.com/_packaging/pscore-release/nuget/v2'
-
-    $azDevOpsCreds = [pscredential]::new($AzDevOpsFeedUserName, (ConvertTo-SecureString -String $AzDevOpsPAT -AsPlainText -Force))
-
-    foreach ($package in $packages) {
-        try {
-            # Get module from gallery
-            $foundPackageOnGallery = Find-Package -ProviderName NuGet -Source $galleryUrl -AllVersions -Name $package.Name -Force -AllowPreReleaseVersion | SortPackage | Select-Object -First 1
-            Write-Verbose -Verbose "Found module $($package.Name) - $($foundPackageOnGallery.Version) in gallery"
-            $galleryPackages += $foundPackageOnGallery
-        } catch {
-            if ($_.FullyQualifiedErrorId -eq 'NoMatchFoundForCriteria,Microsoft.PowerShell.PackageManagement.Cmdlets.FindPackage') {
-                # Log and ignore failure is required version is not found on gallery.
-                Write-Warning "Module not found on gallery $($package.Name) - $($package.Version)"
-            }
-            else {
-                Write-Error $_
-            }
-        }
-
-        try {
-            # Get module from Az Artifacts
-            # There seems to be a bug in the feed with RequiredVersion matching. Adding workaround with post filtering.
-            # Issue: https://github.com/OneGet/oneget/issues/397
-            $foundPackageOnAz = Find-Package -ProviderName NuGet -Source $azArtifactsUrl -AllVersions -Name $package.Name -Force -Credential $azDevOpsCreds -AllowPreReleaseVersion | SortPackage | Select-Object -First 1
-            Write-Verbose -Verbose "Found module $($package.Name) - $($foundPackageOnAz.Version) in azArtifacts"
-            $azArtifactsPackages += $foundPackageOnAz
-        } catch {
-            if ($_.FullyQualifiedErrorId -eq 'NoMatchFoundForCriteria,Microsoft.PowerShell.PackageManagement.Cmdlets.FindPackage') {
-                # Log and add the module to update list.
-                Write-Verbose -Verbose "Az Artifacts Module needs update to - $($package.Name) - $($package.Version)"
-                $modulesToUpdate += $package
-            }
-            else {
-                Write-Error $_
-            }
-        }
-
-        # Check if Az package version is less that gallery version
-        $pkgOnAzVersion = [semver]::new($foundPackageOnAz.Version)
-        $pkgOnGalleryVersion = [semver]::new($foundPackageOnGallery.Version)
-
-        if ($pkgOnAzVersion -lt $pkgOnGalleryVersion) {
-            Write-Verbose -Verbose "Module needs to be updated $($package.Name) - $($foundPackageOnGallery.Version)"
-            $modulesToUpdate += $foundPackageOnGallery
-        } elseif ($pkgOnGalleryVersion -lt $pkgOnAzVersion) {
-            Write-Warning "Newer version found on Az Artifacts - $($foundPackageOnAz.Name) - $($foundPackageOnAz.Version)"
-        } else {
-            Write-Verbose -Verbose "Module is in sync - $($package.Name)"
-        }
-    }
-
-    "`nGallery Packages:"
-    $galleryPackages
-
-    "`nAz Artifacts Packages:`n"
-    $azArtifactsPackages
-
-    "`nModules to update:`n"
-    $modulesToUpdate
-
-    foreach ($package in $modulesToUpdate) {
-        Write-Verbose -Verbose "Saving package $($package.Name) - $($package.Version)"
-        Save-Package -Provider NuGet -Source $galleryUrl -Name $package.Name -RequiredVersion $package.Version -Path $Destination
-    }
-
-    if ($modulesToUpdate.Length -gt 0)
-    {
-        # Remove dependent packages downloaded by Save-Package if there are already present in AzArtifacts feed.
-        try {
-            $null = Register-PackageSource -Name local -Location $Destination -ProviderName NuGet -Force
-            $packageNamesToKeep = @()
-            $savedPackages = Find-Package -Source local -AllVersions -AllowPreReleaseVersion
-
-            Write-Verbose -Verbose "Saved packages:"
-            $savedPackages | Out-String | Write-Verbose -Verbose
-
-            foreach($package in $savedPackages) {
-                $pkgVersion = NormalizeVersion -version $package.Version
-                $foundMatch = $azArtifactsPackages | Where-Object { $_.Name -eq $package.Name -and (NormalizeVersion -version $_.Version) -eq $pkgVersion }
-
-                if(-not $foundMatch) {
-                    Write-Verbose "Keeping package $($package.PackageFileName)" -Verbose
-                    $packageNamesToKeep += "{0}*.nupkg" -f $package.Name
-                }
-            }
-
-            if ($packageNamesToKeep.Length -gt 0) {
-                ## Removing only if we do have some packages to keep,
-                ## otherwise the '$Destination' folder will be removed.
-                Remove-Item -Path $Destination -Exclude $packageNamesToKeep -Recurse -Force -Verbose
-            }
-
-            Write-Verbose -Verbose "Packages kept for upload"
-            Get-ChildItem $Destination | Out-String | Write-Verbose -Verbose
-        }
-        finally {
-            Unregister-PackageSource -Name local -Force -ErrorAction SilentlyContinue
-        }
-    }
-}
-
-Function SortPackage {
-    param(
-        [Parameter(ValueFromPipeline = $true)]
-        [Microsoft.PackageManagement.Packaging.SoftwareIdentity[]]
-        $packages
-    )
-
-    Begin {
-        $allPackages = @()
-    }
-
-    Process {
-        $allPackages += $packages
-    }
-
-    End {
-        $versions = $allPackages.Version |
-        ForEach-Object { ($_ -split '-')[0] } |
-        Select-Object -Unique |
-        Sort-Object -Descending -Property Version
-
-        foreach ($version in $versions) {
-            $exactMatch = $allPackages | Where-Object {
-                Write-Verbose "testing $($_.version) -eq $version"
-                $_.version -eq $version
-            }
-
-            if ($exactMatch) {
-                Write-Output $exactMatch
-            }
-
-            $allPackages | Where-Object {
-                $_.version -like "${version}-*"
-            } | Sort-Object -Descending -Property Version | Write-Output
-        }
-    }
-}
-
-
-function NormalizeVersion {
-    param ([string] $version)
-
-    $sVer = if ($version -match "(\d+.\d+.\d+).0") {
-        $Matches[1]
-    } elseif ($version -match "^\d+.\d+$") {
-        # Two digit versions are stored as three digit versions
-        "$version.0"
-    } else {
-        $version
-    }
-
-    $sVer
-}
-
-Export-ModuleMember -Function 'SyncGalleryToAzArtifacts', 'SortPackage'
diff --git a/tools/releaseBuild/azureDevOps/compliance.yml b/tools/releaseBuild/azureDevOps/compliance.yml
deleted file mode 100644
index 3624f1e1081..00000000000
--- a/tools/releaseBuild/azureDevOps/compliance.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-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
-
-parameters:
-- name: InternalSDKBlobURL
-  displayName: URL to the blob havibg internal .NET SDK
-  type: string
-  default: ' '
-
-variables:
-  - name: DOTNET_CLI_TELEMETRY_OPTOUT
-    value: 1
-  - name: POWERSHELL_TELEMETRY_OPTOUT
-    value: 1
-  - name: nugetMultiFeedWarnLevel
-    value: none
-  - 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'
-  - group: 'PoolNames'
-  - name: __DOTNET_RUNTIME_FEED
-    value: ${{ parameters.InternalSDKBlobURL }}
-
-
-stages:
-  - stage: compliance
-    displayName: 'Compliance'
-    dependsOn: []
-    jobs:
-      - 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: []
-    jobs:
-      - template: templates/compliance/generateNotice.yml
-        parameters:
-          parentJobs: []
diff --git a/tools/releaseBuild/azureDevOps/diagram.puml b/tools/releaseBuild/azureDevOps/diagram.puml
deleted file mode 100644
index ade53b11b9c..00000000000
--- a/tools/releaseBuild/azureDevOps/diagram.puml
+++ /dev/null
@@ -1,107 +0,0 @@
-@startuml
-
-folder "Linux Builds" as LinuxBuilds {
-    ' Define the build tasks as business processes
-    agent "DEB"  as BuildDEB
-    agent "RPM"  as BuildRPM
-    agent "Alpine"  as BuildAlpine
-    agent "Linux-FxDependent"  as BuildLinuxFx
-
-}
-
-agent "macOS Build"  as BuildMac
-
-agent "Upload build metadata" as BuildMetadata
-
-folder "Windows Builds" as WinBuilds {
-    agent "x64"  as BuildWinX64
-    agent "x86"  as BuildWinX86
-    agent "arm32"  as BuildWinArm32
-    agent "arm64"  as BuildWinArm64
-    agent "FxDependent"  as BuildWinFx
-}
-
-agent "ComponentRegistration"  as BuildCG
-
-folder "Linux Package Scanning and Upload" as PkgScanUploadLinux {
-    agent "DEB"  as UploadDEB
-    agent "RPM"  as UploadRPM
-    agent "Alpine"  as UploadAlpine
-    agent "Linux-FxDependent"  as UploadLinuxFx
-}
-
-folder "Package Signing and Upload" as PkgSignUpload {
-    agent "macOS"  as SignMac
-
-    agent "Windows"  as SignWin
-}
-
-folder "Build Test Artifacts" as TestArtifacts {
-    agent "Windows" as WinTest
-    agent "Linux" as LinuxTest
-    agent "Linux-ARM" as LinuxArmTest
-    agent "Linux-ARM64" as LinuxArm64Test
-}
-
-agent "Compliance"  as Compliance
-
-
-agent "Create SDK and Global Tool and Upload" as BuildNuGet
-
-
-' Define finishing the build as a goal filled
-control "Finish"  as Finish
-control "Start" as Start
-
-' map the various Upload task dependencies
-BuildDEB -down-> UploadDEB
-BuildRPM -down-> UploadRPM
-BuildLinuxFx -down-> UploadLinuxFx
-BuildAlpine -down-> UploadAlpine
-
-' map all of the SignMac task dependencies
-BuildMac -down-> SignMac
-
-' map all of the SignWin task dependencies
-WinBuilds -down-> SignWin
-'BuildWinX64 -down-> SignWin
-'BuildWinX86 -down-> SignWin
-'BuildWinArm32 -down-> SignWin
-'BuildWinArm64 -down-> SignWin
-'BuildWinFx -down-> SignWin
-
-' map all of the Compliance task dependencies
-BuildWinX86 -down-> Compliance
-BuildWinX64 -down-> Compliance
-BuildWinFx -down-> Compliance
-
-PkgSignUpload -down-> BuildNuGet
-LinuxBuilds -down-> BuildNuGet
-
-' map all leafs to finish
-Compliance ~~ Finish
-UploadAlpine ~~ Finish
-UploadDEB ~~ Finish
-UploadRPM ~~ Finish
-UploadLinuxFx ~~ Finish
-SignMac ~~ Finish
-BuildCG ~~ Finish
-BuildNuGet ~~ Finish
-TestArtifacts ~~ Finish
-BuildMetadata ~~ Finish
-
-Start ~~ BuildDEB
-Start ~~ BuildRPM
-Start ~~ BuildAlpine
-Start ~~ BuildLinuxFx
-Start ~~ BuildMac
-Start ~~ BuildWinX64
-Start ~~ BuildWinX86
-Start ~~ BuildWinFx
-Start ~~ BuildWinArm32
-Start ~~ BuildWinArm64
-Start ~~ BuildCG
-Start ~~ TestArtifacts
-Start ~~ BuildMetadata
-
-@enduml
diff --git a/tools/releaseBuild/azureDevOps/diagram.svg b/tools/releaseBuild/azureDevOps/diagram.svg
deleted file mode 100644
index 024128bf988..00000000000
--- a/tools/releaseBuild/azureDevOps/diagram.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:1693px;height:560px;" version="1.1" viewBox="0 0 1693 560" width="1693px" zoomAndPan="magnify"><defs><filter height="300%" id="f1l08wivdvpjam" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--cluster LinuxBuilds--><polygon fill="#FFFFFF" filter="url(#f1l08wivdvpjam)" points="1198,228,1290,228,1297,251.6094,1671,251.6094,1671,334,1198,334,1198,228" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="1198" x2="1297" y1="251.6094" y2="251.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="86" x="1202" y="244.5332">Linux Builds</text><!--cluster WinBuilds--><polygon fill="#FFFFFF" filter="url(#f1l08wivdvpjam)" points="570,82,687,82,694,105.6094,1087,105.6094,1087,188,570,188,570,82" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="570" x2="694" y1="105.6094" y2="105.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="111" x="574" y="98.5332">Windows Builds</text><!--cluster PkgScanUploadLinux--><polygon fill="#FFFFFF" filter="url(#f1l08wivdvpjam)" points="1225,366,1484,366,1491,389.6094,1663,389.6094,1663,456,1225,456,1225,366" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="1225" x2="1491" y1="389.6094" y2="389.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="253" x="1229" y="382.5332">Linux Package Scanning and Upload</text><!--cluster PkgSignUpload--><polygon fill="#FFFFFF" filter="url(#f1l08wivdvpjam)" points="904,228,1109,228,1116,251.6094,1148,251.6094,1148,334,904,334,904,228" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="904" x2="1116" y1="251.6094" y2="251.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="199" x="908" y="244.5332">Package Signing and Upload</text><!--cluster TestArtifacts--><polygon fill="#FFFFFF" filter="url(#f1l08wivdvpjam)" points="30,82,168,82,175,105.6094,313,105.6094,313,334,30,334,30,82" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="30" x2="175" y1="105.6094" y2="105.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="132" x="34" y="98.5332">Build Test Artifacts</text><!--entity BuildDEB--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="1241" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="28" x="1251" y="296.5332">DEB</text><!--entity BuildRPM--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="1324" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="30" x="1334" y="296.5332">RPM</text><!--entity BuildAlpine--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1409.5" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="1419.5" y="296.5332">Alpine</text><!--entity BuildLinuxFx--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="1503.5" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="123" x="1513.5" y="296.5332">Linux-FxDependent</text><!--entity BuildWinX64--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="1002" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="22" x="1012" y="150.5332">x64</text><!--entity BuildWinX86--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="925" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="22" x="935" y="150.5332">x86</text><!--entity BuildWinArm32--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="830" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="40" x="840" y="150.5332">arm32</text><!--entity BuildWinArm64--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="735" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="40" x="745" y="150.5332">arm64</text><!--entity BuildWinFx--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="594.5" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="85" x="604.5" y="150.5332">FxDependent</text><!--entity UploadDEB--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="1241" y="402"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="28" x="1251" y="426.5332">DEB</text><!--entity UploadRPM--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="1324" y="402"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="30" x="1334" y="426.5332">RPM</text><!--entity UploadAlpine--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1409.5" y="402"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="1419.5" y="426.5332">Alpine</text><!--entity UploadLinuxFx--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="1503.5" y="402"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="123" x="1513.5" y="426.5332">Linux-FxDependent</text><!--entity SignMac--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="1039" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="46" x="1049" y="296.5332">macOS</text><!--entity SignWin--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="928" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="56" x="938" y="296.5332">Windows</text><!--entity WinTest--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="60" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="56" x="70" y="150.5332">Windows</text><!--entity LinuxTest--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="171.5" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="33" x="181.5" y="150.5332">Linux</text><!--entity LinuxArmTest--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="54" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="68" x="64" y="296.5332">Linux-ARM</text><!--entity LinuxArm64Test--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="177" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="84" x="187" y="296.5332">Linux-ARM64</text><!--entity BuildMac--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="1114.5" y="126"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="81" x="1124.5" y="150.5332">macOS Build</text><!--entity BuildMetadata--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="387.5" y="402"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="141" x="397.5" y="426.5332">Upload build metadata</text><!--entity BuildCG--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="583.5" y="402"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="149" x="593.5" y="426.5332">ComponentRegistration</text><!--entity Compliance--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="777" y="272"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="787" y="296.5332">Compliance</text><!--entity BuildNuGet--><rect fill="#FEFECE" filter="url(#f1l08wivdvpjam)" height="37.6094" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="930" y="402"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="256" x="940" y="426.5332">Create SDK and Global Tool and Upload</text><!--entity Finish--><ellipse cx="972" cy="516" fill="#FEFECE" filter="url(#f1l08wivdvpjam)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="968,504,974,499,972,504,974,509,968,504" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="38" x="953" y="546.5332">Finish</text><!--entity Start--><ellipse cx="946" cy="24" fill="#FEFECE" filter="url(#f1l08wivdvpjam)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="942,12,948,7,946,12,948,17,942,12" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="30" x="931" y="54.5332">Start</text><!--link BuildDEB to UploadDEB--><path d="M1265,310.068 C1265,332.714 1265,371.578 1265,396.511 " fill="none" id="BuildDEB-UploadDEB" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1265,401.61,1269,392.61,1265,396.61,1261,392.61,1265,401.61" style="stroke: #A80036; stroke-width: 1.0;"/><!--link BuildRPM to UploadRPM--><path d="M1349,310.068 C1349,332.714 1349,371.578 1349,396.511 " fill="none" id="BuildRPM-UploadRPM" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1349,401.61,1353,392.61,1349,396.61,1345,392.61,1349,401.61" style="stroke: #A80036; stroke-width: 1.0;"/><!--link BuildLinuxFx to UploadLinuxFx--><path d="M1575,310.068 C1575,332.714 1575,371.578 1575,396.511 " fill="none" id="BuildLinuxFx-UploadLinuxFx" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1575,401.61,1579,392.61,1575,396.61,1571,392.61,1575,401.61" style="stroke: #A80036; stroke-width: 1.0;"/><!--link BuildAlpine to UploadAlpine--><path d="M1439,310.068 C1439,332.714 1439,371.578 1439,396.511 " fill="none" id="BuildAlpine-UploadAlpine" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1439,401.61,1443,392.61,1439,396.61,1435,392.61,1439,401.61" style="stroke: #A80036; stroke-width: 1.0;"/><!--link BuildMac to SignMac--><path d="M1147.44,164.036 C1135.64,176.76 1120.25,194.578 1109,212 C1097.65,229.574 1087.68,251.168 1080.96,267.177 " fill="none" id="BuildMac-SignMac" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1078.98,271.955,1086.1234,265.1748,1080.896,267.3367,1078.7341,262.1092,1078.98,271.955" style="stroke: #A80036; stroke-width: 1.0;"/><!--link WinBuilds to SignWin--><path d="M1071.1227,188.1926 C1071.0799,188.2871 1071.037,188.3816 1070.9938,188.4759 C1070.9074,188.6645 1070.8201,188.8527 1070.7319,189.0404 C1070.5554,189.4159 1070.3752,189.7896 1070.1912,190.1613 C1069.8231,190.9047 1069.4397,191.6401 1069.0405,192.3656 C1068.242,193.8167 1067.3799,195.2288 1066.4491,196.588 C1064.5875,199.3065 1062.4513,201.8138 1060,204 C1046.79,215.777 1035.81,202.311 1021,212 C1000.596,225.353 985.476,249.13 976.307,266.933 " fill="none" id="WinBuilds-SignWin" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="973.879,271.783,981.4848,265.5259,976.1174,267.312,974.3312,261.9445,973.879,271.783" style="stroke: #A80036; stroke-width: 1.0;"/><!--link BuildWinX86 to Compliance--><path d="M935,164.085 C927.58,175.828 917.298,191.261 907,204 C888.324,227.104 864.577,251.264 847.273,268.073 " fill="none" id="BuildWinX86-Compliance" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="843.462,271.757,852.7137,268.3798,847.0577,268.2827,847.1549,262.6267,843.462,271.757" style="stroke: #A80036; stroke-width: 1.0;"/><!--link BuildWinX64 to Compliance--><path d="M1015.85,164.114 C1009.56,177.486 999.048,194.883 984,204 C956.463,220.684 941.426,198.932 912,212 C883.726,224.557 858.09,249.579 841.876,267.909 " fill="none" id="BuildWinX64-Compliance" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="838.362,271.945,847.2889,267.7845,841.6455,268.1742,841.2557,262.5308,838.362,271.945" style="stroke: #A80036; stroke-width: 1.0;"/><!--link BuildWinFx to Compliance--><path d="M668.688,164.11 C682.479,175.592 700.737,190.728 717,204 C744.291,226.271 775.735,251.493 797.44,268.834 " fill="none" id="BuildWinFx-Compliance" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="801.377,271.977,796.8417,263.2345,797.4704,268.8563,791.8486,269.485,801.377,271.977" style="stroke: #A80036; stroke-width: 1.0;"/><!--link PkgSignUpload to BuildNuGet--><path d="M1128.0529,334.0996 C1128.015,334.199 1127.9771,334.2984 1127.939,334.3978 C1127.863,334.5965 1127.7865,334.7952 1127.7098,334.9938 C1127.5562,335.391 1127.4012,335.788 1127.2448,336.1844 C1126.6191,337.7703 1125.9706,339.349 1125.2994,340.9108 C1123.957,344.0343 1122.5238,347.09 1121,350 C1111.97,367.256 1098.75,384.726 1087.77,397.897 " fill="none" id="PkgSignUpload-BuildNuGet" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1084.44,401.841,1093.3049,397.55,1087.6679,398.0225,1087.1953,392.3854,1084.44,401.841" style="stroke: #A80036; stroke-width: 1.0;"/><!--link LinuxBuilds to BuildNuGet--><path d="M1197.9782,302.4489 C1197.9236,302.5184 1197.8687,302.5882 1197.8136,302.6583 C1197.5931,302.9385 1197.3689,303.223 1197.1411,303.5117 C1196.6855,304.0889 1196.2153,304.6826 1195.7313,305.2915 C1193.7955,307.7271 1191.6391,310.4055 1189.3088,313.2465 C1179.9875,324.6105 1167.885,338.5755 1156,350 C1137.71,367.585 1115.3,385.359 1097.68,398.597 " fill="none" id="LinuxBuilds-BuildNuGet" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1093.31,401.862,1102.9165,399.6906,1097.3189,398.8739,1098.1356,393.2763,1093.31,401.862" style="stroke: #A80036; stroke-width: 1.0;"/><!--link Compliance to Finish--><path d="M826.637,310.083 C832.268,343.487 848.092,415.843 885,464 C903.081,487.5915 933.118,505.3521 952.738,515.2143 " fill="none" id="Compliance-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link UploadAlpine to Finish--><path d="M1422.98,440.271 C1414.38,448.879 1403.08,458.4543 1391,464 C1317.88,497.5828 1063.23,517.6171 991.145,522.7068 " fill="none" id="UploadAlpine-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link UploadDEB to Finish--><path d="M1250.8,440.277 C1243.37,448.672 1233.62,458.0596 1223,464 C1144.6,507.8556 1035.04,519.8199 991.222,522.9464 " fill="none" id="UploadDEB-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link UploadRPM to Finish--><path d="M1334.91,440.111 C1327.28,448.678 1317.13,458.2653 1306,464 C1197.06,520.1182 1044.66,524.6537 991.334,524.3816 " fill="none" id="UploadRPM-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link UploadLinuxFx to Finish--><path d="M1543.02,440.193 C1526.5,448.781 1505.71,458.3623 1486,464 C1298.56,517.6086 1059.57,523.4451 991.102,523.9793 " fill="none" id="UploadLinuxFx-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link SignMac to Finish--><path d="M1061.55,310.096 C1052.65,323.645 1038.53,341.285 1021,350 C999.252,360.813 928.533,340.209 912,358 C879.93,392.51 893.971,420.475 912,464 C920.231,483.8706 938.589,500.5917 952.845,511.2926 " fill="none" id="SignMac-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link BuildCG to Finish--><path d="M714.381,440.056 C734.463,447.702 758.297,456.5462 780,464 C842.756,485.5534 918.12,508.164 952.809,518.39 " fill="none" id="BuildCG-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link BuildNuGet to Finish--><path d="M1050.84,440.236 C1034.12,457.9993 1008.74,484.9597 991.324,503.4681 " fill="none" id="BuildNuGet-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link TestArtifacts to Finish--><path d="M313.0986,250.1395 C313.1559,250.6792 313.2135,251.2198 313.2715,251.7614 C313.3875,252.8445 313.5049,253.9315 313.6238,255.0222 C313.8616,257.2034 314.1053,259.3992 314.355,261.6076 C315.3538,270.4413 316.4487,279.4776 317.647,288.5995 C327.2335,361.5745 343.438,440.0245 370,464 C414.344,504.0257 855.296,520.2962 952.927,523.4229 " fill="none" id="TestArtifacts-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link BuildMetadata to Finish--><path d="M503.949,440.057 C522.139,448.504 544.805,458.0014 566,464 C711.002,505.0383 893.53,519.2208 952.606,522.9114 " fill="none" id="BuildMetadata-Finish" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildDEB--><path d="M962.193,34.666 C1019.95,37.193 1213.43,47.023 1233,66 C1290.11,121.375 1276.89,229.303 1268.87,271.995 " fill="none" id="Start-BuildDEB" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildRPM--><path d="M962.101,34.499 C1025.55,36.604 1256.07,45.608 1281,66 C1344.86,118.238 1350.2,228.481 1349.67,271.889 " fill="none" id="Start-BuildRPM" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildAlpine--><path d="M962.398,34.353 C1032.99,36.004 1308.81,43.837 1340,66 C1410.53,116.121 1431.49,228.103 1437.12,271.926 " fill="none" id="Start-BuildAlpine" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildLinuxFx--><path d="M962.16,34.324 C1039.32,35.978 1368.17,44.259 1408,66 C1494.86,113.411 1549.33,227.503 1567.88,271.897 " fill="none" id="Start-BuildLinuxFx" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildMac--><path d="M962.387,34.274 C991.143,35.428 1051.74,40.916 1095,66 C1120.34,80.695 1141.5,107.757 1153.7,125.819 " fill="none" id="Start-BuildMac" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildWinX64--><path d="M962.109,45.192 C969.426,50.834 977.809,58.141 984,66 C998.523,84.434 1009.76,109.139 1016.36,125.765 " fill="none" id="Start-BuildWinX64" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildWinX86--><path d="M946,58.14 C946,78.504 946,107.214 946,125.717 " fill="none" id="Start-BuildWinX86" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildWinFx--><path d="M929.752,34.828 C883.849,37.392 754.12,46.243 717,66 C690.98,79.849 669.86,107.406 657.858,125.775 " fill="none" id="Start-BuildWinFx" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildWinArm32--><path d="M929.728,45.348 C922.276,51.024 913.645,58.315 907,66 C890.971,84.536 877.122,109.221 868.69,125.813 " fill="none" id="Start-BuildWinArm32" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildWinArm64--><path d="M929.912,33.967 C902.962,34.692 848.102,39.597 812,66 C791.454,81.026 778.162,108.003 771.125,125.956 " fill="none" id="Start-BuildWinArm64" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildCG--><path d="M929.983,34.15 C862.298,34.945 602.107,39.706 578,66 C486.721,165.56 609.641,344.512 653.509,401.819 " fill="none" id="Start-BuildCG" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to TestArtifacts--><path d="M929.91,33.95 C853.529,33.871 527.245,35.363 431,66 C400.111,75.8325 369.105,94.8815 345.58,111.6926 C333.8175,120.0982 323.9253,127.9443 316.853,133.7991 C315.969,134.531 315.129,135.2317 314.3349,135.8985 C313.9379,136.2319 313.5524,136.5569 313.1785,136.873 " fill="none" id="Start-TestArtifacts" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link Start to BuildMetadata--><path d="M929.862,34.136 C857.808,34.889 567.731,39.558 538,66 C437.822,155.098 456.214,342.607 464.945,401.736 " fill="none" id="Start-BuildMetadata" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;"/><!--link WinTest to LinuxTest--><!--link WinTest to LinuxArmTest--><!--link LinuxArmTest to LinuxArm64Test--><!--
-@startuml
-
-folder "Linux Builds" as LinuxBuilds {
-    agent "DEB"  as BuildDEB
-    agent "RPM"  as BuildRPM
-    agent "Alpine"  as BuildAlpine
-    agent "Linux-FxDependent"  as BuildLinuxFx
-
-}
-
-agent "macOS Build"  as BuildMac
-
-agent "Upload build metadata" as BuildMetadata
-
-folder "Windows Builds" as WinBuilds {
-    agent "x64"  as BuildWinX64
-    agent "x86"  as BuildWinX86
-    agent "arm32"  as BuildWinArm32
-    agent "arm64"  as BuildWinArm64
-    agent "FxDependent"  as BuildWinFx
-}
-
-agent "ComponentRegistration"  as BuildCG
-
-folder "Linux Package Scanning and Upload" as PkgScanUploadLinux {
-    agent "DEB"  as UploadDEB
-    agent "RPM"  as UploadRPM
-    agent "Alpine"  as UploadAlpine
-    agent "Linux-FxDependent"  as UploadLinuxFx
-}
-
-folder "Package Signing and Upload" as PkgSignUpload {
-    agent "macOS"  as SignMac
-
-    agent "Windows"  as SignWin
-}
-
-folder "Build Test Artifacts" as TestArtifacts {
-    agent "Windows" as WinTest
-    agent "Linux" as LinuxTest
-    agent "Linux-ARM" as LinuxArmTest
-    agent "Linux-ARM64" as LinuxArm64Test
-}
-
-agent "Compliance"  as Compliance
-
-
-agent "Create SDK and Global Tool and Upload" as BuildNuGet
-
-
-control "Finish"  as Finish
-control "Start" as Start
-
-BuildDEB -down-> UploadDEB
-BuildRPM -down-> UploadRPM
-BuildLinuxFx -down-> UploadLinuxFx
-BuildAlpine -down-> UploadAlpine
-
-BuildMac -down-> SignMac
-
-WinBuilds -down-> SignWin
-
-BuildWinX86 -down-> Compliance
-BuildWinX64 -down-> Compliance
-BuildWinFx -down-> Compliance
-
-PkgSignUpload -down-> BuildNuGet
-LinuxBuilds -down-> BuildNuGet
-
-Compliance ~~ Finish
-UploadAlpine ~~ Finish
-UploadDEB ~~ Finish
-UploadRPM ~~ Finish
-UploadLinuxFx ~~ Finish
-SignMac ~~ Finish
-BuildCG ~~ Finish
-BuildNuGet ~~ Finish
-TestArtifacts ~~ Finish
-BuildMetadata ~~ Finish
-
-Start ~~ BuildDEB
-Start ~~ BuildRPM
-Start ~~ BuildAlpine
-Start ~~ BuildLinuxFx
-Start ~~ BuildMac
-Start ~~ BuildWinX64
-Start ~~ BuildWinX86
-Start ~~ BuildWinFx
-Start ~~ BuildWinArm32
-Start ~~ BuildWinArm64
-Start ~~ BuildCG
-Start ~~ TestArtifacts
-Start ~~ BuildMetadata
-
-@enduml
-
-PlantUML version 1.2019.05(Sat Apr 20 09:45:36 PDT 2019)
-(GPL source distribution)
-Java Runtime: Java(TM) SE Runtime Environment
-JVM: Java HotSpot(TM) 64-Bit Server VM
-Java Version: 1.8.0_211-b12
-Operating System: Windows 10
-OS Version: 10.0
-Default Encoding: Cp1252
-Language: en
-Country: US
---></g></svg>
\ No newline at end of file
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
deleted file mode 100644
index 3be90bbefbc..00000000000
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ /dev/null
@@ -1,379 +0,0 @@
-name: UnifiedPackageBuild-$(Build.BuildId)
-trigger:
-  branches:
-    include:
-    - master
-    - release*
-pr:
-  branches:
-    include:
-    - master
-    - release*
-
-parameters:
-  - name: ForceAzureBlobDelete
-    displayName: Delete Azure Blob
-    type: string
-    values:
-      - true
-      - false
-    default: false
-  - name: InternalSDKBlobURL
-    displayName: URL to the blob having internal .NET SDK
-    type: string
-    default: ' '
-
-resources:
-  repositories:
-  - repository: ComplianceRepo
-    type: github
-    endpoint: ComplianceGHRepo
-    name: PowerShell/compliance
-    ref: master
-
-variables:
-  - name: PS_RELEASE_BUILD
-    value: 1
-  - name: DOTNET_CLI_TELEMETRY_OPTOUT
-    value: 1
-  - name: POWERSHELL_TELEMETRY_OPTOUT
-    value: 1
-  - name: nugetMultiFeedWarnLevel
-    value: none
-  - 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
-    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
-  - name: BUILDSECMON_OPT_IN
-    value: true
-  - group: PoolNames
-  - name: __DOTNET_RUNTIME_FEED
-    value: ${{ parameters.InternalSDKBlobURL }}
-
-stages:
-  - stage: prep
-    jobs:
-      - template: templates/checkAzureContainer.yml
-
-  - stage: macos
-    dependsOn: ['prep']
-    jobs:
-      - template: templates/mac.yml
-        parameters:
-          buildArchitecture: x64
-
-      - template: templates/mac.yml
-        parameters:
-          buildArchitecture: arm64
-
-  - stage: linux
-    dependsOn: ['prep']
-    jobs:
-      - template: templates/linux.yml
-        parameters:
-          buildName: deb
-
-      - template: templates/linux.yml
-        parameters:
-          buildName: rpm
-          parentJob: build_deb
-
-      - template: templates/linux.yml
-        parameters:
-          buildName: fxdependent
-          parentJob: build_deb
-
-      - template: templates/linux.yml
-        parameters:
-          buildName: alpine
-
-  - stage: windows
-    dependsOn: ['prep']
-    jobs:
-      - template: templates/windows-hosted-build.yml
-        parameters:
-          Architecture: x64
-
-      - template: templates/windows-hosted-build.yml
-        parameters:
-          Architecture: x64
-          BuildConfiguration: minSize
-
-      - template: templates/windows-hosted-build.yml
-        parameters:
-          Architecture: x86
-
-      - template: templates/windows-hosted-build.yml
-        parameters:
-          Architecture: arm64
-
-      - template: templates/windows-hosted-build.yml
-        parameters:
-          Architecture: fxdependent
-
-      - template: templates/windows-hosted-build.yml
-        parameters:
-          Architecture: fxdependentWinDesktop
-
-  - stage: SignFiles
-    displayName: Sign files
-    dependsOn: ['windows', 'linux', 'macos']
-    jobs:
-    - template: templates/mac-file-signing.yml
-      parameters:
-        buildArchitecture: x64
-
-    - template: templates/mac-file-signing.yml
-      parameters:
-        buildArchitecture: arm64
-
-    - job: SignFilesWinLinux
-      pool:
-        name: $(windowsPool)
-        demands:
-        - ImageOverride -equals PSMMS2019-Secure
-      displayName: Sign files
-
-      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
-
-      strategy:
-        matrix:
-          linux-x64:
-            runtime: linux-x64
-            unsignedBuildArtifactContainer: pwshLinuxBuild.tar.gz
-            unsignedBuildArtifactName: pwshLinuxBuild.tar.gz
-            signedBuildArtifactName: pwshLinuxBuild.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-x64-Alpine:
-            runtime: linux-x64-Alpine
-            unsignedBuildArtifactContainer: pwshLinuxBuildAlpine.tar.gz
-            unsignedBuildArtifactName: pwshLinuxBuild.tar.gz
-            signedBuildArtifactName: pwshLinuxBuildAlpine.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-x64-Alpine-Fxdependent:
-            runtime: linux-x64-Alpine-Fxdependent
-            unsignedBuildArtifactContainer: pwshAlpineFxdBuildAmd64.tar.gz
-            unsignedBuildArtifactName: pwshAlpineFxdBuildAmd64.tar.gz
-            signedBuildArtifactName: pwshAlpineFxdBuildAmd64.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-arm32:
-            runtime: linux-arm32
-            unsignedBuildArtifactContainer: pwshLinuxBuildArm32.tar.gz
-            unsignedBuildArtifactName: pwshLinuxBuildArm32.tar.gz
-            signedBuildArtifactName: pwshLinuxBuildArm32.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-arm64:
-            runtime: linux-arm64
-            unsignedBuildArtifactContainer: pwshLinuxBuildArm64.tar.gz
-            unsignedBuildArtifactName: pwshLinuxBuildArm64.tar.gz
-            signedBuildArtifactName: pwshLinuxBuildArm64.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-fxd:
-            runtime: linux-fxd
-            unsignedBuildArtifactContainer: pwshLinuxBuildFxdependent.tar.gz
-            unsignedBuildArtifactName: pwshLinuxBuild.tar.gz
-            signedBuildArtifactName: pwshLinuxBuildFxdependent.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-mariner:
-            runtime: linux-mariner
-            unsignedBuildArtifactContainer: pwshMarinerBuildAmd64.tar.gz
-            unsignedBuildArtifactName: pwshMarinerBuildAmd64.tar.gz
-            signedBuildArtifactName: pwshMarinerBuildAmd64.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-arm64-mariner:
-            runtime: linux-arm64-mariner
-            unsignedBuildArtifactContainer: pwshMarinerBuildArm64.tar.gz
-            unsignedBuildArtifactName: pwshMarinerBuildArm64.tar.gz
-            signedBuildArtifactName: pwshMarinerBuildArm64.tar.gz
-            signedArtifactContainer: authenticode-signed
-          linux-minsize:
-            runtime: linux-minsize
-            unsignedBuildArtifactContainer: pwshLinuxBuildMinSize.tar.gz
-            unsignedBuildArtifactName: pwshLinuxBuildMinSize.tar.gz
-            signedBuildArtifactName: pwshLinuxBuildMinSize.tar.gz
-            signedArtifactContainer: authenticode-signed
-          win-x64:
-            runtime: win-x64
-            unsignedBuildArtifactContainer: results
-            unsignedBuildArtifactName: '**/*-symbols-win-x64.zip'
-            signedBuildArtifactName: '-symbols-win-x64-signed.zip'
-            signedArtifactContainer: results
-          win-x86:
-            runtime: win-x86
-            unsignedBuildArtifactContainer: results
-            unsignedBuildArtifactName: '**/*-symbols-win-x86.zip'
-            signedBuildArtifactName: '-symbols-win-x86-signed.zip'
-            signedArtifactContainer: results
-          win-arm64:
-            runtime: win-arm64
-            unsignedBuildArtifactContainer: results
-            unsignedBuildArtifactName: '**/*-symbols-win-arm64.zip'
-            signedBuildArtifactName: '-symbols-win-arm64-signed.zip'
-            signedArtifactContainer: results
-          win-x64-gc:
-            runtime: win-x64-gc
-            unsignedBuildArtifactContainer: results
-            unsignedBuildArtifactName: '**/*-symbols-win-x64-gc.zip'
-            signedBuildArtifactName: '-symbols-win-x64-gc-signed.zip'
-            signedArtifactContainer: results
-          win-fxdependent:
-            runtime: win-fxdependent
-            unsignedBuildArtifactContainer: results
-            unsignedBuildArtifactName: '**/*-symbols-win-fxdependent.zip'
-            signedBuildArtifactName: '-symbols-win-fxdependent-signed.zip'
-            signedArtifactContainer: results
-          win-fxdependentWinDesktop:
-            runtime: win-fxdependentWinDesktop
-            unsignedBuildArtifactContainer: results
-            unsignedBuildArtifactName: '**/*-symbols-win-fxdependentWinDesktop.zip'
-            signedBuildArtifactName: '-symbols-win-fxdependentWinDesktop-signed.zip'
-            signedArtifactContainer: results
-      steps:
-      - template: templates/sign-build-file.yml
-
-  - stage: mac_packaging
-    displayName: macOS packaging
-    dependsOn: ['SignFiles']
-    jobs:
-    - template: templates/mac-package-build.yml
-      parameters:
-        buildArchitecture: x64
-
-    - template: templates/mac-package-build.yml
-      parameters:
-        buildArchitecture: arm64
-
-  - stage: linux_packaging
-    displayName: Linux Packaging
-    dependsOn: ['SignFiles']
-    jobs:
-    - template: templates/linux-packaging.yml
-      parameters:
-        buildName: deb
-
-    - template: templates/linux-packaging.yml
-      parameters:
-        buildName: rpm
-        uploadDisplayName: Upload and Sign
-
-    - template: templates/linux-packaging.yml
-      parameters:
-        buildName: alpine
-
-    - template: templates/linux-packaging.yml
-      parameters:
-        buildName: fxdependent
-
-  - stage: win_packaging
-    displayName: Windows Packaging
-    dependsOn: ['SignFiles']
-    jobs:
-    - template: templates/windows-packaging.yml
-      parameters:
-        Architecture: x64
-        parentJob: build_windows_x64_release
-
-    - template: templates/windows-packaging.yml
-      parameters:
-        Architecture: x64
-        BuildConfiguration: minSize
-        parentJob: build_windows_x64_minSize
-
-    - template: templates/windows-packaging.yml
-      parameters:
-        Architecture: x86
-        parentJob: build_windows_x86_release
-
-    - template: templates/windows-packaging.yml
-      parameters:
-        Architecture: arm64
-        parentJob: build_windows_arm64_release
-
-    - template: templates/windows-packaging.yml
-      parameters:
-        Architecture: fxdependent
-        parentJob: build_windows_fxdependent_release
-
-    - template: templates/windows-packaging.yml
-      parameters:
-        Architecture: fxdependentWinDesktop
-        parentJob: build_windows_fxdependentWinDesktop_release
-
-  - stage: package_signing
-    displayName: Package Signing
-    dependsOn: ['mac_packaging', 'linux_packaging', 'win_packaging']
-    jobs:
-    - template: templates/windows-package-signing.yml
-
-    - template: templates/mac-package-signing.yml
-      parameters:
-        buildArchitecture: x64
-
-    - template: templates/mac-package-signing.yml
-      parameters:
-        buildArchitecture: arm64
-
-  - stage: nuget_and_json
-    displayName: NuGet Packaging and Build Json
-    dependsOn: ['package_signing']
-    jobs:
-      - template: templates/nuget.yml
-      - template: templates/json.yml
-
-  # This is done late so that we dont use resources before the big signing and packaging tasks.
-  - stage: compliance
-    dependsOn: ['package_signing']
-    jobs:
-      - template: templates/compliance.yml
-
-  - stage: test_and_release_artifacts
-    displayName: Test and Release Artifacts
-    dependsOn: ['prep']
-    jobs:
-      - template: templates/testartifacts.yml
-
-      - job: release_json
-        displayName: Create and Upload release.json
-        pool:
-          name: $(windowsPool)
-          demands:
-          - ImageOverride -equals PSMMS2019-Secure
-        steps:
-        - checkout: self
-          clean: true
-        - template: templates/SetVersionVariables.yml
-          parameters:
-            ReleaseTagVar: $(ReleaseTagVar)
-
-        - powershell: |
-            $metadata = Get-Content '$(Build.SourcesDirectory)/tools/metadata.json' -Raw | ConvertFrom-Json
-            $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"
-          displayName: Create and upload release.json file to build artifact
-          retryCountOnTaskFailure: 2
-
-        - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
deleted file mode 100644
index 05dbe1799e2..00000000000
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ /dev/null
@@ -1,670 +0,0 @@
-trigger: none
-
-# needed to disable CI trigger and allow manual trigger
-# when the branch is same as pipeline source, the latest build from the source is used.
-# all environment used are for manual tasks and approvals.
-
-parameters:
-  - name: skipPackagesMsftComPublish
-    displayName: Skip actual publishing to Packages.microsoft.com, AFTER we upload it.  Used to test the publishing script.
-    default: false
-    type: boolean
-  - name: skipNugetPublish
-    displayName: Skip nuget publishing.  Used in testing publishing stage.
-    default: false
-    type: boolean
-
-resources:
-  pipelines:
-  - pipeline: releasePipeline
-    source: 'Coordinated Packages'
-    trigger:
-      branches:
-      - release/*
-
-  repositories:
-  - repository: Internal-PowerShellTeam-Tools
-    type: git
-    trigger: none
-    name: Internal-PowerShellTeam-Tools
-    ref: main-mirror
-
-  - repository: ComplianceRepo
-    type: github
-    endpoint: ComplianceGHRepo
-    name: PowerShell/compliance
-    ref: master
-
-variables:
-  - name: runCodesignValidationInjection
-    value : false
-  - name: nugetMultiFeedWarnLevel
-    value: none
-  - name: NugetSecurityAnalysisWarningLevel
-    value: none
-  - name: skipComponentGovernanceDetection
-    value: true
-  - name: BUILDSECMON_OPT_IN
-    value: true
-  - group: ReleasePipelineSecrets
-  - group: PipelineExecutionPats
-
-stages:
-- stage: MSIXBundle
-  displayName: Create MSIX Bundle package
-  dependsOn: []
-  jobs:
-  - template: templates/release-MsixBundle.yml
-
-- stage: ValidateSDK
-  displayName: Validate SDK
-  dependsOn: []
-  jobs:
-  - template: templates/release-SDKTests.yml
-    parameters:
-      jobName: WinSDK
-      displayName: Windows SDK Test
-      imageName: windows-latest
-
-  - template: templates/release-SDKTests.yml
-    parameters:
-      jobName: LinuxSDK
-      displayName: Linux SDK Test
-      imageName: ubuntu-latest
-
-  - template: templates/release-SDKTests.yml
-    parameters:
-      jobName: macOSSDK
-      displayName: macOS SDK Test
-      imageName: macOS-latest
-
-- stage: PRCreation
-  displayName: Create PR in GH Master
-  dependsOn: []
-  jobs:
-  - deployment: CreatePRInMaster
-    displayName: Update README.md and metadata.json
-    pool: server
-    environment: PSReleaseCreatePR
-
-- stage: ValidateGlobalTool
-  displayName: Validate Global Tool
-  dependsOn: []
-  jobs:
-  - template: templates/release-GlobalToolTest.yml
-    parameters:
-      jobName: WinGblTool
-      displayName: Global Tool Test Windows
-      imageName: windows-latest
-      globalToolExeName: 'pwsh.exe'
-      globalToolPackageName: 'PowerShell.Windows.x64'
-
-  - template: templates/release-GlobalToolTest.yml
-    parameters:
-      jobName: LinuxWinGblTool
-      displayName: Global Tool Test Linux
-      imageName: ubuntu-latest
-      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: '**/*linux-x64-fxdependent.tar.gz'
-
-  - template: templates/release-ValidateFxdPackage.yml
-    parameters:
-      jobName: FxdPackageLinuxonARM
-      displayName: Fxd Package Test Linux ARM64
-      imageName: 'PSMMSUbuntu20.04-ARM64-secure'
-      packageNamePattern: '**/*linux-x64-fxdependent.tar.gz'
-      use1ES: true
-
-- stage: StaticPkgValidation
-  dependsOn: []
-  displayName: Static package validation
-  jobs:
-  - job: ValidatePkgNames
-    displayName: Validate Package Names
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-    variables:
-    - group: 'Azure Blob variable group'
-    steps:
-      - template: templates/release-ValidatePackageNames.yml
-  - job: ValidatePkgBOM
-    displayName: Validate Package BOM
-    pool:
-      # testing
-      vmImage: ubuntu-latest
-    steps:
-      - template: templates/release-ValidatePackageBOM.yml
-
-- stage: StartDocker
-  dependsOn: []
-  displayName: Kick Off Docker Staging build
-  jobs:
-  - deployment: PSDockerKickOff
-    displayName: Start Docker build
-    pool: server
-    environment: PSReleaseDockerKickOff
-
-- stage: ManualValidation
-  dependsOn: []
-  displayName: Manual Validation
-  jobs:
-  - template: templates/release/approvalJob.yml
-    parameters:
-      displayName: Validate Windows Packages
-      jobName: ValidateWinPkg
-      instructions: |
-        Validate zip and msipackages on Windows Server 2012 R2
-
-  - 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:
-  - job: KickOffRA
-    displayName: Kickoff Release Automation
-    timeoutInMinutes: 240
-
-    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-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName Release-Automation
-        Set-AzDoAuthToken -Token $(powershellRelExecutionPat)
-        $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-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName Release-Automation
-        Set-AzDoAuthToken -Token $(powershellRelExecutionPat)
-        $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: UpdateChangeLog
-  displayName: Update the changelog
-  # do not include stages that are likely to fail in dependency as there is no way to force deploy.
-  dependsOn:
-  - MSIXBundle
-  - ValidateSDK
-  - PRCreation
-  - StaticPkgValidation
-  - StartDocker
-  - ManualValidation
-  - ValidateFxdPackage
-  - ValidateGlobalTool
-
-  jobs:
-  - template: templates/release/approvalJob.yml
-    parameters:
-      displayName: Make sure the changelog is updated
-      jobName: MergeChangeLog
-      instructions: |
-        Update and merge the changelog for the release.
-        This step is required for creating GitHub draft release.
-
-- stage: BlobPublic
-  displayName: Make Blob Public
-  # do not include stages that are likely to fail in dependency as there is no way to force deploy.
-  dependsOn: UpdateChangeLog
-
-  # The environment here is used for approval.
-  jobs:
-  - deployment: AzureBlobPublic
-    displayName: Make Azure Blob Public
-
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    variables:
-    - group: 'Staging_ACR'
-    environment: PSReleaseAzureBlobPublic
-    strategy:
-      runOnce:
-        deploy:
-          steps:
-          - template: templates/release-MakeContainerPublic.yml
-
-  - template: templates/release/approvalJob.yml
-    parameters:
-      displayName: Copy Global tool packages to PSInfra storage
-      jobName: CopyBlobApproval
-      instructions: |
-        Approval for Copy global tool packages to PSInfra storage
-
-  - job: PSInfraBlobPublic
-    displayName: Copy global tools to PSInfra storage
-    dependsOn: CopyBlobApproval
-
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    variables:
-    - group: 'PSInfraStorage'
-
-    steps:
-    - template: templates/release-CopyGlobalTools.yml
-      parameters:
-        sourceContainerName: 'tool-private'
-        destinationContainerName: 'tool'
-        sourceStorageAccountName: '$(GlobalToolStorageAccount)'
-        destinationStorageAccountName: '$(PSInfraStorageAccount)'
-        blobPrefix: '$(Version)'
-
-- stage: GitHubTasks
-  displayName: GitHub tasks
-  dependsOn: BlobPublic
-  jobs:
-  - job: GitHubDraft
-    displayName: Create GitHub Draft release
-
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    variables:
-    - group: 'Azure Blob variable group'
-    - group: 'AzDevOpsArtifacts'
-    - group: ReleasePipelineSecrets
-    steps:
-    - template: templates/release-CreateGitHubDraft.yml
-
-  - deployment: PushTag
-    dependsOn: GitHubDraft
-    displayName: Push Git Tag
-    pool : server
-    environment: PSReleasePushTag
-
-  - deployment: MakeDraftPublic
-    dependsOn: PushTag
-    displayName: Make GitHub Draft public
-    pool : server
-    environment: PSReleaseDraftPublic
-
-- stage: PublishPackages
-  displayName: Publish packages
-  dependsOn: GitHubTasks
-  jobs:
-  - job: PublishNuget
-
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    steps:
-    - template: templates/release-ReleaseToNuGet.yml
-      parameters:
-        skipPublish: ${{ parameters.skipNugetPublish }}
-
-  - job: PublishPkgsMsftCom
-
-    timeoutInMinutes: 120
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMSUbuntu20.04-Secure
-
-    variables:
-    - group: 'AzDevOpsArtifacts'
-    - group: 'packages.microsoft.com'
-    steps:
-    - template: templates/release-PublishPackageMsftCom.yml
-      parameters:
-        skipPublish: ${{ parameters.skipPackagesMsftComPublish }}
-
-- stage: PublishSymbols
-  displayName: Publish symbols
-  dependsOn: PublishPackages
-  jobs:
-  - job: PublishSymbol
-
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    steps:
-    - template: templates/release-PublishSymbols.yml
-
-- stage: ChangesToMaster
-  displayName: Ensure changes are in GH master
-  dependsOn: PublishPackages
-  jobs:
-  - 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
-  dependsOn:
-    - GitHubTasks
-  jobs:
-  - deployment: ReleaseDocker
-    displayName: Release Docker
-    pool: server
-    environment: PSReleaseDockerRelease
-
-- stage: ReleaseSnap
-  displayName: Release Snap
-  dependsOn:
-    - PublishPackages
-    - ChangesToMaster
-  variables:
-    # adds newPwshOrgName (exists in new and old org)
-    - group: PowerShellRelease
-  jobs:
-  - 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-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName PowerShell
-        Set-AzDoAuthToken -Token $(powershellRelExecutionPat)
-        $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-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName PowerShell
-        Set-AzDoAuthToken -Token $(powershellRelExecutionPat)
-        $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:
-    - 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: GitHubTasks
-  displayName: Update DotNet SDK Docker images
-  jobs:
-  - 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: GitHubTasks
-  displayName: Add manifest entry to winget
-  jobs:
-  - 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: GitHubTasks
-  displayName: Publish MSIX to store
-  jobs:
-  - 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: GitHubTasks
-  displayName: Upload BuildInfoJson
-  jobs:
-  - deployment: UploadJson
-    displayName: Upload BuildInfoJson
-
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    variables:
-    - group: 'Azure Blob variable group'
-    environment: PSReleaseBuildInfoJson
-    strategy:
-      runOnce:
-        deploy:
-          steps:
-          - template: templates/release-BuildJson.yml
-
-- stage: ReleaseVPack
-  dependsOn: GitHubTasks
-  displayName: Release VPack
-  jobs:
-  - 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-AzDoProjectInfo -ProjectOwner mscodehub -ProjectName PowerShellCore
-        Set-AzDoAuthToken -Token $(mscodehubBuildExecutionPat)
-        $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  -Branch '$(Build.SourceBranch)' -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: GitHubTasks
-  displayName: Update pwsh.deps.json links
-  jobs:
-  - template: templates/release-UpdateDepsJson.yml
-
-- stage: ReleaseClose
-  displayName: Finish Release
-  dependsOn:
-  - ReleaseVPack
-  - BuildInfoJson
-  - UpdateDotnetDocker
-  - ReleaseDocker
-  - ReleaseSnap
-  - ChangesToMaster
-  - ReleaseDeps
-  jobs:
-  - template: templates/release/approvalJob.yml
-    parameters:
-      displayName: Retain Build
-      jobName: RetainBuild
-      instructions: |
-        Retain the build
-
-  - template: templates/release/approvalJob.yml
-    parameters:
-      displayName: Delete release branch
-      jobName: DeleteBranch
-      instructions: |
-        Delete release
diff --git a/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml b/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
deleted file mode 100644
index dd9252a406f..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-parameters:
-  ReleaseTagVar: v6.2.0
-  ReleaseTagVarName: ReleaseTagVar
-  CreateJson: 'no'
-  UseJson: 'yes'
-
-steps:
-- ${{ if eq(parameters['UseJson'],'yes') }}:
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: 'BuildInfoJson'
-      itemPattern: '**/*.json'
-      downloadPath: '$(System.ArtifactsDirectory)'
-    displayName: Download Build Info Json
-
-- powershell: |
-    $path = "./build.psm1"
-
-    if($env:REPOROOT){
-      Write-Verbose "reporoot already set to ${env:REPOROOT}" -Verbose
-      exit 0
-    }
-
-    if(Test-Path -Path $path)
-    {
-      Write-Verbose "reporoot detect at: ." -Verbose
-      $repoRoot = '.'
-    }
-    else{
-      $path = "./PowerShell/build.psm1"
-      if(Test-Path -Path $path)
-      {
-        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: |
-    $createJson = ("${{ parameters.CreateJson }}" -ne "no")
-    $releaseTag = & "$env:REPOROOT/tools/releaseBuild/setReleaseTag.ps1" -ReleaseTag ${{ parameters.ReleaseTagVar }} -Variable "${{ parameters.ReleaseTagVarName }}" -CreateJson:$createJson
-    $version = $releaseTag.Substring(1)
-    $vstsCommandString = "vso[task.setvariable variable=Version]$version"
-    Write-Host ("sending " + $vstsCommandString)
-    Write-Host "##$vstsCommandString"
-
-    $azureVersion = $releaseTag.ToLowerInvariant() -replace '\.', '-'
-    $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion"
-    Write-Host ("sending " + $vstsCommandString)
-    Write-Host "##$vstsCommandString"
-  displayName: 'Set ${{ parameters.ReleaseTagVarName }} and other version Variables'
-
-- powershell: |
-    Get-ChildItem -Path env:
-  displayName: Capture environment
-  condition: succeededOrFailed()
diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
deleted file mode 100644
index af6451004e4..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-jobs:
-- job: DeleteBlob
-  variables:
-  - name: runCodesignValidationInjection
-    value : false
-  - name: NugetSecurityAnalysisWarningLevel
-    value: none
-  - group: Azure Blob variable group
-  displayName: Delete blob is exists
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-  steps:
-  - checkout: self
-    clean: true
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-      CreateJson: yes
-      UseJson: no
-
-  - task: AzurePowerShell@4
-    displayName: Check if blob exists and delete if specified
-    inputs:
-      azureSubscription: '$(AzureFileCopySubscription)'
-      scriptType: inlineScript
-      azurePowerShellVersion: latestVersion
-      inline: |
-        try {
-            $container = Get-AzStorageContainer -Container '$(AzureVersion)' -Context (New-AzStorageContext -StorageAccountName '$(StorageAccount)') -ErrorAction Stop
-
-            if ($container -ne $null -and '$(ForceAzureBlobDelete)' -eq 'false') {
-                throw 'Azure blob container $(AzureVersion) already exists. To overwrite, use ForceAzureBlobDelete parameter'
-            }
-            elseif ($container -ne $null -and '$(ForceAzureBlobDelete)' -eq 'true') {
-                Write-Verbose -Verbose 'Removing container $(AzureVersion) due to ForceAzureBlobDelete parameter'
-                Remove-AzStorageContainer -Name '$(AzureVersion)' -Context (New-AzStorageContext -StorageAccountName '$(StorageAccount)') -Force
-            }
-        }
-        catch {
-            if ($_.FullyQualifiedErrorId -eq 'ResourceNotFoundException,Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet.GetAzureStorageContainerCommand') {
-                Write-Verbose -Verbose 'Container "$(AzureVersion)" does not exists.'
-            }
-            else {
-                throw $_
-            }
-        }
-
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml b/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
deleted file mode 100644
index 352458390f9..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  nativePathRoot: ''
-
-steps:
-  - powershell: |
-      $dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
-      $nativePath = "${{parameters.nativePathRoot }}${dirSeparatorChar}PowerShell"
-      Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"
-
-      if ((Test-Path "$nativePath")) {
-        Remove-Item -Path "$nativePath" -Force -Recurse -Verbose -ErrorAction ignore
-      }
-      else {
-        Write-Verbose -Verbose -Message "No cleanup required."
-      }
-
-      git clone --quiet $env:REPOROOT $nativePath
-    displayName: Clone PowerShell Repo to /PowerShell
-    errorActionPreference: silentlycontinue
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
deleted file mode 100644
index 0a416389bf4..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-parameters:
-  parentJobs: []
-
-jobs:
-- job: compliance
-  variables:
-  - name: runCodesignValidationInjection
-    value : false
-  - name: NugetSecurityAnalysisWarningLevel
-    value: none
-
-  displayName: Compliance
-  dependsOn:
-    ${{ parameters.parentJobs }}
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-
-  steps:
-  - checkout: self
-    clean: true
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download artifacts'
-    inputs:
-      buildType: current
-      downloadType: single
-      artifactName: results
-      downloadPath: '$(System.ArtifactsDirectory)'
-
-  - powershell: |
-      dir "$(System.ArtifactsDirectory)\*" -Recurse
-    displayName: 'Capture artifacts directory'
-    continueOnError: true
-
-  - template: expand-compliance.yml
-    parameters:
-      architecture: fxdependent
-      version: $(version)
-
-  - template: expand-compliance.yml
-    parameters:
-      architecture: x86
-      version: $(version)
-
-  - template: expand-compliance.yml
-    parameters:
-      architecture: x64
-      version: $(version)
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run Defender Scan'
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
-    displayName: 'Run BinSkim '
-    inputs:
-      InputType: Basic
-      AnalyzeTarget: '$(CompliancePath)\*.dll;$(CompliancePath)\*.exe'
-      AnalyzeSymPath: 'SRV*'
-      AnalyzeVerbose: true
-      AnalyzeHashes: true
-      AnalyzeStatistics: true
-    continueOnError: true
-
-  # add RoslynAnalyzers
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-autoapplicability.AutoApplicability@1
-    displayName: 'Run AutoApplicability'
-    inputs:
-      ExternalRelease: true
-      IsSoftware: true
-      DataSensitivity: lbi
-    continueOnError: true
-
-  # add codeMetrics
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-vulnerabilityassessment.VulnerabilityAssessment@0
-    displayName: 'Run Vulnerability Assessment'
-    continueOnError: true
-
-  # FXCop is not applicable
-
-  # PreFASt is not applicable
-
-  - 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'
-      uploadAPIScan: false
-      uploadBinSkim: true
-      uploadCredScan: false
-      uploadFortifySCA: false
-      uploadFxCop: false
-      uploadModernCop: false
-      uploadPoliCheck: false
-      uploadPREfast: false
-      uploadRoslyn: false
-      uploadTSLint: false
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
-    displayName: 'Create Security Analysis Report'
-    inputs:
-      TsvFile: false
-      APIScan: false
-      BinSkim: true
-      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)\tools'
-      snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
deleted file mode 100644
index 76ef145886f..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-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
-      - name: branchCounterKey
-        value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
-      - name: branchCounter
-        value: $[counter(variables['branchCounterKey'], 1)]
-      - group: DotNetPrivateBuildAccess
-      - group: Azure Blob variable group
-      - group: ReleasePipelineSecrets
-
-    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
-
-    - template: ../cloneToOfficialPath.yml
-
-    - template: ../insert-nuget-config-azfeed.yml
-      parameters:
-        repoRoot: $(PowerShellRoot)
-
-    - pwsh: |
-        Import-Module .\build.psm1 -force
-        Start-PSBootstrap
-      workingDirectory: '$(Build.SourcesDirectory)'
-      retryCountOnTaskFailure: 2
-      displayName: 'Bootstrap'
-      env:
-        __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-    - 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.SOURCESDIRECTORY)/build.psm1'
-        Install-AzCopy
-      displayName: Install AzCopy
-      retryCountOnTaskFailure: 2
-
-    - pwsh: |
-        Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-        $azcopy = Find-AzCopy
-        Write-Verbose -Verbose "Found AzCopy: $azcopy"
-
-        $winverifySymbolsPath = New-Item -ItemType Directory -Path '$(System.ArtifactsDirectory)/winverify-symbols' -Force
-        Write-Host "##vso[task.setvariable variable=winverifySymbolsPath]$winverifySymbolsPath"
-
-        & $azcopy cp https://$(StorageAccount).blob.core.windows.net/winverify-private $winverifySymbolsPath --recursive
-
-        Get-ChildItem $winverifySymbolsPath -Recurse | Out-String | Write-Verbose -Verbose
-
-      displayName: Download winverify-private Artifacts
-      retryCountOnTaskFailure: 2
-      env:
-        AZCOPY_AUTO_LOGIN_TYPE: MSI
-
-    - pwsh: |
-        Import-Module .\build.psm1 -force
-        Find-DotNet
-        Start-PSBuild -Configuration StaticAnalysis -PSModuleRestore -Clean -Runtime fxdependent-win-desktop
-
-        $OutputFolder = Split-Path (Get-PSOutput)
-        Write-Host "##vso[task.setvariable variable=BinDir]$OutputFolder"
-
-        Write-Verbose -Verbose -Message "Deleting ref folder from output folder"
-        if (Test-Path $OutputFolder/ref) {
-          Remove-Item -Recurse -Force $OutputFolder/ref
-        }
-      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)'
-
-    - pwsh: |
-        Get-ChildItem '$(BinDir)' -File -Recurse |
-        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
-      retryCountOnTaskFailure: 2
-
-    - 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'
-        surrogateConfigurationFolder : $(surrogateFilePath)
-      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'
-
-    - 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
-      condition: succeededOrFailed()
-
-    - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
-      displayName: 'Publish Guardian Artifacts'
-      inputs:
-        AllTools: false
-        APIScan: true
-        ArtifactName: APIScan
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
deleted file mode 100644
index 8db52fc83f0..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-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: $(windowsPool)
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-
-  # 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@2
-    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@3
-    displayName: 'Publish Security Analysis Logs to Build Artifacts'
-    continueOnError: true
-
-  - task: TSAUpload@2
-    displayName: 'TSA upload'
-    inputs:
-      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'
-    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)\tools'
-      snapshotForceEnabled: true
-
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
deleted file mode 100644
index 3e91b9174d2..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-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 PSMMS2019-Secure
-
-  timeoutInMinutes: 15
-
-  steps:
-  - 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 {
-        $branchOnly = $branchOnly -replace '[\./]', '-'
-        $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:
-      sourceScanPath: '$(Build.SourcesDirectory)\tools'
-
-  - pwsh: |
-      ./tools/clearlyDefined/ClearlyDefined.ps1 -TestAndHarvest
-    displayName: Verify that packages have license data
-
-  - 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 -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: |
-      Get-Content -Raw -Path '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt'
-    displayName: Capture Notice
-    continueOnError: true
-
-  - task: AzureFileCopy@4
-    displayName: 'upload Notice'
-    inputs:
-      SourcePath: $(System.ArtifactsDirectory)\ThirdPartyNotices.txt
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: $(tpnContainer)
-      resourceGroup: '$(StorageResourceGroup)'
-    retryCountOnTaskFailure: 2
-
-  - task: PublishPipelineArtifact@1
-    inputs:
-      targetPath: $(System.ArtifactsDirectory)
-      artifactName: notice
-    displayName: Publish notice artifacts
-    retryCountOnTaskFailure: 2
diff --git a/tools/releaseBuild/azureDevOps/templates/expand-compliance.yml b/tools/releaseBuild/azureDevOps/templates/expand-compliance.yml
deleted file mode 100644
index 4cc25433262..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/expand-compliance.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-  architecture: x86
-  version: 6.2.0
-
-steps:
-  - powershell: |
-      Expand-Archive -Path "$(System.ArtifactsDirectory)\results\PowerShell-${{ parameters.version }}-symbols-win-${{ parameters.architecture }}.zip" -Destination "$(Build.StagingDirectory)\symbols\${{ parameters.architecture }}"
-    displayName: Expand symbols zip - ${{ parameters.architecture }}
-
-  - powershell: |
-      tools/releaseBuild/createComplianceFolder.ps1 -ArtifactFolder "$(Build.StagingDirectory)\symbols\${{ parameters.architecture }}" -VSTSVariableName 'CompliancePath'
-    displayName: Expand Compliance file - ${{ parameters.architecture }}
diff --git a/tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml b/tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml
deleted file mode 100644
index d7200809cca..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-parameters:
-  - name: PackageVersion
-  - name: LinuxBinPath
-  - name: WindowsBinPath
-  - name: WindowsDesktopBinPath
-  - name: AlpineBinPath
-  - name: DestinationPath
-  - name: ListOfPackageTypes
-    type: object
-    default:
-    - Unified
-    - PowerShell.Linux.Alpine
-    - PowerShell.Linux.x64
-    - PowerShell.Linux.arm32
-    - PowerShell.Linux.arm64
-    - PowerShell.Windows.x64
-
-steps:
-
-- pwsh: |
-    Write-Verbose -Verbose 'LinuxBinPath path: ${{ parameters.LinuxBinPath }}'
-    Write-Verbose -Verbose 'WindowsBinPath path: ${{ parameters.WindowsBinPath }}'
-    Write-Verbose -Verbose 'WindowsDesktopBinPath path: ${{ parameters.WindowsDesktopBinPath }}'
-    Write-Verbose -Verbose 'AlpineBinPath path: ${{ parameters.AlpineBinPath }}'
-
-    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 }}' -AlpineBinPath '${{ parameters.AlpineBinPath }}'
-  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 }}' -AlpineBinPath '${{ parameters.AlpineBinPath }}'
-    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/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
deleted file mode 100644
index 3ff723be6ed..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-parameters:
-  - name: "repoRoot"
-    default: $(REPOROOT)
-
-steps:
-- pwsh: |
-      $configPath = "${env:NugetConfigDir}/nuget.config"
-      Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination "${env:NugetConfigDir}"
-
-      if(-not (Test-Path $configPath))
-      {
-          throw "nuget.config is not created"
-      }
-      Get-Content $configPath | Write-Verbose -Verbose
-  displayName: 'Add nuget.config for Azure DevOps feed for PSGallery modules'
-  condition: and(succeededOrFailed(), ne(variables['AzDevOpsFeed'], ''))
-  env:
-    NugetConfigDir: ${{ parameters.repoRoot }}/src/Modules
-
-- pwsh: |
-      $configPath = "${env:NugetConfigDir}/nuget.config"
-      Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination "${env:NugetConfigDir}"
-
-      if(-not (Test-Path $configPath))
-      {
-          throw "nuget.config is not created"
-      }
-      Get-Content $configPath | Write-Verbose -Verbose
-  displayName: 'Add nuget.config for Azure DevOps feed for packages'
-  condition: and(succeededOrFailed(), ne(variables['PSInternalNugetFeed'], ''))
-  env:
-    NugetConfigDir: ${{ parameters.repoRoot }}
-
-- task: nuget-security-analysis@0
-  displayName: 'Run Secure Supply Chain analysis'
-  condition: and(succeededOrFailed(), ne(variables['PSInternalNugetFeed'], ''), ne(variables['AzDevOpsFeed'], ''))
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
deleted file mode 100644
index 48a50e0bf14..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/json.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-parameters:
-  parentJobs: []
-
-jobs:
-- job: json
-  variables:
-  - name: runCodesignValidationInjection
-    value : false
-  - name: NugetSecurityAnalysisWarningLevel
-    value: none
-  displayName: Create Json for Blob
-  dependsOn:
-    ${{ parameters.parentJobs }}
-  condition: succeeded()
-  pool:
-    name: $(windowsPool)
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-
-  steps:
-  #- task: <task type name>@<version>
-  #  inputs:
-  #    <task specific inputs>
-  #  displayName: '<display name of task>'
-  - checkout: self
-    clean: true
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-      CreateJson: yes
-
-  - task: AzureFileCopy@4
-    displayName: 'upload daily-build-info JSON file to Azure - ${{ parameters.architecture }}'
-    inputs:
-      SourcePath: '$(BuildInfoPath)'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: 'BuildInfo'
-    condition: and(succeeded(), eq(variables['IS_DAILY'], 'true'))
-
-  - task: AzureCLI@1
-    displayName: 'Make blob public'
-    inputs:
-      azureSubscription: '$(AzureFileCopySubscription)'
-      scriptLocation: inlineScript
-      inlineScript: 'az storage container set-permission --account-name $(StorageAccount) --name $(azureVersion) --public-access blob'
-    condition: and(succeeded(), eq(variables['IS_DAILY'], 'true'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)\tools'
-      snapshotForceEnabled: true
-
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
deleted file mode 100644
index 719ba1a6c30..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
+++ /dev/null
@@ -1,184 +0,0 @@
-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.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars
-    displayName: Download deb build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: pwshLinuxBuildMinSize.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars
-    displayName: Download min-size build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: pwshLinuxBuildArm32.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars
-    displayName: Download arm32 build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: pwshLinuxBuildArm64.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars
-    displayName: Download arm64 build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: pwshMarinerBuildAmd64.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars
-    displayName: Download mariner build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: pwshMarinerBuildArm64.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars
-    displayName: Download mariner arm64 build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: pwshLinuxBuildAlpine.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildAlpine.tar.gz
-    displayName: Download alpine build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: pwshLinuxBuildAlpine.tar.gz
-      path: $(Build.ArtifactStagingDirectory)/linuxTars/pwshAlpineFxdBuildAmd64.tar.gz
-    displayName: Download alpine fxdependent build
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      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/pwshMarinerBuildArm64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64"
-      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64 -ItemType Directory
-      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshMarinerBuildArm64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64
-
-      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/pwshAlpineFxdBuildAmd64.tar.gz/pwshAlpineFxdBuildAmd64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpineFxd"
-      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpineFxd -ItemType Directory
-      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshAlpineFxdBuildAmd64.tar.gz/pwshAlpineFxdBuildAmd64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpineFxd
-
-      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)
-
-  - template: cloneToOfficialPath.yml
-
-  - template: insert-nuget-config-azfeed.yml
-    parameters:
-      repoRoot: $(PowerShellRoot)
-
-  - pwsh: |
-      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 (Mariner) Framework Dependent'
-
-  - template: signBuildFiles.yml
-    parameters:
-      binLocation: pwshMarinerBuildArm64
-      buildPrefixName: 'PowerShell Linux arm64 (Mariner) Framework Dependent'
-
-  - template: signBuildFiles.yml
-    parameters:
-      binLocation: pwshLinuxBuildAlpine
-      buildPrefixName: 'PowerShell Linux Alpine x64'
-
-  - template: signBuildFiles.yml
-    parameters:
-      binLocation: pwshLinuxBuildAlpineFxd
-      buildPrefixName: 'PowerShell Linux Alpine Fxd x64'
-
-  - template: signBuildFiles.yml
-    parameters:
-      binLocation: pwshLinuxBuildFxdependent
-      buildPrefixName: 'PowerShell Linux Framework Dependent'
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
deleted file mode 100644
index 59db37c64ac..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
+++ /dev/null
@@ -1,489 +0,0 @@
-parameters:
-  buildName: ''
-  uploadDisplayName: 'Upload'
-
-jobs:
-- job: pkg_${{ parameters.buildName }}
-  displayName: Package ${{ parameters.buildName }}
-  condition: succeeded()
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMSUbuntu20.04-Secure
-  variables:
-    - name: runCodesignValidationInjection
-      value: false
-    - name: build
-      value: ${{ parameters.buildName }}
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - group: ESRP
-    - group: DotNetPrivateBuildAccess
-
-  steps:
-  - ${{ if or(eq(variables.build,'deb'), eq(variables.build,'rpm')) }} :
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        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: 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: 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: 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: authenticode-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64-signed
-        pattern: '**/pwshMarinerBuildAmd64.tar.gz'
-      displayName: Download mariner amd64 build
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: authenticode-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64-signed
-        pattern: '**/pwshMarinerBuildArm64.tar.gz'
-      displayName: Download mariner arm64 build
-
-  - ${{ if eq(variables.build,'alpine') }} :
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: authenticode-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine-signed
-        pattern: '**/pwshLinuxBuildAlpine.tar.gz'
-      displayName: Download alpine build
-
-  - ${{ if eq(variables.build,'alpine') }} :
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: authenticode-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshAlpineFxdBuildAmd64-signed
-        pattern: '**/pwshAlpineFxdBuildAmd64.tar.gz'
-      displayName: Download alpine framework dependent build
-
-  - ${{ if eq(variables.build,'fxdependent') }} :
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        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')) }} :
-    - 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 x64 build meta
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: pwshMarinerBuildArm64-meta
-        path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64-meta
-      displayName: Download mariner arm64 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,'alpine') }} :
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: pwshAlpineFxdBuildAmd64-meta
-        path: $(Build.ArtifactStagingDirectory)/pwshAlpineFxdBuildAmd64-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
-
-  - 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') {
-        # for mariner x64
-        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
-
-        # for mariner arm64
-        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64-signed/pwshMarinerBuildArm64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64"
-        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64 -ItemType Directory
-        tar -xf $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64-signed/pwshMarinerBuildArm64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshMarinerBuildArm64
-      }
-
-      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
-
-        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshAlpineFxdBuildAmd64-signed/pwshAlpineFxdBuildAmd64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshAlpineFxdBuildAmd64"
-        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshAlpineFxdBuildAmd64 -ItemType Directory
-        tar -xf $(Build.ArtifactStagingDirectory)/pwshAlpineFxdBuildAmd64-signed/pwshAlpineFxdBuildAmd64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshAlpineFxdBuildAmd64
-      }
-
-      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
-
-  - 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)
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - 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)
-    retryCountOnTaskFailure: 2
-
-
-  - 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)'
-      retryCountOnTaskFailure: 2
-
-  - 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())
-    retryCountOnTaskFailure: 2
-
-  - 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'))
-    retryCountOnTaskFailure: 2
-
-  # 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'))
-    retryCountOnTaskFailure: 2
-
-  - 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
deleted file mode 100644
index bb343bed54e..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ /dev/null
@@ -1,313 +0,0 @@
-parameters:
-  buildName: ''
-  uploadDisplayName: 'Upload'
-  parentJob: ''
-
-jobs:
-- job: build_${{ parameters.buildName }}
-  displayName: Build ${{ parameters.buildName }}
-  condition: succeeded()
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMSUbuntu20.04-Secure
-  dependsOn: ${{ parameters.parentJob }}
-  variables:
-    - name: runCodesignValidationInjection
-      value: false
-    - name: build
-      value: ${{ parameters.buildName }}
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - group: ESRP
-    - group: DotNetPrivateBuildAccess
-
-  steps:
-  - 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)
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - pwsh: |
-      try {
-        Import-Module "$env:POWERSHELLROOT/build.psm1"
-        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
-      }
-    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
-      PackageName: PowerShell Linux
-      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 x64 SBOM
-        PackageName: PowerShell Linux Framework Dependent
-        PackageVersion: $(Version)
-        sourceScanPath: '$(PowerShellRoot)/tools'
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - template: Sbom.yml@ComplianceRepo
-      parameters:
-        BuildDropPath: '$(System.ArtifactsDirectory)/pwshMarinerBuildArm64'
-        Build_Repository_Uri: $(Github_Build_Repository_Uri)
-        displayName: Mariner arm64 SBOM
-        PackageName: PowerShell Linux Framework Dependent
-        PackageVersion: $(Version)
-        sourceScanPath: '$(PowerShellRoot)/tools'
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - template: Sbom.yml@ComplianceRepo
-      parameters:
-        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
-      parameters:
-        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
-      parameters:
-        BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64'
-        Build_Repository_Uri: $(Github_Build_Repository_Uri)
-        displayName: Arm64 SBOM
-        PackageName: PowerShell Linux Arm64
-        PackageVersion: $(Version)
-        sourceScanPath: '$(PowerShellRoot)/tools'
-
-  - ${{ if eq(variables.build,'alpine') }} :
-    - template: Sbom.yml@ComplianceRepo
-      parameters:
-        BuildDropPath: '$(System.ArtifactsDirectory)/pwshAlpineFxdBuildAmd64'
-        Build_Repository_Uri: $(Github_Build_Repository_Uri)
-        displayName: Alpine FXD SBOM
-        PackageName: PowerShell Alpine Framework Dependent AMD64
-        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,'alpine') }} :
-    - pwsh: |
-        Set-Location '$(System.ArtifactsDirectory)/pwshAlpineFxdBuildAmd64'
-        tar -czvf $(System.ArtifactsDirectory)/pwshAlpineFxdBuildAmd64.tar.gz *
-      displayName: Compress pwshAlpineFxdBuildAmd64
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - pwsh: |
-        Set-Location '$(System.ArtifactsDirectory)/pwshMarinerBuildArm64'
-        tar -czvf $(System.ArtifactsDirectory)/pwshMarinerBuildArm64.tar.gz *
-      displayName: Compress pwshMarinerBuildArm64
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild.tar.gz'
-        artifactName: pwshLinuxBuild.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild-meta'
-        artifactName: pwshLinuxBuild-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize.tar.gz'
-        artifactName: pwshLinuxBuildMinSize.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize-meta'
-        artifactName: pwshLinuxBuildMinSize-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32.tar.gz'
-        artifactName: pwshLinuxBuildArm32.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32-meta'
-        artifactName: pwshLinuxBuildArm32-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64.tar.gz'
-        artifactName: pwshLinuxBuildArm64.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'deb') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64-meta'
-        artifactName: pwshLinuxBuildArm64-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64.tar.gz'
-        artifactName: pwshMarinerBuildAmd64.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64-meta'
-        artifactName: pwshMarinerBuildAmd64-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildArm64.tar.gz'
-        artifactName: pwshMarinerBuildArm64.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'rpm') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildArm64-meta'
-        artifactName: pwshMarinerBuildArm64-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'alpine') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild.tar.gz'
-        artifactName: pwshLinuxBuildAlpine.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'alpine') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild-meta'
-        artifactName: pwshLinuxBuildAlpine-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'alpine') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshAlpineFxdBuildAmd64.tar.gz'
-        artifactName: pwshAlpineFxdBuildAmd64.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'alpine') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshAlpineFxdBuildAmd64-meta'
-        artifactName: pwshAlpineFxdBuildAmd64-meta
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'fxdependent') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild.tar.gz'
-        artifactName: pwshLinuxBuildFxdependent.tar.gz
-      retryCountOnTaskFailure: 2
-
-  - ${{ if eq(variables.build,'fxdependent') }} :
-    - task: PublishPipelineArtifact@1
-      inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild-meta'
-        artifactName: pwshLinuxBuildFxdependent-meta
-      retryCountOnTaskFailure: 2
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
deleted file mode 100644
index 8159c2bc7d9..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ /dev/null
@@ -1,121 +0,0 @@
-parameters:
-  buildArchitecture: 'x64'
-
-jobs:
-  - job: MacFileSigningJob_${{ parameters.buildArchitecture }}
-    displayName: macOS File signing ${{ parameters.buildArchitecture }}
-    condition: succeeded()
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    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:
-        ReleaseTagVar: $(ReleaseTagVar)
-
-    - template: shouldSign.yml
-
-    - task: DownloadBuildArtifacts@0
-      inputs:
-        artifactName: 'macosBinResults'
-        itemPattern: '**/*.zip'
-        downloadPath: '$(System.ArtifactsDirectory)\Symbols'
-
-    - pwsh: |
-        Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse
-      displayName: 'Capture Downloaded Artifacts'
-      # Diagnostics is not critical it passes every time it runs
-      continueOnError: true
-
-    - pwsh: |
-        $zipPath = Get-Item '$(System.ArtifactsDirectory)\Symbols\macosBinResults\*symbol*${{ parameters.buildArchitecture }}*.zip'
-        Write-Verbose -Verbose "Zip Path: $zipPath"
-
-        $expandedFolder = $zipPath.BaseName
-        Write-Host "sending.. vso[task.setvariable variable=SymbolsFolder]$expandedFolder"
-        Write-Host "##vso[task.setvariable variable=SymbolsFolder]$expandedFolder"
-
-        Expand-Archive -Path $zipPath -Destination "$(System.ArtifactsDirectory)\$expandedFolder" -Force
-      displayName: Expand symbols zip
-
-    - pwsh: |
-        Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse
-      displayName: 'Capture artifacts dir Binaries'
-
-    - pwsh: |
-        Get-ChildItem "$(System.ArtifactsDirectory)\$(SymbolsFolder)" -Recurse -Include pwsh, *.dylib
-      displayName: 'Capture Expanded Binaries'
-      # Diagnostics is not critical it passes every time it runs
-      continueOnError: true
-
-    - pwsh: |
-        $null = new-item -type directory -path "$(Build.StagingDirectory)\macos"
-        $zipFile = "$(Build.StagingDirectory)\macos\powershell-files-$(Version)-osx-${{ parameters.buildArchitecture }}.zip"
-        Get-ChildItem "$(System.ArtifactsDirectory)\$(SymbolsFolder)" -Recurse -Include pwsh, *.dylib |
-          Compress-Archive -Destination $zipFile
-        Write-Host $zipFile
-      displayName: 'Compress macOS binary files'
-
-    - template: EsrpSign.yml@ComplianceRepo
-      parameters:
-          buildOutputPath: $(Build.StagingDirectory)\macos
-          signOutputPath: $(Build.StagingDirectory)\signedMacOSPackages
-          certificateId: "CP-401337-Apple"
-          pattern: |
-            **\*.zip
-          useMinimatch: true
-          shouldSign: $(SHOULD_SIGN)
-          displayName: Sign macOS Binaries
-
-    - pwsh: |
-        $destination = "$(System.ArtifactsDirectory)\azureMacOs_${{ parameters.buildArchitecture }}"
-        New-Item -Path $destination -Type Directory
-        $zipPath = Get-ChildItem "$(Build.StagingDirectory)\signedMacOSPackages\powershell-*.zip" -Recurse | select-object -expandproperty fullname
-        foreach ($z in $zipPath) { Expand-Archive -Path $z -DestinationPath $destination }
-      displayName: 'Extract and copy macOS artifacts for upload'
-      condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-
-    - template: upload-final-results.yml
-      parameters:
-        artifactPath: $(System.ArtifactsDirectory)\azureMacOs_${{ parameters.buildArchitecture }}
-        artifactFilter: "*"
-        artifactName: signedMacOsBins_${{ parameters.buildArchitecture }}
-        condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-
-    - ${{ if eq(variables['SHOULD_SIGN'], 'true') }}:
-      - template: EsrpScan.yml@ComplianceRepo
-        parameters:
-            scanPath: $(System.ArtifactsDirectory)\azureMacOs_${{ parameters.buildArchitecture }}
-            pattern: |
-              **\*
-
-    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-      displayName: 'Component Detection'
-      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
deleted file mode 100644
index c853a21ef37..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ /dev/null
@@ -1,143 +0,0 @@
-parameters:
-  parentJob: ''
-  buildArchitecture: x64
-
-jobs:
-- job: package_macOS_${{ parameters.buildArchitecture }}
-  displayName: Package macOS ${{ parameters.buildArchitecture }}
-  condition: succeeded()
-  pool:
-    vmImage: macos-latest
-  variables:
-    # Turn off Homebrew analytics
-    - name: HOMEBREW_NO_ANALYTICS
-      value: 1
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - group: DotNetPrivateBuildAccess
-  steps:
-  - checkout: self
-    clean: true
-
-  - pwsh: |
-      # create folder
-      sudo mkdir "$(Agent.TempDirectory)/PowerShell"
-
-      # make the current user the owner
-      sudo chown $env:USER "$(Agent.TempDirectory)/PowerShell"
-    displayName: 'Create $(Agent.TempDirectory)/PowerShell'
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - template: shouldSign.yml
-
-  - template: cloneToOfficialPath.yml
-    parameters:
-      nativePathRoot: '$(Agent.TempDirectory)'
-
-  - task: DownloadBuildArtifacts@0
-    displayName: Download macosBinResults
-    inputs:
-      artifactName: 'macosBinResults'
-      itemPattern: '**/*${{ parameters.buildArchitecture }}.zip'
-      downloadPath: '$(System.ArtifactsDirectory)/Symbols'
-
-  - task: DownloadBuildArtifacts@0
-    displayName: Download signedMacOsBins
-    inputs:
-      artifactName: 'signedMacOsBins_${{ parameters.buildArchitecture }}'
-      itemPattern: '**/*'
-      downloadPath: '$(System.ArtifactsDirectory)/macOsBins'
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-
-  - pwsh: |
-      Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse
-    displayName: 'Capture Downloaded Artifacts'
-    # Diagnostics is not critical it passes every time it runs
-    continueOnError: true
-
-  - pwsh: |
-      $zipPath = Get-Item '$(System.ArtifactsDirectory)\Symbols\macosBinResults\*symbol*${{ parameters.buildArchitecture }}.zip'
-      Write-Verbose -Verbose "Zip Path: $zipPath"
-
-      $expandedFolder = $zipPath.BaseName
-      Write-Host "sending.. vso[task.setvariable variable=SymbolsFolder]$expandedFolder"
-      Write-Host "##vso[task.setvariable variable=SymbolsFolder]$expandedFolder"
-
-      Expand-Archive -Path $zipPath -Destination "$(System.ArtifactsDirectory)\$expandedFolder" -Force
-    displayName: Expand symbols zip
-
-  - pwsh: |
-      Import-Module $(PowerShellRoot)/build.psm1 -Force
-      Import-Module $(PowerShellRoot)/tools/packaging -Force
-      $signedFilesPath = '$(System.ArtifactsDirectory)/macOsBins/signedMacOsBins_${{ parameters.buildArchitecture }}/'
-      $BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
-
-      Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath
-    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)
-      PackageName: PowerShell macOS ${{ parameters.buildArchitecture }}
-      PackageVersion: $(Version)
-      sourceScanPath: '$(PowerShellRoot)/tools'
-
-  - pwsh: |
-      Import-Module $(PowerShellRoot)/build.psm1 -Force
-      Import-Module $(PowerShellRoot)/tools/packaging -Force
-
-      $destFolder = '$(System.ArtifactsDirectory)\signedZip'
-      $BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
-
-      $null = New-Item -ItemType Directory -Path $destFolder -Force
-
-      $BuildPackagePath = New-PSBuildZip -BuildPath $BuildPath -DestinationFolder $destFolder
-
-      Write-Verbose -Verbose "New-PSSignedBuildZip returned `$BuildPackagePath as: $BuildPackagePath"
-      Write-Host "##vso[artifact.upload containerfolder=results;artifactname=results]$BuildPackagePath"
-
-      $vstsCommandString = "vso[task.setvariable variable=BuildPackagePath]$BuildPackagePath"
-      Write-Host ("sending " + $vstsCommandString)
-      Write-Host "##$vstsCommandString"
-    displayName: Compress signed files
-    retryCountOnTaskFailure: 2
-
-
-  - pwsh: |
-      try {
-        tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
-      } catch {
-        Get-Error
-        throw
-      }
-    displayName: 'Bootstrap VM'
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - pwsh: |
-      # Add -SkipReleaseChecks as a mitigation to unblock release.
-      # macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
-      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'
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    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
deleted file mode 100644
index d4901580b0b..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ /dev/null
@@ -1,135 +0,0 @@
-parameters:
-  buildArchitecture: x64
-
-jobs:
-- job: MacPackageSigningJob_${{ parameters.buildArchitecture }}
-  displayName: macOS Package signing ${{ parameters.buildArchitecture }}
-  condition: succeeded()
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-  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: shouldSign.yml
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: 'macosPkgResults'
-      itemPattern: '**/*'
-      downloadPath: '$(System.ArtifactsDirectory)'
-
-  - pwsh: |
-      dir "$(System.ArtifactsDirectory)\*" -Recurse
-    displayName: 'Capture Downloaded Artifacts'
-    # Diagnostics is not critical it passes every time it runs
-    continueOnError: true
-
-  - pwsh: |
-      $null = new-item -type directory -path "$(Build.StagingDirectory)\macos"
-      $zipFile = "$(Build.StagingDirectory)\macos\powershell-$(Version)-osx-${{ parameters.buildArchitecture }}.zip"
-      Compress-Archive -Path "$(System.ArtifactsDirectory)\macosPkgResults\powershell-$(Version)-osx-${{ parameters.buildArchitecture }}.pkg" -Destination $zipFile
-      Write-Host $zipFile
-
-      $ltsPkgPath = "$(System.ArtifactsDirectory)\macosPkgResults\powershell-lts-$(Version)-osx-${{ parameters.buildArchitecture }}.pkg"
-
-      if(Test-Path $ltsPkgPath)
-      {
-         $ltsZipFile = "$(Build.StagingDirectory)\macos\powershell-lts-$(Version)-osx-${{ parameters.buildArchitecture }}.zip"
-         Compress-Archive -Path $ltsPkgPath -Destination $ltsZipFile
-         Write-Host $ltsZipFile
-      }
-    displayName: 'Compress macOS Package'
-
-  - template: EsrpSign.yml@ComplianceRepo
-    parameters:
-        buildOutputPath: $(Build.StagingDirectory)\macos
-        signOutputPath: $(Build.StagingDirectory)\signedMacOSPackages
-        certificateId: "CP-401337-Apple"
-        pattern: |
-          **\*.zip
-        useMinimatch: true
-        shouldSign: $(SHOULD_SIGN)
-        displayName: Sign pkg
-
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: $(System.ArtifactsDirectory)\macosPkgResults
-      artifactFilter: "*${{ parameters.buildArchitecture }}.tar.gz"
-
-  - pwsh: |
-      $destination = "$(System.ArtifactsDirectory)\azureMacOs"
-      New-Item -Path $destination -Type Directory
-      $zipPath = dir "$(Build.StagingDirectory)\signedMacOSPackages\powershell-*.zip" -Recurse | select-object -expandproperty fullname
-      foreach ($z in $zipPath) { Expand-Archive -Path $z -DestinationPath $destination }
-      $targzPath = dir "$(System.ArtifactsDirectory)\*osx*.tar.gz" -Recurse | select-object -expandproperty fullname
-      Copy-Item -Path $targzPath -Destination $destination
-    displayName: 'Extract and copy macOS artifacts for upload'
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: $(System.ArtifactsDirectory)\azureMacOs
-      artifactFilter: "*.pkg"
-      condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-
-  - pwsh: |
-      $null = new-item -type directory -path "$(Build.StagingDirectory)\macos-unsigned"
-      Copy-Item -Path "$(System.ArtifactsDirectory)\macosPkgResults\powershell-$(Version)-osx-x64.pkg" -Destination "$(Build.StagingDirectory)\macos-unsigned"
-      Copy-Item -Path "$(System.ArtifactsDirectory)\macosPkgResults\powershell-$(Version)-osx-x64.tar.gz" -Destination "$(Build.StagingDirectory)\macos-unsigned"
-    displayName: 'Create unsigned folder to upload'
-    condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
-
-  - task: AzureFileCopy@4
-    displayName: 'AzureBlob File Copy - unsigned'
-    inputs:
-      SourcePath: '$(Build.StagingDirectory)\macos-unsigned\*'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)'
-    condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
-    retryCountOnTaskFailure: 2
-
-  - task: AzureFileCopy@4
-    displayName: 'AzureBlob File Copy - signed'
-    inputs:
-      SourcePath: '$(System.ArtifactsDirectory)\azureMacOs\*'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)'
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-    retryCountOnTaskFailure: 2
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    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
deleted file mode 100644
index 892064fbbba..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-parameters:
-  buildArchitecture: 'x64'
-
-jobs:
-- job: build_macOS_${{ parameters.buildArchitecture }}
-  displayName: Build macOS ${{ parameters.buildArchitecture }}
-  condition: succeeded()
-  pool:
-    vmImage: macos-latest
-  variables:
-    # Turn off Homebrew analytics
-    - name: HOMEBREW_NO_ANALYTICS
-      value: 1
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - group: DotNetPrivateBuildAccess
-  steps:
-  #- task: <task type name>@<version>
-  #  inputs:
-  #    <task specific inputs>
-  #  displayName: '<display name of task>'
-  - checkout: self
-    clean: true
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - pwsh: |
-      # create folder
-      sudo mkdir "$(Agent.TempDirectory)/PowerShell"
-
-      # make the current user the owner
-      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
-    displayName: 'Bootstrap VM'
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
-    parameters:
-      repoRoot: $(PowerShellRoot)
-
-  - pwsh: |
-      $env:AzDevOpsFeedPAT2 = '$(AzDevOpsFeedPAT2)'
-      # 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'
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)/tools'
-      snapshotForceEnabled: true
-
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml b/tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml
deleted file mode 100644
index 276ab1511cd..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-parameters:
-  - name: PackageVersion
-  - name: PackagePath
-  - name: WinFxdPath
-  - name: LinuxFxdPath
-  - 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:
-
-- pwsh: |
-      $configPath = "$(REPOROOT)/nuget.config"
-      Import-Module '$(REPOROOT)/build.psm1' -Force
-      New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination "$(REPOROOT)"
-
-      if(-not (Test-Path $configPath))
-      {
-          throw "nuget.config is not created"
-      }
-      Get-Content $configPath | Write-Verbose -Verbose
-  displayName: 'Add nuget.config for Azure DevOps feed for packages'
-  condition: and(succeededOrFailed(), ne(variables['PSInternalNugetFeed'], ''))
-
-- pwsh: |
-    Import-Module "$env:REPOROOT/build.psm1" -Force
-    Start-PSBootstrap
-
-    $sharedModules = @('Microsoft.PowerShell.Commands.Management',
-                       'Microsoft.PowerShell.Commands.Utility',
-                       'Microsoft.PowerShell.ConsoleHost',
-                       'Microsoft.PowerShell.Security',
-                       'System.Management.Automation'
-                      )
-
-    $winOnlyModules = @('Microsoft.Management.Infrastructure.CimCmdlets',
-                        'Microsoft.PowerShell.Commands.Diagnostics',
-                        'Microsoft.PowerShell.CoreCLR.Eventing',
-                        'Microsoft.WSMan.Management',
-                        'Microsoft.WSMan.Runtime'
-                        )
-
-    $refAssemblyFolder = Join-Path '$(System.ArtifactsDirectory)' 'RefAssembly'
-    $null = New-Item -Path $refAssemblyFolder -Force -Verbose -Type Directory
-
-    Start-PSBuild -Clean -Runtime linux-x64 -Configuration Release
-
-    $sharedModules | Foreach-Object {
-      $refFile = Get-ChildItem -Path "$env:REPOROOT\src\$_\obj\Release\net8.0\refint\$_.dll"
-      Write-Verbose -Verbose "RefAssembly: $refFile"
-      Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
-      $refDoc = "$env:REPOROOT\src\$_\bin\Release\net8.0\$_.xml"
-      if (-not (Test-Path $refDoc)) {
-        Write-Warning "$refDoc not found"
-        Get-ChildItem -Path "$env:REPOROOT\src\$_\bin\Release\net8.0\" | Out-String | Write-Verbose -Verbose
-      }
-      else {
-        Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose
-      }
-    }
-
-    Start-PSBuild -Clean -Runtime win7-x64 -Configuration Release
-
-    $winOnlyModules | Foreach-Object {
-      $refFile = Get-ChildItem -Path "$env:REPOROOT\src\$_\obj\Release\net8.0\refint\*.dll"
-      Write-Verbose -Verbose 'RefAssembly: $refFile'
-      Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
-      $refDoc = "$env:REPOROOT\src\$_\bin\Release\net8.0\$_.xml"
-      if (-not (Test-Path $refDoc)) {
-        Write-Warning "$refDoc not found"
-        Get-ChildItem -Path "$env:REPOROOT\src\$_\bin\Release\net8.0" | Out-String | Write-Verbose -Verbose
-      }
-      else {
-        Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose
-      }
-    }
-
-    Get-ChildItem $refAssemblyFolder -Recurse | Out-String | Write-Verbose -Verbose
-
-    # Set RefAssemblyPath path variable
-    $vstsCommandString = "vso[task.setvariable variable=RefAssemblyPath]${refAssemblyFolder}"
-    Write-Host "sending " + $vstsCommandString
-    Write-Host "##$vstsCommandString"
-
-  displayName: Build reference assemblies
-  env:
-    __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-- ${{ 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 }}' -CGManifestPath $CGManifestPath -RefAssemblyPath $(RefAssemblyPath)
-    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
deleted file mode 100644
index 22f791bf0eb..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ /dev/null
@@ -1,290 +0,0 @@
-parameters:
-  parentJobs: []
-
-jobs:
-- job: build_nuget
-  dependsOn:
-    ${{ parameters.parentJobs }}
-  displayName: Build NuGet packages
-  condition: succeeded()
-  pool:
-    name: $(windowsPool)
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-
-  timeoutInMinutes: 90
-
-  variables:
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - name: build
-      value: ${{ parameters.buildName }}
-    - group: ESRP
-    - name: GenAPIToolPath
-      value: '$(System.ArtifactsDirectory)/GenAPI'
-    - name: PackagePath
-      value: '$(System.ArtifactsDirectory)/UnifiedPackagePath'
-    - name: winFxdPath
-      value: '$(System.ArtifactsDirectory)/winFxd'
-    - name: winFxdWinDesktopPath
-      value: '$(System.ArtifactsDirectory)/winFxdWinDesktop'
-    - name: linuxFxdPath
-      value: '$(System.ArtifactsDirectory)/linuxFxd'
-    - name: alpineFxdPath
-      value: '$(System.ArtifactsDirectory)/alpineFxd'
-    - group: DotNetPrivateBuildAccess
-
-  steps:
-  - checkout: self
-    clean: true
-
-  - checkout: ComplianceRepo
-    clean: true
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - powershell: |
-      $content = Get-Content "$env:REPOROOT/global.json" -Raw | ConvertFrom-Json
-      $vstsCommandString = "vso[task.setvariable variable=SDKVersion]$($content.sdk.version)"
-      Write-Host "sending " + $vstsCommandString
-      Write-Host "##$vstsCommandString"
-    displayName: 'Find SDK version from global.json'
-
-  - 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
-    env:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download PowerShell build artifacts - finalResults'
-    inputs:
-      buildType: current
-      downloadType: single
-      artifactName: finalResults
-      downloadPath: '$(System.ArtifactsDirectory)'
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download PowerShell build artifacts - macosPkgResults'
-    inputs:
-      buildType: current
-      downloadType: single
-      artifactName: macosPkgResults
-      downloadPath: '$(System.ArtifactsDirectory)'
-
-  - powershell: 'Get-ChildItem $(System.ArtifactsDirectory) -recurse'
-    displayName: 'Capture downloaded artifacts'
-
-  - powershell: |
-      $packagePath = (Join-Path $(System.ArtifactsDirectory)  packages)
-      New-Item $packagePath -ItemType Directory -Force > $null
-      $packages  = Get-ChildItem $(System.ArtifactsDirectory) -Include *.zip, *.tar.gz -Recurse
-      $packages | ForEach-Object { Copy-Item $_.FullName -Destination $packagePath -Verbose }
-      Get-ChildItem $packagePath -Recurse
-    displayName: 'Conflate packages to same folder'
-
-  - task: ExtractFiles@1
-    displayName: 'Extract files win-fxdependent'
-    inputs:
-      archiveFilePatterns: '$(System.ArtifactsDirectory)/packages/PowerShell-*-win-fxdependent.zip'
-      destinationFolder: '$(winFxdPath)'
-
-  - task: ExtractFiles@1
-    displayName: 'Extract files win-fxdependentWinDesktop'
-    inputs:
-      archiveFilePatterns: '$(System.ArtifactsDirectory)/packages/PowerShell-*-win-fxdependentWinDesktop.zip'
-      destinationFolder: '$(winFxdWinDesktopPath)'
-
-  - task: ExtractFiles@1
-    displayName: 'Extract files linux-fxdependent'
-    inputs:
-      archiveFilePatterns: '$(System.ArtifactsDirectory)/packages/powershell-*-linux-x64-fxdependent.tar.gz'
-      destinationFolder: '$(linuxFxdPath)'
-
-  - task: ExtractFiles@1
-    displayName: 'Extract files alpine-fxdependent'
-    inputs:
-      archiveFilePatterns: '$(System.ArtifactsDirectory)/packages/powershell-*-linux-x64-musl-noopt-fxdependent.tar.gz'
-      destinationFolder: '$(alpineFxdPath)'
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - template: shouldSign.yml
-
-  - task: NuGetToolInstaller@1
-    displayName: 'Install NuGet.exe'
-
-  # Create nuget packages along with SBOM manifests.
-  - template: nuget-pkg-sbom.yml
-    parameters:
-      PackageVersion: $(Version)
-      PackagePath: $(PackagePath)
-      WinFxdPath: $(winFxdPath)
-      LinuxFxdPath: $(linuxFxdPath)
-
-  - pwsh: |
-      Get-ChildItem $(linuxFxdPath)
-      Get-ChildItem $(winFxdPath)
-      Get-ChildItem $(winFxdWinDesktopPath)
-      Get-ChildItem $(alpineFxdPath)
-    displayName: Capture fxd folders
-
-  # Create Global Tool packages along with SBOM manifests
-  - template: global-tool-pkg-sbom.yml
-    parameters:
-      PackageVersion: $(Version)
-      LinuxBinPath: $(linuxFxdPath)
-      WindowsBinPath: $(winFxdPath)
-      WindowsDesktopBinPath: $(winFxdWinDesktopPath)
-      AlpineBinPath: $(alpineFxdPath)
-      DestinationPath: $(PackagePath)\globaltool
-
-  - pwsh: |
-      Get-ChildItem "$(PackagePath)" -Recurse
-    displayName: Capture generated packages
-
-  - template: EsrpSign.yml@ComplianceRepo
-    parameters:
-        buildOutputPath: $(PackagePath)
-        signOutputPath: $(System.ArtifactsDirectory)\signed
-        certificateId: "CP-401405"
-        pattern: |
-          **\*.nupkg
-        useMinimatch: true
-        shouldSign: $(SHOULD_SIGN)
-        displayName: Sign NuPkg
-
-  - pwsh: |
-      if (-not (Test-Path '$(System.ArtifactsDirectory)\signed\')) { $null = New-Item -ItemType Directory -Path '$(System.ArtifactsDirectory)\signed\' }
-      Copy-Item -Path '$(PackagePath)\*.nupkg' -Destination '$(System.ArtifactsDirectory)\signed\' -Verbose -Force
-      Copy-Item -Path '$(PackagePath)\globaltool\*.nupkg' -Destination '$(System.ArtifactsDirectory)\signed\' -Verbose -Force
-    displayName: Fake copy when not signing
-    condition: eq(variables['SHOULD_SIGN'], 'false')
-
-  - 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
-    condition: eq(variables['SHOULD_SIGN'], 'true')
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run MpCmdRun.exe'
-    inputs:
-      FileDirPath: '$(PackagePath)'
-      TreatStaleSignatureAs: Warning
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
-    displayName: 'Publish Security Analysis Logs'
-
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: '$(System.ArtifactsDirectory)\signed'
-
-  - pwsh: |
-      if (-not (Test-Path "$(System.ArtifactsDirectory)\signed\globaltool"))
-      {
-        $null = New-Item -Path "$(System.ArtifactsDirectory)\signed\globaltool" -ItemType Directory -Force
-      }
-
-      Move-Item -Path "$(System.ArtifactsDirectory)\signed\PowerShell.*" -Destination "$(System.ArtifactsDirectory)\signed\globaltool" -Force
-      Get-ChildItem "$(System.ArtifactsDirectory)\signed\globaltool" -Recurse
-    displayName: Move global tool packages to subfolder and capture
-
-  - pwsh: |
-      $packagePath = (Join-Path $(System.ArtifactsDirectory) checksum)
-      New-Item $packagePath -ItemType Directory -Force > $null
-      $srcPaths = @("$(System.ArtifactsDirectory)\finalResults", "$(System.ArtifactsDirectory)\macosPkgResults", "$(System.ArtifactsDirectory)\signed")
-
-      $packages  = Get-ChildItem -Path $srcPaths -Include *.zip, *.tar.gz, *.msi*, *.pkg, *.deb, *.rpm -Exclude "PowerShell-Symbols*" -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 -Exclude "SHA512SUMS" |
-          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\' -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 -Exclude "SHA512SUMS" |
-          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 for global tools
-
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: '$(System.ArtifactsDirectory)\checksum'
-      artifactFilter: SHA512SUMS
-
-  - task: AzureFileCopy@4
-    displayName: 'Upload NuGet packages to Azure'
-    inputs:
-      SourcePath: '$(System.ArtifactsDirectory)\signed\*'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)-nuget'
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-    retryCountOnTaskFailure: 2
-
-  - task: AzureFileCopy@4
-    displayName: 'Upload global tool packages to Azure'
-    inputs:
-      sourcePath: '$(System.ArtifactsDirectory)\signed\globaltool\*'
-      azureSubscription: '$(GlobalToolSubscription)'
-      Destination: AzureBlob
-      storage: '$(GlobalToolStorageAccount)'
-      ContainerName: 'tool-private'
-      blobPrefix: '$(Version)'
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
-    retryCountOnTaskFailure: 2
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(PackagePath)'
diff --git a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
deleted file mode 100644
index d183601a06c..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-steps:
-- checkout: self
-  clean: true
-
-- task: DownloadPipelineArtifact@2
-  inputs:
-    source: specific
-    project: PowerShellCore
-    pipeline: '696'
-    preferTriggeringPipeline: true
-    runVersion: latestFromBranch
-    runBranch: '$(Build.SourceBranch)'
-    artifact: BuildInfoJson
-    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
-
-    $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.Latest
-    $ltsRelease = $metadata.LTSRelease.Latest
-
-    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"
-    ConvertTo-Json -InputObject $buildInfo | Out-File $targetFile -Encoding ascii
-
-    if ($stableRelease -or $fileName -eq "preview.json") {
-      Set-BuildVariable -Name CopyMainBuildInfo -Value YES
-    } else {
-      Set-BuildVariable -Name CopyMainBuildInfo -Value NO
-    }
-
-    Set-BuildVariable -Name BuildInfoJsonFile -Value $targetFile
-
-    ## Create 'lts.json' if it's the latest stable and also a LTS release.
-
-    if ($fileName -eq "stable.json") {
-      if ($ltsRelease) {
-        $ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
-        Copy-Item -Path $targetFile -Destination $ltsFile -Force
-        Set-BuildVariable -Name LtsBuildInfoJsonFile -Value $ltsFile
-        Set-BuildVariable -Name CopyLTSBuildInfo -Value YES
-      } else {
-        Set-BuildVariable -Name CopyLTSBuildInfo -Value NO
-      }
-
-      $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
-      Set-BuildVariable -Name VersionBuildInfoJsonFile -Value $versionFile
-      Set-BuildVariable -Name CopyVersionBuildInfo -Value YES
-    } else {
-      Set-BuildVariable -Name CopyVersionBuildInfo -Value NO
-    }
-  displayName: Download and Capture NuPkgs
-
-- task: AzureFileCopy@4
-  displayName: 'AzureBlob build info JSON file Copy'
-  inputs:
-    SourcePath: '$(BuildInfoJsonFile)'
-    azureSubscription: '$(AzureFileCopySubscription)'
-    Destination: AzureBlob
-    storage: '$(StorageAccount)'
-    ContainerName: BuildInfo
-  condition: and(succeeded(), eq(variables['CopyMainBuildInfo'], 'YES'))
-  retryCountOnTaskFailure: 2
-
-- task: AzureFileCopy@4
-  displayName: 'AzureBlob build info ''lts.json'' Copy when needed'
-  inputs:
-    SourcePath: '$(LtsBuildInfoJsonFile)'
-    azureSubscription: '$(AzureFileCopySubscription)'
-    Destination: AzureBlob
-    storage: '$(StorageAccount)'
-    ContainerName: BuildInfo
-  condition: and(succeeded(), eq(variables['CopyLTSBuildInfo'], 'YES'))
-  retryCountOnTaskFailure: 2
-
-- task: AzureFileCopy@4
-  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'))
-  retryCountOnTaskFailure: 2
diff --git a/tools/releaseBuild/azureDevOps/templates/release-CopyGlobalTools.yml b/tools/releaseBuild/azureDevOps/templates/release-CopyGlobalTools.yml
deleted file mode 100644
index 7c9306496ed..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-CopyGlobalTools.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-parameters:
-- name: sourceContainerName
-  type: string
-  default: 'source-container'
-
-- name: destinationContainerName
-  type: string
-  default: 'destination-container'
-
-- name: sourceStorageAccountName
-  type: string
-  default: 'source-storage-account'
-
-- name: destinationStorageAccountName
-  type: string
-  default: 'destination-storage-account'
-
-- name: blobPrefix
-  type: string
-  default: '$(Version)'
-
-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
-    Write-Verbose -Verbose "Found AzCopy: $azcopy"
-
-    $sourceContainerName = "${{ parameters.sourceContainerName }}"
-    $destinationContainerName = "${{ parameters.destinationContainerName }}"
-    $sourceStorageAccountName = "${{ parameters.sourceStorageAccountName }}"
-    $destinationStorageAccountName = "${{ parameters.destinationStorageAccountName }}"
-    $blobPrefix = "${{ parameters.blobPrefix }}"
-
-    $sourceBlobUrl = "https://${sourceStorageAccountName}.blob.core.windows.net/${sourceContainerName}/${blobPrefix}"
-    Write-Verbose -Verbose "Source blob url: $sourceBlobUrl"
-    $destinationBlobUrl = "https://${destinationStorageAccountName}.blob.core.windows.net/${destinationContainerName}"
-    Write-Verbose -Verbose "Destination blob url: $destinationBlobUrl"
-
-    & $azcopy cp $sourceBlobUrl $destinationBlobUrl --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: Copy blobs
-  retryCountOnTaskFailure: 2
-  env:
-    AZCOPY_AUTO_LOGIN_TYPE: MSI
diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
deleted file mode 100644
index 64c4d1b6a24..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-steps:
-- checkout: self
-  clean: true
-
-- download: none
-
-- template: release-SetReleaseTagAndContainerName.yml
-
-- pwsh: |
-    Import-module '$(BUILD.SOURCESDIRECTORY)/PowerShell/build.psm1'
-    Install-AzCopy
-  displayName: Install AzCopy
-  retryCountOnTaskFailure: 2
-
-- pwsh: |
-    Import-module '$(BUILD.SOURCESDIRECTORY)/PowerShell/build.psm1'
-    $azcopy = Find-AzCopy
-    Write-Verbose -Verbose "Found AzCopy: $azcopy"
-
-    & $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_AUTO_LOGIN_TYPE: MSI
-
-- pwsh: |
-    Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty FullName
-  displayName: Capture downloaded artifacts
-
-- pwsh: |
-    git clone https://$(AzureDevOpsPat)@mscodehub.visualstudio.com/PowerShellCore/_git/Internal-PowerShellTeam-Tools '$(Pipeline.Workspace)/tools'
-  displayName: Clone Internal-Tools repository
-
-- pwsh: |
-    $Path = "$(PackagesRoot)"
-    $OutputPath = Join-Path $Path ‘hashes.sha256’
-    $srcPaths = @($Path)
-    $packages  = Get-ChildItem -Path $srcPaths -Include * -Recurse -File
-    $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
-
-- checkout: ComplianceRepo
-
-- pwsh: |
-    $releaseVersion = '$(ReleaseTag)' -replace '^v',''
-    $vstsCommandString = "vso[task.setvariable variable=ReleaseVersion]$releaseVersion"
-    Write-Host "sending " + $vstsCommandString
-    Write-Host "##$vstsCommandString"
-  displayName: 'Set release version'
-
-- template: Sbom.yml@ComplianceRepo
-  parameters:
-    BuildDropPath: '$(PackagesRoot)'
-    Build_Repository_Uri: 'https://github.com/powershell/powershell.git'
-    displayName: PowerShell Hashes SBOM
-    packageName: PowerShell Artifact Hashes
-    packageVersion: $(ReleaseVersion)
-    sourceScanPath: '$(PackagesRoot)'
-
-- pwsh: |
-    Import-module '$(Pipeline.Workspace)/tools/Scripts/GitHubRelease.psm1'
-    $releaseVersion = '$(ReleaseTag)' -replace '^v',''
-    $semanticVersion = [System.Management.Automation.SemanticVersion]$releaseVersion
-
-    $isPreview = $semanticVersion.PreReleaseLabel -ne $null
-
-    $fileName = if ($isPreview) {
-      "preview.md"
-    }
-    else {
-      $semanticVersion.Major.ToString() + "." + $semanticVersion.Minor.ToString() + ".md"
-    }
-
-    $filePath = "$env:BUILD_SOURCESDIRECTORY/PowerShell/CHANGELOG/$fileName"
-    Write-Verbose -Verbose "Selected Log file: $filePath"
-
-    if (-not (Test-Path $filePath)) {
-      throw "$filePath not found"
-    }
-
-    $changelog = Get-Content -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) { $_}
-      } | Out-String
-
-    Write-Verbose -Verbose "Selected content: `n$clContent"
-
-    Publish-ReleaseDraft -Tag '$(ReleaseTag)' -Name '$(ReleaseTag) Release of PowerShell' -Description $clContent -User PowerShell -Repository PowerShell  -PackageFolder $(PackagesRoot) -Token $(GitHubReleasePat)
-  displayName: Publish Release Draft
diff --git a/tools/releaseBuild/azureDevOps/templates/release-MakeContainerPublic.yml b/tools/releaseBuild/azureDevOps/templates/release-MakeContainerPublic.yml
deleted file mode 100644
index 65d5ea50191..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-MakeContainerPublic.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-steps:
-- download: none
-
-- template: release-SetReleaseTagAndContainerName.yml
-
-- pwsh: |
-    az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)
-  displayName: az login
-
-- pwsh: |
-    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
diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
deleted file mode 100644
index a9591b2d251..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-jobs:
-- job: CreateMSIXBundle
-  displayName: Create .msixbundle file
-
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-
-  variables:
-    - group: msixTools
-    - group: 'Azure Blob variable group'
-
-  steps:
-    - template: release-SetReleaseTagAndContainerName.yml
-
-    - task: DownloadPipelineArtifact@2
-      retryCountOnTaskFailure: 2
-      inputs:
-        source: specific
-        project: PowerShellCore
-        pipeline: '696'
-        preferTriggeringPipeline: true
-        runVersion: latestFromBranch
-        runBranch: '$(Build.SourceBranch)'
-        artifact: finalResults
-        patterns: '**/*.msix'
-        path: '$(Pipeline.Workspace)\releasePipeline\msix'
-
-    - pwsh: |
-        $cmd = Get-Command makeappx.exe -ErrorAction Ignore
-        if ($cmd) {
-            Write-Verbose -Verbose 'makeappx available in PATH'
-            $exePath = $cmd.Source
-        } else {
-            $toolsDir = '$(Pipeline.Workspace)\releasePipeline\tools'
-            New-Item $toolsDir -Type Directory -Force > $null
-            Invoke-RestMethod -Uri '$(makeappUrl)' -OutFile "$toolsDir\makeappx.zip"
-            Expand-Archive "$toolsDir\makeappx.zip" -DestinationPath "$toolsDir\makeappx" -Force
-            $exePath = "$toolsDir\makeappx\makeappx.exe"
-
-            Write-Verbose -Verbose 'makeappx was installed:'
-            Get-ChildItem -Path $toolsDir -Recurse
-        }
-
-        $vstsCommandString = "vso[task.setvariable variable=MakeAppxPath]$exePath"
-        Write-Host "sending " + $vstsCommandString
-        Write-Host "##$vstsCommandString"
-      displayName: Install makeappx tool
-      retryCountOnTaskFailure: 1
-
-    - pwsh: |
-        $sourceDir = '$(Pipeline.Workspace)\releasePipeline\msix'
-        $file = Get-ChildItem $sourceDir | Select-Object -First 1
-        $prefix = ($file.BaseName -split "-win")[0]
-        $pkgName = "$prefix.msixbundle"
-        Write-Verbose -Verbose "Creating $pkgName"
-
-        $makeappx = '$(MakeAppxPath)'
-        $outputDir = "$sourceDir\output"
-        New-Item $outputDir -Type Directory -Force > $null
-        & $makeappx bundle /d $sourceDir /p "$outputDir\$pkgName"
-
-        Get-ChildItem -Path $sourceDir -Recurse
-        $vstsCommandString = "vso[task.setvariable variable=BundleDir]$outputDir"
-        Write-Host "sending " + $vstsCommandString
-        Write-Host "##$vstsCommandString"
-      displayName: Create MsixBundle
-      retryCountOnTaskFailure: 1
-
-    - task: AzureFileCopy@4
-      displayName: 'Upload MSIX Bundle package to Az Blob'
-      retryCountOnTaskFailure: 2
-      inputs:
-        SourcePath: '$(BundleDir)/*.msixbundle'
-        azureSubscription: '$(AzureFileCopySubscription)'
-        Destination: AzureBlob
-        storage: '$(StorageAccount)'
-        ContainerName: '$(AzureVersion)-private'
-        resourceGroup: '$(StorageResourceGroup)'
-      condition: succeeded()
diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
deleted file mode 100644
index 0333c77b88c..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-parameters:
-  - name: skipPublish
-    default: false
-    type: boolean
-
-steps:
-- template: release-SetReleaseTagAndContainerName.yml
-
-- pwsh: |
-    $packageVersion = '$(ReleaseTag)'.ToLowerInvariant() -replace '^v',''
-    $vstsCommandString = "vso[task.setvariable variable=packageVersion]$packageVersion"
-    Write-Host "sending " + $vstsCommandString
-    Write-Host "##$vstsCommandString"
-  displayName: Set Package version
-
-- pwsh: |
-    $branch = 'main-mirror'
-    $gitArgs = "clone",
-    "--verbose", 
-    "--branch",
-    "$branch",
-    "https://$(AzureDevOpsPat)@mscodehub.visualstudio.com/PowerShellCore/_git/Internal-PowerShellTeam-Tools", 
-    '$(Pipeline.Workspace)/tools'
-    $gitArgs | Write-Verbose -Verbose
-    git $gitArgs
-  displayName: Clone Internal-PowerShellTeam-Tools from MSCodeHub
-
-- task: PipAuthenticate@1
-  inputs:
-    artifactFeeds: 'pmc'
-    pythonDownloadServiceConnections: pmcDownload
-
-- pwsh: |
-    pip install pmc-cli
-
-    $newPath = (resolve-path '~/.local/bin').providerpath
-    $vstsCommandString = "vso[task.setvariable variable=PATH]${env:PATH}:$newPath"
-    Write-Host "sending " + $vstsCommandString
-    Write-Host "##$vstsCommandString"
-  displayName: Install pmc cli
-  
-- pwsh: |
-    $metadata = Get-Content -Path "$(Build.SourcesDirectory)/tools/metadata.json" -Raw | ConvertFrom-Json
-    $params = @{
-        ReleaseTag = "$(ReleaseTag)"
-        AadClientId = "$(PmcCliClientID)"
-        BlobFolderName = "$(AzureVersion)"
-        LTS = $metadata.LTSRelease.Latest
-        ForProduction = $true
-        SkipPublish = $${{ parameters.skipPublish }}
-        MappingFilePath = '$(System.DefaultWorkingDirectory)/tools/packages.microsoft.com/mapping.json'
-    }
-    
-    $params | Out-String -width 9999 -Stream | write-Verbose -Verbose
-
-    & '$(Pipeline.Workspace)/tools/packages.microsoft.com-v4/releaseLinuxPackages.ps1' @params
-  displayName: Run release script
diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishSymbols.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishSymbols.yml
deleted file mode 100644
index db2cc86e259..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-PublishSymbols.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-steps:
-- task: DownloadPipelineArtifact@2
-  inputs:
-    source: specific
-    project: PowerShellCore
-    pipeline: '696'
-    preferTriggeringPipeline: true
-    runVersion: latestFromBranch
-    runBranch: '$(Build.SourceBranch)'
-    artifact: results
-    path: '$(Pipeline.Workspace)\results'
-    itemPattern: |
-      **/*
-      !**/*signed.zip
-
-- pwsh: |
-    Write-Verbose -Verbose "Enumerating $(Pipeline.Workspace)\results"
-    $downloadedArtifacts = Get-ChildItem -Recurse "$(Pipeline.Workspace)\results"
-    $downloadedArtifacts
-    $expandedRoot = New-Item -Path "$(Pipeline.Workspace)/expanded" -ItemType Directory -Verbose
-    $symbolsRoot = New-Item -Path "$(Pipeline.Workspace)/symbols" -ItemType Directory -Verbose
-
-    $downloadedArtifacts | ForEach-Object {
-      $destFolder = New-Item -Path "$expandedRoot/$($_.BaseName)/" -ItemType Directory -Verbose
-      Expand-Archive -Path $_.FullName -DestinationPath $destFolder -Force
-
-      $symbolsZipFile = Join-Path -Path $destFolder -ChildPath "symbols.zip"
-      $symbolZipFileContents = New-Item -Path "$destFolder/Symbols-$($_.BaseName)" -ItemType Directory -Verbose
-      Expand-Archive -Path $symbolsZipFile -DestinationPath $symbolZipFileContents -Force
-
-      $symbolsToPublish = New-Item -Path "$symbolsRoot/$($_.BaseName)" -ItemType Directory -Verbose
-
-      Get-ChildItem -Path $symbolZipFileContents -Recurse -Filter '*.pdb' | ForEach-Object {
-        Copy-Item -Path $_.FullName -Destination $symbolsToPublish -Verbose
-      }
-    }
-
-    Write-Verbose -Verbose "Enumerating $symbolsRoot"
-    Get-ChildItem -Path $symbolsRoot -Recurse
-    $vstsCommandString = "vso[task.setvariable variable=SymbolsPath]$symbolsRoot"
-    Write-Verbose -Message "$vstsCommandString" -Verbose
-    Write-Host -Object "##$vstsCommandString"
-  displayName: Expand and capture symbols folders
-- task: PublishSymbols@2
-  inputs:
-    symbolsFolder: '$(SymbolsPath)'
-    searchPattern: '**/*.pdb'
-    indexSources: false
-    publishSymbols: true
-    symbolServerType: teamServices
-    detailedLog: true
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
deleted file mode 100644
index 33a72f56bbb..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-parameters:
-  - name: skipPublish
-    default: false
-    type: boolean
-    
-steps:
-- task: DownloadPipelineArtifact@2
-  condition: and(eq('${{ parameters.skipPublish }}', 'false'), succeeded())
-  inputs:
-    source: specific
-    project: PowerShellCore
-    pipeline: '696'
-    preferTriggeringPipeline: true
-    runVersion: latestFromBranch
-    runBranch: '$(Build.SourceBranch)'
-    artifact: finalResults
-    patterns: '**/*.nupkg'
-    path: '$(Pipeline.Workspace)/releasePipeline/finalResults'
-
-- task: DownloadPipelineArtifact@2
-  condition: and(eq('${{ parameters.skipPublish }}', 'false'), succeeded())
-  inputs:
-    source: specific
-    project: PowerShellCore
-    pipeline: '696'
-    preferTriggeringPipeline: true
-    runVersion: latestFromBranch
-    runBranch: '$(Build.SourceBranch)'
-    artifact: metadata
-    path: '$(Pipeline.Workspace)/releasePipeline/metadata'
-
-- pwsh: |
-    #Exclude all global tool packages. Their names start with 'PowerShell.'
-    $null = New-Item -ItemType Directory -Path "$(Pipeline.Workspace)/release"
-    Copy-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force -Verbose
-
-    $releaseVersion = Get-Content "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion'
-    $globalToolPath = "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell.$releaseVersion.nupkg"
-
-    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
-  condition: and(eq('${{ parameters.skipPublish }}', 'false'), succeeded())
-
-- task: NuGetCommand@2
-  displayName: 'NuGet push'
-  condition: and(eq('${{ parameters.skipPublish }}', 'false'), succeeded())
-  inputs:
-    command: push
-    packagesToPush: '$(Pipeline.Workspace)/release/*.nupkg'
-    nuGetFeedType: external
-    publishFeedCredentials: PowerShellNuGetOrgPush
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
deleted file mode 100644
index 880967a37a7..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-parameters:
-  jobName: ""
-  displayName: ""
-  imageName: ""
-
-jobs:
-- job: ${{ parameters.jobName }}
-  displayName: ${{ parameters.displayName }}
-  pool:
-    # testing
-    vmImage: ${{ parameters.imageName }}
-  variables:
-  - group: AzDevOpsArtifacts
-  - group: DotNetPrivateBuildAccess
-  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: '**/*.nupkg'
-        path: '$(Pipeline.Workspace)/releasePipeline/finalResults'
-
-    - 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)/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
-
-        # Channel is like: $Channel = "5.0.1xx-preview2"
-        $Channel = $dotnetMetadataJson.sdk.channel
-
-        $sdkVersion = (Get-Content "$(Build.SourcesDirectory)/global.json" -Raw | ConvertFrom-Json).sdk.version
-        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-
-        Find-Dotnet
-
-        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
-
-            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
-        #Install-Dotnet -Channel "$Channel" -Version $sdkVersion
-
-        Start-PSBootstrap
-
-        Write-Verbose -Message "Installing .NET SDK completed." -Verbose
-
-      displayName: Install .NET
-      env:
-        __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-    - pwsh: |
-        $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-        Start-PSBootstrap
-
-        $localLocation = "$(Pipeline.Workspace)/releasePipeline/finalResults"
-        $xmlElement = @"
-          <add key=`"local`" value=`"$localLocation`" />
-          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v2" />
-        </packageSources>
-        "@
-
-        $releaseVersion = Get-Content "$(Pipeline.Workspace)/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion'
-
-        Set-Location -Path $(Build.SourcesDirectory)/test/hosting
-
-        Get-ChildItem
-
-        ## register the packages download directory in the nuget file
-        $nugetConfigContent = Get-Content ./NuGet.Config -Raw
-        $updateNugetContent = $nugetConfigContent.Replace("</packageSources>", $xmlElement)
-
-        $updateNugetContent | Out-File ./NuGet.Config -Encoding ascii
-
-        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"
-
-      displayName: Restore and execute tests
-      env:
-        __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-    - task: PublishTestResults@2
-      displayName: 'Publish Test Results **\test-hosting.xml'
-      inputs:
-        testResultsFormat: XUnit
-        testResultsFiles: '**\test-hosting.xml'
diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
deleted file mode 100644
index fa42064602e..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-jobs:
-- job: UpdateDepsFiles
-  displayName: Update deps files
-
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-
-  variables:
-  - group: 'Azure Blob variable group'
-  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: '**/PowerShell*-win-x64.zip'
-      path: '$(Pipeline.Workspace)/releasePipeline/finalResults'
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      source: specific
-      project: PowerShellCore
-      pipeline: '696'
-      preferTriggeringPipeline: true
-      runVersion: latestFromBranch
-      runBranch: '$(Build.SourceBranch)'
-      artifact: BuildInfoJson
-      path: '$(Pipeline.Workspace)/releasePipeline/BuildInfoJson'
-
-  - pwsh: |
-      $fileName = (Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/BuildInfoJson/*.json").BaseName
-      if ($fileName -notin 'stable','preview')
-      {
-        throw "Unexpected fileName: $fileName"
-      }
-
-      $vstsCommand = "vso[task.setvariable variable=BlobPrefix]$fileName"
-      Write-Verbose -Verbose $vstsCommand
-      Write-Host "##$vstsCommand"
-    displayName: Determine container name
-
-  - pwsh: |
-      $zipFile = Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell*-win-x64.zip" -Exclude *-symbols-*
-      Write-Verbose -Verbose "zipFile: $zipFile"
-      Expand-Archive -Path $zipFile -Destination "$ENV:PIPELINE_WORKSPACE/expanded"
-
-      $pwshDepsFile = Get-Item "$ENV:PIPELINE_WORKSPACE/expanded/pwsh.deps.json"
-      $vstsCommand = "vso[task.setvariable variable=FileToUpload]$pwshDepsFile"
-      Write-Verbose -Verbose $vstsCommand
-      Write-Host "##$vstsCommand"
-    displayName: Determine file to upload
-
-  - task: AzureFileCopy@4
-    displayName: 'AzureBlob pwsh.deps.json file Copy'
-    inputs:
-      SourcePath: '$(FileToUpload)'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: ps-deps-json
-      blobPrefix: '$(BlobPrefix)'
-    retryCountOnTaskFailure: 2
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
deleted file mode 100644
index 7f2c816a20f..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-parameters:
-  jobName: ""
-  displayName: ""
-  imageName: ""
-  packageNamePattern: ""
-  use1ES: false
-
-jobs:
-- job: ${{ parameters.jobName }}
-  displayName: ${{ parameters.displayName }}
-  variables:
-  - group: DotNetPrivateBuildAccess
-  pool:
-    ${{ if eq(parameters.use1ES, 'false') }}:
-      vmImage: ${{ parameters.imageName }}
-    ${{ else }}:
-      name: 'PS-MSCodeHub-ARM' # add ImageOverride to select image
-  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: |
-        $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:
-        __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-    - 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: |
-        $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' }
-        $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"
-        }
-      displayName: Test package
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
deleted file mode 100644
index 3fd560cbd00..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-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
-
-- task: DownloadPipelineArtifact@2
-  inputs:
-    source: specific
-    project: PowerShellCore
-    pipeline: '696'
-    preferTriggeringPipeline: true
-    runVersion: latestFromBranch
-    runBranch: '$(Build.SourceBranch)'
-    artifact: finalResults
-    path: $(System.ArtifactsDirectory)
-
-
-- 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/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
deleted file mode 100644
index 8e41fbc4a55..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-steps:
-- 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: |
-    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-    $azcopy = Find-AzCopy
-    Write-Verbose -Verbose "Found AzCopy: $azcopy"
-
-    & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)/* $(System.ArtifactsDirectory) --recursive
-
-  displayName: Download Azure Artifacts
-  env:
-    AZCOPY_AUTO_LOGIN_TYPE: MSI
-
-- pwsh: |
-    Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
-  displayName: Capture Artifact Listing
-
-- 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|cm).(x86_64|aarch64)\.rpm')
-        {
-            $messageInstance = "$($_.Name) is not a valid package name"
-            $message += $messageInstance
-            Write-Warning $messageInstance
-        }
-    }
-    if($message.count -gt 0){throw ($message | out-string)}
-  displayName: Validate RPM package names
-
-- 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-musl)+\-(x64\-fxdependent|x64|arm32|arm64|x64\-musl-noopt\-fxdependent)\.(tar\.gz)')
-        {
-            $messageInstance = "$($_.Name) is not a valid package name"
-            $message += $messageInstance
-            Write-Warning $messageInstance
-        }
-    }
-    if($message.count -gt 0){throw ($message | out-string)}
-  displayName: Validate Tar.Gz Package Names
-
-- 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')
-        {
-            $messageInstance = "$($_.Name) is not a valid package name"
-            $message += $messageInstance
-            Write-Warning $messageInstance
-        }
-    }
-    if($message.count -gt 0){throw ($message | out-string)}
-  displayName: Validate PKG Package Names
-
-- 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|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
-        {
-            $messageInstance = "$($_.Name) is not a valid package name"
-            $message += $messageInstance
-            Write-Warning $messageInstance
-        }
-    }
-
-    if($message.count -gt 0){throw ($message | out-string)}
-  displayName: Validate Zip and MSI Package Names
-
-- 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')
-        {
-            $messageInstance = "$($_.Name) is not a valid package name"
-            $message += $messageInstance
-            Write-Warning $messageInstance
-        }
-    }
-    if($message.count -gt 0){throw ($message | out-string)}
-  displayName: Validate Deb Package Names
diff --git a/tools/releaseBuild/azureDevOps/templates/sign-build-file.yml b/tools/releaseBuild/azureDevOps/templates/sign-build-file.yml
deleted file mode 100644
index a584e15e27c..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/sign-build-file.yml
+++ /dev/null
@@ -1,328 +0,0 @@
-steps:
-- pwsh: |
-    $platform = '$(runtime)' -match '^linux' ? 'linux' : 'windows'
-    $vstsCommandString = "vso[task.setvariable variable=ArtifactPlatform]$platform"
-    Write-Host ("sending " + $vstsCommandString)
-    Write-Host "##$vstsCommandString"
-  displayName: Set artifact platform
-
-- task: DownloadPipelineArtifact@2
-  inputs:
-    artifactName: '$(unsignedBuildArtifactContainer)'
-    itemPattern: '$(unsignedBuildArtifactName)'
-
-- pwsh: |
-    Get-ChildItem "$(Pipeline.Workspace)\*" -Recurse
-  displayName: 'Capture Downloaded Artifacts'
-  # Diagnostics is not critical it passes every time it runs
-  continueOnError: true
-
-- checkout: self
-  clean: true
-  path: $(repoFolder)
-
-- template: SetVersionVariables.yml
-  parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-- template: cloneToOfficialPath.yml
-
-- pwsh: |
-    $zipFileFilter = '$(unsignedBuildArtifactName)'
-    $zipFileFilter = $zipFileFilter.Replace('**/', '')
-
-    Write-Verbose -Verbose -Message "zipFileFilter = $zipFileFilter"
-
-    Write-Verbose -Verbose -Message "Looking for $(Pipeline.Workspace)\$(unsignedBuildArtifactName)"
-
-    $zipFilePath = Get-ChildItem -Path '$(Pipeline.Workspace)\$(unsignedBuildArtifactName)' -recurse
-
-    if (-not (Test-Path $zipFilePath))
-    {
-        throw "zip file not found: $zipfilePath"
-    }
-
-    if ($zipFilePath.Count -ne 1) {
-      Write-Verbose "zip filename" -verbose
-      $zipFilePath | Out-String | Write-Verbose -Verbose
-      throw 'multiple zip files found when 1 was expected'
-    }
-
-    $expandedFolderName = [System.io.path]::GetFileNameWithoutExtension($zipfilePath)
-    $expandedFolderPath = Join-Path '$(Pipeline.Workspace)' 'expanded' $expandedFolderName
-
-    Write-Verbose -Verbose -Message "Expaning $zipFilePath to $expandedFolderPath"
-
-    New-Item -Path $expandedFolderPath -ItemType Directory
-    Expand-Archive -Path $zipFilePath -DestinationPath $expandedFolderPath
-
-    if (-not (Test-Path $expandedFolderPath\pwsh.exe) ) {
-      throw 'zip did not expand as expected'
-    }
-    else {
-      $vstsCommandString = "vso[task.setvariable variable=BinPath]$expandedFolderPath"
-      Write-Host ("sending " + $vstsCommandString)
-      Write-Host "##$vstsCommandString"
-    }
-
-  displayName: Expand zip packages
-  condition: eq(variables['ArtifactPlatform'], 'windows')
-
-- pwsh: |
-    $tarPackageName = '$(unsignedBuildArtifactName)'
-
-    Write-Verbose -Verbose -Message "tarPackageName = $tarPackageName"
-
-    $tarPackagePath = Join-Path '$(Pipeline.Workspace)' $tarPackageName
-
-    Write-Verbose -Verbose -Message "Looking for: $tarPackagePath"
-
-    $expandedPathFolderName = $tarPackageName -replace '.tar.gz', ''
-    $expandedFolderPath = Join-Path '$(Pipeline.Workspace)' 'expanded' $expandedPathFolderName
-
-    if (-not (Test-Path $tarPackagePath))
-    {
-        throw "tar file not found: $tarPackagePath"
-    }
-
-    Write-Verbose -Verbose -Message "Expanding $tarPackagePath to $expandedFolderPath"
-
-    New-Item -Path $expandedFolderPath -ItemType Directory
-    tar -xf $tarPackagePath -C $expandedFolderPath
-
-    if (-not (Test-Path $expandedFolderPath/pwsh) ) {
-      throw 'tar.gz did not expand as expected'
-    }
-    else {
-      $vstsCommandString = "vso[task.setvariable variable=BinPath]$expandedFolderPath"
-      Write-Host ("sending " + $vstsCommandString)
-      Write-Host "##$vstsCommandString"
-    }
-
-    Write-Verbose -Verbose "File permisions after expanding"
-    Get-ChildItem -Path "$expandedFolderPath/pwsh" | Select-Object -Property 'unixmode', 'size', 'name'
-  displayName: Expand tar.gz packages
-  condition: eq(variables['ArtifactPlatform'], 'linux')
-
-- template: insert-nuget-config-azfeed.yml
-  parameters:
-    repoRoot: $(PowerShellRoot)
-
-- pwsh: |
-    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
-  path: $(complianceRepoFolder)
-
-- template: shouldSign.yml
-
-- pwsh: |
-    $fullSymbolsFolder = '$(BinPath)'
-    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('$(ArtifactPlatform)' -eq 'windows') {
-      $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: '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: Authenticode sign our binaries
-
-- pwsh: |
-    Import-Module $(PowerShellRoot)/build.psm1 -Force
-    Import-Module $(PowerShellRoot)/tools/packaging -Force
-    $signedFilesPath = '$(System.ArtifactsDirectory)\signed\'
-    $BuildPath = '$(BinPath)'
-    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"
-    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 {
-      $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: 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: 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 = '$(BinPath)'
-
-    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'))
-
-- pwsh: |
-      $uploadFolder = '$(BinPath)'
-      $containerName = '$(signedArtifactContainer)'
-
-      Write-Verbose -Verbose "File permissions after signing"
-      Get-ChildItem $uploadFolder\pwsh | Select-Object -Property 'unixmode', 'size', 'name'
-
-      $uploadTarFilePath = Join-Path '$(System.ArtifactsDirectory)' '$(signedBuildArtifactName)'
-      Write-Verbose -Verbose -Message "Creating tar.gz - $uploadTarFilePath"
-      tar -czvf $uploadTarFilePath -C $uploadFolder *
-
-      Get-ChildItem '$(System.ArtifactsDirectory)' | Out-String | Write-Verbose -Verbose
-
-      Write-Host "##vso[artifact.upload containerfolder=$containerName;artifactname=$containerName]$uploadTarFilePath"
-  displayName: Upload signed tar.gz files to artifacts
-  condition: eq(variables['ArtifactPlatform'], 'linux')
-  retryCountOnTaskFailure: 2
-
-
-- pwsh: |
-      $uploadFolder = '$(BinPath)'
-      $containerName = '$(signedArtifactContainer)'
-
-      Get-ChildItem $uploadFolder -Recurse | Out-String | Write-Verbose -Verbose
-
-      $uploadZipFilePath = Join-Path '$(System.ArtifactsDirectory)' 'PowerShell-$(Version)$(signedBuildArtifactName)'
-      Write-Verbose -Verbose -Message "Creating zip - $uploadZipFilePath"
-      Compress-Archive -Path $uploadFolder/* -DestinationPath $uploadZipFilePath -Verbose
-
-      Get-ChildItem '$(System.ArtifactsDirectory)' | Out-String | Write-Verbose -Verbose
-
-      Write-Host "##vso[artifact.upload containerfolder=$containerName;artifactname=$containerName]$uploadZipFilePath"
-  displayName: Upload signed zip files to artifacts
-  condition: eq(variables['ArtifactPlatform'], 'windows')
-  retryCountOnTaskFailure: 2
-
-
-- template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml b/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
deleted file mode 100644
index a7c7c640ce7..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
+++ /dev/null
@@ -1,189 +0,0 @@
-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"
-    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 {
-      $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 = '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
-  retryCountOnTaskFailure: 2
-
diff --git a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
deleted file mode 100644
index 72a677fec9a..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-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/upload-final-results.yml b/tools/releaseBuild/azureDevOps/templates/upload-final-results.yml
deleted file mode 100644
index 596b61fb6ed..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/upload-final-results.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  artifactPath:
-  artifactFilter: '*'
-  condition: succeeded()
-  artifactName: finalResults
-
-steps:
-  - powershell: |
-        Get-ChildItem -Path '${{ parameters.artifactPath }}' -Recurse -File -filter '${{ parameters.artifactFilter }}' -ErrorAction SilentlyContinue |
-            Select-Object -ExpandProperty FullName |
-                ForEach-Object {
-                    Write-Host "##vso[artifact.upload containerfolder=${{ parameters.artifactName }};artifactname=${{ parameters.artifactName }}]$_"
-                }
-    displayName: Upload ${{ parameters.artifactName }} Artifacts ${{ parameters.artifactFilter }} from ${{ parameters.artifactPath }}
-    condition: ${{ parameters.condition }}
-    retryCountOnTaskFailure: 2
-
diff --git a/tools/releaseBuild/azureDevOps/templates/upload.yml b/tools/releaseBuild/azureDevOps/templates/upload.yml
deleted file mode 100644
index c745a02c2a4..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/upload.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-parameters:
-  architecture: x86
-  version: 6.2.0
-  msi: yes
-  msix: yes
-  pdb: no
-
-steps:
-- template: upload-final-results.yml
-  parameters:
-    artifactPath: $(System.ArtifactsDirectory)\signed
-    artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}*.zip
-
-- task: AzureFileCopy@4
-  displayName: 'upload signed zip to Azure - ${{ parameters.architecture }}'
-  inputs:
-    SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.zip'
-    azureSubscription: '$(AzureFileCopySubscription)'
-    Destination: AzureBlob
-    storage: '$(StorageAccount)'
-    ContainerName: '$(AzureVersion)'
-    resourceGroup: '$(StorageResourceGroup)'
-  condition: succeeded()
-  retryCountOnTaskFailure: 2
-
-- task: AzureFileCopy@4
-  displayName: 'upload signed min-size package (for Guest Config) to Azure - ${{ parameters.architecture }}'
-  inputs:
-    SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}-gc.zip'
-    azureSubscription: '$(AzureFileCopySubscription)'
-    Destination: AzureBlob
-    storage: '$(StorageAccount)'
-    ContainerName: '$(AzureVersion)-gc'
-    resourceGroup: '$(StorageResourceGroup)'
-  condition: and(eq('${{ parameters.architecture }}', 'x64'), succeeded())
-  retryCountOnTaskFailure: 2
-
-- template: upload-final-results.yml
-  parameters:
-    artifactPath: $(System.ArtifactsDirectory)\signedPackages
-    artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe
-    condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
-
-- task: AzureFileCopy@4
-  displayName: 'upload signed exe to Azure - ${{ parameters.architecture }}'
-  inputs:
-    SourcePath: '$(System.ArtifactsDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe'
-    azureSubscription: '$(AzureFileCopySubscription)'
-    Destination: AzureBlob
-    storage: '$(StorageAccount)'
-    ContainerName: '$(AzureVersion)-private'
-    resourceGroup: '$(StorageResourceGroup)'
-  condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
-  retryCountOnTaskFailure: 2
-
-# Disable upload task as the symbols package is not currently used and we want to avoid publishing this in releases
-#- task: AzureFileCopy@4
-#  displayName: 'upload pbd zip to Azure - ${{ parameters.architecture }}'
-#  inputs:
-#    SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-Symbols-${{ parameters.version }}-win-${{ parameters.architecture }}.zip'
-#    azureSubscription: '$(AzureFileCopySubscription)'
-#    Destination: AzureBlob
-#    storage: '$(StorageAccount)'
-#    ContainerName: '$(AzureVersion)'
-#  condition: and(succeeded(), eq('${{ parameters.pdb }}', 'yes'))
-
-- template: upload-final-results.yml
-  parameters:
-    artifactPath: $(Build.StagingDirectory)\signedPackages
-    artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msix
-    condition: and(succeeded(), eq('${{ parameters.msix }}', 'yes'))
-
-- task: AzureFileCopy@4
-  displayName: 'upload signed msix to Azure - ${{ parameters.architecture }}'
-  inputs:
-    SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msix'
-    azureSubscription: '$(AzureFileCopySubscription)'
-    Destination: AzureBlob
-    storage: '$(StorageAccount)'
-    ContainerName: '$(AzureVersion)-private'
-    resourceGroup: '$(StorageResourceGroup)'
-  condition: and(succeeded(), eq('${{ parameters.msix }}', 'yes'), eq(variables['SHOULD_SIGN'], 'true'))
-  retryCountOnTaskFailure: 2
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
deleted file mode 100644
index 83779c75aa0..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-parameters:
-  architecture: x64
-
-jobs:
-- job: vpack_${{ parameters.architecture }}
-  variables:
-    - group: vPack
-    - group: ReleasePipelineSecrets
-
-  displayName: Build and Publish VPack - ${{ parameters.architecture }}
-  condition: succeeded()
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-  steps:
-  - 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)
-
-  - pwsh: |
-      Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-      Install-AzCopy
-    displayName: Install AzCopy
-    retryCountOnTaskFailure: 2
-
-  - pwsh: |
-      Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-      $azcopy = Find-AzCopy
-      Write-Verbose -Verbose "Found AzCopy: $azcopy"
-
-      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)/PowerShell-$(Version)-win-${{ parameters.architecture }}.zip $(System.ArtifactsDirectory)
-    displayName: 'Download Azure Artifacts'
-    retryCountOnTaskFailure: 2
-    env:
-      AZCOPY_AUTO_LOGIN_TYPE: MSI
-
-  - pwsh: 'Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name'
-    displayName: 'Capture Artifact Listing'
-
-  - 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|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
-          {
-                $messageInstance = "$($_.Name) is not a valid package name"
-                $message += $messageInstance
-                Write-Warning $messageInstance
-          }
-      }
-
-      if($message.count -gt 0){throw ($message | out-string)}
-    displayName: 'Validate Zip and MSI Package Names'
-
-  - 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}')
-          {
-              $destDir = "$(System.ArtifactsDirectory)\vpack${{ parameters.architecture }}"
-              $null = new-item -ItemType Directory -Path $destDir
-              Expand-Archive -Path $_.FullName -DestinationPath $destDir
-              $vstsCommandString = "vso[task.setvariable variable=vpackDir]$destDir"
-              Write-Host "sending " + $vstsCommandString
-              Write-Host "##$vstsCommandString"
-          }
-      }
-    displayName: 'Extract Zip'
-
-  - pwsh: |
-      $vpackVersion = '$(version)'
-
-      if('$(VPackPublishOverride)' -ne '' -and '$(VPackPublishOverride)' -ne 'None' )
-      {
-        Write-Host "Using VPackPublishOverride varabile"
-        $vpackVersion = '$(VPackPublishOverride)'
-      }
-
-      $vstsCommandString = "vso[task.setvariable variable=vpackVersion]$vpackVersion"
-      Write-Host "sending " + $vstsCommandString
-      Write-Host "##$vstsCommandString"
-    displayName: 'Set vpackVersion'
-
-  - pwsh: |
-      Get-ChildItem -Path env:
-    displayName: Capture Environment
-    condition: succeededOrFailed()
-
-  - task: PkgESVPack@12
-    displayName: 'Package ES - VPack '
-    inputs:
-      sourceDirectory: '$(vpackDir)'
-      description: PowerShell ${{ parameters.architecture }} $(version)
-      pushPkgName: 'PowerShell.${{ parameters.architecture }}'
-      configurations: Release
-      platforms: x64
-      target: '$(System.ArtifactsDirectory)'
-      owner: tplunk
-      provData: true
-      version: '$(vpackVersion)'
-      vpackToken: $(vPackPat)
-    condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
deleted file mode 100644
index 53947655d90..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-jobs:
-- job: ComponentRegistrationJob
-  variables:
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-  displayName: Component Registration
-  condition: succeeded()
-
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-
-  steps:
-  - checkout: self
-    clean: true
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - powershell: |
-       docker container prune --force
-       docker container ls --all --format '{{ json .ID }}' | ConvertFrom-Json | ForEach-Object {docker container rm --force --volumes $_}
-    displayName: 'Remove all containers'
-    # Cleanup is not critical it passes every time it runs
-    continueOnError: true
-
-  - powershell: |
-       docker image ls --format '{{ json .}}'|ConvertFrom-Json| ForEach-Object {
-           if($_.tag -eq '<none>')
-           {
-               $formatString = 'yyyy-MM-dd HH:mm:ss zz00'
-               $createdAtString = $_.CreatedAt.substring(0,$_.CreatedAt.Length -4)
-               $createdAt = [DateTime]::ParseExact($createdAtString, $formatString,[System.Globalization.CultureInfo]::InvariantCulture)
-               if($createdAt -lt (Get-Date).adddays(-1))
-               {
-                    docker image rm $_.ID
-               }
-           }
-       }
-       exit 0
-    displayName: 'Remove old images'
-    # Cleanup is not critical it passes every time it runs
-    continueOnError: true
-
-  - powershell: |
-       Write-verbose "--docker info---" -verbose
-       docker info
-       Write-verbose "--docker image ls---" -verbose
-       docker image ls
-       Write-verbose "--docker container ls --all---" -verbose
-       docker container ls --all
-    displayName: 'Capture Docker Info'
-    # Diagnostics is not critical it passes every time it runs
-    continueOnError: true
-
-  - template: insert-nuget-config-azfeed.yml
-
-  - powershell: |
-       ./tools/releaseBuild/vstsbuild.ps1 -ReleaseTag $(ReleaseTagVar) -Name win-x64-component-registration
-    displayName: 'Build Windows Universal - Component Registration'
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(componentregistration)'
-      snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
deleted file mode 100644
index 4b36f6f396e..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-parameters:
-  - name: BuildConfiguration
-    default: release
-  - name: BuildPlatform
-    default: any cpu
-  - name: Architecture
-    default: x64
-  - name: parentJob
-    default: ''
-
-jobs:
-- job: build_windows_${{ parameters.Architecture }}_${{ parameters.BuildConfiguration }}
-  displayName: Build Windows - ${{ parameters.Architecture }} ${{ parameters.BuildConfiguration }}
-  condition: succeeded()
-  dependsOn: ${{ parameters.parentJob }}
-  pool:
-    name: $(windowsPool)
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-  variables:
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - name: BuildConfiguration
-      value: ${{ parameters.BuildConfiguration }}
-    - name: BuildPlatform
-      value: ${{ parameters.BuildPlatform }}
-    - name: Architecture
-      value: ${{ parameters.Architecture }}
-    - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
-      value: 1
-    - group: DotNetPrivateBuildAccess
-
-  steps:
-
-  - checkout: self
-    clean: true
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - template: cloneToOfficialPath.yml
-
-  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
-    parameters:
-      repoRoot: $(PowerShellRoot)
-
-  - pwsh: |
-
-      $runtime = switch ($env:Architecture)
-        {
-          "x64" { "win7-x64" }
-          "x86" { "win7-x86" }
-          "arm64" { "win-arm64" }
-          "fxdependent" { "fxdependent" }
-          "fxdependentWinDesktop" { "fxdependent-win-desktop" }
-        }
-
-      $params = @{}
-      if ($env:BuildConfiguration -eq 'minSize') {
-        $params['ForMinimalSize'] = $true
-      }
-
-      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:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - pwsh: |
-      $packageName = (Get-ChildItem '$(Build.ArtifactStagingDirectory)\Symbols_$(Architecture)').FullName
-      $vstsCommandString = "vso[artifact.upload containerfolder=results;artifactname=results]$packageName"
-      Write-Host ("sending " + $vstsCommandString)
-      Write-Host "##$vstsCommandString"
-    displayName: Upload symbols package
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    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
deleted file mode 100644
index fdff7af73b1..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-parameters:
-  parentJobs: []
-
-jobs:
-- job: WinPackageSigningJob
-  displayName: Windows Package signing and upload
-  dependsOn:
-    ${{ parameters.parentJobs }}
-  condition: succeeded()
-  pool:
-    name: $(windowsPool)
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-  variables:
-    - 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:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - template: shouldSign.yml
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download artifacts'
-    inputs:
-      buildType: current
-      downloadType: single
-      artifactName: signed
-      downloadPath: '$(System.ArtifactsDirectory)'
-
-  - powershell: |
-      dir "$(System.ArtifactsDirectory)\*" -Recurse
-    displayName: 'Capture Downloaded Artifacts'
-    # Diagnostics is not critical it passes every time it runs
-    continueOnError: true
-
-  - template: EsrpSign.yml@ComplianceRepo
-    parameters:
-        buildOutputPath: $(System.ArtifactsDirectory)\signed
-        signOutputPath: $(Build.StagingDirectory)\signedPackages
-        certificateId: $(MSIX_CERT)
-        pattern: |
-          **\*.msix
-        useMinimatch: true
-        shouldSign: $(SHOULD_SIGN)
-        displayName: Sign msix
-
-  - template: EsrpSign.yml@ComplianceRepo
-    parameters:
-        buildOutputPath: $(System.ArtifactsDirectory)\signed
-        signOutputPath: $(Build.StagingDirectory)\signedPackages
-        certificateId: $(AUTHENTICODE_CERT)
-        pattern: |
-          **\*.exe
-        useMinimatch: true
-        shouldSign: $(SHOULD_SIGN)
-        displayName: Sign exe
-
-  - powershell: |
-      new-item -itemtype Directory -path '$(Build.StagingDirectory)\signedPackages'
-      Get-ChildItem "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-*.msi*" | copy-item -Destination '$(Build.StagingDirectory)\signedPackages'
-    displayName: 'Fake msi* Signing'
-    condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
-
-  - pwsh: |
-      Get-ChildItem "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-*.exe" | copy-item -Destination '$(Build.StagingDirectory)\signedPackages'
-    displayName: 'Fake exe Signing'
-    condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
-
-  - template: upload.yml
-    parameters:
-      architecture: x86
-      version: $(version)
-
-  - template: upload.yml
-    parameters:
-      architecture: x64
-      version: $(version)
-      pdb: yes
-
-  - template: upload.yml
-    parameters:
-      architecture: arm64
-      version: $(version)
-      msi: no
-
-  - template: upload.yml
-    parameters:
-      architecture: fxdependent
-      version: $(version)
-      msi: no
-      msix: no
-
-  - template: upload.yml
-    parameters:
-      architecture: fxdependentWinDesktop
-      version: $(version)
-      msi: no
-      msix: no
-
-  - template: EsrpScan.yml@ComplianceRepo
-    parameters:
-        scanPath: $(Build.StagingDirectory)
-        pattern: |
-          **\*.msix
-          **\*.msi
-          **\*.zip
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    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
deleted file mode 100644
index 4d1273d135d..00000000000
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ /dev/null
@@ -1,369 +0,0 @@
-parameters:
-  - name: BuildConfiguration
-    default: release
-  - name: BuildPlatform
-    default: any cpu
-  - name: Architecture
-    default: x64
-  - name: parentJob
-    default: ''
-
-jobs:
-- job: sign_windows_${{ parameters.Architecture }}_${{ parameters.BuildConfiguration }}
-  displayName: Package Windows - ${{ parameters.Architecture }} ${{ parameters.BuildConfiguration }}
-  condition: succeeded()
-  pool:
-    name: $(windowsPool)
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-  variables:
-    - name: BuildConfiguration
-      value: ${{ parameters.BuildConfiguration }}
-    - name: BuildPlatform
-      value: ${{ parameters.BuildPlatform }}
-    - name: Architecture
-      value: ${{ parameters.Architecture }}
-    - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
-      value: 1
-    - group: ESRP
-    - group: DotNetPrivateBuildAccess
-
-  steps:
-
-  - checkout: self
-    clean: true
-
-  - checkout: ComplianceRepo
-    clean: true
-
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-
-  - template: shouldSign.yml
-
-  - pwsh: |
-      $pkgFilter = '$(Architecture)'
-      if ($env:BuildConfiguration -eq 'minSize') { $pkgFilter += '-gc' }
-
-      $vstsCommandString = "vso[task.setvariable variable=PkgFilter]$pkgFilter"
-      Write-Host ("sending " + $vstsCommandString)
-      Write-Host "##$vstsCommandString"
-    displayName: Set packageName variable
-
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      artifactName: 'results'
-      itemPattern: '**/*$(PkgFilter).zip'
-      downloadPath: '$(System.ArtifactsDirectory)\Symbols'
-
-  - template: cloneToOfficialPath.yml
-
-  - pwsh: |
-      $zipPathString = '$(System.ArtifactsDirectory)\Symbols\results\*$(PkgFilter).zip'
-      Write-Verbose -Verbose "Zip Path: $zipPathString"
-      $zipPath = Get-Item $zipPathString
-      if(@($zipPath).Count -eq 0) {
-        throw "No files found at '$zipPathString'"
-      }
-      elseif(@($zipPath).Count -ne 1) {
-        $names = $zipPath.Name -join "', '"
-        throw "multiple files '${names}' found with '${zipPathString}'"
-      }
-
-      $expandedFolder = $zipPath.BaseName
-      Write-Host "sending.. vso[task.setvariable variable=SymbolsFolder]$expandedFolder"
-      Write-Host "##vso[task.setvariable variable=SymbolsFolder]$expandedFolder"
-
-      Expand-Archive -Path $zipPath -Destination "$(System.ArtifactsDirectory)\$expandedFolder" -Force
-    displayName: Expand symbols zip
-
-  - pwsh: |
-      $fullSymbolsFolder = "$(System.ArtifactsDirectory)\$($env:SYMBOLSFOLDER)"
-
-      $filesToSignDirectory = "$(System.ArtifactsDirectory)\toBeSigned"
-      $null = New-Item -ItemType Directory -Path $filesToSignDirectory -Force
-
-      $signedFilesDirectory = "$(System.ArtifactsDirectory)\signed"
-      $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force
-
-      $itemsToCopyWithRecurse = @(
-        "$($fullSymbolsFolder)\*.ps1"
-        "$($fullSymbolsFolder)\Microsoft.PowerShell*.dll"
-      )
-
-      $itemsToCopy = @{
-        "$($fullSymbolsFolder)\*.ps1" = ""
-        "$($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.Diagnostics\Microsoft.PowerShell.Diagnostics.psd1" = "Modules\Microsoft.PowerShell.Diagnostics"
-        "$($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"
-        "$($fullSymbolsFolder)\Modules\PSDiagnostics\PSDiagnostics.ps?1" = "Modules\PSDiagnostics"
-        "$($fullSymbolsFolder)\pwsh.dll" = ""
-        "$($fullSymbolsFolder)\System.Management.Automation.dll" = ""
-        "$($fullSymbolsFolder)\pwsh.exe" = ""
-      }
-
-      $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: '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: Sign our binaries
-
-  - pwsh: |
-      Import-Module $(PowerShellRoot)/build.psm1 -Force
-      Import-Module $(PowerShellRoot)/tools/packaging -Force
-      $signedFilesPath = '$(System.ArtifactsDirectory)\signed\'
-      $BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
-
-      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
-
-      $signedFilesDirectory = "$(System.ArtifactsDirectory)\thirdPartySigned"
-      $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force
-
-      $missingSignatures | ForEach-Object {
-        $pathWithoutLeaf = Split-Path $_
-        $relativePath = $pathWithoutLeaf.replace($BuildPath,'')
-        $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath
-        if(!(Test-Path $targetDirectory))
-        {
-          $null = New-Item -ItemType Directory -Path $targetDirectory -Force
-        }
-        Copy-Item -Path $_ -Destination $targetDirectory
-      }
-
-    displayName: 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: 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 = '$(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'))
-
-  - template: Sbom.yml@ComplianceRepo
-    parameters:
-      BuildDropPath: '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
-      Build_Repository_Uri: $(Github_Build_Repository_Uri)
-      PackageName: PowerShell Windows ${{ parameters.Architecture }} ${{ parameters.BuildConfiguration }}
-      PackageVersion: $(Version)
-      sourceScanPath: '$(PowerShellRoot)\tools'
-
-  - pwsh: |
-      Import-Module $(PowerShellRoot)/build.psm1 -Force
-      Import-Module $(PowerShellRoot)/tools/packaging -Force
-
-      $destFolder = '$(System.ArtifactsDirectory)\signedZip'
-      $BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
-
-      New-Item -ItemType Directory -Path $destFolder -Force
-
-      $BuildPackagePath = New-PSBuildZip -BuildPath $BuildPath -DestinationFolder $destFolder
-
-      Write-Verbose -Verbose "New-PSSignedBuildZip returned `$BuildPackagePath as: $BuildPackagePath"
-      Write-Host "##vso[artifact.upload containerfolder=results;artifactname=results]$BuildPackagePath"
-
-      $vstsCommandString = "vso[task.setvariable variable=BuildPackagePath]$BuildPackagePath"
-      Write-Host ("sending " + $vstsCommandString)
-      Write-Host "##$vstsCommandString"
-    displayName: Compress signed files
-    retryCountOnTaskFailure: 2
-
-
-  - pwsh: |
-      $runtime = switch ($env:Architecture)
-        {
-          "x64" { "win7-x64" }
-          "x86" { "win7-x86" }
-          "arm64" { "win-arm64" }
-          "fxdependent" { "fxdependent" }
-          "fxdependentWinDesktop" { "fxdependent-win-desktop" }
-        }
-
-      $signedPkg = "$(BuildPackagePath)"
-      Write-Verbose -Verbose -Message "signedPkg = $signedPkg"
-
-      $params = @{}
-      if ($env:BuildConfiguration -eq 'minSize') {
-        $params['ForMinimalSize'] = $true
-      }
-
-      $(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:
-      __DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
-
-  - pwsh: |
-      Get-ChildItem '$(System.ArtifactsDirectory)\pkgSigned' | ForEach-Object {
-        $packagePath = $_.FullName
-        Write-Host "Uploading $packagePath"
-        Write-Host "##vso[artifact.upload containerfolder=signed;artifactname=signed]$packagePath"
-      }
-    displayName: Upload unsigned packages
-    retryCountOnTaskFailure: 2
-
-  - ${{ if and(ne(variables['BuildConfiguration'],'minSize'), in(variables['Architecture'], 'x64', 'x86')) }}:
-    - template: EsrpSign.yml@ComplianceRepo
-      parameters:
-          buildOutputPath: $(System.ArtifactsDirectory)\pkgSigned
-          signOutputPath: $(Build.StagingDirectory)\signedPackages
-          certificateId: "$(AUTHENTICODE_CERT)"
-          pattern: |
-            **\*.msi
-          useMinimatch: true
-          shouldSign: $(SHOULD_SIGN)
-          displayName: Sign MSI
-          alwaysCopy: true
-
-    - pwsh: |
-        Get-ChildItem '$(System.ArtifactsDirectory)\signedPackages' | ForEach-Object {
-          $packagePath = $_.FullName
-          Write-Host "Uploading $packagePath"
-          Write-Host "##vso[artifact.upload containerfolder=finalResults;artifactname=finalResults]$packagePath"
-        }
-      displayName: Upload signed MSI to finalResults
-      retryCountOnTaskFailure: 2
-
-    - task: AzureFileCopy@4
-      displayName: 'upload signed msi to Azure - ${{ parameters.architecture }}'
-      inputs:
-        SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-$(version)-win-${{ parameters.architecture }}.msi'
-        azureSubscription: '$(AzureFileCopySubscription)'
-        Destination: AzureBlob
-        storage: '$(StorageAccount)'
-        ContainerName: '$(AzureVersion)'
-        resourceGroup: '$(StorageResourceGroup)'
-      retryCountOnTaskFailure: 2
-
-    - pwsh: |
-        cd $(PowerShellRoot)
-        Import-Module $(PowerShellRoot)/build.psm1 -Force
-        Import-Module $(PowerShellRoot)/tools/packaging -Force
-
-        $msiPath = '$(Build.StagingDirectory)\signedPackages\PowerShell-$(version)-win-${{ parameters.architecture }}.msi'
-
-        New-ExePackage -ProductVersion '$(version)' -MsiLocationPath $msiPath -ProductTargetArchitecture ${{ parameters.architecture }}
-        $exePath = Get-ChildItem '.\PowerShell-*.exe' | Select-Object -First 1 -ExpandProperty fullname
-        $enginePath = Join-Path -Path '$(System.ArtifactsDirectory)\unsignedEngine' -ChildPath engine.exe
-        # Expand Burn Engine so we can sign it.
-        Expand-ExePackageEngine -ExePath $exePath -EnginePath $enginePath
-      displayName: Create exe wrapper
-
-    - template: EsrpSign.yml@ComplianceRepo
-      parameters:
-          buildOutputPath: $(System.ArtifactsDirectory)\unsignedEngine
-          signOutputPath: $(System.ArtifactsDirectory)\signedEngine
-          certificateId: "$(AUTHENTICODE_CERT)"
-          pattern: |
-            **\*.exe
-          useMinimatch: true
-          shouldSign: $(SHOULD_SIGN)
-          displayName: Sign Burn Engine
-          alwaysCopy: true
-
-    - pwsh: |
-        cd '$(PowerShellRoot)'
-        Import-Module '$(PowerShellRoot)/build.psm1' -Force
-        Import-Module '$(PowerShellRoot)/tools/packaging' -Force
-
-        $exePath = Get-ChildItem '.\PowerShell-*.exe' | Select-Object -First 1 -ExpandProperty fullname
-        $enginePath = Join-Path -Path '$(System.ArtifactsDirectory)\signedEngine' -ChildPath engine.exe
-        $enginePath | Get-AuthenticodeSignature | out-string | Write-Verbose -verbose
-        Compress-ExePackageEngine -ExePath $exePath -EnginePath $enginePath
-      displayName: Re-attach the signed Burn engine in exe wrapper
-
-    - pwsh: |
-        cd '$(PowerShellRoot)'
-        Get-ChildItem '.\PowerShell-*.exe' | ForEach-Object {
-          $packagePath = $_.FullName
-          Write-Host "Uploading $packagePath"
-          Write-Host "##vso[artifact.upload containerfolder=signed;artifactname=signed]$packagePath"
-        }
-      displayName: Upload unsigned exe
-      retryCountOnTaskFailure: 2
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(PowerShellRoot)\tools'
-      snapshotForceEnabled: true
-
-  - pwsh: |
-      if ((Test-Path "\PowerShell")) {
-        Remove-Item -Path "\PowerShell" -Force -Recurse -Verbose
-      }
-      else {
-        Write-Verbose -Verbose -Message "No cleanup required."
-      }
-    displayName: Clean up local Clone
-    condition: always()
-
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/vpackRelease.yml b/tools/releaseBuild/azureDevOps/vpackRelease.yml
deleted file mode 100644
index 14368ffb8f8..00000000000
--- a/tools/releaseBuild/azureDevOps/vpackRelease.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-name: vpack-$(Build.BuildId)
-trigger:
-  branches:
-    include:
-    - master
-    - release*
-pr:
-  branches:
-    include:
-    - master
-    - release*
-
-variables:
-  - name: DOTNET_CLI_TELEMETRY_OPTOUT
-    value: 1
-  - name: POWERSHELL_TELEMETRY_OPTOUT
-    value: 1
-  - name: nugetMultiFeedWarnLevel
-    value: none
-
-  - group: Azure Blob variable group
-  # adds the pat to publish the vPack
-  # instructions to create are in the description of the library
-  - group: vPack
-
-stages:
-- stage: prep
-  displayName: Create buildInfo and name the Pipeline
-  jobs:
-  - job: rename
-    displayName: Name the build
-    condition: succeeded()
-
-    pool:
-      name: PowerShell1ES
-      demands:
-      - ImageOverride -equals PSMMS2019-Secure
-
-    steps:
-    - checkout: self
-      clean: true
-
-    - template: ./templates/SetVersionVariables.yml
-      parameters:
-        ReleaseTagVar: $(ReleaseTagVar)
-        CreateJson: yes
-        UseJson: no
-        
-    - powershell: |
-        if($env:RELEASETAGVAR -match '-') {
-            throw "Don't release a preview build without coordinating with Windows Engineering Build Tools Team"
-        }
-      displayName: Stop any preview release
-
-    - 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:
-      architecture: x64
-
-  - template: ./templates/vpackReleaseJob.yml
-    parameters:
-      architecture: x86
-
-  - template: ./templates/vpackReleaseJob.yml
-    parameters:
-      architecture: arm64
diff --git a/tools/releaseBuild/build.json b/tools/releaseBuild/build.json
deleted file mode 100644
index fe2f9d96f17..00000000000
--- a/tools/releaseBuild/build.json
+++ /dev/null
@@ -1,336 +0,0 @@
-{
-  "Windows": [
-    {
-        "Name": "win7-x64",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win7-x64 -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\DockerFile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "release",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win7-x86",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win7-x86 -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "release",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-x64-component-registration",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win7-x64 -ReleaseTag _ReleaseTag_ -ComponentRegistration",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "results",
-        "ArtifactsExpected": 1,
-        "VariableForExtractedBinariesPath": "componentregistration",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-x64-symbols",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win7-x64 -ReleaseTag _ReleaseTag_ -Symbols",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "results",
-        "ArtifactsExpected": 1,
-        "VariableForExtractedBinariesPath": "Symbols_x64",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-x86-symbols",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win7-x86 -ReleaseTag _ReleaseTag_ -Symbols",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "results",
-        "ArtifactsExpected": 1,
-        "VariableForExtractedBinariesPath": "Symbols_x86",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-arm-symbols",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win-arm -ReleaseTag _ReleaseTag_ -Symbols",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "results",
-        "ArtifactsExpected": 1,
-        "VariableForExtractedBinariesPath": "Symbols_arm",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-arm64-symbols",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win-arm64 -ReleaseTag _ReleaseTag_ -Symbols",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "results",
-        "ArtifactsExpected": 1,
-        "VariableForExtractedBinariesPath": "Symbols_arm64",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-x64-package",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -BuildZip _RepoDestinationPath_\\_BuildPackageName_ -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win7-x64 -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "signed",
-        "ArtifactsExpected": 4,
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-x86-package",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -BuildZip _RepoDestinationPath_\\_BuildPackageName_ -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win7-x86 -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "signed",
-        "ArtifactsExpected": 4,
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-arm-package",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -BuildZip _RepoDestinationPath_\\_BuildPackageName_ -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win-arm -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "signed",
-        "ArtifactsExpected": 2,
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-arm64-package",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -BuildZip _RepoDestinationPath_\\_BuildPackageName_ -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime win-arm64 -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "signed",
-        "ArtifactsExpected": 2,
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-fxdependent-symbols",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime fxdependent -ReleaseTag _ReleaseTag_ -Symbols",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "results",
-        "ArtifactsExpected": 1,
-        "VariableForExtractedBinariesPath": "Symbols_fxdependent",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-fxdependent-package",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -BuildZip _RepoDestinationPath_\\_BuildPackageName_ -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime fxdependent -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "signed",
-        "ArtifactsExpected": 1,
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-fxdependentWinDesktop-symbols",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime fxdependent-win-desktop -ReleaseTag _ReleaseTag_ -Symbols",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "results",
-        "ArtifactsExpected": 1,
-        "VariableForExtractedBinariesPath": "Symbols_fxdependentWinDesktop",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "win-fxdependentWinDesktop-package",
-        "RepoDestinationPath": "C:\\PowerShell",
-        "BuildCommand": "C:\\PowerShellPackage.ps1 -BuildZip _RepoDestinationPath_\\_BuildPackageName_ -location _RepoDestinationPath_ -destination _DockerVolume_ -Runtime fxdependent-win-desktop -ReleaseTag _ReleaseTag_",
-        "BuildDockerOptions": [
-            "-m",
-            "3968m"
-        ],
-        "DockerFile": ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\Dockerfile",
-        "AdditionalContextFiles" :[
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\PowerShellPackage.ps1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\wix.psm1",
-            ".\\tools\\releaseBuild\\Images\\microsoft_powershell_windowsservercore\\dockerInstall.psm1"
-        ],
-        "DockerImageName": "ps-winsrvcore",
-        "BinaryBucket": "signed",
-        "ArtifactsExpected": 1,
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    }
-  ],
-  "Linux": [
-    {
-        "Name": "deb",
-        "RepoDestinationPath": "/PowerShell",
-        "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -TarX64 -TarArm -TarArm64 -TarMinSize",
-        "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile",
-        "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"],
-        "DockerImageName": "ps-ubunutu-18-04",
-        "BinaryBucket": "release",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "rpm",
-        "RepoDestinationPath": "/PowerShell",
-        "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_",
-        "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"],
-        "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile",
-        "DockerImageName": "ps-centos-7",
-        "BinaryBucket": "release",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "alpine",
-        "RepoDestinationPath": "/PowerShell",
-        "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -Alpine",
-        "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"],
-        "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile",
-        "DockerImageName": "ps-alpine-3",
-        "BinaryBucket": "release",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    },
-    {
-        "Name": "fxdependent",
-        "RepoDestinationPath": "/PowerShell",
-        "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -FxDependent",
-        "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"],
-        "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile",
-        "DockerImageName": "ps-centos-7",
-        "BinaryBucket": "release",
-        "EnableFeature": [ "ArtifactAsFolder" ]
-    }
-  ]
-}
diff --git a/tools/releaseBuild/createComplianceFolder.ps1 b/tools/releaseBuild/createComplianceFolder.ps1
deleted file mode 100644
index c462a09ebdb..00000000000
--- a/tools/releaseBuild/createComplianceFolder.ps1
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-param(
-    [Parameter(HelpMessage="Artifact folder to find compliance files in.")]
-    [string[]]
-    $ArtifactFolder,
-    [Parameter(HelpMessage="VSTS Variable to set path to complinance Files.")]
-    [string]
-    $VSTSVariableName
-)
-
-$compliancePath = $null
-foreach($folder in $ArtifactFolder)
-{
-    # Find Symbols zip which contains compliance files
-    Write-Host "ArtifactFolder: $folder"
-    $filename = Join-Path -Path $folder -ChildPath 'symbols.zip'
-
-    $parentName = Split-Path -Path $folder -Leaf
-
-    # Use simplified names because some of the compliance tools didn't like the full names
-    # decided not to use hashes because the names need to be consistent otherwise the tool also has issues
-    # which is another problem with the full name, it includes version.
-    if ($parentName -match 'x64' -or $parentName -match 'amd64')
-    {
-        $name = 'x64'
-    }
-    elseif ($parentName -match 'x86') {
-        $name = 'x86'
-    }
-    elseif ($parentName -match 'fxdependent') {
-        $name = 'fxd'
-    }
-    else
-    {
-        throw "$parentName could not be classified as x86 or x64"
-    }
-
-    # Throw is compliance zip does not exist
-    if (!(Test-Path $filename))
-    {
-        throw "symbols.zip for $VSTSVariableName does not exist"
-    }
-
-    # make sure we have a single parent for everything
-    if (!$compliancePath)
-    {
-        $parent = Split-Path -Path $folder
-        $compliancePath = Join-Path -Path $parent -ChildPath 'compliance'
-    }
-
-    # Extract complance files to individual folder to avoid overwriting files.
-    $unzipPath = Join-Path -Path $compliancePath -ChildPath $name
-    Write-Host "Symbols-zip: $filename ; unzipPath: $unzipPath"
-    Expand-Archive -Path $fileName -DestinationPath $unzipPath
-}
-
-# set VSTS variable with path to compliance files
-Write-Host "##vso[task.setvariable variable=$VSTSVariableName]$unzipPath"
diff --git a/tools/releaseBuild/generatePackgeSigning.ps1 b/tools/releaseBuild/generatePackgeSigning.ps1
deleted file mode 100644
index ff848892097..00000000000
--- a/tools/releaseBuild/generatePackgeSigning.ps1
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-param(
-    [Parameter(Mandatory)]
-    [string] $Path,
-    [string[]] $AuthenticodeDualFiles,
-    [string[]] $AuthenticodeFiles,
-    [string[]] $NuPkgFiles,
-    [string[]] $MacDeveloperFiles,
-    [string[]] $LinuxFiles,
-    [string[]] $ThirdPartyFiles,
-    [string[]] $MsixFiles,
-    [ValidateSet('release','preview')]
-    [string]  $MsixCertType = 'preview'
-)
-
-if ((!$AuthenticodeDualFiles -or $AuthenticodeDualFiles.Count -eq 0) -and
-    (!$AuthenticodeFiles -or $AuthenticodeFiles.Count -eq 0) -and
-    (!$NuPkgFiles -or $NuPkgFiles.Count -eq 0) -and
-    (!$MacDeveloperFiles -or $MacDeveloperFiles.Count -eq 0) -and
-    (!$LinuxFiles -or $LinuxFiles.Count -eq 0) -and
-    (!$MsixFiles -or $MsixFiles.Count -eq 0) -and
-    (!$ThirdPartyFiles -or $ThirdPartyFiles.Count -eq 0))
-{
-    throw "At least one file must be specified"
-}
-
-function New-Attribute
-{
-    param(
-        [Parameter(Mandatory)]
-        [string]$Name,
-        [Parameter(Mandatory)]
-        [object]$Value,
-        [Parameter(Mandatory)]
-        [System.Xml.XmlElement]$Element
-    )
-
-    $attribute = $signingXml.CreateAttribute($Name)
-    $attribute.Value = $value
-    $null = $fileElement.Attributes.Append($attribute)
-}
-
-function New-FileElement
-{
-    param(
-        [Parameter(Mandatory)]
-        [string]$File,
-        [Parameter(Mandatory)]
-        [string]$SignType,
-        [Parameter(Mandatory)]
-        [System.Xml.XmlDocument]$XmlDoc,
-        [Parameter(Mandatory)]
-        [System.Xml.XmlElement]$Job
-    )
-
-    if(Test-Path -Path $file)
-    {
-        $name = Split-Path -Leaf -Path $File
-        $fileElement = $XmlDoc.CreateElement("file")
-        New-Attribute -Name 'src' -value $file -Element $fileElement
-        New-Attribute -Name 'signType' -value $SignType -Element $fileElement
-        New-Attribute -Name 'dest' -value "__OUTPATHROOT__\$name" -Element $fileElement
-        $null = $job.AppendChild($fileElement)
-    }
-    else
-    {
-        Write-Warning -Message "Skipping $SignType; $File because it does not exist"
-    }
-}
-
-[xml]$signingXml = Get-Content (Join-Path -Path $PSScriptRoot -ChildPath 'packagesigning.xml')
-$job = $signingXml.SignConfigXML.job
-
-foreach($file in $AuthenticodeDualFiles)
-{
-    New-FileElement -File $file -SignType 'AuthenticodeDual' -XmlDoc $signingXml -Job $job
-}
-
-foreach($file in $AuthenticodeFiles)
-{
-    New-FileElement -File $file -SignType 'AuthenticodeFormer' -XmlDoc $signingXml -Job $job
-}
-
-foreach($file in $NuPkgFiles)
-{
-    New-FileElement -File $file -SignType 'NuGet' -XmlDoc $signingXml -Job $job
-}
-
-foreach ($file in $MacDeveloperFiles) {
-    New-FileElement -File $file -SignType 'MacDeveloper' -XmlDoc $signingXml -Job $job
-}
-
-foreach ($file in $LinuxFiles) {
-    New-FileElement -File $file -SignType 'LinuxPack' -XmlDoc $signingXml -Job $job
-}
-
-foreach ($file in $ThirdPartyFiles) {
-    New-FileElement -File $file -SignType 'ThirdParty' -XmlDoc $signingXml -Job $job
-}
-
-foreach ($file in $MsixFiles) {
-    # 'CP-459155' is supposed to work for the store
-    # AuthenticodeFormer works for sideloading and via a workaround, through the store
-    # ----------------------------------------------
-    # update releasePublisher in packaging.psm1 when this is changed
-    New-FileElement -File $file -SignType 'AuthenticodeFormer' -XmlDoc $signingXml -Job $job
-}
-
-$signingXml.Save($path)
-$updateScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'updateSigning.ps1'
-& $updateScriptPath -SigningXmlPath $path
diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
deleted file mode 100644
index acedbdd3388..00000000000
--- a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# PowerShell Script to build and package PowerShell from specified form and branch
-# Script is intented to use in Docker containers
-# Ensure PowerShell is available in the provided image
-
-param (
-    # Set default location to where VSTS cloned the repository locally.
-    [string] $location = $env:BUILD_REPOSITORY_LOCALPATH,
-
-    # Destination location of the package on docker host
-    [Parameter(Mandatory, ParameterSetName = 'packageSigned')]
-    [Parameter(Mandatory, ParameterSetName = 'IncludeSymbols')]
-    [Parameter(Mandatory, ParameterSetName = 'Build')]
-    [string] $destination = '/mnt',
-
-    [Parameter(Mandatory, ParameterSetName = 'packageSigned')]
-    [Parameter(Mandatory, ParameterSetName = 'IncludeSymbols')]
-    [Parameter(Mandatory, ParameterSetName = 'Build')]
-    [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
-    [ValidateNotNullOrEmpty()]
-    [string]$ReleaseTag,
-
-    [Parameter(ParameterSetName = 'packageSigned')]
-    [Parameter(ParameterSetName = 'IncludeSymbols')]
-    [Parameter(ParameterSetName = 'Build')]
-    [ValidateSet("zip", "tar")]
-    [string[]]$ExtraPackage,
-
-    [Parameter(Mandatory, ParameterSetName = 'Bootstrap')]
-    [switch] $BootStrap,
-
-    [Parameter(Mandatory, ParameterSetName = 'IncludeSymbols')]
-    [Parameter(Mandatory, ParameterSetName = 'Build')]
-    [switch] $Build,
-
-    [Parameter(Mandatory, ParameterSetName = 'IncludeSymbols')]
-    [switch] $Symbols,
-
-    [Parameter(Mandatory, ParameterSetName = 'packageSigned')]
-    [ValidatePattern("-signed.zip$")]
-    [string]$BuildZip,
-
-    [Parameter(Mandatory, ParameterSetName = 'packageSigned')]
-    [Parameter(Mandatory, ParameterSetName = 'IncludeSymbols')]
-    [Parameter(Mandatory, ParameterSetName = 'Build')]
-    [ValidateSet('osx-x64', 'osx-arm64')]
-    [string]$Runtime,
-
-    [string]$ArtifactName = 'result',
-
-    [switch]$SkipReleaseChecks
-)
-
-$repoRoot = $location
-
-if ($Build -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
-    $releaseTagParam = @{}
-    if ($ReleaseTag) {
-        $releaseTagParam['ReleaseTag'] = $ReleaseTag
-
-        #Remove the initial 'v' from the ReleaseTag
-        $version = $ReleaseTag -replace '^v'
-        $semVersion = [System.Management.Automation.SemanticVersion] $version
-
-        $metadata = Get-Content "$location/tools/metadata.json" -Raw | ConvertFrom-Json
-
-        $LTS = $metadata.LTSRelease.Package
-
-        Write-Verbose -Verbose -Message "LTS is set to: $LTS"
-    }
-}
-
-Push-Location
-try {
-    $pspackageParams = @{ SkipReleaseChecks = $SkipReleaseChecks; MacOSRuntime = $Runtime }
-    Write-Verbose -Message "Init..." -Verbose
-    Set-Location $repoRoot
-    Import-Module "$repoRoot/build.psm1"
-    Import-Module "$repoRoot/tools/packaging"
-    Sync-PSTags -AddRemoteIfMissing
-
-    if ($BootStrap) {
-        Start-PSBootstrap -Package
-    }
-
-    if ($PSCmdlet.ParameterSetName -eq 'packageSigned') {
-        Write-Verbose "Expanding signed build $BuildZip ..." -Verbose
-        Expand-PSSignedBuild -BuildZip $BuildZip
-
-        Remove-Item -Path $BuildZip
-
-        Start-PSPackage @pspackageParams @releaseTagParam
-        switch ($ExtraPackage) {
-            "tar" { Start-PSPackage -Type tar @pspackageParams @releaseTagParam }
-        }
-
-        if ($LTS) {
-            Start-PSPackage @pspackageParams @releaseTagParam -LTS
-            switch ($ExtraPackage) {
-                "tar" { Start-PSPackage -Type tar @pspackageParams @releaseTagParam -LTS }
-            }
-        }
-    }
-
-    if ($Build) {
-        if ($Symbols) {
-            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' -PSModuleRestore @releaseTagParam -Runtime $Runtime
-            Start-PSPackage @pspackageParams @releaseTagParam
-            switch ($ExtraPackage) {
-                "tar" { Start-PSPackage -Type tar @pspackageParams @releaseTagParam }
-            }
-
-            if ($LTS) {
-                Start-PSPackage @releaseTagParam -LTS
-                switch ($ExtraPackage) {
-                    "tar" { Start-PSPackage -Type tar @pspackageParams @releaseTagParam -LTS }
-                }
-            }
-        }
-    }
-} finally {
-    Pop-Location
-}
-
-if ($Build -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
-    $macPackages = Get-ChildItem "$repoRoot/powershell*" -Include *.pkg, *.tar.gz, *.zip
-    foreach ($macPackage in $macPackages) {
-        $filePath = $macPackage.FullName
-        $extension = (Split-Path -Extension -Path $filePath).Replace('.', '')
-        Write-Verbose "Copying $filePath to $destination" -Verbose
-        Write-Host "##vso[artifact.upload containerfolder=$ArtifactName;artifactname=$ArtifactName]$filePath"
-        Write-Host "##vso[task.setvariable variable=Package-$extension]$filePath"
-        Copy-Item -Path $filePath -Destination $destination -Force
-    }
-}
diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.sh b/tools/releaseBuild/macOS/PowerShellPackageVsts.sh
deleted file mode 100644
index b7bfa7315d8..00000000000
--- a/tools/releaseBuild/macOS/PowerShellPackageVsts.sh
+++ /dev/null
@@ -1 +0,0 @@
-pwsh -command ".\PowerShellPackageVsts.ps1 $*"
diff --git a/tools/releaseBuild/macOS/createPowerShell.sh b/tools/releaseBuild/macOS/createPowerShell.sh
deleted file mode 100644
index 5b0b681716c..00000000000
--- a/tools/releaseBuild/macOS/createPowerShell.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# print version for diags
-sw_vers -productVersion
-
-# create folder
-sudo mkdir /PowerShell
-
-# make the current user the owner
-sudo chown $USER /PowerShell
diff --git a/tools/releaseBuild/packagesigning.xml b/tools/releaseBuild/packagesigning.xml
deleted file mode 100644
index a243e5fbd98..00000000000
--- a/tools/releaseBuild/packagesigning.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- template used by generatePackageSigning.ps1 -->
-<SignConfigXML>
-  <job platform="" configuration="" dest="__OUTPATHROOT__\signed" jobname="PowerShell Core Installer" approvers="vigarg;gstolt">
-  </job>
-</SignConfigXML>
diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
index 8d6a8c3eefe..c5f2f016554 100644
--- a/tools/releaseBuild/setReleaseTag.ps1
+++ b/tools/releaseBuild/setReleaseTag.ps1
@@ -41,6 +41,7 @@ function New-BuildInfoJson {
         ReleaseTag = $ReleaseTag
         ReleaseDate = $dateTime
         BlobName = $blobName
+        BaseUrl = 'https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/install'
     } | ConvertTo-Json | Out-File -Encoding ascii -Force -FilePath $filename
 
     $resolvedPath = (Resolve-Path -Path $filename).ProviderPath
@@ -48,7 +49,21 @@ function New-BuildInfoJson {
     Write-Verbose -Message "$vstsCommandString" -Verbose
     Write-Host -Object "##$vstsCommandString"
 
+    # Upload for ADO pipelines
     Write-Host "##vso[artifact.upload containerfolder=BuildInfoJson;artifactname=BuildInfoJson]$resolvedPath"
+
+    # Copy to location where OneBranch Pipelines uploads from
+
+    # if the environment variable does not exist, we are not in OneBranch. So just return.
+    if (-not $env:ob_outputDirectory) {
+        return
+    }
+
+    if (-not (Test-Path $env:ob_outputDirectory)) {
+        $null = New-Item -Path $env:ob_outputDirectory -ItemType Directory -Force -Verbose
+    }
+
+    Copy-Item $resolvedPath -Destination $env:ob_outputDirectory -Force -Verbose
 }
 
 # Script to set the release tag based on the branch name if it is not set or it is "fromBranch"
diff --git a/tools/releaseBuild/signing.xml b/tools/releaseBuild/signing.xml
deleted file mode 100644
index 11f63fe69cc..00000000000
--- a/tools/releaseBuild/signing.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<SignConfigXML>
-  <!-- ****Begin**** AuthenticodeFormer and should be StrongName, but we will add this in 6.1.0 ******** -->
- <job platform="" configuration="" dest="__OUTPATHROOT__\signed" jobname="PowerShell Core" approvers="vigarg;gstolt">
-    <file src="__INPATHROOT__\Microsoft.Management.Infrastructure.CimCmdlets.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.Management.Infrastructure.CimCmdlets.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.Commands.Diagnostics.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.Commands.Diagnostics.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.Commands.Management.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.Commands.Management.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.Commands.Utility.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.Commands.Utility.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.ConsoleHost.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.ConsoleHost.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.CoreCLR.Eventing.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.CoreCLR.Eventing.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.GlobalTool.Shim.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.GlobalTool.Shim.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.Security.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.Security.dll" />
-    <file src="__INPATHROOT__\Microsoft.WSMan.Management.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.WSMan.Management.dll" />
-    <file src="__INPATHROOT__\Microsoft.WSMan.Runtime.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.WSMan.Runtime.dll" />
-    <file src="__INPATHROOT__\System.Management.Automation.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\System.Management.Automation.dll" />
-    <file src="__INPATHROOT__\pwsh.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\pwsh.dll" />
-
-    <!-- not actually a code file, don't sign for now
-    <file src="__INPATHROOT__\Microsoft.PowerShell.SDK.dll" signType="BothDual" dest="__OUTPATHROOT__\Microsoft.PowerShell.SDK.dll" />
-    -->
-
-    <!-- ****Begin**** AuthenticodeFormer ************* -->
-
-    <file src="__INPATHROOT__\pwsh.exe" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\pwsh.exe" />
-
-
-    <!-- ****Begin**** AuthenticodeFormer - Authenticode SHA256 ************* -->
-    <!-- PowerShell script files cannot be dual signed, so we will sign them only with a SHA256 cert -->
-
-    <file src="__INPATHROOT__\Install-PowerShellRemoting.ps1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Install-PowerShellRemoting.ps1" />
-    <file src="__INPATHROOT__\RegisterManifest.ps1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\RegisterManifest.ps1" />
-    <file src="__INPATHROOT__\InstallPSCorePolicyDefinitions.ps1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\InstallPSCorePolicyDefinitions.ps1" />
-    <file src="__INPATHROOT__\Modules\CimCmdlets\CimCmdlets.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\CimCmdlets\CimCmdlets.psd1" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\Microsoft.PowerShell.Diagnostics.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\Microsoft.PowerShell.Diagnostics.psd1" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Host\Microsoft.PowerShell.Host.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Host\Microsoft.PowerShell.Host.psd1" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Management\Microsoft.PowerShell.Management.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Management\Microsoft.PowerShell.Management.psd1" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1" />
-    <file src="__INPATHROOT__\Modules\Microsoft.WSMan.Management\Microsoft.WSMan.Management.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.WSMan.Management\Microsoft.WSMan.Management.psd1" />
-    <file src="__INPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psd1" />
-    <file src="__INPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psm1" />
-    <file src="__INPATHROOT__\Modules\Microsoft.WSMan.Management\WSMan.format.ps1xml" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.WSMan.Management\WSMan.format.ps1xml" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\Event.format.ps1xml" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\Event.format.ps1xml" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\GetEvent.types.ps1xml" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\GetEvent.types.ps1xml" />
-    <file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\Diagnostics.format.ps1xml" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Diagnostics\Diagnostics.format.ps1xml" />
-  </job>
-</SignConfigXML>
diff --git a/tools/releaseBuild/updateSigning.ps1 b/tools/releaseBuild/updateSigning.ps1
deleted file mode 100644
index bace3aec2b7..00000000000
--- a/tools/releaseBuild/updateSigning.ps1
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-param(
-    [string] $SigningXmlPath = (Join-Path -Path $PSScriptRoot  -ChildPath 'signing.xml'),
-    [switch] $SkipPwshExe
-)
-# Script for use in VSTS to update signing.xml
-
-if ($SkipPwshExe) {
-    ## This is required for fxdependent package as no .exe is generated.
-    $xmlContent = Get-Content $SigningXmlPath | Where-Object { $_ -notmatch '__INPATHROOT__\\pwsh.exe' }
-} else {
-    ## We skip the global tool shim assembly for regular builds.
-    $xmlContent = Get-Content $signingXmlPath | Where-Object { $_ -notmatch '__INPATHROOT__\\Microsoft.PowerShell.GlobalTool.Shim.dll' }
-}
-
-# Parse the signing xml
-$signingXml = [xml] $xmlContent
-
-# Get any variables to updating 'signType' in the XML
-# Define a varabile named `<signTypeInXml>SignType' in VSTS to updating that signing type
-# Example:  $env:AuthenticodeSignType='newvalue'
-#      will cause all files with the 'Authenticode' signtype to be updated with the 'newvalue' signtype
-$signTypes = @{}
-Get-ChildItem -Path env:/*SignType | ForEach-Object -Process {
-    $signType = $_.Name.ToUpperInvariant().Replace('SIGNTYPE','')
-    Write-Host "Found SigningType $signType with value $($_.value)"
-    $signTypes[$signType] = $_.Value
-}
-
-# examine each job in the xml
-$signingXml.SignConfigXML.job | ForEach-Object -Process {
-    # examine each file in the job
-    $_.file | ForEach-Object -Process {
-        # if the sign type is one of the variables we found, update it to the new value
-        $signType = $_.SignType.ToUpperInvariant()
-        if($signTypes.ContainsKey($signType))
-        {
-            $newSignType = $signTypes[$signType]
-            Write-Host "Updating $($_.src) to $newSignType"
-            $_.signType = $newSignType
-        }
-    }
-}
-
-$signingXml.Save($signingXmlPath)
diff --git a/tools/releaseBuild/vstsbuild.ps1 b/tools/releaseBuild/vstsbuild.ps1
deleted file mode 100644
index 1c2d740c418..00000000000
--- a/tools/releaseBuild/vstsbuild.ps1
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-[cmdletbinding(DefaultParameterSetName='Build')]
-param(
-    [Parameter(ParameterSetName='packageSigned')]
-    [Parameter(ParameterSetName='Build')]
-    [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
-    [string]$ReleaseTag,
-
-    # full paths to files to add to container to run the build
-    [Parameter(Mandatory,ParameterSetName='packageSigned')]
-    [string]
-    $BuildPath,
-
-    [Parameter(Mandatory,ParameterSetName='packageSigned')]
-    [string]
-    $SignedFilesPath
-)
-
-DynamicParam {
-    # Add a dynamic parameter '-Name' which specifies the name of the build to run
-
-    # Get the names of the builds.
-    $buildJsonPath = (Join-Path -Path $PSScriptRoot -ChildPath 'build.json')
-    $build = Get-Content -Path $buildJsonPath | ConvertFrom-Json
-    $names = @($build.Windows.Name)
-    foreach($name in $build.Linux.Name)
-    {
-        $names += $name
-    }
-
-    # Create the parameter attributs
-    $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
-    $ValidateSetAttr = New-Object "System.Management.Automation.ValidateSetAttribute" -ArgumentList $names
-    $Attributes = New-Object "System.Collections.ObjectModel.Collection``1[System.Attribute]"
-    $Attributes.Add($ParameterAttr) > $null
-    $Attributes.Add($ValidateSetAttr) > $null
-
-    # Create the parameter
-    $Parameter = New-Object "System.Management.Automation.RuntimeDefinedParameter" -ArgumentList ("Name", [string], $Attributes)
-    $Dict = New-Object "System.Management.Automation.RuntimeDefinedParameterDictionary"
-    $Dict.Add("Name", $Parameter) > $null
-    return $Dict
-}
-
-Begin {
-    $Name = $PSBoundParameters['Name']
-}
-
-End {
-    $ErrorActionPreference = 'Stop'
-
-    $additionalFiles = @()
-    $buildPackageName = $null
-    # If specified, Add package file to container
-    if ($BuildPath)
-    {
-        Import-Module (Join-Path -Path $PSScriptRoot -ChildPath '..\..\build.psm1')
-        Import-Module (Join-Path -Path $PSScriptRoot -ChildPath '..\packaging')
-
-        # Use temp as destination if not running in VSTS
-        $destFolder = $env:temp
-        if($env:BUILD_STAGINGDIRECTORY)
-        {
-            # Use artifact staging if running in VSTS
-            $destFolder = $env:BUILD_STAGINGDIRECTORY
-        }
-
-        $BuildPackagePath = New-PSSignedBuildZip -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath -DestinationFolder $destFolder
-        Write-Verbose -Verbose "New-PSSignedBuildZip returned `$BuildPackagePath as: $BuildPackagePath"
-        Write-Host "##vso[artifact.upload containerfolder=results;artifactname=results]$BuildPackagePath"
-        $buildPackageName = Split-Path -Path $BuildPackagePath -Leaf
-        $additionalFiles += $BuildPackagePath
-    }
-
-    $psReleaseBranch = 'master'
-    $psReleaseFork = 'PowerShell'
-    $location = Join-Path -Path $PSScriptRoot -ChildPath 'PSRelease'
-    if(Test-Path $location)
-    {
-        Remove-Item -Path $location -Recurse -Force
-    }
-
-    $gitBinFullPath = (Get-Command -Name git).Source
-    if (-not $gitBinFullPath)
-    {
-        throw "Git is required to proceed. Install from 'https://git-scm.com/download/win'"
-    }
-
-    Write-Verbose "cloning -b $psReleaseBranch --quiet https://github.com/$psReleaseFork/PSRelease.git" -Verbose
-    & $gitBinFullPath clone -b $psReleaseBranch --quiet https://github.com/$psReleaseFork/PSRelease.git $location
-
-    Push-Location -Path $PWD.Path
-
-    $unresolvedRepoRoot = Join-Path -Path $PSScriptRoot '../..'
-    $resolvedRepoRoot = (Resolve-Path -Path $unresolvedRepoRoot).ProviderPath
-
-    try
-    {
-        Write-Verbose "Starting build at $resolvedRepoRoot  ..." -Verbose
-        Import-Module "$location/vstsBuild" -Force
-        Import-Module "$location/dockerBasedBuild" -Force
-        Clear-VstsTaskState
-
-        $buildParameters = @{
-            ReleaseTag = $ReleaseTag
-            BuildPackageName = $buildPackageName
-        }
-
-        Invoke-Build -RepoPath $resolvedRepoRoot -BuildJsonPath './tools/releaseBuild/build.json' -Name $Name -Parameters $buildParameters -AdditionalFiles $AdditionalFiles
-    }
-    catch
-    {
-        Write-VstsError -Error $_
-    }
-    finally{
-        Write-VstsTaskState
-        exit 0
-    }
-}
diff --git a/tools/releaseBuild/vstsbuild.sh b/tools/releaseBuild/vstsbuild.sh
deleted file mode 100644
index d7d0363745f..00000000000
--- a/tools/releaseBuild/vstsbuild.sh
+++ /dev/null
@@ -1 +0,0 @@
-pwsh -command ".\vstsbuild.ps1 $*"
diff --git a/tools/releaseToWinget.ps1 b/tools/releaseToWinget.ps1
deleted file mode 100644
index e3c1af080e3..00000000000
--- a/tools/releaseToWinget.ps1
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-param(
-    [Parameter(Mandatory)]
-    [semver]
-    $ReleaseVersion,
-
-    [Parameter()]
-    [string]
-    $WingetRepoPath = "$PSScriptRoot/../../winget-pkgs",
-
-    [Parameter()]
-    [string]
-    $FromRepository = 'rjmholt',
-
-    [Parameter()]
-    [string]
-    $GitHubToken
-)
-
-function GetMsiHash
-{
-    param(
-        [Parameter(Mandatory)]
-        [string]
-        $ReleaseVersion,
-
-        [Parameter(Mandatory)]
-        $MsiName
-    )
-
-    $releaseParams = @{
-        Tag = "v$ReleaseVersion"
-        OwnerName = 'PowerShell'
-        RepositoryName = 'PowerShell'
-    }
-
-    if ($GitHubToken) { $releaseParams.AccessToken = $GitHubToken }
-
-    $releaseDescription = (Get-GitHubRelease @releaseParams).body
-
-    $regex = [regex]::new("powershell-$ReleaseVersion-win-x64.msi.*?([0-9A-F]{64})", 'SingleLine,IgnoreCase')
-
-    return $regex.Match($releaseDescription).Groups[1].Value
-}
-
-function GetThisScriptRepoUrl
-{
-    # Find the root of the repo
-    $prefix = $PSScriptRoot
-    while ($prefix)
-    {
-        if (Test-Path "$prefix/LICENSE.txt")
-        {
-            break
-        }
-
-        $prefix = Split-Path $prefix
-    }
-
-    $stem = $PSCommandPath.Substring($prefix.Length + 1).Replace('\', '/')
-
-    return "https://github.com/PowerShell/PowerShell/blob/master/$stem"
-}
-
-function Exec
-{
-    param([scriptblock]$sb)
-
-    & $sb
-
-    if ($LASTEXITCODE -ne 0)
-    {
-        throw "Invocation failed for '$sb'. See above errors for details"
-    }
-}
-
-$ErrorActionPreference = 'Stop'
-
-$wingetPath = (Resolve-Path $WingetRepoPath).Path
-
-# Ensure we have git and PowerShellForGitHub installed
-Import-Module -Name PowerShellForGitHub
-$null = Get-Command git
-
-# Get the MSI hash from the release body
-$msiName = "PowerShell-$ReleaseVersion-win-x64.msi"
-$msiHash = GetMsiHash -ReleaseVersion $ReleaseVersion -MsiName $msiName
-
-$publisherName = 'Microsoft'
-
-# Create the manifest
-$productName = if ($ReleaseVersion.PreReleaseLabel)
-{
-    'PowerShell-Preview'
-}
-else
-{
-    'PowerShell'
-}
-
-$manifestDir = Join-Path $wingetPath 'manifests' 'm' $publisherName $productName $ReleaseVersion
-$manifestPath = Join-Path $manifestDir "$publisherName.$productName.yaml"
-
-$manifestContent = @"
-PackageIdentifier: $publisherName.$productName
-PackageVersion: $ReleaseVersion
-PackageName: $productName
-Publisher: $publisherName
-PackageUrl: https://microsoft.com/PowerShell
-License: MIT
-LicenseUrl: https://github.com/PowerShell/PowerShell/blob/master/LICENSE.txt
-Moniker: $($productName.ToLower())
-ShortDescription: $publisherName.$productName
-Description: PowerShell is a cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework that works well with your existing tools and is optimized for dealing with structured data (e.g. JSON, CSV, XML, etc.), REST APIs, and object models. It includes a command-line shell, an associated scripting language and a framework for processing cmdlets.
-Tags:
-- powershell
-- pwsh
-Homepage: https://github.com/PowerShell/PowerShell
-Installers:
-- Architecture: x64
-  InstallerUrl: https://github.com/PowerShell/PowerShell/releases/download/v$ReleaseVersion/$msiName
-  InstallerSha256: $msiHash
-  InstallerType: msi
-PackageLocale: en-US
-ManifestType: singleton
-ManifestVersion: 1.0.0
-
-"@
-
-Push-Location $wingetPath
-try
-{
-    $branch = "pwsh-$ReleaseVersion"
-
-    Exec { git checkout master }
-    Exec { git checkout -b $branch }
-
-    New-Item -Path $manifestDir -ItemType Directory
-    Set-Content -Path $manifestPath -Value $manifestContent -Encoding utf8NoBOM
-
-    Exec { git add $manifestPath }
-    Exec { git commit -m "Add $productName $ReleaseVersion" }
-    Exec { git push origin $branch }
-
-    $prParams = @{
-        Title = "Add $productName $ReleaseVersion"
-        Body = "This pull request is automatically generated. See $(GetThisScriptRepoUrl)."
-        Head = $branch
-        HeadOwner = $FromRepository
-        Base = 'master'
-        Owner = 'Microsoft'
-        RepositoryName = 'winget-pkgs'
-        MaintainerCanModify = $true
-    }
-
-    if ($GitHubToken) { $prParams.AccessToken = $GitHubToken }
-
-    New-GitHubPullRequest @prParams
-}
-finally
-{
-    git checkout master
-    Pop-Location
-}
diff --git a/tools/releaseTools.psm1 b/tools/releaseTools.psm1
index 86b04ac6b50..99edf93c08a 100644
--- a/tools/releaseTools.psm1
+++ b/tools/releaseTools.psm1
@@ -37,12 +37,35 @@ $Script:powershell_team = @(
     "dependabot-preview[bot]"
     "dependabot[bot]"
     "github-actions[bot]"
+    "Copilot"
     "Anam Navied"
     "Andrew Schwartzmeyer"
     "Jason Helmick"
     "Patrick Meinecke"
     "Steven Bucher"
     "PowerShell Team Bot"
+    "Justin Chung"
+)
+
+# The powershell team members GitHub logins. We use them to decide if the original author of a backport PR is from the team.
+$script:psteam_logins = @(
+    'andyleejordan'
+    'TravisEz13'
+    'daxian-dbw'
+    'adityapatwardhan'
+    'SteveL-MSFT'
+    'dependabot[bot]'
+    'pwshBot'
+    'jshigetomi'
+    'SeeminglyScience'
+    'anamnavi'
+    'sdwheeler'
+    'Copilot'
+    'copilot-swe-agent'
+    'app/copilot-swe-agent'
+    'StevenBucher98'
+    'alerickson'
+    'tgauth'
 )
 
 # They are very active contributors, so we keep their email-login mappings here to save a few queries to Github.
@@ -53,11 +76,6 @@ $Script:community_login_map = @{
     "info@powercode-consulting.se" = "powercode"
 }
 
-# Ignore dependency bumping bot (Dependabot):
-$Script:attribution_ignore_list = @(
-    'dependabot[bot]@users.noreply.github.com'
-)
-
 ##############################
 #.SYNOPSIS
 #In the release workflow, the release branch will be merged back to master after the release is done,
@@ -150,13 +168,20 @@ function Get-ChangeLog
         [Parameter(Mandatory = $true)]
         [string]$ThisReleaseTag,
 
-        [Parameter(Mandatory)]
+        [Parameter(Mandatory = $false)]
         [string]$Token,
 
         [Parameter()]
         [switch]$HasCherryPick
     )
 
+    if(-not $Token) {
+        $Token = Get-GHDefaultAuthToken
+        if(-not $Token) {
+            throw "No GitHub Auth Token provided"
+        }
+    }
+
     $tag_hash = git rev-parse "$LastReleaseTag^0"
     $format = '%H||%P||%aN||%aE||%s'
     $header = @{"Authorization"="token $Token"}
@@ -180,7 +205,7 @@ function Get-ChangeLog
         ## but not reachable from the last release tag. Instead, we need to exclude the commits that were cherry-picked,
         ## and only include the commits that are not in the last release into the change log.
 
-        # Find the commits that were only in the orginal master, excluding those that were cherry-picked to release branch.
+        # Find the commits that were only in the original master, excluding those that were cherry-picked to release branch.
         $new_commits_from_other_parent = git --no-pager log --first-parent --cherry-pick --right-only "$tag_hash...$other_parent_hash" --format=$format | New-CommitNode
         # Find the commits that were only in the release branch, excluding those that were cherry-picked from master branch.
         $new_commits_from_last_release = git --no-pager log --first-parent --cherry-pick --left-only "$tag_hash...$other_parent_hash" --format=$format | New-CommitNode
@@ -254,25 +279,76 @@ function Get-ChangeLog
     $clExperimental = @()
 
     foreach ($commit in $new_commits) {
+        $commitSubject = $commit.Subject
+        $prNumber = $commit.PullRequest
+        Write-Verbose "subject: $commitSubject"
         Write-Verbose "authorname: $($commit.AuthorName)"
-        if ($commit.AuthorEmail.EndsWith("@microsoft.com") -or $powershell_team -contains $commit.AuthorName -or $Script:attribution_ignore_list -contains $commit.AuthorEmail) {
-            $commit.ChangeLogMessage = "- {0}" -f (Get-ChangeLogMessage $commit.Subject)
+
+        try {
+            $pr = Invoke-RestMethod `
+                -Uri "https://api.github.com/repos/PowerShell/PowerShell/pulls/$prNumber" `
+                -Headers $header `
+                -ErrorAction Stop `
+                -Verbose:$false ## Always disable verbose to avoid noise when we debug this function.
+        } catch {
+            ## A commit may not have corresponding GitHub PRs. In that case, we will get status code 404 (Not Found).
+            ## Otherwise, let the error bubble up.
+            if ($_.Exception.Response.StatusCode -ne 404) {
+                throw
+            }
+        }
+
+        if ($commitSubject -match '^\[release/v\d\.\d\] ') {
+            ## The commit was from a backport PR. We need to get the real author in this case.
+            if (-not $pr) {
+                throw "The commit is from a backport PR (#$prNumber), but the PR cannot be found.`nPR Title: $commitSubject"
+            }
+
+            $userPattern = 'Triggered by @.+ on behalf of @(.+)'
+            if ($pr.body -match $userPattern) {
+                $commit.AuthorGitHubLogin = ($Matches.1).Trim()
+                Write-Verbose "backport PR. real author login: $($commit.AuthorGitHubLogin)"
+            } else {
+                throw "The commit is from a backport PR (#$prNumber), but the PR description failed to match the pattern '$userPattern'. Was the template for backport PRs changed?`nPR Title: $commitSubject"
+            }
+        }
+
+        if ($commit.AuthorGitHubLogin) {
+            if ($script:psteam_logins -contains $commit.AuthorGitHubLogin) {
+                $commit.ChangeLogMessage = "- {0}" -f (Get-ChangeLogMessage $commitSubject)
+            } else {
+                $commit.ChangeLogMessage = ("- {0} (Thanks @{1}!)" -f (Get-ChangeLogMessage $commitSubject), $commit.AuthorGitHubLogin)
+                $commit.ThankYouMessage = ("@{0}" -f ($commit.AuthorGitHubLogin))
+            }
+        } elseif ($commit.AuthorEmail.EndsWith("@microsoft.com") -or $powershell_team -contains $commit.AuthorName) {
+            $commit.ChangeLogMessage = "- {0}" -f (Get-ChangeLogMessage $commitSubject)
         } else {
             if ($community_login_map.ContainsKey($commit.AuthorEmail)) {
                 $commit.AuthorGitHubLogin = $community_login_map[$commit.AuthorEmail]
             } else {
-                $uri = "https://api.github.com/repos/PowerShell/PowerShell/commits/$($commit.Hash)"
                 try{
-                    $response = Invoke-WebRequest -Uri $uri -Method Get -Headers $header -ErrorAction Ignore
-                } catch{}
+                    ## Always disable verbose to avoid noise when we debug this function.
+                    $response = Invoke-RestMethod `
+                        -Uri "https://api.github.com/repos/PowerShell/PowerShell/commits/$($commit.Hash)" `
+                        -Headers $header `
+                        -ErrorAction Stop `
+                        -Verbose:$false
+                } catch {
+                    ## A commit could be available in ADO only. In that case, we will get status code 422 (UnprocessableEntity).
+                    ## Otherwise, let the error bubble up.
+                    if ($_.Exception.Response.StatusCode -ne 422) {
+                        throw
+                    }
+                }
+
                 if($response)
                 {
-                    $content = ConvertFrom-Json -InputObject $response.Content
-                    $commit.AuthorGitHubLogin = $content.author.login
+                    $commit.AuthorGitHubLogin = $response.author.login
                     $community_login_map[$commit.AuthorEmail] = $commit.AuthorGitHubLogin
                 }
             }
-            $commit.ChangeLogMessage = ("- {0} (Thanks @{1}!)" -f (Get-ChangeLogMessage $commit.Subject), $commit.AuthorGitHubLogin)
+
+            $commit.ChangeLogMessage = ("- {0} (Thanks @{1}!)" -f (Get-ChangeLogMessage $commitSubject), $commit.AuthorGitHubLogin)
             $commit.ThankYouMessage = ("@{0}" -f ($commit.AuthorGitHubLogin))
         }
 
@@ -281,16 +357,6 @@ function Get-ChangeLog
         }
 
         ## Get the labels for the PR
-        try {
-            $pr = Invoke-RestMethod -Uri "https://api.github.com/repos/PowerShell/PowerShell/pulls/$($commit.PullRequest)" -Headers $header -ErrorAction SilentlyContinue
-        }
-        catch {
-            if ($_.Exception.Response.StatusCode -eq '404') {
-                $pr = $null
-                #continue
-            }
-        }
-
         if($pr)
         {
             $clLabel = $pr.labels | Where-Object { $_.Name -match "^CL-"}
@@ -320,7 +386,7 @@ function Get-ChangeLog
                 "CL-Tools" { $clTools += $commit }
                 "CL-Untagged" { $clUntagged += $commit }
                 "CL-NotInBuild" { continue }
-                Default { throw "unknown tag '$cLabel' for PR: '$($commit.PullRequest)'" }
+                Default { throw "unknown tag '$cLabel' for PR: '$prNumber'" }
             }
         }
     }
@@ -360,6 +426,29 @@ function Get-ChangeLog
     Write-Output "[${version}]: https://github.com/PowerShell/PowerShell/compare/${LastReleaseTag}...${ThisReleaseTag}`n"
 }
 
+function Get-GHDefaultAuthToken {
+    $IsGHCLIInstalled = $false
+    if (Get-command -CommandType Application -Name gh -ErrorAction SilentlyContinue) {
+        $IsGHCLIInstalled = $true
+    } else {
+        Write-Error -Message "GitHub CLI is not installed. Please install it from https://cli.github.com/" -ErrorAction Stop
+    }
+
+    if ($IsGHCLIInstalled) {
+        try {
+            $Token = & gh auth token
+        } catch {
+            Write-Error -Message "Please login to GitHub CLI using 'gh auth login'"
+        }
+    }
+
+    if (-not $Token) {
+        $Token = Read-Host -Prompt "Enter GitHub Auth Token"
+    }
+
+    return $Token
+}
+
 function PrintChangeLog($clSection, $sectionTitle, [switch] $Compress) {
     if ($clSection.Count -gt 0) {
         "### $sectionTitle`n"
@@ -395,6 +484,9 @@ function Get-ChangeLogMessage
         '^Build\(deps\): ' {
             return $OriginalMessage.replace($Matches.0,'')
         }
+        '^\[release/v\d\.\d\] ' {
+            return $OriginalMessage.replace($Matches.0,'')
+        }
         default {
             return $OriginalMessage
         }
@@ -723,6 +815,74 @@ function Get-PRBackportReport {
         $prs
     }
 }
+enum RemoteType {
+    GitHub
+    AzureRepo
+}
+
+function Get-UpstreamInfo {
+    param(
+        [Parameter(Mandatory=$true)]
+        [string[]]$Upstream,
+
+        [Parameter(Mandatory=$true)]
+        [string]$UpstreamRemote
+    )
+
+    $upstreamName = '(powershell(core)?)(/_git)?/(powershell)'
+    $pattern = "^$UpstreamRemote\s*(.*)\:(.*/([-\w.]+)/)?$upstreamName(\.git)?.*fetch"
+    Write-Verbose -Verbose "searching for an upstream with regex: '$pattern'"
+    $Upstream = $Upstream | Where-Object { $_ -match $pattern }
+
+    Write-Verbose -Verbose "found $Upstream"
+
+    if (!$Upstream) {
+        throw "Please create an upstream remote that points to $upstreamName"
+    }
+
+    $matches | Format-Table | Out-String -Stream -Width 9999 | Write-Verbose
+    $org = $matches[3]
+    if ($org -ne 'github.com' -and $matches[1] -ne 'git@github.com') {
+        Write-Verbose 'parsing Azure repo remote' -Verbose
+        # Azure Repo remote
+        $project = $matches[4]
+        $repo = $matches[7]
+        $upstreamHost = $matches[1]
+
+        if ($upstreamHost -eq 'https') {
+            $upstreamHost = $org
+        }
+        # matches everything but `.` ending in a `.`
+        # in other word, matching the first part of a hostname.
+        # like `www.microsoft.com` it would match `www.` with `www` in a capture group.
+        if ($org -match '([^\..]*)\.') {
+            $org = $Matches[1]
+        }
+    } else {
+        Write-Verbose 'parsing github remote' -Verbose
+        # GitHub Repo remote
+        $org = $matches[4]
+        $repo = $matches[7]
+        $upstreamHost = 'github.com'
+        $project = $upstreamHost
+    }
+
+    $remoteType = [RemoteType]::GitHub
+
+    if ($upstreamHost -match '.*azure.com$' -or $upstreamHost -match '.*visualstudio.com$') {
+        [RemoteType] $remoteType = [RemoteType]::AzureRepo
+    }
+
+    $upstreamMatchInfo = @{
+        org     = $org
+        project = $project
+        repo    = $repo
+        host    = $upstreamHost
+        remoteType = $remoteType
+    }
+
+    return $upstreamMatchInfo
+}
 
 # Backports a PR
 # requires:
@@ -740,7 +900,7 @@ function Invoke-PRBackport {
         $PrNumber,
 
         [Parameter(Mandatory)]
-        [ValidateScript({$_ -match '^release/v\d+\.\d+\.\d+'})]
+        [ValidateScript({$_ -match '^release/v\d+\.\d+(\.\d+)?'})]
         [string]
         $Target,
 
@@ -748,7 +908,10 @@ function Invoke-PRBackport {
         $Overwrite,
 
         [string]
-        $BranchPostFix
+        $BranchPostFix,
+
+        [string]
+        $UpstreamRemote = 'upstream'
     )
     function script:Invoke-NativeCommand {
         param(
@@ -765,8 +928,8 @@ function Invoke-PRBackport {
         )
         $continue = $false
         while(!$continue) {
-            $input= Read-Host -Prompt ($Message + "`nType 'Yes<enter>' to continue 'No<enter>' to exit")
-            switch($input) {
+            $value = Read-Host -Prompt ($Message + "`nType 'Yes<enter>' to continue 'No<enter>' to exit")
+            switch($value) {
                 'yes' {
                     $continue= $true
                 }
@@ -792,15 +955,14 @@ function Invoke-PRBackport {
         throw "PR is not merged ($state)"
     }
 
-    $upstream = $null
-    $upstreamName = 'powershell/powershell'
-    $upstream = Invoke-NativeCommand { git remote -v } | Where-Object { $_ -match "^upstream.*$upstreamName.*fetch" }
+    $upstream = Invoke-NativeCommand { git remote -v }
+    $upstreamMatchInfo = Get-UpstreamInfo -Upstream $upstream -UpstreamRemote $UpstreamRemote
+    $remoteType = $upstreamMatchInfo.remoteType
 
-    if (!$upstream) {
-        throw "Please create an upstream remote that points to $upstreamName"
-    }
+    Write-Verbose -Verbose "remotetype: $remoteType"
+    $upstreamMatchInfo | Format-Table | Out-String -Stream -Width 9999 | Write-Verbose -Verbose
 
-    Invoke-NativeCommand { git fetch upstream $Target }
+    Invoke-NativeCommand { git fetch $UpstreamRemote $Target }
 
     $switch = '-c'
     if ($Overwrite) {
@@ -812,10 +974,22 @@ function Invoke-PRBackport {
         $branchName += "-$BranchPostFix"
     }
 
-    if ($PSCmdlet.ShouldProcess("Create branch $branchName from upstream/$Target")) {
-        Invoke-NativeCommand { git switch upstream/$Target $switch $branchName }
+    if ($PSCmdlet.ShouldProcess("Create branch $branchName from $UpstreamRemote/$Target")) {
+        Invoke-NativeCommand { git switch $UpstreamRemote/$Target $switch $branchName }
+    }
+
+    try {
+        $revParseParams = @(
+            '--verify'
+            "$commitId^{commit}"
+        )
+        Invoke-NativeCommand { git rev-parse --quiet $revParseParams }
+    }
+    catch {
+        throw "Commit does not exist.  Try fetching the upstream. (git rev-parse $revParseParams)"
     }
 
+
     try {
         Invoke-NativeCommand { git cherry-pick $commitId }
     }
@@ -824,7 +998,72 @@ function Invoke-PRBackport {
     }
 
     if ($PSCmdlet.ShouldProcess("Create the PR")) {
-        gh pr create --base $Target --title $backportTitle --body "Backport #$PrNumber" --web
+        $body = "Backport #$PrNumber"
+        switch($remoteType) {
+            "AzureRepo" {
+                Write-Verbose -Verbose "Pushing branch to $UpstreamRemote"
+                git push --set-upstream $UpstreamRemote HEAD
+                $parameters = @(
+                    'repos'
+                    'pr'
+                    'create'
+                )
+                # Open in the browser
+                $parameters += @(
+                    '--open'
+                )
+                $parameters += @(
+                    '--target-branch'
+                    $Target
+                )
+                $parameters += @(
+                    '--title'
+                    $backportTitle
+                )
+                $parameters += @(
+                    '--description'
+                $body
+                )
+                $parameters += @(
+                    '--squash'
+                    'true'
+                )
+                $parameters += @(
+                    '--auto-complete'
+                    'true'
+                )
+                $parameters += @(
+                    '--delete-source-branch'
+                    'true'
+                )
+                $parameters += @(
+                    '--org'
+                    "https://dev.azure.com/$($upstreamMatchInfo.org)"
+                )
+                $parameters += @(
+                    '--project'
+                    $upstreamMatchInfo.project
+                )
+                $parameters += @(
+                    '--source-branch'
+                    $branchName
+                )
+                $parameters += @(
+                    '--repository'
+                    $upstreamMatchInfo.repo
+                )
+
+                Write-Verbose -Verbose "az $parameters"
+                $null = Invoke-NativeCommand { az $parameters }
+            }
+            "GitHub" {
+                Write-Verbose -Verbose "Creating PR using gh CLI"
+                gh pr create --base $Target --title $backportTitle --body $body --web
+            }
+            default {
+                throw "unknown remoteType: $remoteType"
+            }
+        }
     }
 }
 
@@ -848,4 +1087,4 @@ function Invoke-PRBackportApproved {
         }
 }
 
-Export-ModuleMember -Function Get-ChangeLog, Get-NewOfficalPackage, Update-PsVersionInCode, Get-PRBackportReport, Invoke-PRBackport, Invoke-PRBackportApproved
+Export-ModuleMember -Function Get-ChangeLog, Get-NewOfficalPackage, Update-PsVersionInCode, Get-PRBackportReport, Invoke-PRBackport, Invoke-PRBackportApproved, Get-UpstreamInfo
diff --git a/tools/super-linter/config/super-linter.env b/tools/super-linter/config/super-linter.env
new file mode 100644
index 00000000000..e7324b0feb9
--- /dev/null
+++ b/tools/super-linter/config/super-linter.env
@@ -0,0 +1,8 @@
+VALIDATE_ALL_CODEBASE=false
+DEFAULT_BRANCH=master
+FILTER_REGEX_INCLUDE=.*\.md
+VALIDATE_EDITORCONFIG=false
+VALIDATE_JSCPD=false
+VALIDATE_CHECKOV=false
+FIX_MARKDOWN_PRETTIER=true
+FIX_MARKDOWN=true
diff --git a/tools/super-linter/super-linter.ps1 b/tools/super-linter/super-linter.ps1
new file mode 100644
index 00000000000..571ba9c7f8d
--- /dev/null
+++ b/tools/super-linter/super-linter.ps1
@@ -0,0 +1,15 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+param(
+    [string]$RepoRoot = (Join-Path -Path $PSScriptRoot -ChildPath '../..'),
+    [string]$Platform
+)
+
+$resolvedPath = (Resolve-Path $RepoRoot).ProviderPath
+$platformParam = @()
+if ($Platform) {
+    $platformParam = @("--platform", $Platform)
+}
+
+docker run $platformParam -e RUN_LOCAL=true --env-file "$PSScriptRoot/config/super-linter.env" -v "${resolvedPath}:/tmp/lint"  ghcr.io/super-linter/super-linter:latest
diff --git a/tools/wix/Microsoft.PowerShell.Packaging.csproj b/tools/wix/Microsoft.PowerShell.Packaging.csproj
new file mode 100644
index 00000000000..3f59a225100
--- /dev/null
+++ b/tools/wix/Microsoft.PowerShell.Packaging.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <Import Project="..\..\PowerShell.Common.props" />
+
+  <ItemGroup>
+    <!-- Keep version in sync with wix.psm1 line 18 -->
+    <PackageReference Include="Microsoft.Signed.Wix" Version="3.14.1-8722.20240403.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/tools/NamedPipeConnection/nuget.config b/tools/wix/nuget.config
similarity index 61%
rename from test/tools/NamedPipeConnection/nuget.config
rename to tools/wix/nuget.config
index 6548586147e..ce91b13c60b 100644
--- a/test/tools/NamedPipeConnection/nuget.config
+++ b/tools/wix/nuget.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/tools/wix/wix.psm1 b/tools/wix/wix.psm1
new file mode 100644
index 00000000000..8d4dd45fdc9
--- /dev/null
+++ b/tools/wix/wix.psm1
@@ -0,0 +1,108 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+function Append-Path
+{
+    param
+    (
+        $path
+    )
+    $machinePathString = [System.Environment]::GetEnvironmentVariable('path',[System.EnvironmentVariableTarget]::Machine)
+    $machinePath = $machinePathString -split ';'
+
+    if($machinePath -inotcontains $path)
+    {
+        $newPath = "$machinePathString;$path"
+        Write-Verbose "Adding $path to path..." -Verbose
+        [System.Environment]::SetEnvironmentVariable('path',$newPath,[System.EnvironmentVariableTarget]::Machine)
+        Write-Verbose "Added $path to path." -Verbose
+    }
+    else
+    {
+        Write-Verbose "$path already in path." -Verbose
+    }
+}
+
+# Install using Wix Zip because the MSI requires an older version of dotnet
+# which was large and unstable in docker
+function Install-Wix
+{
+    param($arm64 = $false)
+
+    $targetRoot = $arm64 ? "${env:ProgramFiles(x86)}\Arm Support WiX Toolset xcopy" : "${env:ProgramFiles(x86)}\WiX Toolset xcopy"
+    # cleanup previous install
+    if(Test-Path $targetRoot) {
+        Remove-Item $targetRoot -Recurse -Force
+    }
+    $binPath = Join-Path -Path $targetRoot -ChildPath 'bin'
+
+    $psresourceGet = Get-Module -ListAvailable -Name 'Microsoft.PowerShell.PSResourceGet' -ErrorAction SilentlyContinue
+
+    if (-not $psresourceGet) {
+        Install-Module -Name 'Microsoft.PowerShell.PSResourceGet' -Force -AllowClobber -Scope CurrentUser
+    }
+
+    $respository = Get-PSResourceRepository -Name 'dotnet-eng' -ErrorAction SilentlyContinue
+
+    if (-not $respository) {
+        Write-Verbose -Verbose "Registering dotnet-eng repository..."
+        Register-PSResourceRepository -Name 'dotnet-eng' -Uri 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' -Trusted
+    }
+
+    # keep version in sync with Microsoft.PowerShell.Packaging.csproj
+
+    if (-not (Test-Path $binPath)) {
+        $null = New-Item -ItemType Directory -Path $binPath
+        Write-Verbose -Verbose "Created bin directory for WIX at $binPath"
+    }
+
+    try {
+        Save-PSResource -Name 'Microsoft.Signed.Wix' -Repository 'dotnet-eng' -path "$binPath/" -Prerelease
+    }
+    finally {
+        Write-Verbose -Verbose "Unregistering dotnet-eng repository..."
+        Unregister-PSResourceRepository -Name 'dotnet-eng'
+    }
+
+    $docExpandPath = Join-Path -Path "$binPath\Microsoft.Signed.Wix\3.14.1\tools\" -ChildPath 'doc'
+    $sdkExpandPath = Join-Path -Path "$binPath\Microsoft.Signed.Wix\3.14.1\tools\" -ChildPath 'sdk'
+    $x86ExpandPath = Join-Path -Path "$binPath\Microsoft.Signed.Wix\3.14.1\tools\" -ChildPath 'x86'
+
+    $docTargetPath = Join-Path -Path $targetRoot -ChildPath 'doc'
+
+    if (-not (Test-Path $docTargetPath)) {
+        $null = New-Item -ItemType Directory -Path $docTargetPath
+        Write-Verbose -Verbose "Created doc directory for WIX at $docTargetPath"
+    }
+
+    $sdkTargetPath = Join-Path -Path $targetRoot -ChildPath 'sdk'
+
+    if (-not (Test-Path $sdkTargetPath)) {
+        $null = New-Item -ItemType Directory -Path $sdkTargetPath
+        Write-Verbose -Verbose "Created sdk directory for WIX at $sdkTargetPath"
+    }
+
+    $binTargetPath = Join-Path -Path $targetRoot -ChildPath 'bin'
+
+    if (-not (Test-Path $binTargetPath)) {
+        $null = New-Item -ItemType Directory -Path $binTargetPath
+        Write-Verbose -Verbose "Created bin directory for WIX at $binTargetPath"
+    }
+
+    $x86TargetPath = Join-Path -Path $binPath -ChildPath 'x86'
+
+    if (-not (Test-Path $x86TargetPath)) {
+        $null = New-Item -ItemType Directory -Path $x86TargetPath
+        Write-Verbose -Verbose "Created x86 directory for WIX at $x86TargetPath"
+    }
+
+    Write-Verbose "Fixing folder structure ..." -Verbose
+    Copy-Item -Path $docExpandPath -Destination $docTargetPath -Force
+    Copy-Item -Path $sdkExpandPath -Destination $sdkTargetPath -Force
+    Copy-Item -Path "$binPath\Microsoft.Signed.Wix\3.14.1\tools\*" -Destination $binTargetPath -Force
+    Copy-Item -Path $x86ExpandPath -Destination $x86TargetPath -Force -Recurse -Verbose
+    Copy-Item -Path "$x86ExpandPath\burn.exe" -Destination "$x86TargetPath\burn.exe" -Force -Verbose
+
+    Append-Path -path $binPath
+    Write-Verbose "Done installing WIX!"
+}