diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index 75b6ddf3266..8b3ac660f42 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"
   },
   {
@@ -1012,51 +1020,51 @@
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework-SystemCore.dll",
+    "Pattern": "PresentationFramework.Aero.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework-SystemData.dll",
+    "Pattern": "PresentationFramework.Aero2.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework-SystemDrawing.dll",
+    "Pattern": "PresentationFramework.AeroLite.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework-SystemXml.dll",
+    "Pattern": "PresentationFramework.Classic.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework-SystemXmlLinq.dll",
+    "Pattern": "PresentationFramework.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework.Aero.dll",
+    "Pattern": "PresentationFramework.Luna.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework.Aero2.dll",
+    "Pattern": "PresentationFramework.Royale.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework.AeroLite.dll",
+    "Pattern": "PresentationFramework-SystemCore.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework.Classic.dll",
+    "Pattern": "PresentationFramework-SystemData.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework.dll",
+    "Pattern": "PresentationFramework-SystemDrawing.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework.Luna.dll",
+    "Pattern": "PresentationFramework-SystemXml.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "PresentationFramework.Royale.dll",
+    "Pattern": "PresentationFramework-SystemXmlLinq.dll",
     "FileType": "NonProduct"
   },
   {
@@ -2056,27 +2064,27 @@
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "Schemas/PSMaml/Maml_HTML_Style.xsl",
+    "Pattern": "Schemas/PSMaml/Maml.rld",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "Schemas/PSMaml/Maml_HTML.xsl",
+    "Pattern": "Schemas/PSMaml/Maml.tbr",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "Schemas/PSMaml/Maml.rld",
+    "Pattern": "Schemas/PSMaml/Maml.xsd",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "Schemas/PSMaml/Maml.tbr",
+    "Pattern": "Schemas/PSMaml/Maml.xsx",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "Schemas/PSMaml/Maml.xsd",
+    "Pattern": "Schemas/PSMaml/Maml_HTML.xsl",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "Schemas/PSMaml/Maml.xsx",
+    "Pattern": "Schemas/PSMaml/Maml_HTML_Style.xsl",
     "FileType": "NonProduct"
   },
   {