[pull] master from PowerShell:master

.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"
+    }
+  ]
+}

.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"
+    ]
+}

.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

.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"
+      ]
+    }
+  }
 }

.editorconfig

@@ -1,6 +1,6 @@
 # EditorConfig is awesome: https://EditorConfig.org
 # .NET coding convention settings for EditorConfig
-# https://docs.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference
+# https://learn.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference
 #
 # This file comes from dotnet repositories:
 # https://github.com/dotnet/runtime/blob/master/.editorconfig
@@ -21,6 +21,7 @@ indent_size = 4
 
 # Shell scripts
 [*.sh]
+end_of_line = lf
 indent_size = 4
 
 # Xml project files
@@ -43,6 +44,9 @@ indent_size = 2
 [*.{props,targets,config,nuspec}]
 indent_size = 2
 
+[*.tsv]
+indent_style = tab
+
 # Dotnet code style settings:
 [*.cs]
 # Sort using and Import directives with System.* appearing first
@@ -99,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
@@ -113,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]
 

.gitattributes

@@ -2,5 +2,6 @@ CHANGELOG.md merge=union
 * text=auto
 *.png binary
 *.rtf binary
+*.sh text eol=lf
 testablescript.ps1 text eol=lf
 TestFileCatalog.txt text eol=lf

.github/CODEOWNERS

@@ -6,72 +6,60 @@
 # 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