diff --git a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs index f4af9e962..e00972f8f 100644 --- a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs +++ b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs @@ -8,6 +8,7 @@ + @@ -24,7 +25,6 @@ - @@ -36,42 +36,24 @@ - - - - - - - - - - - - - - - - - - @@ -109,99 +91,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -214,12 +150,6 @@ - - - - - - @@ -238,8 +168,8 @@ - - + + @@ -259,6 +189,9 @@ + + + @@ -415,8 +348,8 @@ - - + + @@ -427,492 +360,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -928,18 +387,6 @@ - - - - - - - - - - - - @@ -954,31 +401,11 @@ - - - - - - - - - - - - - - - - - - - - @@ -989,31 +416,11 @@ - - - - - - - - - - - - - - - - - - - - @@ -1029,11 +436,6 @@ - - - - - @@ -1050,13 +452,8 @@ - - - - - - - + + diff --git a/mRemoteNGInstaller/Installer/Installer.wixproj b/mRemoteNGInstaller/Installer/Installer.wixproj index b8ba58ac5..fe4905f3c 100644 --- a/mRemoteNGInstaller/Installer/Installer.wixproj +++ b/mRemoteNGInstaller/Installer/Installer.wixproj @@ -124,4 +124,70 @@ REM Harvest bin directory of the mRemoteNG project REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT" + + en-US + HarvestPath=$(SolutionDir)mRemoteNG\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + en-US + True + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + True + False + + + en-US + HarvestPath=$(SolutionDir)mRemoteNG\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + en-US + True + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + \ No newline at end of file diff --git a/mRemoteNGInstaller/Installer/mRemoteNG.wxs b/mRemoteNGInstaller/Installer/mRemoteNG.wxs index 682e631cd..773f3c703 100644 --- a/mRemoteNGInstaller/Installer/mRemoteNG.wxs +++ b/mRemoteNGInstaller/Installer/mRemoteNG.wxs @@ -9,7 +9,7 @@ - +