From ab3917f32b4c382b1e7a48f507f639aaa57b3cf9 Mon Sep 17 00:00:00 2001 From: kurtanr Date: Tue, 26 Mar 2024 22:26:11 +0100 Subject: [PATCH] Updated wix 3.14.0 -> 3.14.1 --- .../DownloadAndExtractWix.ps1 | 2 +- .../01_HelloWorldInstallerUpgradable.wixproj | 4 ++-- .../packages.config | 2 +- .../02_x86_x64_Installer.wixproj | 4 ++-- 02_x86_x64_Installer/packages.config | 2 +- ...nstallLocationParameterToInstaller.wixproj | 4 ++-- .../packages.config | 2 +- ...PowerShellPreconditionCustomAction.wixproj | 4 ++-- .../packages.config | 2 +- .../05_RememberPropertyPattern.wixproj | 4 ++-- 05_RememberPropertyPattern/packages.config | 2 +- ...06_RememberPropertyPatternComplete.wixproj | 4 ++-- .../packages.config | 2 +- ..._InstallerWithMyCSharpCustomAction.wixproj | 4 ++-- .../packages.config | 2 +- .../07_MyCSharpCustomAction.csproj | 6 +++--- .../07_MyCSharpCustomAction/packages.config | 2 +- .../08_InstallerWithMyCppCustomAction.wixproj | 4 ++-- .../packages.config | 2 +- .../08_MyCppCustomAction.vcxproj | 12 +++++------ .../08_MyCppCustomAction/packages.config | 2 +- .../09_InstallerWithUserInterface.wixproj | 4 ++-- 09_InstallerWithUserInterface/packages.config | 2 +- .../10_WeatherForecastInstaller.wixproj | 20 +++++++++---------- .../WeatherForecastGenerated.wxs | 6 +++--- .../packages.config | 2 +- .../README.md | 2 +- README.md | 4 ++-- WixInstallerExamples.sln | 4 ++-- 29 files changed, 58 insertions(+), 58 deletions(-) diff --git a/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 b/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 index a38978f..8d29f92 100644 --- a/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 +++ b/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 @@ -1,4 +1,4 @@ -$source = "https://github.com/wixtoolset/wix3/releases/download/wix314rtm/wix314-binaries.zip" +$source = "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip" $destination = Join-Path $PSScriptRoot -ChildPath 'wix.zip' $wixFolder = Join-Path $PSScriptRoot -ChildPath 'wix/' diff --git a/01_HelloWorldInstallerUpgradable/01_HelloWorldInstallerUpgradable.wixproj b/01_HelloWorldInstallerUpgradable/01_HelloWorldInstallerUpgradable.wixproj index bc40517..a8e9cf2 100644 --- a/01_HelloWorldInstallerUpgradable/01_HelloWorldInstallerUpgradable.wixproj +++ b/01_HelloWorldInstallerUpgradable/01_HelloWorldInstallerUpgradable.wixproj @@ -1,6 +1,6 @@ - + Debug x86 @@ -41,7 +41,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/WeatherForecastGenerated.wxs b/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/WeatherForecastGenerated.wxs index 685948e..032745d 100644 --- a/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/WeatherForecastGenerated.wxs +++ b/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/WeatherForecastGenerated.wxs @@ -575,8 +575,8 @@ - - + + @@ -1286,7 +1286,7 @@ - + diff --git a/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/packages.config b/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/packages.config index 3b82078..86ace61 100644 --- a/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/packages.config +++ b/10_ASP.NET_Core6_WeatherForecastInstaller/10_WeatherForecastInstaller/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/10_ASP.NET_Core6_WeatherForecastInstaller/README.md b/10_ASP.NET_Core6_WeatherForecastInstaller/README.md index e467206..e95e559 100644 --- a/10_ASP.NET_Core6_WeatherForecastInstaller/README.md +++ b/10_ASP.NET_Core6_WeatherForecastInstaller/README.md @@ -45,7 +45,7 @@ The publish command is creating a [self-contained](https://docs.microsoft.com/en The following statement harvests the WeatherForecast web application publish folder using heat.exe: ``` -$(ProjectDir)..\..\packages\wix.3.14.0\tools\heat.exe dir $(ProjectDir)..\10_WeatherForecast\bin\$(ConfigurationName)\net6.0\win-x86\publish -cg WeatherForecastGroup -out $(ProjectDir)WeatherForecastGenerated.wxs -ag -sfrag -srd -sreg -dr MY_INSTALL_LOCATION -var var.InstallerSource +$(ProjectDir)..\..\packages\wix.3.14.1\tools\heat.exe dir $(ProjectDir)..\10_WeatherForecast\bin\$(ConfigurationName)\net6.0\win-x86\publish -cg WeatherForecastGroup -out $(ProjectDir)WeatherForecastGenerated.wxs -ag -sfrag -srd -sreg -dr MY_INSTALL_LOCATION -var var.InstallerSource ``` | Argument | Description | diff --git a/README.md b/README.md index 52d97f2..81c783f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ WiX (Windows Installer XML) is a framework that lets developers create installers (MSIs) for Windows.\ The Repository contains multiple sample installers which demonstrate how to achieve various tasks using WiX.\ -Examples use version 3.14.0 of WiX. +Examples use version 3.14.1 of WiX.

@@ -25,7 +25,7 @@ choco install wixtoolset Download [NuGet package](https://www.nuget.org/packages/WiX/): ``` -Install-Package wix -Version 3.14.0 +Install-Package wix -Version 3.14.1 ```
diff --git a/WixInstallerExamples.sln b/WixInstallerExamples.sln index 0aba015..ab61dbd 100644 --- a/WixInstallerExamples.sln +++ b/WixInstallerExamples.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31112.23 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34723.18 MinimumVisualStudioVersion = 10.0.40219.1 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "01_HelloWorldInstallerUpgradable", "01_HelloWorldInstallerUpgradable\01_HelloWorldInstallerUpgradable.wixproj", "{E18CC5FC-F028-48A7-9343-E32A85CDF7B3}" EndProject