From ba0058c0b9593b01c035699698ad27ed7986c229 Mon Sep 17 00:00:00 2001
From: Dimitrij <kvarkas@gmail.com>
Date: Sat, 4 Mar 2023 22:49:23 +0000
Subject: [PATCH] fix installer paths

---
 Tools/rename_and_copy_installer.ps1                |  2 +-
 mRemoteNG/Properties/AssemblyInfo.cs               |  6 +++---
 .../Installer/Fragments/FilesFragment.wxs          |  6 +++---
 mRemoteNGInstaller/Installer/Installer.wixproj     | 14 +-------------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Tools/rename_and_copy_installer.ps1 b/Tools/rename_and_copy_installer.ps1
index 0667cee9..05cb2676 100644
--- a/Tools/rename_and_copy_installer.ps1
+++ b/Tools/rename_and_copy_installer.ps1
@@ -8,7 +8,7 @@
 
 $targetVersionedFile = "$SolutionDir\mRemoteNG\bin\x64\$BuildConfiguration\mRemoteNG.exe"
 $version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
-$src = $SolutionDir + "mRemoteNGInstaller\Installer\bin\$BuildConfiguration\en-US\mRemoteNG-Installer.msi"
+$src = $SolutionDir + "mRemoteNGInstaller\Installer\bin\x64\$BuildConfiguration\en-US\mRemoteNG-Installer.msi"
 $dst = $SolutionDir + "mRemoteNG\bin\x64\$BuildConfiguration\mRemoteNG-Installer-" + $version + ".msi"
 
 # Copy file
diff --git a/mRemoteNG/Properties/AssemblyInfo.cs b/mRemoteNG/Properties/AssemblyInfo.cs
index 1f0218fb..af6e90e3 100644
--- a/mRemoteNG/Properties/AssemblyInfo.cs
+++ b/mRemoteNG/Properties/AssemblyInfo.cs
@@ -15,8 +15,8 @@ using System.Resources;
 [assembly: AssemblyCulture("")]
 
 // Version information
-[assembly: AssemblyVersion("1.77.3.1797")]
-[assembly: AssemblyFileVersion("1.77.3.1797")]
+[assembly: AssemblyVersion("1.77.3.1803")]
+[assembly: AssemblyFileVersion("1.77.3.1803")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
-[assembly: AssemblyInformationalVersion("1.77.3   (Nightly Build: 1797)")]
+[assembly: AssemblyInformationalVersion("1.77.3   (Nightly Build: 1803)")]
 
diff --git a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
index f6bdc345..e9a91aaf 100644
--- a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
+++ b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
@@ -120,9 +120,6 @@
             <Component Id="cmp6107C12C2A55CB8E7E97FF2C9A33F385" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil135F9AEEB4A74E1EE438100986E97C41" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Xaml.Behaviors.dll" />
             </Component>
-            <Component Id="cmp1F9DC155A4152A7B61C375BCAEC12565" Directory="INSTALLDIR" Guid="*">
-                <File Id="fil46E8EE7D018FEE0848D7DF0C0BD9952D" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG-Installer-1.77.3.1765.msi" />
-            </Component>
             <Component Id="cmp41D33384103998013724F7507BE537A3" Directory="INSTALLDIR" Guid="*">
                 <File Id="filD409F3953DFE64FEE2FDC4460BD98297" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.deps.json" />
             </Component>
@@ -133,6 +130,9 @@
                 <File Id="filAC4D49028FDDA1626E5B006C9D1ED57E" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.dll.config" />
             </Component>
             
+            <Component Id="cmp67313C6B4CE3487E9A8165EFFE369D16" Directory="INSTALLDIR" Guid="*">
+                <File Id="fil5F0524AF62166FF3C4DAE07F1113C0D9" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.pdb" />
+            </Component>
             <Component Id="cmp9FF194CCD09E9797444CF95F7C37C75A" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil09655B2FCDF14CBBA2E03BBD3F6C58EE" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.runtimeconfig.json" />
             </Component>
diff --git a/mRemoteNGInstaller/Installer/Installer.wixproj b/mRemoteNGInstaller/Installer/Installer.wixproj
index 8ea9e6bd..7424278a 100644
--- a/mRemoteNGInstaller/Installer/Installer.wixproj
+++ b/mRemoteNGInstaller/Installer/Installer.wixproj
@@ -10,21 +10,9 @@
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>bin\x64\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Debug;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Release;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug Portable' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Debug Portable;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release Portable' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Release Portable;</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="CustomActions\CheckForInstalledWindowsUpdates.wxs" />
     <Compile Include="CustomActions\SaveInstallLocation.wxs" />