Update Wix toolset version to 3.10.4 (dotnet/core-setup#3559)

* Update Wix toolset version to 3.10.4

* Refactoring as per review

* cleanup work

Commit migrated from https://github.com/dotnet/core-setup/commit/1958c5b97f8496a59390825ae7ff966cfea3cb46

diff --git a/src/installer/pkg/packaging/windows/GetWix.ps1 b/src/installer/pkg/packaging/windows/GetWix.ps1
index 498c89a..9048543 100644 (file)
--- a/src/installer/pkg/packaging/windows/GetWix.ps1
+++ b/src/installer/pkg/packaging/windows/GetWix.ps1
@@ -1,5 +1,5 @@
 Param(
-    [string]$WixFilename="wix.3.10.2.zip",
+    [string]$WixFilename,
     [string]$OutputDir="."
 )
 

diff --git a/src/installer/pkg/packaging/windows/package.props b/src/installer/pkg/packaging/windows/package.props
index fb61f61..f9f36e3 100644 (file)
--- a/src/installer/pkg/packaging/windows/package.props
+++ b/src/installer/pkg/packaging/windows/package.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <WindowsScriptRoot>$(PackagingRoot)windows\</WindowsScriptRoot>
-    <WixVersion>3.10.2</WixVersion>
+    <WixVersion>3.10.4</WixVersion>
     <GetWixScript>$(WindowsScriptRoot)GetWix.ps1</GetWixScript>
     <WixToolsDir>$(IntermediateOutputRootPath)WixTools.$(WixVersion)</WixToolsDir>
     <WixObjRoot>$(IntermediateOutputRootPath)wix/</WixObjRoot>

diff --git a/src/installer/pkg/packaging/windows/package.targets b/src/installer/pkg/packaging/windows/package.targets
index e1b7145..d70026c 100644 (file)
--- a/src/installer/pkg/packaging/windows/package.targets
+++ b/src/installer/pkg/packaging/windows/package.targets
@@ -22,11 +22,10 @@
             Condition="'$(OSGroup)' == 'Windows_NT' and '$(GenerateMSI)' == 'true'">
       
       <PropertyGroup>
-        <WixVersion Condition="'$(WixVersion)' == ''">3.10.2</WixVersion>
         <WixFilename>wix.$(WixVersion).zip</WixFilename>
       </PropertyGroup>
 
-      <Exec Command="powershell -NoProfile -NoLogo $(GetWixScript) -WixVersion $(WixVersion) -OutputDir $(WixToolsDir)" />
+      <Exec Command="powershell -NoProfile -NoLogo $(GetWixScript) -WixFilename $(WixFilename) -OutputDir $(WixToolsDir)" />
       
       <ItemGroup>
         <_filelist Include="$(WixToolsDir)\**" />