From 1256bd0d5795151adc1c07c5c9c677d91e044256 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 6 Jul 2017 15:46:51 -0700 Subject: [PATCH] Changing the name of the cab file generated by the two msis. Before they were stomping on each other. --- packaging/windows/msbuildextensions/generatemsi.ps1 | 4 ++-- packaging/windows/msbuildextensions/msbuildextensions.wxs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/windows/msbuildextensions/generatemsi.ps1 b/packaging/windows/msbuildextensions/generatemsi.ps1 index 84ca7462e..a7444058d 100644 --- a/packaging/windows/msbuildextensions/generatemsi.ps1 +++ b/packaging/windows/msbuildextensions/generatemsi.ps1 @@ -16,8 +16,8 @@ param( . "$PSScriptRoot\..\..\..\scripts\common\_common.ps1" $RepoRoot = Convert-Path "$PSScriptRoot\..\..\.." -$InstallFileswsx = "install-files.wxs" -$InstallFilesWixobj = "install-files.wixobj" +$InstallFileswsx = "install-msbuild-extensions-files.wxs" +$InstallFilesWixobj = "install-msbuild-extensions-files.wixobj" function RunHeat { diff --git a/packaging/windows/msbuildextensions/msbuildextensions.wxs b/packaging/windows/msbuildextensions/msbuildextensions.wxs index 9cfa987fa..e44a14855 100644 --- a/packaging/windows/msbuildextensions/msbuildextensions.wxs +++ b/packaging/windows/msbuildextensions/msbuildextensions.wxs @@ -6,7 +6,7 @@ - +