Fix issue with license keys not working correctly

CyanLabs · Sep 20, 2021 · b1b9bf3 · b1b9bf3
1 parent 8a872b7
commit b1b9bf3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 26 deletions.
diff --git 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
diff --git 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")]
+[assembly: AssemblyVersion("2.10.6.0")]
+[assembly: AssemblyFileVersion("2.10.6.0")]
diff --git 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")]
+[assembly: AssemblyVersion("2.10.6.0")]
+[assembly: AssemblyFileVersion("2.10.6.0")]
diff --git 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,12 +87,21 @@
 	  <Page Update="UI\Tabs\About.xaml">
 	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
 	  </Page>
+	  <Page Remove="Models\**" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <Content Include="Languages\*.json">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Compile Remove="Models\**" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <EmbeddedResource Remove="Models\**" />
+	</ItemGroup>
 	<Import Project="..\SharedCode\SharedCode.projitems" Label="Shared" />
 </Project>
diff --git 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))
             {