Skip to content

[release/v7.4.3] Use feed with signed wix package #23923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 1 commit into from
Jun 11, 2024
Merged

[release/v7.4.3] Use feed with signed wix package #23923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vsts-ci/windows/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pr:
- test/packaging/windows/*
- tools/ci.psm1
- tools/packaging/*
- tools/wix/*

variables:
- name: GIT_CONFIG_PARAMETERS
Expand Down
2 changes: 1 addition & 1 deletion tools/wix/Microsoft.PowerShell.Packaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 10 additions & 0 deletions tools/wix/nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions tools/wix/wix.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down