Merge pull request #1522 from Sridhar-MS/wix-upgrade

Upgrade Wix to stable version 3.10.2.

packaging/windows/WiXTools/Program.cs

@@ -1,14 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace WiX.Toolset.2015
-{
-    public class Program
-    {
-        public static int Main(string[] args)
-        {
-            // Temporary and bogus. Just needed so we can publish this
-            return 1;
-        }
-    }
-}

packaging/windows/WiXTools/README.md

@@ -1,3 +0,0 @@
-# WiX.Toolset.2015
-
-This is a utility project that brings the Wix Tools down and lets us publish it as though it were an app. Do NOT add any C# code to it! It is not designed to actually be compiled as an assembly, it's just used for its dependencies.

packaging/windows/WiXTools/project.json

@@ -1,13 +0,0 @@
-{
-  "compilationOptions": {
-      "emitEntryPoint": true
-  },
-
-  "dependencies": {
-    "WiX": "3.10.0.2103-pre1"
-  },
-
-  "frameworks": {
-    "dnxcore50": { }
-  }
-}

packaging/windows/generatemsi.ps1

@@ -15,25 +15,26 @@ $InstallFilesWixobj = "install-files.wixobj"
 
 function AcquireWixTools
 {
-    pushd "$Stage2Dir\bin"
+    $result = Join-Path $OutputDir WiXTools
 
-    Write-Host Restoring Wixtools..
+    if(Test-Path "$result\candle.exe")
+    {
+        return $result
+    }
 
-    $result = $env:TEMP
+    Write-Host Downloading Wixtools..
+    New-Item $result -type directory -force | Out-Null
+    # Download Wix version 3.10.2 - https://wix.codeplex.com/releases/view/619491
+    Invoke-WebRequest -Uri https://wix.codeplex.com/downloads/get/1540241 -Method Get -OutFile $result\WixTools.zip
 
-    .\dotnet restore $RepoRoot\packaging\windows\WiXTools --packages $result | Out-Null
+    Write-Host Extracting Wixtools..
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$result\WixTools.zip", $result)
 
     if($LastExitCode -ne 0)
     {
-        $result = ""
+        throw "Unable to download and extract the WixTools."
-        Write-Host "dotnet restore failed with exit code $LastExitCode."
-    }
-    else
-    {
-        $result = Join-Path $result WiX\3.10.0.2103-pre1\tools
     }
 
-    popd
     return $result
 }