From 1e129f0fbb6b9b4aaef0dd6241c050eca6a9616e Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 1 Jun 2023 14:26:29 -0700
Subject: [PATCH 1/2] Disable SBOM signing and add fake files

---
 .vsts-ci/windows/templates/windows-packaging.yml | 13 +++++++++++++
 .vsts-ci/windows/windows-packaging.yml           |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 90655ee6298..3961214c86f 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -70,6 +70,7 @@ jobs:
       Build_Repository_Uri: $(build.repository.uri)
       displayName: SBOM
       sourceScanPath: '$(repoPath)\tools'
+      signSBOM: false
 
   # This is needed as SBOM task removed the installed .NET and installs .NET 3.1
   - pwsh: |
@@ -79,6 +80,18 @@ jobs:
     condition: succeeded()
     workingDirectory: $(repoPath)
 
+  - 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
       New-CodeCoverageAndTestPackage
diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml
index d7443ffa135..e225ecf7382 100644
--- a/.vsts-ci/windows/windows-packaging.yml
+++ b/.vsts-ci/windows/windows-packaging.yml
@@ -61,7 +61,7 @@ resources:
       type: github
       endpoint: PowerShell
       name: PowerShell/compliance
-      ref: master
+      ref: adityapatwardhan-patch-1
 
 stages:
 - stage: PackagingWin

From 0c60108b448421dd8cfc0ac814a81dd5bdde2a7b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 1 Jun 2023 15:12:50 -0700
Subject: [PATCH 2/2] Use master branch

---
 .vsts-ci/windows/windows-packaging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml
index e225ecf7382..d7443ffa135 100644
--- a/.vsts-ci/windows/windows-packaging.yml
+++ b/.vsts-ci/windows/windows-packaging.yml
@@ -61,7 +61,7 @@ resources:
       type: github
       endpoint: PowerShell
       name: PowerShell/compliance
-      ref: adityapatwardhan-patch-1
+      ref: master
 
 stages:
 - stage: PackagingWin