diff --git a/Control Center/Control Center.csproj b/Control Center/Control Center.csproj
index e570a4730..dadf51e73 100644
--- a/Control Center/Control Center.csproj
+++ b/Control Center/Control Center.csproj
@@ -24,8 +24,8 @@
false
false
true
- 330
- 1.4.2019.0330
+ 317
+ 1.4.2019.0317
false
true
diff --git a/Control Center/Properties/AssemblyInfo.cs b/Control Center/Properties/AssemblyInfo.cs
index 557a66ac3..ad5fbdd92 100644
--- a/Control Center/Properties/AssemblyInfo.cs
+++ b/Control Center/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.2019.0330")]
-[assembly: AssemblyFileVersion("1.4.2019.0330")]
+[assembly: AssemblyVersion("1.4.2019.0317")]
+[assembly: AssemblyFileVersion("1.4.2019.0317")]
diff --git a/Helios/Interfaces/DCS/Common/DCSConfigurator.cs b/Helios/Interfaces/DCS/Common/DCSConfigurator.cs
index bf4f3e3f6..d66fc9a59 100644
--- a/Helios/Interfaces/DCS/Common/DCSConfigurator.cs
+++ b/Helios/Interfaces/DCS/Common/DCSConfigurator.cs
@@ -269,11 +269,26 @@ public string ExportAppPath
if (_allowDCSWorld)
{
RegistryKey pathKey = Registry.CurrentUser.OpenSubKey(@"Software\Eagle Dynamics\DCS World");
+
+ // We attempt to get the Saved Games known folder from the native method to cater for situations
+ // when the locale of the installation has the folder name in non-English.
+
+ String path;
+ IntPtr pathPtr;
+ int hr = NativeMethods.SHGetKnownFolderPath(ref FolderSavedGames, 0, IntPtr.Zero, out pathPtr);
+ if (hr == 0)
+ {
+ path = Marshal.PtrToStringUni(pathPtr);
+ Marshal.FreeCoTaskMem(pathPtr);
+ } else
+ {
+ path = Environment.GetEnvironmentVariable("userprofile") + "Saved Games";
+ }
+
if (pathKey != null)
{
pathKey.Close();
- return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"), "Saved Games", "DCS.openbeta");
- return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"), "DCS");
+ return System.IO.Path.Combine(path, "DCS");
}
else
{
@@ -281,7 +296,7 @@ public string ExportAppPath
if (pathKey != null)
{
pathKey.Close();
- return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"), "Saved Games", "DCS.openbeta");
+ return System.IO.Path.Combine(path, "DCS.openbeta");
}
else
{
@@ -289,7 +304,7 @@ public string ExportAppPath
if (pathKey != null)
{
pathKey.Close();
- return System.IO.Path.Combine(Environment.GetEnvironmentVariable("userprofile"),"Saved Games", "DCS.openalpha");
+ return System.IO.Path.Combine(path, "DCS.openalpha");
}
}
}
diff --git a/Helios/Properties/AssemblyInfo.cs b/Helios/Properties/AssemblyInfo.cs
index 0993cf0b4..625dc19df 100644
--- a/Helios/Properties/AssemblyInfo.cs
+++ b/Helios/Properties/AssemblyInfo.cs
@@ -45,5 +45,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.2019.0330")]
-[assembly: AssemblyFileVersion("1.4.2019.0330")]
+[assembly: AssemblyVersion("1.4.2019.0317")]
+[assembly: AssemblyFileVersion("1.4.2019.0317")]
diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj
index 6fdc95cfa..3e1fdf39d 100644
--- a/Installer/Installer.vdproj
+++ b/Installer/Installer.vdproj
@@ -45,6 +45,36 @@
}
"Entry"
{
+ "MsmKey" = "8:_08A8CE6856A173C96A70F80100AED9E5"
+ "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_08A8CE6856A173C96A70F80100AED9E5"
+ "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_08A8CE6856A173C96A70F80100AED9E5"
+ "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_08A8CE6856A173C96A70F80100AED9E5"
+ "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_08A8CE6856A173C96A70F80100AED9E5"
+ "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_092DA7B2E10C49B7962C99EA2D4EBB40"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -69,6 +99,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_0DFBFCB8369F49CDB7ED7DBA3C68A78E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_0E176AE0E2354CC8A3B557390A1FD4B4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -111,68 +147,68 @@
}
"Entry"
{
- "MsmKey" = "8:_17EDC72CD7334DAF9892887E3B80B864"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_161114B3210C9125BCADDBB596A52A7A"
+ "OwnerKey" = "8:_08A8CE6856A173C96A70F80100AED9E5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_19FA496ED2DF4F1C898DB30B6B4246F3"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_161114B3210C9125BCADDBB596A52A7A"
+ "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1AAA4B73050C4625B97C77180323D08D"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_161114B3210C9125BCADDBB596A52A7A"
+ "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_257CD7D688EC47DEBC542C3FA55A2B62"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_161114B3210C9125BCADDBB596A52A7A"
+ "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_262483C9069B43B6B6DE577C81D14D5D"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_161114B3210C9125BCADDBB596A52A7A"
+ "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2883A5E1FD7240DA82ECECFBD7BBBA53"
+ "MsmKey" = "8:_17EDC72CD7334DAF9892887E3B80B864"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA"
- "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
+ "MsmKey" = "8:_19FA496ED2DF4F1C898DB30B6B4246F3"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA"
- "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
+ "MsmKey" = "8:_1AAA4B73050C4625B97C77180323D08D"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA"
- "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
+ "MsmKey" = "8:_257CD7D688EC47DEBC542C3FA55A2B62"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA"
- "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
+ "MsmKey" = "8:_262483C9069B43B6B6DE577C81D14D5D"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA"
- "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
+ "MsmKey" = "8:_2883A5E1FD7240DA82ECECFBD7BBBA53"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -477,74 +513,74 @@
}
"Entry"
{
- "MsmKey" = "8:_6D9F3C5832A04C4EBB4D0C278EBC1435"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6D25A3A87606F011B198DAE49306A51A"
+ "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6DF5AF699B9B40CFA13583B1FDCAB1AE"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6D25A3A87606F011B198DAE49306A51A"
+ "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_70790A957042404AB91CA9496EF10663"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6D25A3A87606F011B198DAE49306A51A"
+ "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_715D294991C048DF9FB2873186BA980E"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6D25A3A87606F011B198DAE49306A51A"
+ "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_6D25A3A87606F011B198DAE49306A51A"
+ "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_73422F6702814298BD7C7BB55F0A9189"
+ "MsmKey" = "8:_6D9F3C5832A04C4EBB4D0C278EBC1435"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_7373B32BEA9F4C90A1AB3607D27D4FB6"
+ "MsmKey" = "8:_6DF5AF699B9B40CFA13583B1FDCAB1AE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1"
- "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
+ "MsmKey" = "8:_70790A957042404AB91CA9496EF10663"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1"
- "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
+ "MsmKey" = "8:_715D294991C048DF9FB2873186BA980E"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1"
- "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
+ "MsmKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1"
- "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
+ "MsmKey" = "8:_73422F6702814298BD7C7BB55F0A9189"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1"
- "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
+ "MsmKey" = "8:_7373B32BEA9F4C90A1AB3607D27D4FB6"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -681,6 +717,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_86B5509906954EAFAA91F78CC89F32A9"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_875128DC0CE24BF88B98731A5ABCDA15"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -843,128 +885,128 @@
}
"Entry"
{
- "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979"
- "OwnerKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA"
+ "MsmKey" = "8:_A23DD0E6E2324AB79E81D4B2CF805182"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979"
- "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
+ "MsmKey" = "8:_A88B52B9AB0F4E14B856642CD8FD0C33"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979"
- "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
+ "MsmKey" = "8:_A8A74056124C4AD693F3BAFD2ADA58FD"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979"
- "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
+ "MsmKey" = "8:_ABEFA240B7DC4932AE60B85114E8E703"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979"
- "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
+ "MsmKey" = "8:_AC29AC036EBF454C85B51E7829B7B14C"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A177E20BA06FFC17C6F3199B766D8979"
- "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
+ "MsmKey" = "8:_AD56652454A345D5BE11B0768B60A253"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A23DD0E6E2324AB79E81D4B2CF805182"
+ "MsmKey" = "8:_AD66F05204DF4728BFEBB7217DFF461B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A88B52B9AB0F4E14B856642CD8FD0C33"
+ "MsmKey" = "8:_AD7D03839E304167B1475303E6245715"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A8A74056124C4AD693F3BAFD2ADA58FD"
+ "MsmKey" = "8:_ADA63B3B4AC3454F8CB5B815B2FCE1DE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_ABEFA240B7DC4932AE60B85114E8E703"
+ "MsmKey" = "8:_AE9BF261DD9341E69804011F5F0CB58B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AC29AC036EBF454C85B51E7829B7B14C"
+ "MsmKey" = "8:_B25A40941EAF434794710A2A568E56A4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AD56652454A345D5BE11B0768B60A253"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_B460C897C30FCD732C43CB2D97564E5C"
+ "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AD66F05204DF4728BFEBB7217DFF461B"
+ "MsmKey" = "8:_B98FC97AB593418DAE7EF536AAD530C1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AD7D03839E304167B1475303E6245715"
+ "MsmKey" = "8:_BA9FC9731D5A4946A05CFD1261A14EF1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_ADA63B3B4AC3454F8CB5B815B2FCE1DE"
+ "MsmKey" = "8:_BB29820F6A4F4438B99646A0DC3709CF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AE9BF261DD9341E69804011F5F0CB58B"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_BBD01F1F2CAB406FBC39642D2C723667"
+ "OwnerKey" = "8:_6D25A3A87606F011B198DAE49306A51A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B25A40941EAF434794710A2A568E56A4"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_BBD01F1F2CAB406FBC39642D2C723667"
+ "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B460C897C30FCD732C43CB2D97564E5C"
- "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
+ "MsmKey" = "8:_BBD01F1F2CAB406FBC39642D2C723667"
+ "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B98FC97AB593418DAE7EF536AAD530C1"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_BBD01F1F2CAB406FBC39642D2C723667"
+ "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BA9FC9731D5A4946A05CFD1261A14EF1"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_BBD01F1F2CAB406FBC39642D2C723667"
+ "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BB29820F6A4F4438B99646A0DC3709CF"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_BBD01F1F2CAB406FBC39642D2C723667"
+ "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -1233,36 +1275,6 @@
}
"Entry"
{
- "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603"
- "OwnerKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603"
- "OwnerKey" = "8:_FA987369A3EA4F739E46E3E94BA7D12B"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603"
- "OwnerKey" = "8:_E6A2C78B3575408E83C42476E5449D05"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603"
- "OwnerKey" = "8:_80A510498A90463B948A51AD3876BD90"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603"
- "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_F3B1D8DB61CE450B85EDF08FCC5C0866"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1378,19 +1390,13 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_745A49A328E3528657335FAFB62F6368"
+ "OwnerKey" = "8:_B460C897C30FCD732C43CB2D97564E5C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F"
+ "OwnerKey" = "8:_F05AA613420BC07A0759C84A86730A98"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -1498,55 +1504,61 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_B460C897C30FCD732C43CB2D97564E5C"
+ "OwnerKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_F05AA613420BC07A0759C84A86730A98"
+ "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_2FC823C6E84B4FB3636C109E6D48F087"
+ "OwnerKey" = "8:_3017249F82D3593F85B2600DA584699B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_72CEFC0E61EB439E9A3A8073F41622EF"
+ "OwnerKey" = "8:_DE2E358AC1B539A5DE4E38F0CC0E49B6"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_3017249F82D3593F85B2600DA584699B"
+ "OwnerKey" = "8:_6D25A3A87606F011B198DAE49306A51A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_BBD01F1F2CAB406FBC39642D2C723667"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_29F6005D9412AD6742A02CE06C9D27EA"
+ "OwnerKey" = "8:_08A8CE6856A173C96A70F80100AED9E5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_A177E20BA06FFC17C6F3199B766D8979"
+ "OwnerKey" = "8:_161114B3210C9125BCADDBB596A52A7A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_743F6EA1E81D7EB020EC69ACED6138A1"
+ "OwnerKey" = "8:_745A49A328E3528657335FAFB62F6368"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_F39C8C3B8DFF944FF19A868A0FA4E603"
+ "OwnerKey" = "8:_31E026CE4D511148C375D73ABB8FFE1F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -1761,6 +1773,37 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_08A8CE6856A173C96A70F80100AED9E5"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:NLua, Version=1.3.2.0, Culture=neutral, PublicKeyToken=8df2ab518030ea95, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_08A8CE6856A173C96A70F80100AED9E5"
+ {
+ "Name" = "8:NLua.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:NLua.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:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_092DA7B2E10C49B7962C99EA2D4EBB40"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\F-16\\DED Bezel.htpl"
@@ -1841,6 +1884,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0DFBFCB8369F49CDB7ED7DBA3C68A78E"
+ {
+ "SourcePath" = "8:..\\..\\..\\Iris\\Installer\\Iris Setup\\Release\\Iris Setup.msi"
+ "TargetName" = "8:Iris Screeen Exporter Setup.msi"
+ "Tag" = "8:"
+ "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C"
+ "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:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0E176AE0E2354CC8A3B557390A1FD4B4"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\AV-8B\\Landing Lights Switch.htpl"
@@ -1992,6 +2055,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_161114B3210C9125BCADDBB596A52A7A"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:KeraLua, Version=1.3.2.0, Culture=neutral, PublicKeyToken=04d04586786c6f34, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_161114B3210C9125BCADDBB596A52A7A"
+ {
+ "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:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17EDC72CD7334DAF9892887E3B80B864"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\A-10\\1.htpl"
@@ -2112,37 +2206,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_29F6005D9412AD6742A02CE06C9D27EA"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:SharpDX.DirectInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_29F6005D9412AD6742A02CE06C9D27EA"
- {
- "Name" = "8:SharpDX.DirectInput.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:SharpDX.DirectInput.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:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2A9134C3F98C458CB33F247E6D04B6DE"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\A-10\\Fire Pull APU.htpl"
@@ -3153,6 +3216,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6D25A3A87606F011B198DAE49306A51A"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:SharpDX.DirectInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_6D25A3A87606F011B198DAE49306A51A"
+ {
+ "Name" = "8:SharpDX.DirectInput.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:SharpDX.DirectInput.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:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D9F3C5832A04C4EBB4D0C278EBC1435"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\Threeway Toggles\\Orange Seal - Round.htpl"
@@ -3273,37 +3367,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_743F6EA1E81D7EB020EC69ACED6138A1"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:NLua, Version=1.3.2.0, Culture=neutral, PublicKeyToken=8df2ab518030ea95, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_743F6EA1E81D7EB020EC69ACED6138A1"
- {
- "Name" = "8:NLua.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:NLua.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}:_745A49A328E3528657335FAFB62F6368"
{
"AssemblyRegister" = "3:1"
@@ -3686,6 +3749,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_86B5509906954EAFAA91F78CC89F32A9"
+ {
+ "SourcePath" = "8:..\\..\\..\\Iris\\Installer\\Iris Setup\\Release\\Iris Setup.exe"
+ "TargetName" = "8:Iris Screeen Exporter Setup.exe"
+ "Tag" = "8:"
+ "Folder" = "8:_99D248ECE7CA4B17A15B204984A6573C"
+ "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:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_875128DC0CE24BF88B98731A5ABCDA15"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\A-10\\AFT.htpl"
@@ -4259,37 +4342,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A177E20BA06FFC17C6F3199B766D8979"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_A177E20BA06FFC17C6F3199B766D8979"
- {
- "Name" = "8:SharpDX.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:SharpDX.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:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A23DD0E6E2324AB79E81D4B2CF805182"
{
"SourcePath" = "8:..\\Helios\\Fonts\\Hornet UFC.ttf"
@@ -4601,6 +4653,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BBD01F1F2CAB406FBC39642D2C723667"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_BBD01F1F2CAB406FBC39642D2C723667"
+ {
+ "Name" = "8:SharpDX.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:SharpDX.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:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BD6F94700DAF4B34AA9627BB9C798790"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\F-16\\Panel Screw.htpl"
@@ -5465,37 +5548,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F39C8C3B8DFF944FF19A868A0FA4E603"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:KeraLua, Version=1.3.2.0, Culture=neutral, PublicKeyToken=04d04586786c6f34, 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:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F3B1D8DB61CE450B85EDF08FCC5C0866"
{
"SourcePath" = "8:..\\bin\\Release\\Templates\\Base\\F-16\\Horizontal Panel Guard.htpl"
@@ -6230,15 +6282,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Helios"
- "ProductCode" = "8:{3468124B-CC42-49EF-A85A-2B64863872DD}"
- "PackageCode" = "8:{B88CAC81-24C4-4996-A8DD-C4596035D509}"
+ "ProductCode" = "8:{C0AC4425-E688-43F2-8428-82EF852470D7}"
+ "PackageCode" = "8:{94C51AA7-0E40-4854-98EE-57DF05170765}"
"UpgradeCode" = "8:{589D8667-3ED9-478B-8F67-A56E4FADBC63}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.4.1903"
+ "ProductVersion" = "8:1.4.2019"
"Manufacturer" = "8:Gadrocs Workshop"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
diff --git a/Profile Editor/Profile Editor.csproj b/Profile Editor/Profile Editor.csproj
index 2b0295e1d..a181711ad 100644
--- a/Profile Editor/Profile Editor.csproj
+++ b/Profile Editor/Profile Editor.csproj
@@ -24,8 +24,8 @@
false
false
true
- 330
- 1.4.2019.0330
+ 317
+ 1.4.2019.0317
false
true
diff --git a/Profile Editor/Properties/AssemblyInfo.cs b/Profile Editor/Properties/AssemblyInfo.cs
index d53fb6823..861818564 100644
--- a/Profile Editor/Properties/AssemblyInfo.cs
+++ b/Profile Editor/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.2019.0330")]
-[assembly: AssemblyFileVersion("1.4.2019.0330")]
+[assembly: AssemblyVersion("1.4.2019.0317")]
+[assembly: AssemblyFileVersion("1.4.2019.0317")]