From 4d3d3688618c9071ed7f0e0d5b0eb87362259b0d Mon Sep 17 00:00:00 2001
From: PwshBot <pwshbot@microsoft.com>
Date: Tue, 18 Apr 2023 18:54:22 +0000
Subject: [PATCH 1/3] Update .NET SDK version from `8.0.100-preview.2.23157.25`
 to `8.0.100-preview.3.23178.7`

---
 global.json                                   |  2 +-
 ...oft.PowerShell.Commands.Diagnostics.csproj |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           | 20 +++++++++----------
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 16 +++++++--------
 .../ResultsComparer/ResultsComparer.csproj    |  2 +-
 ...soft.PowerShell.NamedPipeConnection.csproj |  2 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 ++--
 12 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/global.json b/global.json
index 845df69857c..1a6ad4fbb96 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.2.23157.25"
+    "version": "8.0.100-preview.3.23178.7"
   }
 }
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 10d4d9de8e0..46f8b45199c 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-preview.2.23128.3" />
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.3.23174.8" />
   </ItemGroup>
 
   <PropertyGroup>
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 5a254cf199c..d5325a78bbc 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-preview.2.23128.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0-preview.3.23174.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 5170227d65f..3cb6cf49b0a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -33,7 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-1.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="System.Threading.AccessControl" Version="8.0.0-preview.3.23174.8" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.0-preview.2.23128.3" />
     <PackageReference Include="NJsonSchema" Version="10.8.0" />
   </ItemGroup>
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 25bd002b426..c4c4e4ed923 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-preview.2.23128.3" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="8.0.0-preview.3.23174.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 67329671c88..4b23fd82487 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -19,18 +19,18 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="System.IO.Packaging" Version="8.0.0-preview.3.23174.8" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0-preview.3.23174.8" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-preview.3.23174.8" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0-preview1.23060.3" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0-preview1.23060.3" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="6.0.0-preview1.23060.3" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0-preview1.23060.3" />
-    <PackageReference Include="System.ServiceModel.Security" Version="6.0.0-preview1.23060.3" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0-rc.23205.4" />
+    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0-rc.23205.4" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="6.0.0-rc.23205.4" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0-rc.23205.4" />
+    <PackageReference Include="System.ServiceModel.Security" Version="6.0.0-rc.23205.4" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.10.2" />
     <!-- the source could not be found for the following package(s) -->
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-preview.3.23174.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index c80283a4533..50ad75c44ac 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-preview.2.23128.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0-preview.3.23174.8" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 3110a52d623..bff75e77480 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -34,16 +34,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="System.DirectoryServices" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.3.23174.8" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0-preview.3.23174.8" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.3.23174.8" />
+    <PackageReference Include="System.DirectoryServices" Version="8.0.0-preview.3.23174.8" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="System.Management" Version="8.0.0-preview.3.23174.8" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="System.Security.Permissions" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.3.23174.8" />
+    <PackageReference Include="System.Security.Permissions" Version="8.0.0-preview.3.23174.8" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-preview.3.23174.8" />
     <!-- the following package(s) are from the powershell org -->
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
     <PackageReference Include="Microsoft.PowerShell.Native" Version="7.4.0-preview.2" />
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 2e0c00506c9..f63f5adde24 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -10,6 +10,6 @@
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
-    <PackageReference Include="Perfolizer" Version="0.2.1" />
+    <PackageReference Include="Perfolizer" Version="0.3.4" />
   </ItemGroup>
 </Project>
diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
index 0a5ca72e317..3959c584e8c 100644
--- a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
+++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
@@ -15,6 +15,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Management.Automation" Version="7.4.0-preview.1" />
+    <PackageReference Include="System.Management.Automation" Version="7.4.0-preview.2" />
   </ItemGroup>
 </Project>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index d1d924628e3..1e25fb6b580 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-preview.3.23174.8" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 0a8bf752e9b..2bc28b42845 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-preview.2.23153.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-preview.3.23177.8" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-preview.3.23174.8" />
   </ItemGroup>
 
   <ItemGroup>

From 243b730047543912d7cb42dfbfca328389463371 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 18 Apr 2023 14:23:42 -0700
Subject: [PATCH 2/3] Lock the version of System.ServiceModel.XX packages

---
 .../Microsoft.PowerShell.SDK.csproj                    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 4b23fd82487..5767001acac 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -23,11 +23,11 @@
     <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0-preview.3.23174.8" />
     <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-preview.3.23174.8" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0-rc.23205.4" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0-rc.23205.4" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="6.0.0-rc.23205.4" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0-rc.23205.4" />
-    <PackageReference Include="System.ServiceModel.Security" Version="6.0.0-rc.23205.4" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.2" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.10.2" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.2" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.2" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.10.2" />
     <PackageReference Include="System.Private.ServiceModel" Version="4.10.2" />
     <!-- the source could not be found for the following package(s) -->
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0-preview.3.23174.8" />

From 79993a51b1db15e8ac35629d7e5bab911f0f5c8f Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 18 Apr 2023 14:39:28 -0700
Subject: [PATCH 3/3] Update Windows.json

