Skip to content

Commit 975aa35

Browse files
committed
Migrate to WinAppSDK 1.6.3
1 parent 8b728cb commit 975aa35

File tree

139 files changed

+1527
-2077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+1527
-2077
lines changed

.editorconfig

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,31 +81,31 @@ dotnet_naming_style.interface_style.required_prefix = I
8181
# Use PascalCase for constant fields
8282
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
8383
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
84-
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
84+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
8585
dotnet_naming_symbols.constant_fields.applicable_kinds = field
8686
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
8787
dotnet_naming_symbols.constant_fields.required_modifiers = const
8888

8989
# Use IPascalCase for interfaces
9090
dotnet_naming_rule.interfaces_should_start_with_i.severity = warning
9191
dotnet_naming_rule.interfaces_should_start_with_i.symbols = interfaces
92-
dotnet_naming_rule.interfaces_should_start_with_i.style = interface_style
92+
dotnet_naming_rule.interfaces_should_start_with_i.style = interface_style
9393
dotnet_naming_symbols.interfaces.applicable_kinds = interface
9494

9595
# Use PascalCase for types
9696
dotnet_naming_rule.use_pascal_case_for_types.severity = error
9797
dotnet_naming_rule.use_pascal_case_for_types.symbols = types
98-
dotnet_naming_rule.use_pascal_case_for_types.style = pascal_case_style
98+
dotnet_naming_rule.use_pascal_case_for_types.style = pascal_case_style
9999
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
100100

101101
# Use PascalCase for non-field members
102102
dotnet_naming_rule.use_pascal_case_for_non_field_members.severity = warning
103103
dotnet_naming_rule.use_pascal_case_for_non_field_members.symbols = non_fields_members
104-
dotnet_naming_rule.use_pascal_case_for_non_field_members.style = pascal_case_style
104+
dotnet_naming_rule.use_pascal_case_for_non_field_members.style = pascal_case_style
105105
dotnet_naming_symbols.non_fields_members.applicable_kinds = property, method, event
106106

107107
# Use _camelCase for private and protected fields
108-
dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.severity = suggestion
108+
dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.severity = warning
109109
dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.symbols = private_or_protected_field
110110
dotnet_naming_rule.private_or_protected_field_should_be_begin_with__.style = begin_with__
111111
dotnet_naming_symbols.private_or_protected_field.applicable_kinds = field
@@ -114,6 +114,11 @@ dotnet_naming_style.begin_with__.required_prefix = _
114114
dotnet_naming_style.begin_with__.required_suffix =
115115
dotnet_naming_style.begin_with__.word_separator =
116116
dotnet_naming_style.begin_with__.capitalization = camel_case
117+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
118+
tab_width = 4
119+
end_of_line = crlf
120+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
121+
dotnet_style_namespace_match_folder = false:suggestion
117122

118123
###############################
119124
# C# Code Style Rules #
@@ -185,3 +190,14 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
185190
# Wrapping preferences
186191
csharp_preserve_single_line_statements = false
187192
csharp_preserve_single_line_blocks = true
193+
csharp_using_directive_placement = outside_namespace:silent
194+
csharp_prefer_simple_using_statement = true:suggestion
195+
csharp_style_namespace_declarations = file_scoped:warning
196+
csharp_style_prefer_method_group_conversion = true:silent
197+
csharp_style_prefer_top_level_statements = true:silent
198+
csharp_style_expression_bodied_lambdas = true:silent
199+
csharp_style_expression_bodied_local_functions = false:silent
200+
dotnet_diagnostic.SA1633.severity = error
201+
csharp_style_prefer_primary_constructors = true:suggestion
202+
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
203+
dotnet_diagnostic.IDE0073.severity = warning

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "custom"]
22
path = custom
33
url = custom_module_url
4+
[submodule "src/WinUI.Share"]
5+
path = src/WinUI.Share
6+
url = https://github.com/Richasy/WinUI.Share

