SIEG-2: Updated installer to WiX 3.14.0

GridProtectionAlliance · Feb 22, 2024 · 023c3bf · 023c3bf
1 parent f9d83e4
commit 023c3bf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/Source/Applications/SIEGate/SIEGateSetup/SIEGateSetup.wixproj b/Source/Applications/SIEGate/SIEGateSetup/SIEGateSetup.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\Dependencies\NuGet Packages\WiX.3.11.1\build\wix.props" Condition="Exists('..\..\..\Dependencies\NuGet Packages\WiX.3.11.1\build\wix.props')" />
+  <Import Project="..\..\..\Dependencies\NuGet Packages\wix.3.14.0\build\wix.props" Condition="Exists('..\..\..\Dependencies\NuGet Packages\wix.3.14.0\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -35,15 +35,15 @@
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixNetFxExtension">
-      <HintPath>..\..\..\Dependencies\WiX\WixNetFxExtension.dll</HintPath>
+      <HintPath>$(SolutionDir)Dependencies\NuGet Packages\WiX.3.14.0\tools\WixNetFxExtension.dll</HintPath>
       <Name>WixNetFxExtension</Name>
     </WixExtension>
     <WixExtension Include="WixUtilExtension">
-      <HintPath>..\..\..\Dependencies\WiX\WixUtilExtension.dll</HintPath>
+      <HintPath>$(SolutionDir)Dependencies\NuGet Packages\WiX.3.14.0\tools\WixUtilExtension.dll</HintPath>
       <Name>WixUtilExtension</Name>
     </WixExtension>
     <WixExtension Include="WixUIExtension">
-      <HintPath>..\..\..\Dependencies\WiX\WixUIExtension.dll</HintPath>
+      <HintPath>$(SolutionDir)Dependencies\NuGet Packages\WiX.3.14.0\tools\WixUIExtension.dll</HintPath>
       <Name>WixUIExtension</Name>
     </WixExtension>
   </ItemGroup>
@@ -131,8 +131,8 @@
     <Content Include="VersionBitmap.ps1" />
   </ItemGroup>
   <PropertyGroup>
-    <WixInstallPath>$(SolutionDir)Dependencies\NuGet Packages\WiX.3.11.1\tools\</WixInstallPath>
-    <WixToolPath>$(SolutionDir)Dependencies\NuGet Packages\WiX.3.11.1\tools\</WixToolPath>
+    <WixInstallPath>$(SolutionDir)Dependencies\NuGet Packages\WiX.3.14.0\tools\</WixInstallPath>
+    <WixToolPath>$(SolutionDir)Dependencies\NuGet Packages\WiX.3.14.0\tools\</WixToolPath>
     <WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
     <WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
   </PropertyGroup>
@@ -185,7 +185,7 @@
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\Dependencies\NuGet Packages\WiX.3.11.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Dependencies\NuGet Packages\WiX.3.11.1\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\..\Dependencies\NuGet Packages\wix.3.14.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Dependencies\NuGet Packages\wix.3.14.0\build\wix.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

diff --git a/Source/Applications/SIEGate/SIEGateSetup/packages.config b/Source/Applications/SIEGate/SIEGateSetup/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WiX" version="3.11.1" />
+  <package id="wix" version="3.14.0" />
 </packages>
diff --git a/Source/Dependencies/WiX/WixNetFxExtension.dll b/Source/Dependencies/WiX/WixNetFxExtension.dll
diff --git a/Source/Dependencies/WiX/WixUIExtension.dll b/Source/Dependencies/WiX/WixUIExtension.dll
diff --git a/Source/Dependencies/WiX/WixUtilExtension.dll b/Source/Dependencies/WiX/WixUtilExtension.dll
diff --git a/Source/SIEGate.sln b/Source/SIEGate.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2037
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34607.119
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{A594B55D-0C88-4F66-AF6E-86266F933DF0}"
 EndProject
@@ -158,13 +158,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SIEGateSetup", "Application
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIEGateManager", "Applications\SIEGateManager\SIEGateManager.csproj", "{CCF1DF65-C4DA-41CE-9332-0293D33934C5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WiX", "WiX", "{E9C94F23-DA42-4006-A83C-F1ABA3F3AB26}"
-	ProjectSection(SolutionItems) = preProject
-		Dependencies\WiX\WixNetFxExtension.dll = Dependencies\WiX\WixNetFxExtension.dll
-		Dependencies\WiX\WixUIExtension.dll = Dependencies\WiX\WixUIExtension.dll
-		Dependencies\WiX\WixUtilExtension.dll = Dependencies\WiX\WixUtilExtension.dll
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PostgreSQL", "PostgreSQL", "{20C5EFE4-6DFC-4692-B8CA-7D0EF8070CA9}"
 	ProjectSection(SolutionItems) = preProject
 		Data\PostgreSQL\InitialDataSet.sql = Data\PostgreSQL\InitialDataSet.sql
@@ -243,7 +236,6 @@ Global
 		{018FDA38-8662-4733-A3C8-22EC24A0CE85} = {A594B55D-0C88-4F66-AF6E-86266F933DF0}
 		{59671700-02F8-4B9D-B1F7-0CCE4599177E} = {A594B55D-0C88-4F66-AF6E-86266F933DF0}
 		{CCF1DF65-C4DA-41CE-9332-0293D33934C5} = {A594B55D-0C88-4F66-AF6E-86266F933DF0}
-		{E9C94F23-DA42-4006-A83C-F1ABA3F3AB26} = {F1E4A6D5-E5A1-48EC-B2E7-C20AADCF94E1}
 		{20C5EFE4-6DFC-4692-B8CA-7D0EF8070CA9} = {300F8C7D-35CC-4CFA-A97A-82824E4E59BA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution