Xcube-Studio · gaviny82 · Jul 4, 2024 · Jul 4, 2024 · Jul 4, 2024 · Jul 4, 2024
diff --git a/Natsurainko.FluentLauncher.sln b/Natsurainko.FluentLauncher.sln
@@ -13,6 +13,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentLauncher.Infra.UI", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentLauncher.Infra.WinUI", "infra\FluentLauncher.Infra.WinUI\FluentLauncher.Infra.WinUI.csproj", "{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentLauncher.Infra.Settings", "infra\FluentLauncher.Infra.Settings\FluentLauncher.Infra.Settings.csproj", "{FBF301A2-326F-4B53-94A2-399102202D7E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentLauncher.Infra.Settings.SourceGenerators", "infra\FluentLauncher.Infra.Settings.SourceGenerators\FluentLauncher.Infra.Settings.SourceGenerators.csproj", "{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -92,13 +96,47 @@ Global
 		{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|x64.Build.0 = Release|Any CPU
 		{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|x86.ActiveCfg = Release|Any CPU
 		{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|x86.Build.0 = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|x64.Build.0 = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Debug|x86.Build.0 = Debug|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|ARM64.Build.0 = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|x64.ActiveCfg = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|x64.Build.0 = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|x86.ActiveCfg = Release|Any CPU
+		{FBF301A2-326F-4B53-94A2-399102202D7E}.Release|x86.Build.0 = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|x64.Build.0 = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Debug|x86.Build.0 = Debug|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|ARM64.Build.0 = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|x64.ActiveCfg = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|x64.Build.0 = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F} = {0537A9FF-BF86-4F92-A731-B6141B27ADDB}
 		{0AD85018-AAA2-49D9-A29F-910E6A82A6BF} = {0537A9FF-BF86-4F92-A731-B6141B27ADDB}
+		{FBF301A2-326F-4B53-94A2-399102202D7E} = {0537A9FF-BF86-4F92-A731-B6141B27ADDB}
+		{0BE5C833-0FA6-446B-89FA-FD4D3B1B7CD5} = {0537A9FF-BF86-4F92-A731-B6141B27ADDB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7BD789E2-AC9A-40C1-BD71-A7DA5DFBF325}

diff --git a/Natsurainko.FluentLauncher/App.xaml.cs b/Natsurainko.FluentLauncher/App.xaml.cs
@@ -1,11 +1,11 @@
-using AppSettingsManagement;
-using AppSettingsManagement.Windows;
+using FluentLauncher.Infra.Settings;
 using FluentLauncher.Infra.UI.Navigation;
 using FluentLauncher.Infra.UI.Pages;
 using FluentLauncher.Infra.UI.Windows;
 using FluentLauncher.Infra.WinUI;
 using FluentLauncher.Infra.WinUI.Navigation;
 using FluentLauncher.Infra.WinUI.Pages;
+using FluentLauncher.Infra.WinUI.Settings;
 using FluentLauncher.Infra.WinUI.Windows;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Dispatching;

diff --git a/Natsurainko.FluentLauncher/Natsurainko.FluentLauncher.csproj b/Natsurainko.FluentLauncher/Natsurainko.FluentLauncher.csproj
@@ -98,7 +98,6 @@
 
   <!-- NuGet Packages -->
   <ItemGroup>
-    <PackageReference Include="AppSettingsManagement.Windows" Version="0.2.6-alpha" />
     <PackageReference Include="ColorCode.WinUI" Version="2.0.15" />
     <PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.240517-build.1678" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
@@ -122,6 +121,10 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\infra\FluentLauncher.Infra.Settings.SourceGenerators\FluentLauncher.Infra.Settings.SourceGenerators.csproj"
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="false"/>
+    <ProjectReference Include="..\infra\FluentLauncher.Infra.Settings\FluentLauncher.Infra.Settings.csproj" />
     <ProjectReference Include="..\infra\FluentLauncher.Infra.WinUI\FluentLauncher.Infra.WinUI.csproj" />
     <ProjectReference Include="..\Natsurainko.FluentCore\Natsurainko.FluentCore\Natsurainko.FluentCore.csproj" />
   </ItemGroup>

diff --git a/Natsurainko.FluentLauncher/Services/Settings/SettingsService.cs b/Natsurainko.FluentLauncher/Services/Settings/SettingsService.cs
@@ -1,5 +1,5 @@
-using AppSettingsManagement;
-using AppSettingsManagement.Converters;
+using FluentLauncher.Infra.Settings;
+using FluentLauncher.Infra.Settings.Converters;
 using Natsurainko.FluentLauncher.Services.Storage;
 using Natsurainko.FluentLauncher.Utils;
 using Nrk.FluentCore.Management;

diff --git a/Natsurainko.FluentLauncher/Utils/AccountToJsonConverter.cs b/Natsurainko.FluentLauncher/Utils/AccountToJsonConverter.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Converters;
+using FluentLauncher.Infra.Settings.Converters;
 using Nrk.FluentCore.Authentication;
 using System;
 using System.Text.Json;

diff --git a/Natsurainko.FluentLauncher/ViewModels/Common/SettingsViewModelBase.cs b/Natsurainko.FluentLauncher/ViewModels/Common/SettingsViewModelBase.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Natsurainko.FluentLauncher.ViewModels.Common;

diff --git a/Natsurainko.FluentLauncher/ViewModels/Common/SwitchAccountDialogViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Common/SwitchAccountDialogViewModel.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Natsurainko.FluentLauncher.Services.Accounts;

diff --git a/Natsurainko.FluentLauncher/ViewModels/Cores/CoresViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Cores/CoresViewModel.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentLauncher.Infra.UI.Navigation;

diff --git a/Natsurainko.FluentLauncher/ViewModels/OOBE/OOBEViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/OOBE/OOBEViewModel.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;

diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/AccountViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/AccountViewModel.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;

diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/AppearanceViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/AppearanceViewModel.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.UI.Xaml.Controls;

diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/DownloadViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/DownloadViewModel.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.ViewModels.Common;

diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/LaunchViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/LaunchViewModel.cs
@@ -1,4 +1,4 @@
-using AppSettingsManagement.Mvvm;
+using FluentLauncher.Infra.Settings.Mvvm;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentLauncher.Infra.UI.Navigation;

diff --git a/Natsurainko.FluentLauncher/Views/Settings/AboutPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/AboutPage.xaml
@@ -183,11 +183,6 @@
                     </controls:SettingsExpander.Description>
 
                     <controls:SettingsExpander.Items>
-                        <controls:SettingsCard Description="0.2.6-alpha" Header="AppSettingsManagement.Windows">
-                            <HyperlinkButton NavigateUri="https://github.com/gaviny82/AppSettingsManagement" ToolTipService.ToolTip="https://github.com/gaviny82/AppSettingsManagement">
-                                <TextBlock Text="Github" />
-                            </HyperlinkButton>
-                        </controls:SettingsCard>
 
                         <controls:SettingsCard Description="2.0.15" Header="ColorCode.WinUI">
                             <HyperlinkButton NavigateUri="https://github.com/CommunityToolkit/ColorCode-Universal" ToolTipService.ToolTip="https://github.com/CommunityToolkit/ColorCode-Universal">

diff --git a/...her.Infra.Settings.SourceGenerators/FluentLauncher.Infra.Settings.SourceGenerators.csproj b/...her.Infra.Settings.SourceGenerators/FluentLauncher.Infra.Settings.SourceGenerators.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <LangVersion>12.0</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Ensure the source generator can be loaded on any architecture -->
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+
+  <ItemGroup>
+      <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+  </ItemGroup>
+
+</Project>