Skip to content

Commit ad81bab

Browse files
tgauthadityapatwardhan
authored andcommitted
Use feed with Microsoft Wix toolset (#21651)
1 parent f2cdabe commit ad81bab

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

.vsts-ci/windows/windows-packaging.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ pr:
5454
- test/packaging/windows/*
5555
- tools/ci.psm1
5656
- tools/packaging/*
57+
- tools/wix/*
5758

5859
variables:
5960
- name: GIT_CONFIG_PARAMETERS

tools/wix/Microsoft.PowerShell.Packaging.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<ItemGroup>
55
<!-- Keep version in sync with wix.psm1 line 18 -->
6-
<PackageReference Include="WiX" Version="3.14.1" />
6+
<PackageReference Include="Microsoft.Signed.Wix" Version="3.14.1-8722.20240403.1" />
77
</ItemGroup>
88

99
</Project>

tools/wix/nuget.config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
6+
</packageSources>
7+
<disabledPackageSources>
8+
<clear />
9+
</disabledPackageSources>
10+
</configuration>

tools/wix/wix.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ function Install-Wix
1414
Remove-Item $targetRoot -Recurse -Force
1515
}
1616
$binPath = Join-Path -Path $targetRoot -ChildPath 'bin'
17-
Register-PSRepository -Name NuGetGallery -SourceLocation https://api.nuget.org/v3/index.json
17+
Register-PSRepository -Name 'dotnet-eng' -SourceLocation "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
1818
# keep version in sync with Microsoft.PowerShell.Packaging.csproj
19-
Save-Module -name wix -RequiredVersion 3.14.1 -path "$binPath/"
19+
Save-Module -name Microsoft.Signed.Wix -RequiredVersion '3.14.1-8722.20240403.1' -path "$binPath/"
2020
$docExpandPath = Join-Path -Path $binPath -ChildPath 'doc'
2121
$sdkExpandPath = Join-Path -Path $binPath -ChildPath 'sdk'
2222
$docTargetPath = Join-Path -Path $targetRoot -ChildPath 'doc'

0 commit comments

Comments
 (0)