Update to WiX 3.14.0 (#461) (#463)

microsoft · Feb 12, 2024 · 4e951fa · 4e951fa
1 parent dfd8b1d
commit 4e951fa
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 15 deletions.
diff --git a/.azure/templates/build.yml b/.azure/templates/build.yml
@@ -84,6 +84,13 @@ jobs:
       feedsToUse: config
       nugetConfigPath: ./src/nuget.config
 
+  - task: NuGetCommand@2
+    displayName: Nuget Restore (Installer)
+    inputs:
+      restoreSolution: src\xdpinstaller\xdpinstaller.sln
+      feedsToUse: config
+      nugetConfigPath: ./src/nuget.config
+
   - task: PowerShell@2
     displayName: Prepare for compiling eBPF programs
     inputs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,6 +49,8 @@ jobs:
         echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: Nuget Restore
       run: nuget.exe restore xdp.sln -ConfigFile src/nuget.config
+    - name: Nuget Restore (Installer)
+      run: nuget.exe restore src\xdpinstaller\xdpinstaller.sln -ConfigFile src/nuget.config
     - name: Prepare for compiling eBPF programs
       run: tools/prepare-machine.ps1 -ForEbpfBuild -Verbose
     - name: Build

diff --git a/src/xdp.props b/src/xdp.props
@@ -6,6 +6,7 @@
     <XdpPatchVersion>0</XdpPatchVersion>
     <!-- Project-wide properties -->
     <EbpfPackagePath>$(SolutionDir)packages\eBPF-for-Windows.0.9.0\</EbpfPackagePath>
+    <WiXPackagePath>$(SolutionDir)packages\wix.3.14.0\</WiXPackagePath>
   </PropertyGroup>
   <!-- The set of (eventually?) supported configurations -->
   <ItemGroup Label="ProjectConfigurations">

diff --git a/src/xdpinstaller/packages.config b/src/xdpinstaller/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="WiX" version="3.11.2" />
+    <package id="WiX" version="3.14.0" />
 </packages>
diff --git a/src/xdpinstaller/xdpinstaller.wixproj b/src/xdpinstaller/xdpinstaller.wixproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(SolutionDir)..\..\src\xdp.props" />
   <PropertyGroup>
     <ProductVersion>3.10</ProductVersion>
@@ -24,7 +24,6 @@
     <Compile Include="Product.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config" />
     <Content Include="scripts\xdp-setup.ps1" />
   </ItemGroup>
   <ItemGroup>
@@ -38,17 +37,12 @@
   <ItemGroup>
     <Folder Include="scripts" />
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
+  <ItemGroup>
+    <None Include="$(SolutionDir)packages.config" />
+  </ItemGroup>
+  <Import Project="$(WixPackagePath)build\wix.props" Condition="Exists('$(WixPackagePath)\build\wix.props')" />
+  <Import Project="$(WixTargetsPath)" Condition="$(WixTargetsPath) != ''" />
+  <Target Name="EnsureNuGetPackageBuildImports" Condition=" '$(WixTargetsImported)' != 'true' " BeforeTargets="PrepareForBuild">
+    <Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases" />
   </Target>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
 </Project>
diff --git a/tools/build.ps1 b/tools/build.ps1
@@ -57,6 +57,7 @@ if ([string]::IsNullOrEmpty($Project)) {
 
 & $RootDir\tools\prepare-machine.ps1 -ForBuild -Force:$UpdateDeps
 
+Write-Verbose "Restoring packages [xdp.sln]"
 msbuild.exe $RootDir\xdp.sln `
     /t:restore `
     /p:RestorePackagesConfig=true `
@@ -67,6 +68,10 @@ if (!$?) {
     Write-Error "Restoring NuGet packages failed: $LastExitCode"
 }
 
+Write-Verbose "Restoring packages [xdpinstaller.sln]"
+nuget.exe restore $RootDir\src\xdpinstaller\xdpinstaller.sln `
+    -ConfigFile $RootDir\src\nuget.config
+
 & $RootDir\tools\prepare-machine.ps1 -ForEbpfBuild
 
 msbuild.exe $RootDir\xdp.sln `