From 1f02772fd97fea7395fbb7b68e2befd5790db392 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 1 Jun 2023 16:49:11 -0700
Subject: [PATCH] Update `windows.json` packaging BOM (#19728)

---
 tools/packaging/boms/windows.json | 68 +++++++++++++++++--------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index 75b6ddf326..8b3ac660f4 100644
--- a/tools/packaging/boms/windows.json
+++ b/tools/packaging/boms/windows.json
@@ -1,4 +1,12 @@
 [
+  {
+    "Pattern": "_manifest\\spdx_2.2\\bsi.json",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "_manifest\\spdx_2.2\\manifest.cat",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "Accessibility.dll",
     "FileType": "NonProduct"
@@ -868,11 +876,11 @@
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "mscordaccore_*.dll",
+    "Pattern": "mscordaccore.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "mscordaccore.dll",
+    "Pattern": "mscordaccore_*.dll",
     "FileType": "NonProduct"
   },
   {
@@ -1011,26 +1019,6 @@
     "Pattern": "PresentationCore.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "PresentationFramework-SystemCore.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "PresentationFramework-SystemData.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "PresentationFramework-SystemDrawing.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "PresentationFramework-SystemXml.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "PresentationFramework-SystemXmlLinq.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "PresentationFramework.Aero.dll",
     "FileType": "NonProduct"
@@ -1059,6 +1047,26 @@
     "Pattern": "PresentationFramework.Royale.dll",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "PresentationFramework-SystemCore.dll",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "PresentationFramework-SystemData.dll",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "PresentationFramework-SystemDrawing.dll",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "PresentationFramework-SystemXml.dll",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "PresentationFramework-SystemXmlLinq.dll",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "PresentationNative_cor3.dll",
     "FileType": "NonProduct"
@@ -2055,14 +2063,6 @@
     "Pattern": "Schemas/PSMaml/ITPro.xsd",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "Schemas/PSMaml/Maml_HTML_Style.xsl",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "Schemas/PSMaml/Maml_HTML.xsl",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "Schemas/PSMaml/Maml.rld",
     "FileType": "NonProduct"
@@ -2079,6 +2079,14 @@
     "Pattern": "Schemas/PSMaml/Maml.xsx",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "Schemas/PSMaml/Maml_HTML.xsl",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "Schemas/PSMaml/Maml_HTML_Style.xsl",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "Schemas/PSMaml/ManagedDeveloper.xsd",
     "FileType": "NonProduct"