App.ruleset

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RuleSet Name="Rules for App" Description="Code analysis rules for App.csproj." ToolsVersion="17.0">
33
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
4-
<Rule Id="CA1001" Action="Warning" />
54
<Rule Id="CA1009" Action="Warning" />
65
<Rule Id="CA1016" Action="Warning" />
76
<Rule Id="CA1033" Action="Warning" />
87
<Rule Id="CA1049" Action="Warning" />
98
<Rule Id="CA1052" Action="Warning" />
109
<Rule Id="CA1053" Action="Warning" />
1110
<Rule Id="CA1061" Action="Warning" />
12-
<Rule Id="CA1063" Action="Warning" />
1311
<Rule Id="CA1065" Action="Warning" />
1412
<Rule Id="CA1301" Action="Warning" />
1513
<Rule Id="CA1400" Action="Warning" />
@@ -26,6 +24,7 @@
2624
<Rule Id="CA1901" Action="Warning" />
2725
<Rule Id="CA2002" Action="Warning" />
2826
<Rule Id="CA2100" Action="Warning" />
27+
<Rule Id="CA2101" Action="Warning" />
2928
<Rule Id="CA2108" Action="Warning" />
3029
<Rule Id="CA2111" Action="Warning" />
3130
<Rule Id="CA2112" Action="Warning" />
@@ -53,6 +52,7 @@
5352
<Rule Id="CA2212" Action="Warning" />
5453
<Rule Id="CA2213" Action="Warning" />
5554
<Rule Id="CA2214" Action="Warning" />
55+
<Rule Id="CA2216" Action="Warning" />
5656
<Rule Id="CA2220" Action="Warning" />
5757
<Rule Id="CA2229" Action="Warning" />
5858
<Rule Id="CA2231" Action="Warning" />
@@ -66,21 +66,48 @@
6666
<Rule Id="CA2242" Action="Warning" />
6767
</Rules>
6868
<Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
69+
<Rule Id="CS8305" Action="None" />
70+
<Rule Id="CS8600" Action="None" />
71+
<Rule Id="CS8601" Action="None" />
72+
<Rule Id="CS8602" Action="None" />
73+
<Rule Id="CS8603" Action="None" />
74+
<Rule Id="CS8604" Action="None" />
6975
<Rule Id="CS8618" Action="None" />
76+
<Rule Id="CS8625" Action="None" />
77+
<Rule Id="CS9057" Action="None" />
7078
</Rules>
7179
<Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
7280
<Rule Id="IDE0005" Action="Warning" />
7381
<Rule Id="IDE0044" Action="Warning" />
7482
<Rule Id="IDE0044WithoutSuggestion" Action="Warning" />
7583
</Rules>
84+
<Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.NetAnalyzers">
85+
<Rule Id="CA1001" Action="None" />
86+
</Rules>
7687
<Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.NetAnalyzers">
77-
<Rule Id="CA2101" Action="None" />
88+
<Rule Id="CA1416" Action="None" />
89+
</Rules>
90+
<Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers">
91+
<Rule Id="VSTHRD100" Action="None" />
92+
<Rule Id="VSTHRD101" Action="None" />
93+
<Rule Id="VSTHRD111" Action="None" />
94+
<Rule Id="VSTHRD200" Action="None" />
95+
</Rules>
96+
<Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers.CSharp" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers.CSharp">
97+
<Rule Id="VSTHRD105" Action="None" />
7898
</Rules>
7999
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
80100
<Rule Id="SA0001" Action="None" />
101+
<Rule Id="SA1000" Action="None" />
102+
<Rule Id="SA1008" Action="None" />
103+
<Rule Id="SA1009" Action="None" />
104+
<Rule Id="SA1010" Action="None" />
81105
<Rule Id="SA1101" Action="None" />
106+
<Rule Id="SA1108" Action="None" />
82107
<Rule Id="SA1309" Action="None" />
108+
<Rule Id="SA1310" Action="None" />
83109
<Rule Id="SA1402" Action="None" />
110+
<Rule Id="SA1516" Action="Info" />
84111
<Rule Id="SA1518" Action="None" />
85112
<Rule Id="SA1611" Action="None" />
86113
<Rule Id="SA1623" Action="None" />

LoopbackManager.Desktop.sln

Lines changed: 0 additions & 57 deletions
This file was deleted.

