From 58ac696f19bdcd9792f57c15c086bd19c8584d6d Mon Sep 17 00:00:00 2001 From: Robert <36173263+kurtanr@users.noreply.github.com> Date: Sun, 18 Feb 2024 13:40:23 +0100 Subject: [PATCH] Updated wix 3.11.2 -> 3.14.0; Updated PlatformToolset v142 -> v143 (08_MyCppCustomAction.vcxproj). (#22) --- .../DownloadAndExtractWix.ps1 | 2 +- .../01_HelloWorldInstallerUpgradable.wixproj | 6 ++++-- .../packages.config | 2 +- .../02_x86_x64_Installer.wixproj | 4 ++-- 02_x86_x64_Installer/packages.config | 2 +- ...nstallLocationParameterToInstaller.wixproj | 4 ++-- .../packages.config | 2 +- ...PowerShellPreconditionCustomAction.wixproj | 8 +++++--- .../packages.config | 2 +- .../05_RememberPropertyPattern.wixproj | 6 +++--- 05_RememberPropertyPattern/packages.config | 2 +- ...06_RememberPropertyPatternComplete.wixproj | 6 +++--- .../packages.config | 2 +- ..._InstallerWithMyCSharpCustomAction.wixproj | 10 +++++----- .../packages.config | 2 +- .../07_MyCSharpCustomAction.csproj | 6 +++--- .../07_MyCSharpCustomAction/packages.config | 2 +- .../08_InstallerWithMyCppCustomAction.wixproj | 8 +++++--- .../packages.config | 2 +- .../08_MyCppCustomAction.vcxproj | 17 ++++++++-------- .../08_MyCppCustomAction/packages.config | 2 +- .../09_InstallerWithUserInterface.wixproj | 4 ++-- 09_InstallerWithUserInterface/packages.config | 2 +- .../10_WeatherForecastInstaller.wixproj | 20 +++++++++---------- .../WeatherForecastGenerated.wxs | 10 +++++++--- .../packages.config | 2 +- .../README.md | 4 ++-- README.md | 8 ++++---- 28 files changed, 79 insertions(+), 68 deletions(-) diff --git a/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 b/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 index 49810b7..a38978f 100644 --- a/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 +++ b/00_HelloWorldInstaller/DownloadAndExtractWix.ps1 @@ -1,4 +1,4 @@ -$source = "https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip" +$source = "https://github.com/wixtoolset/wix3/releases/download/wix314rtm/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 1e118c4..bc40517 100644 --- a/01_HelloWorldInstallerUpgradable/01_HelloWorldInstallerUpgradable.wixproj +++ b/01_HelloWorldInstallerUpgradable/01_HelloWorldInstallerUpgradable.wixproj @@ -1,6 +1,6 @@ - + Debug x86 @@ -28,6 +28,8 @@ + + @@ -39,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}. - +