From b1b9bf37366378260e7198d7f2af31493cd15eab Mon Sep 17 00:00:00 2001
From: Fma965 <fma965@cyanlabs.net>
Date: Mon, 20 Sep 2021 18:29:57 +0100
Subject: [PATCH] Fix issue with license keys not working correctly

---
 .gitignore                                    |  1 +
 .idea/.idea.Syn3Updater/.idea/riderModule.iml | 21 -------------------
 Launcher/Properties/AssemblyInfo.cs           |  4 ++--
 Syn3Updater/Properties/AssemblyInfo.cs        |  4 ++--
 Syn3Updater/Syn3Updater.csproj                | 10 +++++++++
 Syn3Updater/UI/Tabs/HomeViewModel.cs          |  2 +-
 6 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 .idea/.idea.Syn3Updater/.idea/riderModule.iml

diff --git a/.gitignore b/.gitignore
index c9eb93ff..c6f6c6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -362,3 +362,4 @@ references/ModernWpf.dll
 references/ModernWpf.Controls.dll
 Syn3Updater/PullLanguages.ps1
 /Syn3Updater/Properties/launchSettings.json
+Syn3Updater/Models/APISecretModel.cs
diff --git a/.idea/.idea.Syn3Updater/.idea/riderModule.iml b/.idea/.idea.Syn3Updater/.idea/riderModule.iml
deleted file mode 100644
index 459a9b42..00000000
--- a/.idea/.idea.Syn3Updater/.idea/riderModule.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.10.0/build/netcoreapp2.1" />
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.10.0/build/netcoreapp2.1/x64/Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.10.0/build/netcoreapp2.1/x64/testhost.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.10.0/build/netcoreapp2.1/x64/testhost.exe" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/net35/NUnit3.TestAdapter.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/net35/NUnit3.TestAdapter.pdb" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/net35/nunit.engine.api.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/net35/nunit.engine.core.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/net35/nunit.engine.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.pdb" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.api.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.core.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.dll" />
-    <content url="file://$MODULE_DIR$/../.." />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/Launcher/Properties/AssemblyInfo.cs b/Launcher/Properties/AssemblyInfo.cs
index cdbdc5b7..acb3a5a2 100644
--- a/Launcher/Properties/AssemblyInfo.cs
+++ b/Launcher/Properties/AssemblyInfo.cs
@@ -37,5 +37,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("2.10.5.0")]
-[assembly: AssemblyFileVersion("2.10.5.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.10.6.0")]
+[assembly: AssemblyFileVersion("2.10.6.0")]
\ No newline at end of file
diff --git a/Syn3Updater/Properties/AssemblyInfo.cs b/Syn3Updater/Properties/AssemblyInfo.cs
index 5394c194..4987931a 100644
--- a/Syn3Updater/Properties/AssemblyInfo.cs
+++ b/Syn3Updater/Properties/AssemblyInfo.cs
@@ -46,5 +46,5 @@
 // You can specify all the values or you can default the Build a nd Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.10.5.0")]
-[assembly: AssemblyFileVersion("2.10.5.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.10.6.0")]
+[assembly: AssemblyFileVersion("2.10.6.0")]
\ No newline at end of file
diff --git a/Syn3Updater/Syn3Updater.csproj b/Syn3Updater/Syn3Updater.csproj
index b1409ca3..90c94558 100644
--- a/Syn3Updater/Syn3Updater.csproj
+++ b/Syn3Updater/Syn3Updater.csproj
@@ -39,6 +39,7 @@
 		<None Include="$(SolutionDir)Syn3Updater\Languages\**" CopyToOutputDirectory="PreserveNewest" />
 		<Resource Include="cyanlabs.ico" />
 		<Resource Include="UI\Tabs\syncversion.png" />
+		<None Remove="Models\**" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="FluentWPF" Version="0.9.0" />
@@ -86,6 +87,7 @@
 	  <Page Update="UI\Tabs\About.xaml">
 	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
 	  </Page>
+	  <Page Remove="Models\**" />
 	</ItemGroup>
 	
 	<ItemGroup>
@@ -93,5 +95,13 @@
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
+	
+	<ItemGroup>
+	  <Compile Remove="Models\**" />
+	</ItemGroup>
+	
+	<ItemGroup>
+	  <EmbeddedResource Remove="Models\**" />
+	</ItemGroup>
 	<Import Project="..\SharedCode\SharedCode.projitems" Label="Shared" />
 </Project>
\ No newline at end of file
diff --git a/Syn3Updater/UI/Tabs/HomeViewModel.cs b/Syn3Updater/UI/Tabs/HomeViewModel.cs
index e86c9573..20968bf0 100644
--- a/Syn3Updater/UI/Tabs/HomeViewModel.cs
+++ b/Syn3Updater/UI/Tabs/HomeViewModel.cs
@@ -514,7 +514,7 @@ private async Task UpdateSelectedRelease()
                 SMapVersion?.Add(LM.GetValue("String.KeepExistingMaps"));
 
             string license = string.Empty;
-            if (AppMan.App.MainSettings.LicenseKey?.Length > 10) license = @"{""licensekeys"":{""_contains"":""" + AppMan.App.MainSettings.LicenseKey + @"""}},";
+            if (AppMan.App.MainSettings.LicenseKey?.Length > 10) license = @"{licensekeys:{_contains:""" + AppMan.App.MainSettings.LicenseKey + @"""}},";
 
             if (!string.IsNullOrWhiteSpace(SelectedRelease))
             {