From 0bb6d7b430117bf5ab0ac2558552ce1c236dd983 Mon Sep 17 00:00:00 2001
From: Tess Gauthier <tgauth@bu.edu>
Date: Wed, 8 May 2024 15:27:24 -0400
Subject: [PATCH 1/3] use feed with signed wix package

---
 tools/wix/Microsoft.PowerShell.Packaging.csproj |  2 +-
 tools/wix/nuget.config                          | 10 ++++++++++
 tools/wix/wix.psm1                              |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 tools/wix/nuget.config

diff --git a/tools/wix/Microsoft.PowerShell.Packaging.csproj b/tools/wix/Microsoft.PowerShell.Packaging.csproj
index bddbe6474de..3f59a225100 100644
--- a/tools/wix/Microsoft.PowerShell.Packaging.csproj
+++ b/tools/wix/Microsoft.PowerShell.Packaging.csproj
@@ -3,7 +3,7 @@
 
   <ItemGroup>
     <!-- Keep version in sync with wix.psm1 line 18 -->
-    <PackageReference Include="WiX" Version="3.14.1" />
+    <PackageReference Include="Microsoft.Signed.Wix" Version="3.14.1-8722.20240403.1" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/wix/nuget.config b/tools/wix/nuget.config
new file mode 100644
index 00000000000..ce91b13c60b
--- /dev/null
+++ b/tools/wix/nuget.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
diff --git a/tools/wix/wix.psm1 b/tools/wix/wix.psm1
index a6fcf922d3c..15ebb2d47c6 100644
--- a/tools/wix/wix.psm1
+++ b/tools/wix/wix.psm1
@@ -14,9 +14,9 @@ function Install-Wix
         Remove-Item $targetRoot -Recurse -Force
     }
     $binPath = Join-Path -Path $targetRoot -ChildPath 'bin'
-    Register-PSRepository -Name NuGetGallery -SourceLocation https://api.nuget.org/v3/index.json
+    Register-PSRepository -Name NuGetGallery -SourceLocation "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
     # keep version in sync with Microsoft.PowerShell.Packaging.csproj
-    Save-Module -name wix -RequiredVersion 3.14.1 -path "$binPath/"
+    Save-Module -name Microsoft.Signed.Wix -RequiredVersion 3.14.1-8722.20240403.1 -path "$binPath/"
     $docExpandPath = Join-Path -Path $binPath -ChildPath 'doc'
     $sdkExpandPath = Join-Path -Path $binPath -ChildPath 'sdk'
     $docTargetPath = Join-Path -Path $targetRoot -ChildPath 'doc'

From 5c24e8f75e821eea57419855f3bce73485eac13c Mon Sep 17 00:00:00 2001
From: Tess Gauthier <tgauth@bu.edu>
Date: Wed, 8 May 2024 15:47:45 -0400
Subject: [PATCH 2/3] include wix folder in path filter

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

diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml
index d0e3c101081..05f69400719 100644
--- a/.vsts-ci/windows/windows-packaging.yml
+++ b/.vsts-ci/windows/windows-packaging.yml
@@ -38,6 +38,7 @@ pr:
     - test/packaging/windows/*
     - tools/ci.psm1
     - tools/packaging/*
+    - tools/wix/*
 
 variables:
   - name: GIT_CONFIG_PARAMETERS

From e49d7aaf79c08d16d3cb8b3d7c1a2e51dfaeb3aa Mon Sep 17 00:00:00 2001
From: Tess Gauthier <tgauth@bu.edu>
Date: Wed, 8 May 2024 16:50:16 -0400
Subject: [PATCH 3/3] update repository name

---
 tools/wix/wix.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/wix/wix.psm1 b/tools/wix/wix.psm1
index 15ebb2d47c6..abc944aac99 100644
--- a/tools/wix/wix.psm1
+++ b/tools/wix/wix.psm1
@@ -14,9 +14,9 @@ function Install-Wix
         Remove-Item $targetRoot -Recurse -Force
     }
     $binPath = Join-Path -Path $targetRoot -ChildPath 'bin'
-    Register-PSRepository -Name NuGetGallery -SourceLocation "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
+    Register-PSRepository -Name 'dotnet-eng' -SourceLocation "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
     # keep version in sync with Microsoft.PowerShell.Packaging.csproj
-    Save-Module -name Microsoft.Signed.Wix -RequiredVersion 3.14.1-8722.20240403.1 -path "$binPath/"
+    Save-Module -name Microsoft.Signed.Wix -RequiredVersion '3.14.1-8722.20240403.1' -path "$binPath/"
     $docExpandPath = Join-Path -Path $binPath -ChildPath 'doc'
     $sdkExpandPath = Join-Path -Path $binPath -ChildPath 'sdk'
     $docTargetPath = Join-Path -Path $targetRoot -ChildPath 'doc'