From ca61ea09d0f1148bfc8a35f3e79d079acff75a74 Mon Sep 17 00:00:00 2001 From: Dimitrij Date: Wed, 1 Dec 2021 20:55:15 +0000 Subject: [PATCH 1/8] --update test libs --- mRemoteNGTests/mRemoteNGTests.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj index 9c4e3368..233ecf41 100644 --- a/mRemoteNGTests/mRemoteNGTests.csproj +++ b/mRemoteNGTests/mRemoteNGTests.csproj @@ -15,11 +15,11 @@ - + - - + + all From d918d8ffd181397d0a9582c4db6d77e40ad6f47d Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 1 Dec 2021 22:53:18 +0100 Subject: [PATCH 2/8] Update README.MD --- README.MD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.MD b/README.MD index f82916f5..f49b8e67 100644 --- a/README.MD +++ b/README.MD @@ -2,7 +2,7 @@

- +

@@ -45,11 +45,11 @@ --- -| Update Channel | Build Status | Downloads | +| Channel | Build Status | Downloads | | ---------------|--------------|-----------| | Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) | -| Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) | -| Nightly build | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) | +| Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/prerelease?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) | +| Nightly | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/nightly?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) | ## Features From 7d6c9d517c71149a7ddf167d81341e2ef017f192 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 1 Dec 2021 23:25:17 +0100 Subject: [PATCH 3/8] unified different project configurations --- .../SecretServerInterface.csproj | 48 ++++++ mRemoteNG.sln | 142 ++++++------------ 2 files changed, 90 insertions(+), 100 deletions(-) diff --git a/SecretServerInterface/SecretServerInterface.csproj b/SecretServerInterface/SecretServerInterface.csproj index e5f263a4..ca4abb54 100644 --- a/SecretServerInterface/SecretServerInterface.csproj +++ b/SecretServerInterface/SecretServerInterface.csproj @@ -31,6 +31,54 @@ prompt 4 + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + + + bin\Release Portable\ + TRACE + true + pdbonly + AnyCPU + 7.3 + prompt + + + bin\x64\Release Portable\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + + + bin\Release Installer\ + + + bin\x64\Release Installer\ + + + bin\Debug Portable\ + + + bin\x64\Debug Portable\ + diff --git a/mRemoteNG.sln b/mRemoteNG.sln index d272931b..59039abe 100644 --- a/mRemoteNG.sln +++ b/mRemoteNG.sln @@ -22,131 +22,73 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecretServerInterface", "Se EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug Portable|Any CPU = Debug Portable|Any CPU Debug Portable|x64 = Debug Portable|x64 - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Release Installer|Any CPU = Release Installer|Any CPU Release Installer|x64 = Release Installer|x64 - Release Portable|Any CPU = Release Portable|Any CPU Release Portable|x64 = Release Portable|x64 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.Build.0 = Debug Portable|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.ActiveCfg = Debug|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.Build.0 = Debug|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release Installer|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release Installer|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.ActiveCfg = Release|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.Build.0 = Release|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.ActiveCfg = Release Installer|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.Build.0 = Release Installer|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.ActiveCfg = Release Portable|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.Build.0 = Release Portable|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.ActiveCfg = Release|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.Build.0 = Release|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.Build.0 = Debug Portable|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.ActiveCfg = Debug|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.Build.0 = Debug|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release Installer|Any CPU - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release Installer|Any CPU - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.ActiveCfg = Release|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.Build.0 = Release|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.ActiveCfg = Release Installer|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.Build.0 = Release Installer|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.ActiveCfg = Release Portable|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.Build.0 = Release Portable|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|Any CPU {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.ActiveCfg = Release|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.Build.0 = Release|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Debug Portable|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.ActiveCfg = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.Build.0 = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.Build.0 = Debug|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.ActiveCfg = Release Installer|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.Build.0 = Release Installer|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.Build.0 = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release Portable|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.Build.0 = Release Portable|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.Build.0 = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.ActiveCfg = Debug Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.Build.0 = Debug Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.Build.0 = Debug|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.ActiveCfg = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.Build.0 = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.Build.0 = Release Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.ActiveCfg = Release Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.ActiveCfg = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.Build.0 = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.ActiveCfg = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.Build.0 = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.Build.0 = Debug Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.Build.0 = Debug|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.ActiveCfg = Release Installer|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.Build.0 = Release Installer|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.ActiveCfg = Release Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.Build.0 = Release Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.Build.0 = Release|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.Build.0 = Debug Portable|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.Build.0 = Debug|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.ActiveCfg = Release Portable|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.Build.0 = Release Portable|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.ActiveCfg = Release Portable|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.Build.0 = Release Portable|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.Build.0 = Release|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.Build.0 = Debug Portable|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.ActiveCfg = Debug|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release Installer|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release Installer|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.ActiveCfg = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.Build.0 = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.ActiveCfg = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.Build.0 = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.Build.0 = Release|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.Build.0 = Debug|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.ActiveCfg = Release Installer|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.Build.0 = Release Installer|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.ActiveCfg = Release Portable|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.Build.0 = Release Portable|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release|x64 - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|Any CPU.ActiveCfg = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|Any CPU.Build.0 = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.ActiveCfg = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.Build.0 = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|x64.ActiveCfg = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|x64.Build.0 = Debug|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|Any CPU.ActiveCfg = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|Any CPU.Build.0 = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|x64.ActiveCfg = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|x64.Build.0 = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|Any CPU.Build.0 = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|x64.ActiveCfg = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|x64.Build.0 = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|Any CPU.Build.0 = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|x64.ActiveCfg = Release|Any CPU - {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|x64.Build.0 = Release|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.Build.0 = Release|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.Build.0 = Debug Portable|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|x64.ActiveCfg = Debug|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|x64.Build.0 = Debug|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|x64.ActiveCfg = Release Installer|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|x64.Build.0 = Release Installer|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|x64.ActiveCfg = Release Portable|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|x64.Build.0 = Release Portable|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|x64.ActiveCfg = Release|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 6496e348685c650132a4448dc4ecab0db4ebac6a Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 1 Dec 2021 23:25:42 +0100 Subject: [PATCH 4/8] fixed installer paths --- .../Installer/Fragments/FilesFragment.wxs | 647 +----------------- .../Installer/Installer.wixproj | 66 ++ mRemoteNGInstaller/Installer/mRemoteNG.wxs | 2 +- 3 files changed, 89 insertions(+), 626 deletions(-) diff --git a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs index f4af9e96..e00972f8 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 b8ba58ac..fe4905f3 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 682e631c..773f3c70 100644 --- a/mRemoteNGInstaller/Installer/mRemoteNG.wxs +++ b/mRemoteNGInstaller/Installer/mRemoteNG.wxs @@ -9,7 +9,7 @@ - + From ff88d4649cc6cdaa9502ad24345bc56772ab9dd5 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 1 Dec 2021 23:42:16 +0100 Subject: [PATCH 5/8] more adjustments to the build configuration --- mRemoteNG.sln | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/mRemoteNG.sln b/mRemoteNG.sln index 59039abe..3c2be26f 100644 --- a/mRemoteNG.sln +++ b/mRemoteNG.sln @@ -40,45 +40,29 @@ Global {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.ActiveCfg = Release|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.Build.0 = Release|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.Build.0 = Debug Portable|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.ActiveCfg = Debug|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.Build.0 = Debug|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.ActiveCfg = Release Installer|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.Build.0 = Release Installer|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.ActiveCfg = Release Portable|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.Build.0 = Release Portable|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.ActiveCfg = Release|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.Build.0 = Release|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.Build.0 = Debug Portable|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.Build.0 = Debug|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.ActiveCfg = Release Installer|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.Build.0 = Release Installer|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.ActiveCfg = Release Portable|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.Build.0 = Release Portable|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.Build.0 = Release|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.Build.0 = Debug Portable|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x64 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.Build.0 = Debug|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.ActiveCfg = Release Portable|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.Build.0 = Release Portable|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.ActiveCfg = Release Portable|x64 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.Build.0 = Release Portable|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x64 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.Build.0 = Release|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.Build.0 = Debug Portable|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.ActiveCfg = Debug|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.Build.0 = Debug|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.ActiveCfg = Release Installer|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.Build.0 = Release Installer|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.ActiveCfg = Release Portable|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.Build.0 = Release Portable|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.Build.0 = Release|x64 {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.Build.0 = Debug Portable|x64 {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|x64.ActiveCfg = Debug|x64 From 98a9cc7436874d5977a6ccfc3ddf176ccbb86826 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 1 Dec 2021 23:51:06 +0100 Subject: [PATCH 6/8] Update README.MD --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index f49b8e67..b6bbec7a 100644 --- a/README.MD +++ b/README.MD @@ -48,7 +48,7 @@ | Channel | Build Status | Downloads | | ---------------|--------------|-----------| | Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) | -| Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/prerelease?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) | +| Preview | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/prerelease?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) | | Nightly | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/nightly?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) | ## Features From 1df3c33f69414f722dca6dde874f4f9d283311b2 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Thu, 2 Dec 2021 00:11:07 +0100 Subject: [PATCH 7/8] removed developer note from license file --- COPYING.TXT | 59 ------------------- .../Installer/Resources/License.rtf | 33 +---------- 2 files changed, 1 insertion(+), 91 deletions(-) diff --git a/COPYING.TXT b/COPYING.TXT index d511905c..e37680cf 100644 --- a/COPYING.TXT +++ b/COPYING.TXT @@ -278,62 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/mRemoteNGInstaller/Installer/Resources/License.rtf b/mRemoteNGInstaller/Installer/Resources/License.rtf index e1878024..e7f24cb5 100644 --- a/mRemoteNGInstaller/Installer/Resources/License.rtf +++ b/mRemoteNGInstaller/Installer/Resources/License.rtf @@ -47,36 +47,5 @@ {\pard \ql \f0 \sa180 \li360 \fi0 \f1 NO WARRANTY\par} {\pard \ql \f0 \sa180 \li360 \fi-360 11.\tx360\tab BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par} {\pard \ql \f0 \sa180 \li360 \fi-360 12.\tx360\tab IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par} -{\pard \ql \f0 \sa180 \li360 \fi0 \f1 END OF TERMS AND CONDITIONS\line -\line -How to Apply These Terms to Your New Programs\sa180\par} -{\pard \ql \f0 \sa180 \li0 \fi0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par} -{\pard \ql \f0 \sa180 \li0 \fi0 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\par} -{\pard \ql \f0 \sa180 \li0 \fi0 \f1 \line -Copyright (C) \line -\line -This program is free software; you can redistribute it and/or modify\line -it under the terms of the GNU General Public License as published by\line -the Free Software Foundation; either version 2 of the License, or\line -(at your option) any later version.\line -\line -This program is distributed in the hope that it will be useful,\line -but WITHOUT ANY WARRANTY; without even the implied warranty of\line -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\line -GNU General Public License for more details.\line -\line -You should have received a copy of the GNU General Public License along\line -with this program; if not, write to the Free Software Foundation, Inc.,\line -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\par} -{\pard \ql \f0 \sa180 \li0 \fi0 Also add information on how to contact you by electronic and paper mail.\par} -{\pard \ql \f0 \sa180 \li0 \fi0 If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par} -{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Gnomovision version 69, Copyright (C) year name of author\line -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\line -This is free software, and you are welcome to redistribute it\line -under certain conditions; type `show c' for details.\par} -{\pard \ql \f0 \sa180 \li0 \fi0 The hypothetical commands {\f1 show w' and}show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than {\f1 show w' and}show c'; they could even be mouse-clicks or menu items--whatever suits your program.\par} -{\pard \ql \f0 \sa180 \li0 \fi0 You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:\par} -{\pard \ql \f0 \sa180 \li0 \fi0 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.\par} -{\pard \ql \f0 \sa180 \li0 \fi0 , 1 April 1989 Ty Coon, President of Vice\par} -{\pard \ql \f0 \sa180 \li0 \fi0 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.\par} +{\pard \ql \f0 \sa180 \li360 \fi0 \f1 END OF TERMS AND CONDITIONS\sa180\par} } From fc65c2583ed9118359602be27ddd18623d551223 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Thu, 2 Dec 2021 01:15:22 +0100 Subject: [PATCH 8/8] hopefully fixed all installer build issues --- mRemoteNG/mRemoteNG.csproj | 6 +- .../Installer/Fragments/MainExeFragment.wxs | 2 +- .../Installer/Installer.wixproj | 101 +++++++++--------- 3 files changed, 55 insertions(+), 54 deletions(-) diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index 039c5296..70a04c38 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -25,7 +25,7 @@ false - bin\Release\ + bin\x64\Release\ false @@ -33,7 +33,7 @@ DEBUG;PORTABLE false - bin\Debug Portable\ + bin\x64\Debug Portable\ false @@ -41,7 +41,7 @@ PORTABLE false - bin\Release Portable\ + bin\x64\Release Portable\ false diff --git a/mRemoteNGInstaller/Installer/Fragments/MainExeFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/MainExeFragment.wxs index 2a3b11d9..8cb9f674 100644 --- a/mRemoteNGInstaller/Installer/Fragments/MainExeFragment.wxs +++ b/mRemoteNGInstaller/Installer/Fragments/MainExeFragment.wxs @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/mRemoteNGInstaller/Installer/Installer.wixproj b/mRemoteNGInstaller/Installer/Installer.wixproj index fe4905f3..f8644fbe 100644 --- a/mRemoteNGInstaller/Installer/Installer.wixproj +++ b/mRemoteNGInstaller/Installer/Installer.wixproj @@ -2,7 +2,7 @@ Debug - x86 + x64 3.10 f0168b9f-6815-40df-ba53-46cee7683b68 2.0 @@ -81,22 +81,23 @@ - + - HarvestPath=$(SolutionDir)mRemoteNG\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help en-US True - + en-US - HarvestPath=$(SolutionDir)mRemoteNG\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help - - HarvestPath=$(SolutionDir)mRemoteNG\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help - - HarvestPath=$(SolutionDir)mRemoteNG\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\x64\$(Platform)\$(Configuration)\ :: When passing paths to powershell scripts, check if the path ends with a backslash "\" @@ -111,35 +112,49 @@ set /p buildenv=<buildenv.tmp :: Call the post build powershell script powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_installer.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "%25cd%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe" - - - REM Clean the TargetDir -rmdir /S /Q "$(TargetDir)" - -echo $(ConfigurationName) > buildenv.tmp - -REM Harvest bin directory of the mRemoteNG project -"$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteNG\bin\$(Configuration)" -ag -nologo -dr INSTALLDIR -var var.HarvestPath -srd -scom -sreg -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" - -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 + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - HarvestPath=$(SolutionDir)mRemoteNG\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\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 + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\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\x64\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + True + False + + + en-US + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help + en-US + True + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + HarvestPath=$(SolutionDir)mRemoteNG\bin\x64\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ @@ -147,32 +162,6 @@ REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the i 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)\ @@ -190,4 +179,16 @@ REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the i bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + REM Clean the TargetDir +rmdir /S /Q "$(TargetDir)" + +echo $(ConfigurationName) > buildenv.tmp + +REM Harvest bin directory of the mRemoteNG project +"$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteNG\bin\x64\$(Configuration)" -ag -nologo -dr INSTALLDIR -var var.HarvestPath -srd -scom -sreg -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" + +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" + \ No newline at end of file