---
 tools/packaging/boms/windows.json | 270 ++++--------------------------
 1 file changed, 31 insertions(+), 239 deletions(-)

diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index c1d06bb2c64..dc4329e4751 100644
--- a/tools/packaging/boms/windows.json
+++ b/tools/packaging/boms/windows.json
@@ -1,32 +1,8 @@
 [
-  {
-    "Pattern": "_manifest/spdx_2.2/manifest.spdx.json",
-    "FileType": "Product"
-  },
-  {
-    "Pattern": "_manifest/spdx_2.2/manifest.spdx.json.sha256",
-    "FileType": "Product"
-  },
   {
     "Pattern": "Accessibility.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "assets/Powershell_av_colors.ico",
-    "FileType": "Product"
-  },
-  {
-    "Pattern": "assets/Powershell_avatar.ico",
-    "FileType": "Product"
-  },
-  {
-    "Pattern": "assets/Powershell_black.ico",
-    "FileType": "Product"
-  },
-  {
-    "Pattern": "assets/ps_black_32x32.ico",
-    "FileType": "Product"
-  },
   {
     "Pattern": "clretwrc.dll",
     "FileType": "NonProduct"
@@ -79,22 +55,6 @@
     "Pattern": "cs/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "cs/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "cs/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "cs/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "cs/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "cs/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -183,22 +143,6 @@
     "Pattern": "de/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "de/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "de/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "de/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "de/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "de/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -291,22 +235,6 @@
     "Pattern": "es/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "es/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "es/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "es/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "es/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "es/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -391,22 +319,6 @@
     "Pattern": "fr/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "fr/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "fr/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "fr/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "fr/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "fr/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -507,22 +419,6 @@
     "Pattern": "it/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "it/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "it/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "it/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "it/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "it/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -607,22 +503,6 @@
     "Pattern": "ja/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "ja/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ja/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ja/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ja/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "ja/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -707,22 +587,6 @@
     "Pattern": "ko/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "ko/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ko/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ko/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ko/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "ko/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -775,10 +639,6 @@
     "Pattern": "ko/WindowsFormsIntegration.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "LICENSE.txt",
-    "FileType": "Product"
-  },
   {
     "Pattern": "Markdig.Signed.dll",
     "FileType": "NonProduct"
@@ -1063,22 +923,6 @@
     "Pattern": "pl/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "pl/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pl/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pl/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pl/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "pl/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -1251,22 +1095,6 @@
     "Pattern": "pt-BR/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "pt-BR/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pt-BR/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pt-BR/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "pt-BR/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "pt-BR/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -2023,22 +1851,6 @@
     "Pattern": "ru/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "ru/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ru/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ru/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "ru/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "ru/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -2940,15 +2752,15 @@
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "System.ServiceModel.Duplex.dll",
+    "Pattern": "System.ServiceModel.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "System.ServiceModel.Http.dll",
+    "Pattern": "System.ServiceModel.Duplex.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "System.ServiceModel.NetFramingBase.dll",
+    "Pattern": "System.ServiceModel.Http.dll",
     "FileType": "NonProduct"
   },
   {
@@ -3187,22 +2999,6 @@
     "Pattern": "tr/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "tr/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "tr/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "tr/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "tr/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "tr/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -3319,22 +3115,6 @@
     "Pattern": "zh-Hans/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "zh-Hans/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hans/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hans/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hans/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "zh-Hans/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -3419,22 +3199,6 @@
     "Pattern": "zh-Hant/System.Private.ServiceModel.resources.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "zh-Hant/System.ServiceModel.Http.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hant/System.ServiceModel.NetFramingBase.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hant/System.ServiceModel.NetTcp.resources.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "zh-Hant/System.ServiceModel.Primitives.resources.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "zh-Hant/System.Web.Services.Description.resources.dll",
     "FileType": "NonProduct"
@@ -3487,6 +3251,30 @@
     "Pattern": "zh-Hant/WindowsFormsIntegration.resources.dll",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "_manifest/spdx_2.2/manifest.spdx.json",
+    "FileType": "Product"
+  },
+  {
+    "Pattern": "_manifest/spdx_2.2/manifest.spdx.json.sha256",
+    "FileType": "Product"
+  },
+  {
+    "Pattern": "assets/Powershell_av_colors.ico",
+    "FileType": "Product"
+  },
+  {
+    "Pattern": "assets/Powershell_avatar.ico",
+    "FileType": "Product"
+  },
+  {
+    "Pattern": "assets/Powershell_black.ico",
+    "FileType": "Product"
+  },
+  {
+    "Pattern": "assets/ps_black_32x32.ico",
+    "FileType": "Product"
+  },
   {
     "Pattern": "Install-PowerShellRemoting.ps1",
     "FileType": "Product"
@@ -3495,6 +3283,10 @@
     "Pattern": "InstallPSCorePolicyDefinitions.ps1",
     "FileType": "Product"
   },
+  {
+    "Pattern": "LICENSE.txt",
+    "FileType": "Product"
+  },
   {
     "Pattern": "Microsoft.Management.Infrastructure.CimCmdlets.dll",
     "FileType": "Product"