2.0.0 release

AkazaRenn · Nov 21, 2023 · 573c773 · 573c773
1 parent 5bfe0ee
commit 573c773
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -1,17 +1,11 @@
-using System;
-using System.ComponentModel;
-
 using FruitLanguageSwitcher.Core;
 
 using H.NotifyIcon;
 
 using Microsoft.Toolkit.Uwp.Notifications;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 
-using Windows.ApplicationModel;
-
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
@@ -94,11 +88,11 @@ private static void InitializeFunction()
 
             if(!Switcher.Ready())
             {
-                Settings.LanguageSwitcherEnabled = false;
-                new ToastContentBuilder()
-                    .AddText("Unable to enable language switcher")
-                    .AddText("Please make sure you have both keyboard languages and IME languages installed")
-                    .Show();
+               Settings.LanguageSwitcherEnabled = false;
+               new ToastContentBuilder()
+                   .AddText("Unable to enable language switcher")
+                   .AddText("Please make sure you have both keyboard languages and IME languages installed")
+                   .Show();
             }
 
         }

diff --git a/FruitLanguageSwitcher.csproj b/FruitLanguageSwitcher.csproj
@@ -6,9 +6,7 @@
 		<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
 		<Platforms>x64;arm64</Platforms>
-		<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
 		<SelfContained>true</SelfContained>
-		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<UseWinUI>true</UseWinUI>
 		<EnableMsixTooling>true</EnableMsixTooling>
@@ -18,6 +16,14 @@
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Platform)'=='x64'">
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+	  </PropertyGroup>
+
+	  <PropertyGroup Condition="'$(Platform)'=='arm64'">
+		<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+	  </PropertyGroup>
+
 	<ItemGroup>
 	  <Content Remove="Assets\durian.png" />
 	  <Content Remove="Assets\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
@@ -48,13 +54,13 @@
 		<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
 		<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
 		<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-		<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+		<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
 		<GenerateTestArtifacts>False</GenerateTestArtifacts>
 		<AppxBundle>Always</AppxBundle>
 		<AppxBundlePlatforms>x64</AppxBundlePlatforms>
 		<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
 		<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-		<PackageCertificateThumbprint>A4033C3B4F345A042F1D980927710330A30416B0</PackageCertificateThumbprint>
+		<PackageCertificateThumbprint>FB69A2BAF37F01275BC888753500C0C0C576F2A8</PackageCertificateThumbprint>
 		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
 		<ApplicationIcon>Assets\durian.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>

diff --git a/Package.appxmanifest b/Package.appxmanifest
@@ -3,7 +3,7 @@
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"  
+  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
@@ -24,6 +24,7 @@
 	<Dependencies>
 		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
 		<PackageDependency Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.30704.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
+		<PackageDependency Name="Microsoft.WindowsAppRuntime.1.4" MinVersion="1.4.0.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
 	</Dependencies>
 
 	<Resources>
@@ -68,14 +69,14 @@
 						</com:ExeServer>
 					</com:ComServer>
 				</com:Extension>
-				<uap5:Extension   
-				    Category="windows.appExecutionAlias"   
-				    Executable="FruitLanguageSwitcher.exe"   
-				    EntryPoint="Windows.FullTrustApplication">  
-				    <uap5:AppExecutionAlias>  
-						<uap5:ExecutionAlias Alias="fls.exe" />  
-				    </uap5:AppExecutionAlias>  
-				</uap5:Extension>  
+				<uap5:Extension
+				    Category="windows.appExecutionAlias"
+				    Executable="FruitLanguageSwitcher.exe"
+				    EntryPoint="Windows.FullTrustApplication">
+				    <uap5:AppExecutionAlias>
+						<uap5:ExecutionAlias Alias="fls.exe" />
+				    </uap5:AppExecutionAlias>
+				</uap5:Extension>
 			</Extensions>
 		</Application>
 	</Applications>

diff --git a/Views/Settings.xaml.cs b/Views/Settings.xaml.cs
@@ -18,6 +18,7 @@ public Settings()
     private void StartUp_Toggle(object sender, RoutedEventArgs e)
     {
         Core.Settings.StartUp = (sender as ToggleSwitch).IsOn;
+        (sender as ToggleSwitch).IsOn = Core.Settings.StartUp;
     }
 
     private void ReloadButton_Click(object sender, RoutedEventArgs e)