From 52e82d0d7f385a99c7c1530478d857830da443fb Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 15 Oct 2021 11:29:19 -0700
Subject: [PATCH] Ensure `psoptions.json` and `manifest.spdx.json` files always
 exist in packages (#16258)

---
 tools/packaging/packaging.psm1 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 71c5f4dcbe..e20fb0d014 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -225,6 +225,20 @@ function Start-PSPackage {
         # Copy the default.help.txt so it's part of the package
         Copy-Item "$RepoRoot/assets/default.help.txt" -Destination "$Source/en-US" -Force
 
+        # Make sure psoptions.json file exists so appropriate files.wsx is generated
+        $psOptionsPath = (Join-Path -Path $Source "psoptions.json")
+        if (-not (Test-Path -Path $psOptionsPath)) {
+            $createdOptionsFile = New-Item -Path $psOptionsPath -Force
+            Write-Verbose -Verbose "Created psoptions file: $createdOptionsFile"
+        }
+
+        # Make sure _manifest\spdx_2.2\manifest.spdx.json file exists so appropriate files.wxs is generated
+        $manifestSpdxPath = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.spdx.json")
+        if (-not (Test-Path -Path $manifestSpdxPath)) {
+            $createdSpdxPath = New-Item -Path $manifestSpdxPath -Force
+            Write-Verbose -Verbose "Created manifest.spdx.json file: $createdSpdxPath"
+        }
+
         # If building a symbols package, we add a zip of the parent to publish
         if ($IncludeSymbols.IsPresent)
         {