Upgrade Wix to stable version 3.10.1.

Get rid of dummy project and instead download Wix tools directly.
This commit is contained in:
Sridhar Periyasamy 2016-02-22 11:47:41 -08:00
parent 962411969e
commit 8179958342
4 changed files with 11 additions and 37 deletions

View file

@ -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;
}
}
}

View file

@ -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.

View file

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

View file

@ -15,25 +15,29 @@ $InstallFilesWixobj = "install-files.wixobj"
function AcquireWixTools
{
pushd "$Stage2Dir\bin"
Write-Host Downloading Wixtools..
Write-Host Restoring Wixtools..
$result = Join-Path $OutputDir WiXTools
$result = $env:TEMP
if(Test-Path "$result\tools\candle.exe")
{
return Join-Path $result tools
}
.\dotnet restore $RepoRoot\packaging\windows\WiXTools --packages $result | Out-Null
New-Item $result -type directory -force | Out-Null
Invoke-WebRequest -Uri https://api.nuget.org/packages/wix.3.10.1.nupkg -Method Get -OutFile $result\WixTools.zip
Expand-Archive $result\WixTools.zip -dest $result\
if($LastExitCode -ne 0)
{
$result = ""
Write-Host "dotnet restore failed with exit code $LastExitCode."
Write-Host "Unable to download and extract the WixTools."
}
else
{
$result = Join-Path $result WiX\3.10.0.2103-pre1\tools
$result = Join-Path $result tools
}
popd
return $result
}