Migrate to WinAppSDK 1.6.3

Richasy · Nov 21, 2024 · 975aa35 · 975aa35
1 parent 8b728cb
commit 975aa35
Show file tree

Hide file tree

Showing 139 changed files with 1,527 additions and 2,077 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -81,31 +81,31 @@ dotnet_naming_style.interface_style.required_prefix = I
 # Use PascalCase for constant fields
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
 dotnet_naming_symbols.constant_fields.applicable_kinds            = field
 dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
 dotnet_naming_symbols.constant_fields.required_modifiers          = const
 
 # Use IPascalCase for interfaces
 dotnet_naming_rule.interfaces_should_start_with_i.severity = warning
 dotnet_naming_rule.interfaces_should_start_with_i.symbols  = interfaces
-dotnet_naming_rule.interfaces_should_start_with_i.style    = interface_style
+dotnet_naming_rule.interfaces_should_start_with_i.style = interface_style
 dotnet_naming_symbols.interfaces.applicable_kinds          = interface
 
 # Use PascalCase for types
 dotnet_naming_rule.use_pascal_case_for_types.severity = error
 dotnet_naming_rule.use_pascal_case_for_types.symbols  = types
-dotnet_naming_rule.use_pascal_case_for_types.style    = pascal_case_style
+dotnet_naming_rule.use_pascal_case_for_types.style = pascal_case_style
 dotnet_naming_symbols.types.applicable_kinds          = class, struct, interface, enum
 
 # Use PascalCase for non-field members
 dotnet_naming_rule.use_pascal_case_for_non_field_members.severity = warning
 dotnet_naming_rule.use_pascal_case_for_non_field_members.symbols  = non_fields_members
-dotnet_naming_rule.use_pascal_case_for_non_field_members.style    = pascal_case_style
+dotnet_naming_rule.use_pascal_case_for_non_field_members.style = pascal_case_style
 dotnet_naming_symbols.non_fields_members.applicable_kinds         = property, method, event
 
 # Use _camelCase for private and protected fields
-dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.severity = suggestion
+dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.severity = warning
 dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.symbols = private_or_protected_field
 dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.style = begin_with__
 dotnet_naming_symbols.private_or_protected_field.applicable_kinds = field
@@ -114,6 +114,11 @@ dotnet_naming_style.begin_with__.required_prefix = _
 dotnet_naming_style.begin_with__.required_suffix = 
 dotnet_naming_style.begin_with__.word_separator = 
 dotnet_naming_style.begin_with__.capitalization = camel_case
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+end_of_line = crlf
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_namespace_match_folder = false:suggestion
 
 ###############################
 # C# Code Style Rules         #
@@ -185,3 +190,14 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = false
 csharp_preserve_single_line_blocks = true
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_namespace_declarations = file_scoped:warning
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+dotnet_diagnostic.SA1633.severity = error
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+dotnet_diagnostic.IDE0073.severity = warning
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "custom"]
 	path = custom
 	url = custom_module_url
+[submodule "src/WinUI.Share"]
+	path = src/WinUI.Share
+	url = https://github.com/Richasy/WinUI.Share
diff --git a/App.ruleset b/App.ruleset
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="Rules for App" Description="Code analysis rules for App.csproj." ToolsVersion="17.0">
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
-    <Rule Id="CA1001" Action="Warning" />
     <Rule Id="CA1009" Action="Warning" />
     <Rule Id="CA1016" Action="Warning" />
     <Rule Id="CA1033" Action="Warning" />
     <Rule Id="CA1049" Action="Warning" />
     <Rule Id="CA1052" Action="Warning" />
     <Rule Id="CA1053" Action="Warning" />
     <Rule Id="CA1061" Action="Warning" />
-    <Rule Id="CA1063" Action="Warning" />
     <Rule Id="CA1065" Action="Warning" />
     <Rule Id="CA1301" Action="Warning" />
     <Rule Id="CA1400" Action="Warning" />
