From 27ba372cf28e01e98c0dc15625f8f19b48ac7826 Mon Sep 17 00:00:00 2001 From: BlueFinBima Date: Sun, 31 May 2020 22:39:17 +0100 Subject: [PATCH] Fixes for the 3x 3-way toggles on the F/A-18C interface. Adding x86 platform back in for those with half the bits of others with a few tweaks in post build to make it work. --- Aircraft A-10C/Aircraft A-10C.csproj | 36 ++ Aircraft AV-8B/Aircraft AV-8B.csproj | 36 ++ Aircraft FA-18C/Aircraft FA-18C.csproj | 36 ++ Aircraft M2000C/Aircraft M2000C.csproj | 38 +- Control Center/Control Center.csproj | 51 ++ Control Center/Control Center.csproj.user | 6 + Helios Installer/Helios Installer.vdproj | 499 +++++++++--------- ...ios 1.4.2020.0503 Download from GitHub.url | 8 - .../Helios 1.4.2020.0530.zip.checksum.txt | 6 - Helios.sln | 69 +++ Helios/Helios.csproj | 51 +- Helios/Interfaces/DCS/FA18C/FA18CInterface.cs | 6 +- KeyPressReceiver/Keypress Receiver.csproj | 40 ++ .../Keypress Receiver Installer.vdproj | 39 +- Phidgets/Phidgets.csproj | 36 ++ Profile Editor/Profile Editor.csproj | 40 ++ Profile Editor/Profile Editor.csproj.user | 3 + 17 files changed, 739 insertions(+), 261 deletions(-) delete mode 100644 Helios Installer/Release/Helios 1.4.2020.0503 Download from GitHub.url delete mode 100644 Helios Installer/Release/Helios 1.4.2020.0530.zip.checksum.txt diff --git a/Aircraft A-10C/Aircraft A-10C.csproj b/Aircraft A-10C/Aircraft A-10C.csproj index 674b615da..4a205fa02 100644 --- a/Aircraft A-10C/Aircraft A-10C.csproj +++ b/Aircraft A-10C/Aircraft A-10C.csproj @@ -31,6 +31,42 @@ prompt MinimumRecommendedRules.ruleset + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + diff --git a/Aircraft AV-8B/Aircraft AV-8B.csproj b/Aircraft AV-8B/Aircraft AV-8B.csproj index 6cd661321..0a2e67e23 100644 --- a/Aircraft AV-8B/Aircraft AV-8B.csproj +++ b/Aircraft AV-8B/Aircraft AV-8B.csproj @@ -34,6 +34,42 @@ prompt MinimumRecommendedRules.ruleset + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + diff --git a/Aircraft FA-18C/Aircraft FA-18C.csproj b/Aircraft FA-18C/Aircraft FA-18C.csproj index 6cfa692c9..b57c30dbd 100644 --- a/Aircraft FA-18C/Aircraft FA-18C.csproj +++ b/Aircraft FA-18C/Aircraft FA-18C.csproj @@ -31,6 +31,42 @@ prompt MinimumRecommendedRules.ruleset + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + diff --git a/Aircraft M2000C/Aircraft M2000C.csproj b/Aircraft M2000C/Aircraft M2000C.csproj index d6e1e9b19..68cb7994c 100644 --- a/Aircraft M2000C/Aircraft M2000C.csproj +++ b/Aircraft M2000C/Aircraft M2000C.csproj @@ -1,4 +1,4 @@ - + @@ -31,6 +31,42 @@ prompt MinimumRecommendedRules.ruleset + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + diff --git a/Control Center/Control Center.csproj b/Control Center/Control Center.csproj index d2b30d98d..6b75d65f6 100644 --- a/Control Center/Control Center.csproj +++ b/Control Center/Control Center.csproj @@ -75,6 +75,57 @@ ManagedMinimumRules.ruleset true + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + ManagedMinimumRules.ruleset + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + ManagedMinimumRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + ManagedMinimumRules.ruleset + true + + + true + bin\x86\Development\ + TRACE;DEBUG;DEVELOPMENT_CONFIGURATION + full + x86 + 7.3 + prompt + ManagedMinimumRules.ruleset + true + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + ManagedMinimumRules.ruleset + true + ..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll diff --git a/Control Center/Control Center.csproj.user b/Control Center/Control Center.csproj.user index 52521a00a..483d511fd 100644 --- a/Control Center/Control Center.csproj.user +++ b/Control Center/Control Center.csproj.user @@ -20,4 +20,10 @@ --loglevel=debug --documents HeliosTesting + + --loglevel=debug --documents HeliosTesting + + + --documents HeliosTesting --loglevel Info + \ No newline at end of file diff --git a/Helios Installer/Helios Installer.vdproj b/Helios Installer/Helios Installer.vdproj index 526de3f50..31be694b9 100644 --- a/Helios Installer/Helios Installer.vdproj +++ b/Helios Installer/Helios Installer.vdproj @@ -21,146 +21,152 @@ } "Entry" { - "MsmKey" = "8:_1FB50865C6EB4D3EAF5A6197E72FAEBF" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_25D03799FFC54E17A4D2DC75D13D8177" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA" - "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" + "MsmKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087" + "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA" + "MsmKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087" "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA" - "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" + "MsmKey" = "8:_3017249F82D3593F85B2600DA584699B" + "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA" + "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087" - "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" + "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" + "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087" - "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" + "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" + "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3017249F82D3593F85B2600DA584699B" - "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" + "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" - "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "MsmKey" = "8:_342A06F1A0DF19F7F87DEBC263D3C104" + "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" + "MsmKey" = "8:_342A06F1A0DF19F7F87DEBC263D3C104" "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" + "MsmKey" = "8:_342A06F1A0DF19F7F87DEBC263D3C104" "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F" - "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" + "MsmKey" = "8:_342A06F1A0DF19F7F87DEBC263D3C104" + "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3BDDB34F79F7418EBFD2D513E068A09B" + "MsmKey" = "8:_3E517CFAB0B22FAEB933CC50A9D2B15B" + "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3E517CFAB0B22FAEB933CC50A9D2B15B" - "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "MsmKey" = "8:_613DEFB4437CD7D588A942CAFCB96E19" + "OwnerKey" = "8:_A2D9583EDBF1E4EBAB279B1734C383F4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_613DEFB4437CD7D588A942CAFCB96E19" + "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_635A8A23E1C069F3F83821DEFD568135" + "MsmKey" = "8:_613DEFB4437CD7D588A942CAFCB96E19" + "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_613DEFB4437CD7D588A942CAFCB96E19" "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_693E71612CB241C2B5898A115F06ACDF" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_613DEFB4437CD7D588A942CAFCB96E19" + "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_635A8A23E1C069F3F83821DEFD568135" + "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_70E53CBB875F467EAF0875D64644C788" + "MsmKey" = "8:_641ACA6C3B564507AA999EE91EA3F626" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1" - "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" + "MsmKey" = "8:_693E71612CB241C2B5898A115F06ACDF" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1" - "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" + "MsmKey" = "8:_6A85411CAFFD4B618EC6C6B61AC873B4" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1" - "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" + "MsmKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1" - "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "MsmKey" = "8:_70E53CBB875F467EAF0875D64644C788" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -189,6 +195,12 @@ } "Entry" { + "MsmKey" = "8:_80A6BDFEDF1242D1902D1070E636D5D9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_8EC729DF25F34C3E94899B16F8A2F877" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -219,85 +231,91 @@ } "Entry" { - "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979" - "OwnerKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA" + "MsmKey" = "8:_9F47C7E7A93125F05844EDD7575D7F37" + "OwnerKey" = "8:_342A06F1A0DF19F7F87DEBC263D3C104" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979" - "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" + "MsmKey" = "8:_9F47C7E7A93125F05844EDD7575D7F37" + "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979" - "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" + "MsmKey" = "8:_9F47C7E7A93125F05844EDD7575D7F37" + "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979" - "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" + "MsmKey" = "8:_A23DD0E6E2324AB79E81D4B2CF805182" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979" - "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "MsmKey" = "8:_A2D9583EDBF1E4EBAB279B1734C383F4" + "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A23DD0E6E2324AB79E81D4B2CF805182" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_A2D9583EDBF1E4EBAB279B1734C383F4" + "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A2EADACAF8494846B8288499BE8F4F96" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_A2D9583EDBF1E4EBAB279B1734C383F4" + "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A38184EF0FAB4236B0041C15A012552E" + "MsmKey" = "8:_A2D9583EDBF1E4EBAB279B1734C383F4" + "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A2EADACAF8494846B8288499BE8F4F96" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A64B328D3E2F4134B429BCC14711B0B6" + "MsmKey" = "8:_A38184EF0FAB4236B0041C15A012552E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B3429646F38C40A5A4B89ADF49299B9A" + "MsmKey" = "8:_A64B328D3E2F4134B429BCC14711B0B6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B3F350392E2043689F87D29BFD8B7FBF" + "MsmKey" = "8:_A7357803C19D4119AEBFF5287CABF3CF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C4E244B7C98E4FCAA2E188040474BD32" + "MsmKey" = "8:_B3429646F38C40A5A4B89ADF49299B9A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C943713F24B34CA38263E6AEEE9AFD24" + "MsmKey" = "8:_B3F350392E2043689F87D29BFD8B7FBF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CB3772881E5840A98CB09460F7421DB3" + "MsmKey" = "8:_C4E244B7C98E4FCAA2E188040474BD32" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -357,24 +375,6 @@ } "Entry" { - "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603" - "OwnerKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603" - "OwnerKey" = "8:_70E53CBB875F467EAF0875D64644C788" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603" - "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F62FF08081A599A5153EE7E796758E85" "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" @@ -430,103 +430,103 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E5E14DCBC2A2466DA4718ADC479A8E9D" + "OwnerKey" = "8:_A2D9583EDBF1E4EBAB279B1734C383F4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C4E244B7C98E4FCAA2E188040474BD32" + "OwnerKey" = "8:_613DEFB4437CD7D588A942CAFCB96E19" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8EC729DF25F34C3E94899B16F8A2F877" + "OwnerKey" = "8:_342A06F1A0DF19F7F87DEBC263D3C104" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E82F3FE48F7BBBBF540D96F770BDB2D9" + "OwnerKey" = "8:_9F47C7E7A93125F05844EDD7575D7F37" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" + "OwnerKey" = "8:_E5E14DCBC2A2466DA4718ADC479A8E9D" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087" + "OwnerKey" = "8:_C4E244B7C98E4FCAA2E188040474BD32" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8F3C6B7CFA1EE0CE0E032282CF8BC712" + "OwnerKey" = "8:_8EC729DF25F34C3E94899B16F8A2F877" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_928ADA8B9CF9B5FF98FE5A1219024B82" + "OwnerKey" = "8:_E82F3FE48F7BBBBF540D96F770BDB2D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_635A8A23E1C069F3F83821DEFD568135" + "OwnerKey" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_064F99F3D9F35DDC146FD8173A1CAD11" + "OwnerKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F62FF08081A599A5153EE7E796758E85" + "OwnerKey" = "8:_8F3C6B7CFA1EE0CE0E032282CF8BC712" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" + "OwnerKey" = "8:_928ADA8B9CF9B5FF98FE5A1219024B82" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3017249F82D3593F85B2600DA584699B" + "OwnerKey" = "8:_635A8A23E1C069F3F83821DEFD568135" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA" + "OwnerKey" = "8:_064F99F3D9F35DDC146FD8173A1CAD11" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A177E20BA06FFC17C6F3199B766D8979" + "OwnerKey" = "8:_F62FF08081A599A5153EE7E796758E85" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1" + "OwnerKey" = "8:_531AD437E2DF44DC8E98C94F2EEEBB9F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603" + "OwnerKey" = "8:_3017249F82D3593F85B2600DA584699B" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -640,6 +640,33 @@ } } } + "Release x86" + { + "DisplayName" = "8:Release x86" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Release x86\\Helios Installer.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + } + } + } "ReleaseX64" { "DisplayName" = "8:ReleaseX64" @@ -731,10 +758,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1FB50865C6EB4D3EAF5A6197E72FAEBF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2FC823C6E84B4FB3636C109E6D48F087" { - "SourcePath" = "8:..\\bin\\Release\\Helios.ico" - "TargetName" = "8:Helios.ico" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_2FC823C6E84B4FB3636C109E6D48F087" + { + "Name" = "8:CommandLine.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:CommandLine.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "Condition" = "8:" @@ -748,23 +786,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_29F6005D9412AD6742A02CE06C9D27EA" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3017249F82D3593F85B2600DA584699B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:SharpDX.DirectInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Phidget21.NET, Version=2.1.9.8, Culture=neutral, PublicKeyToken=c2b1f2a3594bce52, processorArchitecture=MSIL" "ScatterAssemblies" { - "_29F6005D9412AD6742A02CE06C9D27EA" + "_3017249F82D3593F85B2600DA584699B" { - "Name" = "8:SharpDX.DirectInput.dll" + "Name" = "8:Phidget21.NET.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:SharpDX.DirectInput.dll" + "SourcePath" = "8:Phidget21.NET.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" @@ -782,20 +820,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2FC823C6E84B4FB3636C109E6D48F087" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_31E026CE4D511148C375D73ABB8FFE1F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:EosSharp, Version=1.1.5488.21795, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2FC823C6E84B4FB3636C109E6D48F087" + "_31E026CE4D511148C375D73ABB8FFE1F" { - "Name" = "8:CommandLine.dll" + "Name" = "8:EosSharp.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:CommandLine.dll" + "SourcePath" = "8:EosSharp.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" @@ -813,20 +851,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3017249F82D3593F85B2600DA584699B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_342A06F1A0DF19F7F87DEBC263D3C104" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Phidget21.NET, Version=2.1.9.8, Culture=neutral, PublicKeyToken=c2b1f2a3594bce52, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:NLua, Version=1.4.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL" "ScatterAssemblies" { - "_3017249F82D3593F85B2600DA584699B" + "_342A06F1A0DF19F7F87DEBC263D3C104" { - "Name" = "8:Phidget21.NET.dll" + "Name" = "8:NLua.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Phidget21.NET.dll" + "SourcePath" = "8:NLua.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" @@ -844,20 +882,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_31E026CE4D511148C375D73ABB8FFE1F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3E517CFAB0B22FAEB933CC50A9D2B15B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:EosSharp, Version=1.1.5488.21795, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_31E026CE4D511148C375D73ABB8FFE1F" + "_3E517CFAB0B22FAEB933CC50A9D2B15B" { - "Name" = "8:EosSharp.dll" + "Name" = "8:System.Windows.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:EosSharp.dll" + "SourcePath" = "8:System.Windows.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" @@ -875,10 +913,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3BDDB34F79F7418EBFD2D513E068A09B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_613DEFB4437CD7D588A942CAFCB96E19" { - "SourcePath" = "8:..\\bin\\Release\\ProfileEditor.ico" - "TargetName" = "8:ProfileEditor.ico" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_613DEFB4437CD7D588A942CAFCB96E19" + { + "Name" = "8:SharpDX.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:SharpDX.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "Condition" = "8:" @@ -892,23 +941,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3E517CFAB0B22FAEB933CC50A9D2B15B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_635A8A23E1C069F3F83821DEFD568135" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Xceed.Wpf.AvalonDock.Themes.Expression, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL" "ScatterAssemblies" { - "_3E517CFAB0B22FAEB933CC50A9D2B15B" + "_635A8A23E1C069F3F83821DEFD568135" { - "Name" = "8:System.Windows.dll" + "Name" = "8:Xceed.Wpf.AvalonDock.Themes.Expression.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Windows.dll" + "SourcePath" = "8:Xceed.Wpf.AvalonDock.Themes.Expression.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" @@ -926,21 +975,10 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_635A8A23E1C069F3F83821DEFD568135" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_641ACA6C3B564507AA999EE91EA3F626" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Xceed.Wpf.AvalonDock.Themes.Expression, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_635A8A23E1C069F3F83821DEFD568135" - { - "Name" = "8:Xceed.Wpf.AvalonDock.Themes.Expression.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Xceed.Wpf.AvalonDock.Themes.Expression.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\bin\\Release\\lua53.dll" + "TargetName" = "8:lua53.dll" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "Condition" = "8:" @@ -954,7 +992,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_693E71612CB241C2B5898A115F06ACDF" @@ -977,21 +1015,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_743F6EA1E81D7EB020EC69ACED6138A1" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A85411CAFFD4B618EC6C6B61AC873B4" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:NLua, Version=1.4.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_743F6EA1E81D7EB020EC69ACED6138A1" - { - "Name" = "8:NLua.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:NLua.dll" - "TargetName" = "8:" + "SourcePath" = "8:Graphics\\ProfileEditor.ico" + "TargetName" = "8:ProfileEditor.ico" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "Condition" = "8:" @@ -1005,7 +1032,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_745A49A328E3528657335FAFB62F6368" @@ -1039,6 +1066,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_80A6BDFEDF1242D1902D1070E636D5D9" + { + "SourcePath" = "8:Graphics\\Helios.ico" + "TargetName" = "8:Helios.ico" + "Tag" = "8:" + "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8F3C6B7CFA1EE0CE0E032282CF8BC712" { "AssemblyRegister" = "3:1" @@ -1141,20 +1188,20 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A177E20BA06FFC17C6F3199B766D8979" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9F47C7E7A93125F05844EDD7575D7F37" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A177E20BA06FFC17C6F3199B766D8979" + "_9F47C7E7A93125F05844EDD7575D7F37" { - "Name" = "8:SharpDX.dll" + "Name" = "8:KeraLua.DLL" "Attributes" = "3:512" } } - "SourcePath" = "8:SharpDX.dll" + "SourcePath" = "8:KeraLua.DLL" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" @@ -1192,12 +1239,23 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2EADACAF8494846B8288499BE8F4F96" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2D9583EDBF1E4EBAB279B1734C383F4" { - "SourcePath" = "8:..\\..\\Iris-Screen-Exporter\\Installer\\Iris Setup\\Release\\Iris Screen Exporter Setup.msi" - "TargetName" = "8:Iris Screen Exporter Setup.msi" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SharpDX.DirectInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_A2D9583EDBF1E4EBAB279B1734C383F4" + { + "Name" = "8:SharpDX.DirectInput.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:SharpDX.DirectInput.dll" + "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C" + "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1209,15 +1267,15 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A38184EF0FAB4236B0041C15A012552E" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2EADACAF8494846B8288499BE8F4F96" { - "SourcePath" = "8:..\\Helios\\_Documents\\Helios.Install.Read.Me.rtf" - "TargetName" = "8:Helios.Install.Read.Me.rtf" + "SourcePath" = "8:..\\..\\Iris-Screen-Exporter\\Installer\\Iris Setup\\Release\\Iris Screen Exporter Setup.msi" + "TargetName" = "8:Iris Screen Exporter Setup.msi" "Tag" = "8:" - "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" + "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1232,10 +1290,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A64B328D3E2F4134B429BCC14711B0B6" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A38184EF0FAB4236B0041C15A012552E" { - "SourcePath" = "8:Graphics\\HeliosBanner.jpg" - "TargetName" = "8:HeliosBanner.jpg" + "SourcePath" = "8:..\\Helios\\_Documents\\Helios.Install.Read.Me.rtf" + "TargetName" = "8:Helios.Install.Read.Me.rtf" "Tag" = "8:" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "Condition" = "8:" @@ -1252,13 +1310,13 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B3429646F38C40A5A4B89ADF49299B9A" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A64B328D3E2F4134B429BCC14711B0B6" { - "SourcePath" = "8:..\\Keypress Receiver Installer\\Release\\Helios Keypress Receiver Setup.msi" - "TargetName" = "8:Helios Keypress Receiver Setup.msi" + "SourcePath" = "8:Graphics\\HeliosBanner.jpg" + "TargetName" = "8:HeliosBanner.jpg" "Tag" = "8:" - "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C" - "Condition" = "8:CHECKBOXA3=1" + "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" + "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" @@ -1272,12 +1330,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B3F350392E2043689F87D29BFD8B7FBF" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A7357803C19D4119AEBFF5287CABF3CF" { - "SourcePath" = "8:..\\Helios\\_Documents\\HeliosDiag.cmd" - "TargetName" = "8:HeliosDiag.cmd" + "SourcePath" = "8:..\\bin\\Release\\liblua53.dylib" + "TargetName" = "8:liblua53.dylib" "Tag" = "8:" - "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C" + "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1292,13 +1350,13 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C943713F24B34CA38263E6AEEE9AFD24" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B3429646F38C40A5A4B89ADF49299B9A" { - "SourcePath" = "8:Release\\Helios 1.4.2020.0503 Download from GitHub.url" - "TargetName" = "8:Helios 1.4.2020.0503 Download from GitHub.url" + "SourcePath" = "8:..\\Keypress Receiver Installer\\Release\\Helios Keypress Receiver Setup.msi" + "TargetName" = "8:Helios Keypress Receiver Setup.msi" "Tag" = "8:" - "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Condition" = "8:" + "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C" + "Condition" = "8:CHECKBOXA3=1" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" @@ -1312,12 +1370,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB3772881E5840A98CB09460F7421DB3" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B3F350392E2043689F87D29BFD8B7FBF" { - "SourcePath" = "8:..\\bin\\Release\\lua53.dll" - "TargetName" = "8:lua53.dll" + "SourcePath" = "8:..\\Helios\\_Documents\\HeliosDiag.cmd" + "TargetName" = "8:HeliosDiag.cmd" "Tag" = "8:" - "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" + "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1434,37 +1492,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F39C8C3B8DFF944FF19A868A0FA4E603" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_F39C8C3B8DFF944FF19A868A0FA4E603" - { - "Name" = "8:KeraLua.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:KeraLua.DLL" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F62FF08081A599A5153EE7E796758E85" { "AssemblyRegister" = "3:1" @@ -1696,7 +1723,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Helios" "ProductCode" = "8:{421509D7-A828-4190-8C5E-8E1D34BAA66F}" - "PackageCode" = "8:{F040E0B3-5406-4248-B60D-C9F3BB6250CE}" + "PackageCode" = "8:{7E28147D-16CC-40A5-BE28-4B4058A4FD74}" "UpgradeCode" = "8:{589D8667-3ED9-478B-8F67-A56E4FADBC63}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" @@ -1713,7 +1740,7 @@ "Keywords" = "8:Helios DCS BMS Cockpit" "ARPCOMMENTS" = "8:Helios Virtual Cockpit System" "ARPURLINFOABOUT" = "8:" - "ARPPRODUCTICON" = "8:_1FB50865C6EB4D3EAF5A6197E72FAEBF" + "ARPPRODUCTICON" = "8:_80A6BDFEDF1242D1902D1070E636D5D9" "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" @@ -1827,7 +1854,7 @@ "Target" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Icon" = "8:_3BDDB34F79F7418EBFD2D513E068A09B" + "Icon" = "8:_6A85411CAFFD4B618EC6C6B61AC873B4" "Feature" = "8:" } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_2B970F9261D74E48B635D95B39584885" @@ -1841,7 +1868,7 @@ "Target" = "8:_70E53CBB875F467EAF0875D64644C788" "Folder" = "8:_AD59734AD6DF48A39047EBE90EC7C76E" "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Icon" = "8:_1FB50865C6EB4D3EAF5A6197E72FAEBF" + "Icon" = "8:_80A6BDFEDF1242D1902D1070E636D5D9" "Feature" = "8:" } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_2F3FAA5C53374F6AA80B6B711CC4B6A8" @@ -1855,7 +1882,7 @@ "Target" = "8:_70E53CBB875F467EAF0875D64644C788" "Folder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Icon" = "8:_1FB50865C6EB4D3EAF5A6197E72FAEBF" + "Icon" = "8:_80A6BDFEDF1242D1902D1070E636D5D9" "Feature" = "8:" } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_3B1C13344FA444319964666F1D0CF2CE" @@ -1869,7 +1896,7 @@ "Target" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "Folder" = "8:_AD59734AD6DF48A39047EBE90EC7C76E" "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Icon" = "8:_3BDDB34F79F7418EBFD2D513E068A09B" + "Icon" = "8:_6A85411CAFFD4B618EC6C6B61AC873B4" "Feature" = "8:" } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_4959DA6DB3794FBA92F8B9F85C1ACFC9" @@ -1883,7 +1910,7 @@ "Target" = "8:_6CAA7C85519B4DD98F25EC242F854D7F" "Folder" = "8:_937487924C53439892F37CF38F2AF25A" "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Icon" = "8:_3BDDB34F79F7418EBFD2D513E068A09B" + "Icon" = "8:_6A85411CAFFD4B618EC6C6B61AC873B4" "Feature" = "8:" } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_DD2FA98523D44BD6A7B73D0A28AFCE94" @@ -1897,7 +1924,7 @@ "Target" = "8:_70E53CBB875F467EAF0875D64644C788" "Folder" = "8:_937487924C53439892F37CF38F2AF25A" "WorkingFolder" = "8:_E384890BFB804E8DBFE6ADCE0EDB8172" - "Icon" = "8:_1FB50865C6EB4D3EAF5A6197E72FAEBF" + "Icon" = "8:_80A6BDFEDF1242D1902D1070E636D5D9" "Feature" = "8:" } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FCBB6E6F2968476B81D434499FA96C9B" diff --git a/Helios Installer/Release/Helios 1.4.2020.0503 Download from GitHub.url b/Helios Installer/Release/Helios 1.4.2020.0503 Download from GitHub.url deleted file mode 100644 index 3f61753b2..000000000 --- a/Helios Installer/Release/Helios 1.4.2020.0503 Download from GitHub.url +++ /dev/null @@ -1,8 +0,0 @@ -[{000214A0-0000-0000-C000-000000000046}] -Prop3=19,11 -[InternetShortcut] -IDList= -URL=https://github.com/BlueFinBima/Helios/releases/download/untagged-4518d671631bd2e9aef5/Helios.1.4.2020.0530.zip -IconIndex=0 -HotKey=0 -IconFile=E:\Users\larmour\Source\Repos\BlueFinBima\helios\Helios Installer\Graphics\helios_Ks7_icon.ico diff --git a/Helios Installer/Release/Helios 1.4.2020.0530.zip.checksum.txt b/Helios Installer/Release/Helios 1.4.2020.0530.zip.checksum.txt deleted file mode 100644 index 42b728952..000000000 --- a/Helios Installer/Release/Helios 1.4.2020.0530.zip.checksum.txt +++ /dev/null @@ -1,6 +0,0 @@ -// -// File Checksum Integrity Verifier version 2.05. -// - MD5 SHA-1 -------------------------------------------------------------------------- -5a3ca8ae5300b20e9d2976abb27a32a3 4beda06de0497ea45560262c0169ada00195e25c helios 1.4.2020.0530.zip diff --git a/Helios.sln b/Helios.sln index 0a98cfe7f..b9f543133 100644 --- a/Helios.sln +++ b/Helios.sln @@ -46,74 +46,143 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Development|x64 = Development|x64 + Development|x86 = Development|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Debug|x64.ActiveCfg = Debug|x64 {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Debug|x64.Build.0 = Debug|x64 + {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Debug|x86.ActiveCfg = Debug|x86 + {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Debug|x86.Build.0 = Debug|x86 {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Development|x64.ActiveCfg = Debug|x64 {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Development|x64.Build.0 = Debug|x64 + {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Development|x86.ActiveCfg = Debug|x86 + {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Development|x86.Build.0 = Debug|x86 {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Release|x64.ActiveCfg = Release|x64 {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Release|x64.Build.0 = Release|x64 + {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Release|x86.ActiveCfg = Release|x86 + {2B00F04B-3CB2-44E7-B49B-DA94FF74C66C}.Release|x86.Build.0 = Release|x86 {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Debug|x64.ActiveCfg = Debug|x64 {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Debug|x64.Build.0 = Debug|x64 + {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Debug|x86.ActiveCfg = Debug|x86 + {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Debug|x86.Build.0 = Debug|x86 {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Development|x64.ActiveCfg = Debug|x64 {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Development|x64.Build.0 = Debug|x64 + {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Development|x86.ActiveCfg = Debug|x86 + {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Development|x86.Build.0 = Debug|x86 {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Release|x64.ActiveCfg = Release|x64 {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Release|x64.Build.0 = Release|x64 + {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Release|x86.ActiveCfg = Release|x86 + {BD8B2678-7D32-4E3D-8A9D-CA1CE201285F}.Release|x86.Build.0 = Release|x86 {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Debug|x64.ActiveCfg = Debug|x64 {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Debug|x64.Build.0 = Debug|x64 + {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Debug|x86.ActiveCfg = Debug|x86 + {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Debug|x86.Build.0 = Debug|x86 {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Development|x64.ActiveCfg = Debug|x64 {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Development|x64.Build.0 = Debug|x64 + {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Development|x86.ActiveCfg = Debug|x86 + {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Development|x86.Build.0 = Debug|x86 {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Release|x64.ActiveCfg = Release|x64 {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Release|x64.Build.0 = Release|x64 + {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Release|x86.ActiveCfg = Release|x86 + {4FDCE381-AA97-4C5E-B4CF-F9EC6792DD2C}.Release|x86.Build.0 = Release|x86 {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Debug|x64.ActiveCfg = Debug|x64 {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Debug|x64.Build.0 = Debug|x64 + {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Debug|x86.ActiveCfg = Debug|x86 + {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Debug|x86.Build.0 = Debug|x86 {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Development|x64.ActiveCfg = Development|x64 {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Development|x64.Build.0 = Development|x64 + {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Development|x86.ActiveCfg = Development|x86 + {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Development|x86.Build.0 = Development|x86 {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Release|x64.ActiveCfg = Release|x64 {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Release|x64.Build.0 = Release|x64 + {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Release|x86.ActiveCfg = Release|x86 + {E5ABE3F5-46EC-46D1-9330-D42311471A93}.Release|x86.Build.0 = Release|x86 {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Debug|x64.ActiveCfg = Debug|x64 {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Debug|x64.Build.0 = Debug|x64 + {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Debug|x86.ActiveCfg = Debug|x86 + {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Debug|x86.Build.0 = Debug|x86 {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Development|x64.ActiveCfg = Debug|x64 {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Development|x64.Build.0 = Debug|x64 + {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Development|x86.ActiveCfg = Debug|x86 + {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Development|x86.Build.0 = Debug|x86 {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Release|x64.ActiveCfg = Release|x64 {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Release|x64.Build.0 = Release|x64 + {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Release|x86.ActiveCfg = Release|x86 + {3AF089A2-9DA0-40C3-AD3A-92253F497BC8}.Release|x86.Build.0 = Release|x86 {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Debug|x64.ActiveCfg = Debug|x64 {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Debug|x64.Build.0 = Debug|x64 + {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Debug|x86.ActiveCfg = Debug|x86 + {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Debug|x86.Build.0 = Debug|x86 {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Development|x64.ActiveCfg = Development|x64 {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Development|x64.Build.0 = Development|x64 + {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Development|x86.ActiveCfg = Development|x86 + {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Development|x86.Build.0 = Development|x86 {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Release|x64.ActiveCfg = Release|x64 {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Release|x64.Build.0 = Release|x64 + {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Release|x86.ActiveCfg = Release|x86 + {80D80B0F-0DC0-49E2-97C2-3CC6436FA61F}.Release|x86.Build.0 = Release|x86 {06BA10F4-279C-4E82-B77C-333706A617B9}.Debug|x64.ActiveCfg = Debug|x64 {06BA10F4-279C-4E82-B77C-333706A617B9}.Debug|x64.Build.0 = Debug|x64 + {06BA10F4-279C-4E82-B77C-333706A617B9}.Debug|x86.ActiveCfg = Debug|x86 + {06BA10F4-279C-4E82-B77C-333706A617B9}.Debug|x86.Build.0 = Debug|x86 {06BA10F4-279C-4E82-B77C-333706A617B9}.Development|x64.ActiveCfg = Debug|x64 {06BA10F4-279C-4E82-B77C-333706A617B9}.Development|x64.Build.0 = Debug|x64 + {06BA10F4-279C-4E82-B77C-333706A617B9}.Development|x86.ActiveCfg = Debug|x86 + {06BA10F4-279C-4E82-B77C-333706A617B9}.Development|x86.Build.0 = Debug|x86 {06BA10F4-279C-4E82-B77C-333706A617B9}.Release|x64.ActiveCfg = Release|x64 {06BA10F4-279C-4E82-B77C-333706A617B9}.Release|x64.Build.0 = Release|x64 + {06BA10F4-279C-4E82-B77C-333706A617B9}.Release|x86.ActiveCfg = Release|x86 + {06BA10F4-279C-4E82-B77C-333706A617B9}.Release|x86.Build.0 = Release|x86 {5F79059E-6954-45C1-8929-27683551D25A}.Debug|x64.ActiveCfg = Debug|x64 {5F79059E-6954-45C1-8929-27683551D25A}.Debug|x64.Build.0 = Debug|x64 + {5F79059E-6954-45C1-8929-27683551D25A}.Debug|x86.ActiveCfg = Debug|x86 + {5F79059E-6954-45C1-8929-27683551D25A}.Debug|x86.Build.0 = Debug|x86 {5F79059E-6954-45C1-8929-27683551D25A}.Development|x64.ActiveCfg = Debug|x64 {5F79059E-6954-45C1-8929-27683551D25A}.Development|x64.Build.0 = Debug|x64 + {5F79059E-6954-45C1-8929-27683551D25A}.Development|x86.ActiveCfg = Debug|x86 + {5F79059E-6954-45C1-8929-27683551D25A}.Development|x86.Build.0 = Debug|x86 {5F79059E-6954-45C1-8929-27683551D25A}.Release|x64.ActiveCfg = Release|x64 {5F79059E-6954-45C1-8929-27683551D25A}.Release|x64.Build.0 = Release|x64 + {5F79059E-6954-45C1-8929-27683551D25A}.Release|x86.ActiveCfg = Release|x86 + {5F79059E-6954-45C1-8929-27683551D25A}.Release|x86.Build.0 = Release|x86 {61272BD1-E670-45CC-918B-1208B837F4DC}.Debug|x64.ActiveCfg = Debug + {61272BD1-E670-45CC-918B-1208B837F4DC}.Debug|x86.ActiveCfg = Debug + {61272BD1-E670-45CC-918B-1208B837F4DC}.Debug|x86.Build.0 = Debug {61272BD1-E670-45CC-918B-1208B837F4DC}.Development|x64.ActiveCfg = Debug + {61272BD1-E670-45CC-918B-1208B837F4DC}.Development|x86.ActiveCfg = DebugX64 + {61272BD1-E670-45CC-918B-1208B837F4DC}.Development|x86.Build.0 = DebugX64 {61272BD1-E670-45CC-918B-1208B837F4DC}.Release|x64.ActiveCfg = Release {61272BD1-E670-45CC-918B-1208B837F4DC}.Release|x64.Build.0 = Release + {61272BD1-E670-45CC-918B-1208B837F4DC}.Release|x86.ActiveCfg = Release + {61272BD1-E670-45CC-918B-1208B837F4DC}.Release|x86.Build.0 = Release {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Debug|x64.ActiveCfg = Debug {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Debug|x64.Build.0 = Debug + {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Debug|x86.ActiveCfg = Debug + {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Debug|x86.Build.0 = Debug {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Development|x64.ActiveCfg = Debug {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Development|x64.Build.0 = Debug + {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Development|x86.ActiveCfg = DebugX64 + {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Development|x86.Build.0 = DebugX64 {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Release|x64.ActiveCfg = Release {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Release|x64.Build.0 = Release + {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Release|x86.ActiveCfg = Release + {3EBE3C85-C79E-42EF-AA07-EEDA5990205B}.Release|x86.Build.0 = Release {80870108-EFE4-4ADF-969D-A0CE06123271}.Debug|x64.ActiveCfg = Debug|x64 {80870108-EFE4-4ADF-969D-A0CE06123271}.Debug|x64.Build.0 = Debug|x64 + {80870108-EFE4-4ADF-969D-A0CE06123271}.Debug|x86.ActiveCfg = Debug|x86 + {80870108-EFE4-4ADF-969D-A0CE06123271}.Debug|x86.Build.0 = Debug|x86 {80870108-EFE4-4ADF-969D-A0CE06123271}.Development|x64.ActiveCfg = Debug|x64 {80870108-EFE4-4ADF-969D-A0CE06123271}.Development|x64.Build.0 = Debug|x64 + {80870108-EFE4-4ADF-969D-A0CE06123271}.Development|x86.ActiveCfg = Debug|x86 + {80870108-EFE4-4ADF-969D-A0CE06123271}.Development|x86.Build.0 = Debug|x86 {80870108-EFE4-4ADF-969D-A0CE06123271}.Release|x64.ActiveCfg = Release|x64 {80870108-EFE4-4ADF-969D-A0CE06123271}.Release|x64.Build.0 = Release|x64 + {80870108-EFE4-4ADF-969D-A0CE06123271}.Release|x86.ActiveCfg = Release|x86 + {80870108-EFE4-4ADF-969D-A0CE06123271}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Helios/Helios.csproj b/Helios/Helios.csproj index 1730adaa8..ac8ac8db6 100644 --- a/Helios/Helios.csproj +++ b/Helios/Helios.csproj @@ -48,6 +48,52 @@ prompt ManagedMinimumRules.ruleset + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + ManagedMinimumRules.ruleset + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + ManagedMinimumRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + ManagedMinimumRules.ruleset + + + true + bin\x86\Development\ + TRACE;DEBUG;DEVELOPMENT_CONFIGURATION + full + x86 + 7.3 + prompt + ManagedMinimumRules.ruleset + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + ManagedMinimumRules.ruleset + False @@ -3799,7 +3845,10 @@ del "$(TargetDir)Templates\*.htpl" - +if "x86"=="$(PlatformName)" ( + copy "$(TargetDir)*lua*.*" "$(SolutionDir)bin\release\" + copy "$(TargetDir)helios.dll" "$(SolutionDir)bin\release\" +) diff --git a/Helios/Interfaces/DCS/FA18C/FA18CInterface.cs b/Helios/Interfaces/DCS/FA18C/FA18CInterface.cs index 4e6037b57..c5b372686 100644 --- a/Helios/Interfaces/DCS/FA18C/FA18CInterface.cs +++ b/Helios/Interfaces/DCS/FA18C/FA18CInterface.cs @@ -392,15 +392,15 @@ public FA18CInterface() #region Multipurpose Display Group #endregion #region Head-Up Display - AddFunction(new Switch(this, HUD, "140", new SwitchPosition[] { new SwitchPosition("1.0", "NORM", "3001"), new SwitchPosition("0.5", "REJ 1", "3001"), new SwitchPosition("0.0", "REJ 2", "3001") }, "Head-Up Display", "HUD Symbology Reject Switch", "%0.1f")); // elements["pnt_140"] = default_3_position_tumb(_("HUD Symbology Reject Switch, NORM/REJ 1/REJ 2"), devices.HUD, HUD_commands.HUD_SymbRejectSw, 140, false, anim_speed_default, false, 0.1, {0, 0.2}) + AddFunction(new Switch(this, HUD, "140", new SwitchPosition[] { new SwitchPosition("0.2", "NORM", "3001"), new SwitchPosition("0.1", "REJ 1", "3001"), new SwitchPosition("0.0", "REJ 2", "3001") }, "Head-Up Display", "HUD Symbology Reject Switch", "%0.1f")); // elements["pnt_140"] = default_3_position_tumb(_("HUD Symbology Reject Switch, NORM/REJ 1/REJ 2"), devices.HUD, HUD_commands.HUD_SymbRejectSw, 140, false, anim_speed_default, false, 0.1, {0, 0.2}) AddFunction(new Axis(this, HUD, "3002", "141", 0.15d, 0d, 1d, "Head-Up Display", "HUD Symbology Brightness Control Knob")); // elements["pnt_141"] = default_axis_limited(_("HUD Symbology Brightness Control Knob"), devices.HUD, HUD_commands.HUD_SymbBrightCtrl, 141, 0.0, 0.1, false, false, {0, 1}) AddFunction(Switch.CreateToggleSwitch(this, HUD, "3003", "142", "1.0", "DAY", "0.0", "NIGHT", "Head-Up Display", "HUD Symbology Brightness Selector Switch", "%0.1f")); // elements["pnt_142"] = default_2_position_tumb(_("HUD Symbology Brightness Selector Knob, DAY/NIGHT"), devices.HUD, HUD_commands.HUD_SymbBrightSelKnob, 142) AddFunction(new Axis(this, HUD, "3004", "143", 0.15d, 0d, 1d, "Head-Up Display", "Black Level Control Knob")); // elements["pnt_143"] = default_axis_limited(_("Black Level Control Knob"), devices.HUD, HUD_commands.HUD_BlackLevelCtrl, 143, 0.0, 0.1, false, false, {0, 1}) - AddFunction(new Switch(this, HUD, "144", new SwitchPosition[] { new SwitchPosition("1.0", "W", "3005"), new SwitchPosition("0.7", "B", "3005"), new SwitchPosition("0.3", "VID", "3005"), new SwitchPosition("0.0", "OFF", "3005") }, "Head-Up Display", "HUD Video Control Switch", "%0.1f")); // elements["pnt_144"] = default_3_position_tumb(_("HUD Video Control Switch, W/B /VID/OFF"), devices.HUD, HUD_commands.HUD_VideoCtrlSw, 144, false, anim_speed_default, false, 0.1, {0, 0.2}) + AddFunction(new Switch(this, HUD, "144", new SwitchPosition[] { new SwitchPosition("0.2", "W/B", "3005"), new SwitchPosition("0.1", "VID", "3005"), new SwitchPosition("0.0", "OFF", "3005") }, "Head-Up Display", "HUD Video Control Switch", "%0.1f")); // elements["pnt_144"] = default_3_position_tumb(_("HUD Video Control Switch, W/B /VID/OFF"), devices.HUD, HUD_commands.HUD_VideoCtrlSw, 144, false, anim_speed_default, false, 0.1, {0, 0.2}) AddFunction(new Axis(this, HUD, "3006", "145", 0.15d, 0d, 1d, "Head-Up Display", "Balance Control Knob")); // elements["pnt_145"] = default_axis_limited(_("Balance Control Knob"), devices.HUD, HUD_commands.HUD_BalanceCtrl, 145, 0.0, 0.1, false, false, {0, 1}) AddFunction(new Axis(this, HUD, "3007", "146", 0.15d, 0d, 1d, "Head-Up Display", "AOA Indexer Control Knob")); // elements["pnt_146"] = default_axis_limited(_("AOA Indexer Control Knob"), devices.HUD, HUD_commands.HUD_AoA_IndexerCtrl, 146, 0.0, 0.1, false, false, {0, 1}) AddFunction(Switch.CreateToggleSwitch(this, HUD, "3008", "147", "1.0", "BARO", "0.0", "RDR", "Head-Up Display", "Altitude Switch", "%0.1f")); // elements["pnt_147"] = default_2_position_tumb(_("Altitude Switch, BARO/RDR"), devices.HUD, HUD_commands.HUD_AltitudeSw, 147) - AddFunction(new Switch(this, HUD, "148", new SwitchPosition[] { new SwitchPosition("1.0", "INS", "3009"), new SwitchPosition("0.5", "AUTO", "3009"), new SwitchPosition("0.0", "STBY", "3009") }, "Head-Up Display", "Attitude Selector Switch", "%0.1f")); // elements["pnt_148"] = default_3_position_tumb(_("Attitude Selector Switch, INS/AUTO/STBY"), devices.HUD, HUD_commands.HUD_AttitudeSelSw, 148) + AddFunction(new Switch(this, HUD, "148", new SwitchPosition[] { new SwitchPosition("1.0", "INS", "3009"), new SwitchPosition("0.0", "AUTO", "3009"), new SwitchPosition("-1.0", "STBY", "3009") }, "Head-Up Display", "Attitude Selector Switch", "%0.1f")); // elements["pnt_148"] = default_3_position_tumb(_("Attitude Selector Switch, INS/AUTO/STBY"), devices.HUD, HUD_commands.HUD_AttitudeSelSw, 148) #endregion #region Left MDI AddFunction(new Switch(this, MDI_LEFT, "51", new SwitchPosition[] { new SwitchPosition("0.0", "OFF", "3001"), new SwitchPosition("0.5", "NIGHT", "3001"), new SwitchPosition("1.0", "DAY", "3001") }, "Left MDI", "Left MDI Brightness Selector Knob", "%0.1f")); // elements["pnt_51"] = default_3_position_tumb(_("Left MDI Brightness Selector Knob, OFF/NIGHT/DAY"), devices.MDI_LEFT, MDI_commands.MDI_off_night_day, 51, false, anim_speed_default, false, 0.1, {0, 0.2}) diff --git a/KeyPressReceiver/Keypress Receiver.csproj b/KeyPressReceiver/Keypress Receiver.csproj index 1f6237a96..b5f9f0114 100644 --- a/KeyPressReceiver/Keypress Receiver.csproj +++ b/KeyPressReceiver/Keypress Receiver.csproj @@ -55,6 +55,46 @@ MinimumRecommendedRules.ruleset true + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + diff --git a/Keypress Receiver Installer/Keypress Receiver Installer.vdproj b/Keypress Receiver Installer/Keypress Receiver Installer.vdproj index 0d4616bef..47e7f9c53 100644 --- a/Keypress Receiver Installer/Keypress Receiver Installer.vdproj +++ b/Keypress Receiver Installer/Keypress Receiver Installer.vdproj @@ -154,6 +154,38 @@ } } } + "Release x86" + { + "DisplayName" = "8:Release x86" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Release x86\\Keypress Receiver Installer.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5.2" + { + "Name" = "8:Microsoft .NET Framework 4.5.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.5.2" + } + } + } + } "ReleaseX64" { "DisplayName" = "8:ReleaseX64" @@ -281,11 +313,6 @@ "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_D303DF1DE183FF588DBC5FC8651CF07E" - { - "Name" = "8:System.Net.Http.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" @@ -871,7 +898,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_46A844A2E7194B4991ED76F97CB1DA46" { - "SourcePath" = "8:..\\KeyPressReceiver\\obj\\x64\\Release\\Keypress Receiver.exe" + "SourcePath" = "8:..\\KeyPressReceiver\\obj\\x86\\Release\\Keypress Receiver.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_60CAE0386DD048369A125B9D95E737B0" diff --git a/Phidgets/Phidgets.csproj b/Phidgets/Phidgets.csproj index 8bda23aba..8ba2a7f1f 100644 --- a/Phidgets/Phidgets.csproj +++ b/Phidgets/Phidgets.csproj @@ -33,6 +33,42 @@ Helios.ico + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + ..\Lib\Phidget21.NET.dll diff --git a/Profile Editor/Profile Editor.csproj b/Profile Editor/Profile Editor.csproj index 1ed4ecf65..460d43071 100644 --- a/Profile Editor/Profile Editor.csproj +++ b/Profile Editor/Profile Editor.csproj @@ -54,6 +54,46 @@ GadrocsWorkshop.Helios.ProfileEditor.App + + bin\x64\Release x86\ + TRACE + true + pdbonly + x64 + prompt + ManagedMinimumRules.ruleset + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + ManagedMinimumRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + ManagedMinimumRules.ruleset + true + + + bin\x86\Release x86\ + TRACE + true + pdbonly + x86 + prompt + ManagedMinimumRules.ruleset + true + ..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll diff --git a/Profile Editor/Profile Editor.csproj.user b/Profile Editor/Profile Editor.csproj.user index 75784a2ea..773619a6b 100644 --- a/Profile Editor/Profile Editor.csproj.user +++ b/Profile Editor/Profile Editor.csproj.user @@ -17,4 +17,7 @@ --loglevel=debug --documents HeliosTesting + + --loglevel=debug --documents HeliosTesting + \ No newline at end of file