Changing the name of the cab file generated by the two msis. Before they were stomping on each other.

Livar Cunha · Livar Cunha · commit 1256bd0d5795 · 2017-07-06T15:46:51.000-07:00
diff --git 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
@@ -6,7 +6,7 @@
 
     <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
 
-    <MediaTemplate CabinetTemplate="dnet-{0}.cab" CompressionLevel="high" />
+    <MediaTemplate CabinetTemplate="dnet-mse-{0}.cab" CompressionLevel="high" />
 
     <Feature Id="MainFeature" Title="Main Feature" Level="1">
       <ComponentGroupRef Id="InstallFiles" />

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ param(`
`16`	`16`	`. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"`
`17`	`17`	`$RepoRoot = Convert-Path "$PSScriptRoot\..\..\.."`
`18`	`18`
`19`		`-$InstallFileswsx = "install-files.wxs"`
`20`		`-$InstallFilesWixobj = "install-files.wixobj"`
	`19`	`+$InstallFileswsx = "install-msbuild-extensions-files.wxs"`
	`20`	`+$InstallFilesWixobj = "install-msbuild-extensions-files.wixobj"`
`21`	`21`
`22`	`22`	`function RunHeat`
`23`	`23`	`{`