@@ -26,6 +24,7 @@
     <Rule Id="CA1901" Action="Warning" />
     <Rule Id="CA2002" Action="Warning" />
     <Rule Id="CA2100" Action="Warning" />
+    <Rule Id="CA2101" Action="Warning" />
     <Rule Id="CA2108" Action="Warning" />
     <Rule Id="CA2111" Action="Warning" />
     <Rule Id="CA2112" Action="Warning" />
@@ -53,6 +52,7 @@
     <Rule Id="CA2212" Action="Warning" />
     <Rule Id="CA2213" Action="Warning" />
     <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2216" Action="Warning" />
     <Rule Id="CA2220" Action="Warning" />
     <Rule Id="CA2229" Action="Warning" />
     <Rule Id="CA2231" Action="Warning" />
@@ -66,21 +66,48 @@
     <Rule Id="CA2242" Action="Warning" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
+    <Rule Id="CS8305" Action="None" />
+    <Rule Id="CS8600" Action="None" />
+    <Rule Id="CS8601" Action="None" />
+    <Rule Id="CS8602" Action="None" />
+    <Rule Id="CS8603" Action="None" />
+    <Rule Id="CS8604" Action="None" />
     <Rule Id="CS8618" Action="None" />
+    <Rule Id="CS8625" Action="None" />
+    <Rule Id="CS9057" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
     <Rule Id="IDE0005" Action="Warning" />
     <Rule Id="IDE0044" Action="Warning" />
     <Rule Id="IDE0044WithoutSuggestion" Action="Warning" />
   </Rules>
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.NetAnalyzers">
+    <Rule Id="CA1001" Action="None" />
+  </Rules>
   <Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.NetAnalyzers">
-    <Rule Id="CA2101" Action="None" />
+    <Rule Id="CA1416" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers">
+    <Rule Id="VSTHRD100" Action="None" />
+    <Rule Id="VSTHRD101" Action="None" />
+    <Rule Id="VSTHRD111" Action="None" />
+    <Rule Id="VSTHRD200" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers.CSharp" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers.CSharp">
+    <Rule Id="VSTHRD105" Action="None" />
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA0001" Action="None" />
+    <Rule Id="SA1000" Action="None" />
+    <Rule Id="SA1008" Action="None" />
+    <Rule Id="SA1009" Action="None" />
+    <Rule Id="SA1010" Action="None" />
     <Rule Id="SA1101" Action="None" />
+    <Rule Id="SA1108" Action="None" />
     <Rule Id="SA1309" Action="None" />
+    <Rule Id="SA1310" Action="None" />
     <Rule Id="SA1402" Action="None" />
+    <Rule Id="SA1516" Action="Info" />
     <Rule Id="SA1518" Action="None" />
     <Rule Id="SA1611" Action="None" />
     <Rule Id="SA1623" Action="None" />

