From bb9eb1675f5a43dee7f2d1271cf9b98091318868 Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Mon, 12 Feb 2018 19:04:26 -0500 Subject: [PATCH] Get WiX extensions from NuGet --- Bootstrapper/Bootstrapper.wixproj | 13 ++++++++----- Bootstrapper/packages.config | 5 +++++ Setup/Setup.wixproj | 11 +++++++---- Setup/packages.config | 4 ++++ 4 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 Bootstrapper/packages.config create mode 100644 Setup/packages.config diff --git a/Bootstrapper/Bootstrapper.wixproj b/Bootstrapper/Bootstrapper.wixproj index a0f0c0e..3f1a29b 100644 --- a/Bootstrapper/Bootstrapper.wixproj +++ b/Bootstrapper/Bootstrapper.wixproj @@ -26,17 +26,17 @@ - ..\..\WixBalExtensionExt\wixext\bin\Release\WixBalExtensionExt.dll + ..\packages\WixBalExtensionExt.1.0.0.49\lib\WixBalExtensionExt.dll WixBalExtensionExt + + ..\packages\WixFileVersionExtension.1.0.0.3\lib\WixFileVersionExtension.dll + WixFileVersionExtension + $(WixExtDir)\WixNetFxExtension.dll WixNetFxExtension - - ..\..\WixFileVersionExtension\bin\Release\WixFileVersionExtension.dll - WixFileVersionExtension - @@ -56,6 +56,9 @@ INSTALLFOLDER + + + D:\Code\Personal\CreateInstallDescriptor\bin\Debug\CreateInstallDescriptor.exe !(TargetPath) $(TargetDir)\$(TargetName).xml diff --git a/Bootstrapper/packages.config b/Bootstrapper/packages.config new file mode 100644 index 0000000..75654f0 --- /dev/null +++ b/Bootstrapper/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj index 5f7b6e6..1ffd910 100644 --- a/Setup/Setup.wixproj +++ b/Setup/Setup.wixproj @@ -29,6 +29,10 @@ + + ..\packages\WixFileVersionExtension.1.0.0.3\lib\WixFileVersionExtension.dll + WixFileVersionExtension + $(WixExtDir)\WixUtilExtension.dll WixUtilExtension @@ -37,10 +41,6 @@ $(WixExtDir)\WixNetFxExtension.dll WixNetFxExtension - - ..\..\WixFileVersionExtension\bin\Release\WixFileVersionExtension.dll - WixFileVersionExtension - @@ -76,6 +76,9 @@ INSTALLFOLDER + + +