From a545c8de2f9e517a6f0668c68711485da5028f28 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 1 Jun 2023 16:13:55 -0700
Subject: [PATCH] Disable SBOM signing for CI and add extra files for packaging
 tests (#19729)

---
 .../windows/templates/windows-packaging.yml   | 13 +++
 tools/packaging/boms/windows.json             | 96 ++++++++++---------
 2 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 832fe73af5..ec5ebfa9db 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -70,6 +70,19 @@ jobs:
       Build_Repository_Uri: $(build.repository.uri)
       displayName: SBOM
       sourceScanPath: '$(repoPath)\tools'
+      signSBOM: false
+
+  - pwsh: |
+      $manifestFolder = Join-Path -Path '$(System.ArtifactsDirectory)/mainBuild' -ChildPath '_manifest'
+
+      if (-not (Test-Path $manifestFolder)) {
+        throw "_manifest folder does not exist under $(System.ArtifactsDirectory)/mainBuild"
+      }
+
+      $null = New-Item -Path "$manifestFolder/spdx_2.2/bsi.json" -Verbose -Force
+      $null = New-Item -Path "$manifestFolder/spdx_2.2/manifest.cat" -Verbose -Force
+
+    displayName: Create fake SBOM manifest signed files
 
   - pwsh: |
       Import-Module .\tools\ci.psm1
diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index 80ed8f3d0a..8285c23937 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"
@@ -12,11 +20,11 @@
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "api-ms-win-core-com-private-l1-1-0.dll",
+    "Pattern": "api-ms-win-core-comm-l1-1-0.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "api-ms-win-core-comm-l1-1-0.dll",
+    "Pattern": "api-ms-win-core-com-private-l1-1-0.dll",
     "FileType": "NonProduct"
   },
   {
@@ -271,6 +279,10 @@
     "Pattern": "api-ms-win-core-shutdown-l1-1-1.dll",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "API-MS-Win-Core-StringAnsi-L1-1-0.dll",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "api-ms-win-core-string-l1-1-0.dll",
     "FileType": "NonProduct"
@@ -279,18 +291,6 @@
     "Pattern": "API-MS-Win-Core-String-L2-1-0.dll",
     "FileType": "NonProduct"
   },
-  {
-    "Pattern": "api-ms-win-core-string-obsolete-l1-1-0.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "api-ms-win-core-string-obsolete-l1-1-1.dll",
-    "FileType": "NonProduct"
-  },
-  {
-    "Pattern": "API-MS-Win-Core-StringAnsi-L1-1-0.dll",
-    "FileType": "NonProduct"
-  },
   {
     "Pattern": "api-ms-win-core-stringloader-l1-1-0.dll",
     "FileType": "NonProduct"
@@ -299,6 +299,14 @@
     "Pattern": "api-ms-win-core-stringloader-l1-1-1.dll",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "api-ms-win-core-string-obsolete-l1-1-0.dll",
+    "FileType": "NonProduct"
+  },
+  {
+    "Pattern": "api-ms-win-core-string-obsolete-l1-1-1.dll",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "api-ms-win-core-synch-l1-1-0.dll",
     "FileType": "NonProduct"
@@ -1400,11 +1408,11 @@
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "mscordaccore_*.dll",
+    "Pattern": "mscordaccore.dll",
     "FileType": "NonProduct"
   },
   {
-    "Pattern": "mscordaccore.dll",
+    "Pattern": "mscordaccore_*.dll",
     "FileType": "NonProduct"
   },
   {
@@ -1551,26 +1559,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"
@@ -1599,6 +1587,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"
@@ -2579,14 +2587,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"
@@ -2603,6 +2603,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"