LoopbackManager.sln

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.2.32526.322
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoopbackManager.UI", "src\LoopbackManager.UI\LoopbackManager.UI.csproj", "{857A6D62-2862-48DF-B26A-EB5206C5CCD0}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Richasy.WinUI.Share", "src\WinUI.Share\src\Richasy.WinUI.Share.csproj", "{338387A5-DB11-4F0D-B483-35150B386FEF}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoopbackManager.Models", "src\LoopbackManager.Models\LoopbackManager.Models.csproj", "{DE181807-3426-4A84-A21A-07A18C593DB8}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoopbackManager.ResourceGenerator", "src\LoopbackManager.ResourceGenerator\LoopbackManager.ResourceGenerator.csproj", "{F93A995A-C4D4-4605-B35C-3850BDB76B25}"
13+
EndProject
14+
Global
15+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16+
Debug|arm64 = Debug|arm64
17+
Debug|x64 = Debug|x64
18+
Debug|x86 = Debug|x86
19+
Release|arm64 = Release|arm64
20+
Release|x64 = Release|x64
21+
Release|x86 = Release|x86
22+
EndGlobalSection
23+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|arm64.ActiveCfg = Debug|ARM64
25+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|arm64.Build.0 = Debug|ARM64
26+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|arm64.Deploy.0 = Debug|ARM64
27+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x64.ActiveCfg = Debug|x64
28+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x64.Build.0 = Debug|x64
29+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x64.Deploy.0 = Debug|x64
30+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x86.ActiveCfg = Debug|x86
31+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x86.Build.0 = Debug|x86
32+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Debug|x86.Deploy.0 = Debug|x86
33+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|arm64.ActiveCfg = Release|ARM64
34+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|arm64.Build.0 = Release|ARM64
35+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|arm64.Deploy.0 = Release|ARM64
36+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x64.ActiveCfg = Release|x64
37+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x64.Build.0 = Release|x64
38+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x64.Deploy.0 = Release|x64
39+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x86.ActiveCfg = Release|x86
40+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x86.Build.0 = Release|x86
41+
{857A6D62-2862-48DF-B26A-EB5206C5CCD0}.Release|x86.Deploy.0 = Release|x86
42+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|arm64.ActiveCfg = Debug|ARM64
43+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|arm64.Build.0 = Debug|ARM64
44+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x64.ActiveCfg = Debug|x64
45+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x64.Build.0 = Debug|x64
46+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x86.ActiveCfg = Debug|x86
47+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Debug|x86.Build.0 = Debug|x86
48+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|arm64.ActiveCfg = Release|ARM64
49+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|arm64.Build.0 = Release|ARM64
50+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x64.ActiveCfg = Release|x64
51+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x64.Build.0 = Release|x64
52+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x86.ActiveCfg = Release|x86
53+
{338387A5-DB11-4F0D-B483-35150B386FEF}.Release|x86.Build.0 = Release|x86
54+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|arm64.ActiveCfg = Debug|Any CPU
55+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|arm64.Build.0 = Debug|Any CPU
56+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x64.ActiveCfg = Debug|Any CPU
57+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x64.Build.0 = Debug|Any CPU
58+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x86.ActiveCfg = Debug|Any CPU
59+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Debug|x86.Build.0 = Debug|Any CPU
60+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|arm64.ActiveCfg = Release|Any CPU
61+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|arm64.Build.0 = Release|Any CPU
62+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x64.ActiveCfg = Release|Any CPU
63+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x64.Build.0 = Release|Any CPU
64+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x86.ActiveCfg = Release|Any CPU
65+
{DE181807-3426-4A84-A21A-07A18C593DB8}.Release|x86.Build.0 = Release|Any CPU
66+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|arm64.ActiveCfg = Debug|Any CPU
67+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|arm64.Build.0 = Debug|Any CPU
68+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x64.ActiveCfg = Debug|Any CPU
69+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x64.Build.0 = Debug|Any CPU
70+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x86.ActiveCfg = Debug|Any CPU
71+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Debug|x86.Build.0 = Debug|Any CPU
72+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|arm64.ActiveCfg = Release|Any CPU
73+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|arm64.Build.0 = Release|Any CPU
74+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x64.ActiveCfg = Release|Any CPU
75+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x64.Build.0 = Release|Any CPU
76+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x86.ActiveCfg = Release|Any CPU
77+
{F93A995A-C4D4-4605-B35C-3850BDB76B25}.Release|x86.Build.0 = Release|Any CPU
78+
EndGlobalSection
79+
GlobalSection(SolutionProperties) = preSolution
80+
HideSolutionNode = FALSE
81+
EndGlobalSection
82+
GlobalSection(ExtensibilityGlobals) = postSolution
83+
SolutionGuid = {F9713457-4087-4717-BF63-AE69F8A8B308}
84+
EndGlobalSection
85+
EndGlobal

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src="https://img1.imgtp.com/2022/07/25/CBI1j6zz.png" style="width:48px"/>
2+
<img src="./assets/logo.png" style="width:48px"/>
33
</p>
44

55
<div align="center">
@@ -46,8 +46,6 @@ Windows 11 的本地网络回环管理器
4646

4747
如果你想本地安装网络回环管理器,请打开右侧的 [Release](https://github.com/Richasy/LoopbackManager.Desktop/releases) 页面,找到最新版本,并选择适用于当前系统的安装包下载。
4848

49-
*目前仅提供 x64 安装包,对于 ARM64 设备,Win11 可以直接安装 X64 的包*
50-
5149
然后打开 [系统设置](ms-settings:developers),打开 `开发者模式` ,并等待系统安装一些必要的扩展项。
5250

5351
在应用压缩包下载完成后,解压压缩包,并在管理员模式下,使用 **Windows PowerShell** *(不是PowerShell Core)* 运行解压后的 `install.ps1` 脚本,根据提示进行安装。

README_EN.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src="https://img1.imgtp.com/2022/07/25/CBI1j6zz.png" style="width:48px"/>
2+
<img src="./assets/logo.png" style="width:48px"/>
33
</p>
44

55
<div align="center">
@@ -46,8 +46,6 @@ The store version only supports Windows 11 and above.
4646

4747
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。
4848

49-
*Currently only x64 packages are provided, for ARM64 devices, Win11 can directly install X64 packages*
50-
5149
Then open [System Settings](ms-settings:developers),Turn on `Developer mode` and wait for the system to install some necessary extensions.
5250

5351
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.

TestUtils.targets

Lines changed: 0 additions & 12 deletions
This file was deleted.

UnitTests.targets

Lines changed: 0 additions & 21 deletions
This file was deleted.

assets/logo.png

18 KB
Loading

0 commit comments

Comments
 (0)