diff --git a/packaging/windows/dotnet.wxs b/packaging/windows/dotnet.wxs
index 6c487db9b..c3123d83e 100644
--- a/packaging/windows/dotnet.wxs
+++ b/packaging/windows/dotnet.wxs
@@ -13,7 +13,6 @@
-
@@ -25,18 +24,17 @@
-
+
+
-
-
-
+
diff --git a/packaging/windows/envvars.wxs b/packaging/windows/envvars.wxs
deleted file mode 100644
index 60ffc6648..000000000
--- a/packaging/windows/envvars.wxs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packaging/windows/generatemsi.ps1 b/packaging/windows/generatemsi.ps1
index aa0f36fdb..b0a2bef2d 100644
--- a/packaging/windows/generatemsi.ps1
+++ b/packaging/windows/generatemsi.ps1
@@ -43,7 +43,7 @@ function RunHeat
Write-Host Running heat..
- .\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Null
+ .\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Host
if($LastExitCode -ne 0)
{
@@ -66,10 +66,9 @@ function RunCandle
.\candle.exe -dDotnetSrc="$inputDir" -dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" -dBuildVersion="$env:DOTNET_BUILD_VERSION" -arch x64 `
-ext WixDependencyExtension.dll `
"$AuthWsxRoot\dotnet.wxs" `
- "$AuthWsxRoot\envvars.wxs" `
"$AuthWsxRoot\provider.wxs" `
"$AuthWsxRoot\registrykeys.wxs" `
- $InstallFileswsx | Out-Null
+ $InstallFileswsx | Out-Host
if($LastExitCode -ne 0)
{
@@ -91,11 +90,10 @@ function RunLight
.\light -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension `
-cultures:en-us `
dotnet.wixobj `
- envvars.wixobj `
provider.wixobj `
registrykeys.wixobj `
$InstallFilesWixobj `
- -out $DotnetMSIOutput | Out-Null
+ -out $DotnetMSIOutput | Out-Host
if($LastExitCode -ne 0)
{
diff --git a/packaging/windows/registrykeys.wxs b/packaging/windows/registrykeys.wxs
index feac69619..89196b7b9 100644
--- a/packaging/windows/registrykeys.wxs
+++ b/packaging/windows/registrykeys.wxs
@@ -4,12 +4,14 @@
-
-
-
-
+
+
+
+
-
+
+
+
\ No newline at end of file