fix(settings): Added force msix to settings save, update version numbers

benaclejames · Jul 27, 2023 · cada128 · cada128
1 parent f95570f
commit cada128
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/VRCFaceTracking.Core/Contracts/Services/ILocalSettingsService.cs b/VRCFaceTracking.Core/Contracts/Services/ILocalSettingsService.cs
@@ -2,7 +2,7 @@
 
 public interface ILocalSettingsService
 {
-    Task<T> ReadSettingAsync<T>(string key, T? defaultValue = default);
+    Task<T> ReadSettingAsync<T>(string key, T? defaultValue = default, bool forceLocal = false);
 
-    Task SaveSettingAsync<T>(string key, T value);
+    Task SaveSettingAsync<T>(string key, T value, bool forceLocal = false);
 }
diff --git a/VRCFaceTracking.Core/Params/Data/UnifiedTrackingMutator.cs b/VRCFaceTracking.Core/Params/Data/UnifiedTrackingMutator.cs
@@ -180,7 +180,7 @@ public async Task SaveCalibration()
             await _localSettingsService.SaveSettingAsync("CalibrationEnabled", Enabled);
             await _localSettingsService.SaveSettingAsync("CalibrationWeight", CalibrationWeight);
             await _localSettingsService.SaveSettingAsync("ContinuousCalibrationEnabled", ContinuousCalibration);
-            await _localSettingsService.SaveSettingAsync("Mutations", mutationData);
+            await _localSettingsService.SaveSettingAsync("Mutations", mutationData, true);
         }
 
         public async void LoadCalibration()

diff --git a/VRCFaceTracking.Core/VRCFaceTracking.Core.csproj b/VRCFaceTracking.Core/VRCFaceTracking.Core.csproj
@@ -5,7 +5,7 @@
     <Platforms>x64</Platforms>
     <Platforms>x64</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyVersion>5.0.2.3</AssemblyVersion>
+    <AssemblyVersion>5.1.0.0</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="..\fti_osc.dll" Link="fti_osc.dll">

diff --git a/VRCFaceTracking/BundleArtifacts/VRCFaceTracking_x64.appinstaller.xml b/VRCFaceTracking/BundleArtifacts/VRCFaceTracking_x64.appinstaller.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<AppInstaller DisplayName="VRCFaceTracking" IsBundle="false" Version="5.0.2.3" DisplayPublisher="benaclejames" SupportedArchitectures="x64" OutputFolder="bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64\AppPackages\" Description="VRChat OSC App to allow AV3 Avatars to interact with eye and lip tracking runtimes" MinOS="10.0.19041.0" CertificateUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.0.2.3_x64_Test/VRCFaceTracking_5.0.2.3_x64.cer" PackageUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.0.2.3_x64_Test/VRCFaceTracking_5.0.2.3_x64.msix" AppInstallerFile="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_x64.appinstaller" LogoPath="C:\Users\Ben\Downloads\VRCFaceTracking-Next\VRCFaceTracking\Assets\StoreLogo.png" TileColor="transparent" />
+<AppInstaller DisplayName="VRCFaceTracking" IsBundle="false" Version="5.1.0.0" DisplayPublisher="benaclejames" SupportedArchitectures="x64" OutputFolder="bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64\AppPackages\" Description="VRChat OSC App to allow AV3 Avatars to interact with eye and lip tracking runtimes" MinOS="10.0.19041.0" CertificateUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.0.2.3_x64_Test/VRCFaceTracking_5.0.2.3_x64.cer" PackageUri="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_5.0.2.3_x64_Test/VRCFaceTracking_5.0.2.3_x64.msix" AppInstallerFile="https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/VRCFaceTracking_x64.appinstaller" LogoPath="C:\Users\Ben\Downloads\VRCFaceTracking-Next\VRCFaceTracking\Assets\StoreLogo.png" TileColor="transparent" />
diff --git a/VRCFaceTracking/Package.appinstaller b/VRCFaceTracking/Package.appinstaller
@@ -11,7 +11,7 @@
               Uri="{MainPackageUri}"/>
 
   <UpdateSettings>
-    <OnLaunch HoursBetweenUpdateChecks="12" ShowPrompt="true" UpdateBlocksActivation="false" />
+    <OnLaunch HoursBetweenUpdateChecks="12" ShowPrompt="false" UpdateBlocksActivation="false" />
   </UpdateSettings>
 
 </AppInstaller>
diff --git a/VRCFaceTracking/Package.appxmanifest b/VRCFaceTracking/Package.appxmanifest
@@ -14,7 +14,7 @@
   <Identity
     Name="96ba052f-0948-44d8-86c4-a0212e4ae047"
     Publisher="[email protected], &quot;Open Source Developer, Benjamin Thomas&quot;, O=Open Source Developer, L=Gloucester, S=Gloucestershire, C=GB"
-    Version="5.0.2.3" />
+    Version="5.1.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="96ba052f-0948-44d8-86c4-a0212e4ae047" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/VRCFaceTracking/Services/LocalSettingsService.cs b/VRCFaceTracking/Services/LocalSettingsService.cs
@@ -48,9 +48,9 @@ private async Task InitializeAsync()
         }
     }
 
-    public async Task<T?> ReadSettingAsync<T>(string key, T? defaultValue = default)
+    public async Task<T?> ReadSettingAsync<T>(string key, T? defaultValue = default, bool forceLocal = false)
     {
-        if (RuntimeHelper.IsMSIX)
+        if (RuntimeHelper.IsMSIX && !forceLocal)
         {
             if (ApplicationData.Current.LocalSettings.Values.TryGetValue(key, out var obj))
             {
@@ -70,9 +70,9 @@ private async Task InitializeAsync()
         return defaultValue;
     }
 
-    public async Task SaveSettingAsync<T>(string key, T value)
+    public async Task SaveSettingAsync<T>(string key, T value, bool forceLocal = false)
     {
-        if (RuntimeHelper.IsMSIX)
+        if (RuntimeHelper.IsMSIX && !forceLocal)
         {
             ApplicationData.Current.LocalSettings.Values[key] = await Json.StringifyAsync(value);
         }

diff --git a/VRCFaceTracking/VRCFaceTracking.csproj b/VRCFaceTracking/VRCFaceTracking.csproj
@@ -21,7 +21,7 @@
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Auto</AppxBundle>
-    <AssemblyVersion>5.0.2.3</AssemblyVersion>
+    <AssemblyVersion>5.1.0.0</AssemblyVersion>
     <AppInstallerUri>https://github.com/benaclejames/VRCFaceTracking/releases/latest/download/</AppInstallerUri>
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
   </PropertyGroup>