Use feed with Microsoft Wix toolset (#21651)

PowerShell · May 11, 2024 · 0f3fd20 · 0f3fd20
1 parent d564d0f
commit 0f3fd20
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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 '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 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'