diff --git a/LoopbackManager.Desktop.sln b/LoopbackManager.Desktop.sln
diff --git a/LoopbackManager.sln b/LoopbackManager.sln
@@ -0,0 +1,85 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32526.322
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoopbackManager.UI", "src\LoopbackManager.UI\LoopbackManager.UI.csproj", "{857A6D62-2862-48DF-B26A-EB5206C5CCD0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Richasy.WinUI.Share", "src\WinUI.Share\src\Richasy.WinUI.Share.csproj", "{338387A5-DB11-4F0D-B483-35150B386FEF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoopbackManager.Models", "src\LoopbackManager.Models\LoopbackManager.Models.csproj", "{DE181807-3426-4A84-A21A-07A18C593DB8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoopbackManager.ResourceGenerator", "src\LoopbackManager.ResourceGenerator\LoopbackManager.ResourceGenerator.csproj", "{F93A995A-C4D4-4605-B35C-3850BDB76B25}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|arm64.Build.0 = Debug|ARM64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|arm64.Deploy.0 = Debug|ARM64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x64.ActiveCfg = Debug|x64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x64.Build.0 = Debug|x64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x64.Deploy.0 = Debug|x64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x86.ActiveCfg = Debug|x86
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x86.Build.0 = Debug|x86
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x86.Deploy.0 = Debug|x86
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|arm64.ActiveCfg = Release|ARM64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|arm64.Build.0 = Release|ARM64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|arm64.Deploy.0 = Release|ARM64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x64.ActiveCfg = Release|x64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x64.Build.0 = Release|x64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x64.Deploy.0 = Release|x64
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x86.ActiveCfg = Release|x86
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x86.Build.0 = Release|x86
+		{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x86.Deploy.0 = Release|x86
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|arm64.Build.0 = Debug|ARM64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x64.ActiveCfg = Debug|x64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x64.Build.0 = Debug|x64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x86.ActiveCfg = Debug|x86
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x86.Build.0 = Debug|x86
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|arm64.ActiveCfg = Release|ARM64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|arm64.Build.0 = Release|ARM64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x64.ActiveCfg = Release|x64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x64.Build.0 = Release|x64
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x86.ActiveCfg = Release|x86
+		{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x86.Build.0 = Release|x86
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|arm64.Build.0 = Debug|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x64.Build.0 = Debug|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|arm64.Build.0 = Release|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x64.ActiveCfg = Release|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x64.Build.0 = Release|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x86.Build.0 = Release|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|arm64.Build.0 = Debug|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x64.Build.0 = Debug|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x86.Build.0 = Debug|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|arm64.Build.0 = Release|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x64.ActiveCfg = Release|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x64.Build.0 = Release|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x86.ActiveCfg = Release|Any CPU
+		{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F9713457-4087-4717-BF63-AE69F8A8B308}
+	EndGlobalSection
+EndGlobal
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-<img src="https://img1.imgtp.com/2022/07/25/CBI1j6zz.png" style="width:48px"/>
+<img src="./assets/logo.png" style="width:48px"/>
 </p>
 
 <div align="center">
@@ -46,8 +46,6 @@ Windows 11 的本地网络回环管理器
 
 如果你想本地安装网络回环管理器，请打开右侧的 [Release](https://github.com/Richasy/LoopbackManager.Desktop/releases) 页面，找到最新版本，并选择适用于当前系统的安装包下载。
 
-*目前仅提供 x64 安装包，对于 ARM64 设备，Win11 可以直接安装 X64 的包*
-
 然后打开 [系统设置](ms-settings:developers)，打开 `开发者模式` ，并等待系统安装一些必要的扩展项。
 
 在应用压缩包下载完成后，解压压缩包，并在管理员模式下，使用 **Windows PowerShell** *(不是PowerShell Core)* 运行解压后的 `install.ps1` 脚本，根据提示进行安装。

diff --git a/README_EN.md b/README_EN.md
@@ -1,5 +1,5 @@
 <p align="center">
-<img src="https://img1.imgtp.com/2022/07/25/CBI1j6zz.png" style="width:48px"/>
+<img src="./assets/logo.png" style="width:48px"/>
 </p>
 
 <div align="center">
@@ -46,8 +46,6 @@ The store version only supports Windows 11 and above.
 
 If you want to install the network loopback manager locally, please open the [Release](https://github.com/Richasy/LoopbackManager.Desktop/releases) on the right, Find the latest version and select the installation package for the current system to download。
 
-*Currently only x64 packages are provided, for ARM64 devices, Win11 can directly install X64 packages*
-
 Then open [System Settings](ms-settings:developers)，Turn on `Developer mode` and wait for the system to install some necessary extensions.
 
 After the application package is downloaded, unzip the package, and in administrator mode, use **Windows PowerShell** *(not PowerShell Core)* to run the unzipped `install.ps1` script, and follow the prompts to install.

diff --git a/TestUtils.targets b/TestUtils.targets
diff --git a/UnitTests.targets b/UnitTests.targets
diff --git a/assets/logo.png b/assets/logo.png