Skip to content

Commit bf3c4a6

Browse files
authored
Merge pull request #1014 from lepoco/development
Sync development with main, update
2 parents f59daa0 + 4df88fc commit bf3c4a6

File tree

94 files changed

+1383
-828
lines changed

Some content is hidden

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

94 files changed

+1383
-828
lines changed

.editorconfig

+36-53
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,8 @@ indent_size = 4
1515
indent_style = space
1616

1717
# New line preferences
18-
end_of_line = crlf
18+
end_of_line = unset
1919
insert_final_newline = false
20-
dotnet_style_operator_placement_when_wrapping = beginning_of_line
21-
dotnet_style_coalesce_expression = true:suggestion
22-
dotnet_style_null_propagation = true:suggestion
23-
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
24-
dotnet_style_prefer_auto_properties = true:silent
25-
dotnet_style_object_initializer = true:suggestion
26-
dotnet_style_collection_initializer = true:suggestion
27-
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
28-
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
29-
dotnet_style_prefer_conditional_expression_over_return = true:silent
30-
dotnet_style_explicit_tuple_names = true:suggestion
31-
dotnet_style_prefer_inferred_tuple_names = true:suggestion
32-
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
33-
dotnet_style_prefer_compound_assignment = true:suggestion
34-
dotnet_style_prefer_simplified_interpolation = true:suggestion
35-
dotnet_style_namespace_match_folder = true:suggestion
3620

3721
#### Build files ####
3822

@@ -73,7 +57,7 @@ dotnet_style_qualification_for_property = false:warning
7357

7458
# Language keywords vs BCL types preferences
7559
dotnet_style_predefined_type_for_locals_parameters_members = true:warning
76-
dotnet_style_predefined_type_for_member_access = false:warning
60+
dotnet_style_predefined_type_for_member_access = true:warning
7761

7862
# Parentheses preferences
7963
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
@@ -111,8 +95,8 @@ dotnet_style_readonly_field = true:warning
11195

11296
# var preferences
11397
csharp_style_var_elsewhere = false:warning
114-
csharp_style_var_for_built_in_types = true:warning
115-
csharp_style_var_when_type_is_apparent = true:warning
98+
csharp_style_var_for_built_in_types = false:warning
99+
csharp_style_var_when_type_is_apparent = false:warning
116100

117101
# Expression-bodied members
118102
csharp_style_expression_bodied_accessors = false:silent
@@ -241,9 +225,9 @@ dotnet_naming_style.prefix_interface_interface_with_i.required_prefix
241225
# Naming Rules
242226

243227
# Async
244-
dotnet_naming_rule.async_methods_end_in_async.severity = silent
228+
dotnet_naming_rule.async_methods_end_in_async.severity = silent
245229
dotnet_naming_rule.async_methods_end_in_async.symbols = any_async_methods
246-
dotnet_naming_rule.async_methods_end_in_async.style = end_in_async
230+
dotnet_naming_rule.async_methods_end_in_async.style = end_in_async
247231

248232
dotnet_naming_symbols.any_async_methods.applicable_kinds = method
249233
dotnet_naming_symbols.any_async_methods.applicable_accessibilities = *
@@ -253,45 +237,45 @@ dotnet_naming_style.end_in_async.required_suffix
253237
dotnet_naming_style.end_in_async.capitalization = pascal_case
254238

255239
# Constant fields must be PascalCase
256-
dotnet_naming_rule.constant_fields_must_be_pascal_case.severity = silent
240+
dotnet_naming_rule.constant_fields_must_be_pascal_case.severity = silent
257241
dotnet_naming_rule.constant_fields_must_be_pascal_case.symbols = constant_fields
258-
dotnet_naming_rule.constant_fields_must_be_pascal_case.style = pascal_case
242+
dotnet_naming_rule.constant_fields_must_be_pascal_case.style = pascal_case
259243
# Public, internal and protected readonly fields must be PascalCase
260-
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = silent
244+
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = silent
261245
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.symbols = non_private_readonly_fields
262-
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case
246+
dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case
263247
# Static readonly fields must be PascalCase
264-
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity = silent
248+
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity = silent
265249
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.symbols = static_readonly_fields
266-
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style = pascal_case
250+
dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style = pascal_case
267251
# Private readonly fields must be camelCase
268-
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity = silent
252+
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity = silent
269253
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.symbols = private_readonly_fields
270-
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style = camel_case
254+
dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style = camel_case
271255
# Public and internal fields must be PascalCase
272-
dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.severity = silent
256+
dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.severity = silent
273257
dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.symbols = public_internal_protected_fields
274-
dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.style = pascal_case
258+
dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.style = pascal_case
275259
# Private and protected fields must be camelCase
276-
dotnet_naming_rule.private_fields_must_be_camel_case.severity = silent
260+
dotnet_naming_rule.private_fields_must_be_camel_case.severity = silent
277261
dotnet_naming_rule.private_fields_must_be_camel_case.symbols = private_protected_fields
278-
dotnet_naming_rule.private_fields_must_be_camel_case.style = prefix_private_field_with_underscore
262+
dotnet_naming_rule.private_fields_must_be_camel_case.style = prefix_private_field_with_underscore
279263
# Public members must be capitalized
280-
dotnet_naming_rule.public_members_must_be_capitalized.severity = silent
264+
dotnet_naming_rule.public_members_must_be_capitalized.severity = silent
281265
dotnet_naming_rule.public_members_must_be_capitalized.symbols = public_symbols
282-
dotnet_naming_rule.public_members_must_be_capitalized.style = first_upper
266+
dotnet_naming_rule.public_members_must_be_capitalized.style = first_upper
283267
# Parameters must be camelCase
284-
dotnet_naming_rule.parameters_must_be_camel_case.severity = silent
268+
dotnet_naming_rule.parameters_must_be_camel_case.severity = silent
285269
dotnet_naming_rule.parameters_must_be_camel_case.symbols = parameters
286-
dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case
270+
dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case
287271
# Class, struct, enum and delegates must be PascalCase
288-
dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity = silent
272+
dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity = silent
289273
dotnet_naming_rule.non_interface_types_must_be_pascal_case.symbols = non_interface_types
290-
dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case
274+
dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case
291275
# Interfaces must be PascalCase and start with an 'I'
292-
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = silent
276+
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = silent
293277
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.symbols = interface_types
294-
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i
278+
dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i
295279
# prefix_private_field_with_underscore - Private fields must be prefixed with _
296280
dotnet_naming_style.prefix_private_field_with_underscore.capitalization = camel_case
297281
dotnet_naming_style.prefix_private_field_with_underscore.required_prefix = _
@@ -361,12 +345,6 @@ dotnet_diagnostic.CA2240.severity = warning
361345
dotnet_diagnostic.CA2241.severity = warning
362346
dotnet_diagnostic.CA2242.severity = warning
363347

364-
# Stylecop Analyzers
365-
dotnet_diagnostic.SA1111.severity = none
366-
dotnet_diagnostic.SA1121.severity = none
367-
dotnet_diagnostic.SA1208.severity = none
368-
dotnet_diagnostic.SA1518.severity = none
369-
370348
# Require file header OR A source file contains a header that does not match the required text
371349
dotnet_diagnostic.IDE0073.severity = error
372350

@@ -409,8 +387,13 @@ dotnet_diagnostic.SA1629.severity = none
409387
dotnet_diagnostic.SA1633.severity = none
410388
dotnet_diagnostic.SA1634.severity = none
411389
dotnet_diagnostic.SA1652.severity = none
412-
csharp_prefer_simple_using_statement = true:suggestion
413-
csharp_style_prefer_method_group_conversion = true:silent
414-
csharp_style_prefer_top_level_statements = true:silent
415-
csharp_style_expression_bodied_local_functions = false:silent
416-
csharp_style_prefer_null_check_over_type_check = true:suggestion
390+
391+
dotnet_diagnostic.IDE0009.severity = none
392+
393+
# Additional Stylecop Analyzers
394+
dotnet_diagnostic.SA1111.severity = none
395+
dotnet_diagnostic.SA1121.severity = none
396+
dotnet_diagnostic.SA1204.severity = none
397+
dotnet_diagnostic.SA1208.severity = none
398+
dotnet_diagnostic.SA1518.severity = none
399+
dotnet_diagnostic.SA1615.severity = none

.github/labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ controls:
4646

4747
navigation:
4848
- changed-files:
49-
- any-glob-to-any-file: 'src/Wpf.Ui/Controls/NavigationView/'
49+
- any-glob-to-any-file: 'src/Wpf.Ui/Controls/NavigationView/**'
5050

5151
gallery:
5252
- changed-files:

Directory.Build.props

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<Version>3.0.2</Version>
4+
<Version>3.0.3</Version>
55
<LangVersion>12.0</LangVersion>
66
<Deterministic>true</Deterministic>
77
</PropertyGroup>
88

9-
<PropertyGroup>
10-
<NuGetAudit>true</NuGetAudit>
11-
<NuGetAuditLevel>moderate</NuGetAuditLevel>
12-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
13-
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
14-
</PropertyGroup>
15-
169
<PropertyGroup>
1710
<Authors>lepo.co</Authors>
1811
<Company>lepo.co</Company>
@@ -37,6 +30,14 @@
3730
<PackageReadmeFile>README.md</PackageReadmeFile>
3831
</PropertyGroup>
3932

33+
<PropertyGroup>
34+
<NuGetAudit>true</NuGetAudit>
35+
<NuGetAuditLevel>moderate</NuGetAuditLevel>
36+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
37+
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
38+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
39+
</PropertyGroup>
40+
4041
<ItemGroup>
4142
<None Include="..\..\README.md" Pack="true" PackagePath="\"/>
4243
</ItemGroup>

src/Wpf.Ui.Demo.Console/Wpf.Ui.Demo.Console.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<Nullable>enable</Nullable>
88
<UseWPF>true</UseWPF>
99
<ApplicationIcon>wpfui.ico</ApplicationIcon>
10+
<NoWarn>$(NoWarn);SA1601</NoWarn>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

src/Wpf.Ui.Demo.Mvvm/Wpf.Ui.Demo.Mvvm.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<ApplicationManifest>app.manifest</ApplicationManifest>
1111
<ApplicationIcon>applicationIcon.ico</ApplicationIcon>
1212
<Platforms>AnyCPU;x64</Platforms>
13+
<NoWarn>$(NoWarn);SA1601</NoWarn>
1314
</PropertyGroup>
1415

1516
<ItemGroup>

src/Wpf.Ui.Demo.Simple/Wpf.Ui.Demo.Simple.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<ApplicationManifest>app.manifest</ApplicationManifest>
1010
<ApplicationIcon>applicationIcon.ico</ApplicationIcon>
1111
<Platforms>AnyCPU;x64</Platforms>
12+
<NoWarn>$(NoWarn);SA1601</NoWarn>
1213
</PropertyGroup>
1314

1415
<ItemGroup>

src/Wpf.Ui.Extension.Template.Blank/App.xaml.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using Microsoft.Extensions.Configuration;
1+
using Microsoft.Extensions.Configuration;
72
using Microsoft.Extensions.Hosting;
83
using System.IO;
94
using System.Reflection;

src/Wpf.Ui.Extension.Template.Blank/AssemblyInfo.cs

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
61
using System.Windows;
72

83
[assembly: ThemeInfo(

src/Wpf.Ui.Extension.Template.Blank/Wpf.Ui.Blank.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="WPF-UI" Version="3.0.0" />
18+
<PackageReference Include="WPF-UI" Version="3.0.3" />
1919
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0 " />
2020
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2 "/>
2121
</ItemGroup>

src/Wpf.Ui.Extension.Template.Compact/App.xaml.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using Microsoft.Extensions.Configuration;
1+
using Microsoft.Extensions.Configuration;
72
using Microsoft.Extensions.DependencyInjection;
83
using Microsoft.Extensions.Hosting;
94
using System.IO;

src/Wpf.Ui.Extension.Template.Compact/AssemblyInfo.cs

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
61
using System.Windows;
72

83
[assembly: ThemeInfo(

src/Wpf.Ui.Extension.Template.Compact/Helpers/EnumToBooleanConverter.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using System.Globalization;
1+
using System.Globalization;
72
using System.Windows.Data;
83
using Wpf.Ui.Appearance;
94

src/Wpf.Ui.Extension.Template.Compact/Models/AppConfig.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
namespace $safeprojectname$.Models
1+
namespace $safeprojectname$.Models
72
{
83
public class AppConfig
94
{

src/Wpf.Ui.Extension.Template.Compact/Models/DataColor.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using System.Windows.Media;
1+
using System.Windows.Media;
72

83
namespace $safeprojectname$.Models
94
{

src/Wpf.Ui.Extension.Template.Compact/Resources/Translations.cs

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
61
namespace $safeprojectname$.Resources
72
{
83
public partial class Translations

src/Wpf.Ui.Extension.Template.Compact/Services/ApplicationHostService.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using Microsoft.Extensions.DependencyInjection;
1+
using Microsoft.Extensions.DependencyInjection;
72
using Microsoft.Extensions.Hosting;
83
using Wpf.Ui;
94
using $safeprojectname$.Views.Pages;

src/Wpf.Ui.Extension.Template.Compact/Services/PageService.cs

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
61
using Wpf.Ui;
72

83
namespace $safeprojectname$.Services

src/Wpf.Ui.Extension.Template.Compact/ViewModels/Pages/DashboardViewModel.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
namespace $safeprojectname$.ViewModels.Pages
1+
namespace $safeprojectname$.ViewModels.Pages
72
{
83
public partial class DashboardViewModel : ObservableObject
94
{

src/Wpf.Ui.Extension.Template.Compact/ViewModels/Pages/DataViewModel.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using System.Windows.Media;
1+
using System.Windows.Media;
72
using $safeprojectname$.Models;
83
using Wpf.Ui.Controls;
94

src/Wpf.Ui.Extension.Template.Compact/ViewModels/Pages/SettingsViewModel.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using Wpf.Ui.Appearance;
1+
using Wpf.Ui.Appearance;
72
using Wpf.Ui.Controls;
83

94
namespace $safeprojectname$.ViewModels.Pages

src/Wpf.Ui.Extension.Template.Compact/ViewModels/Windows/MainWindowViewModel.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using System.Collections.ObjectModel;
1+
using System.Collections.ObjectModel;
72
using Wpf.Ui.Controls;
83

94
namespace $safeprojectname$.ViewModels.Windows

src/Wpf.Ui.Extension.Template.Compact/Views/Pages/DashboardPage.xaml.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
// This Source Code Form is subject to the terms of the MIT License.
2-
// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
3-
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
4-
// All Rights Reserved.
5-
6-
using $safeprojectname$.ViewModels.Pages;
1+
using $safeprojectname$.ViewModels.Pages;
72
using Wpf.Ui.Controls;
83

94
namespace $safeprojectname$.Views.Pages

0 commit comments

Comments
 (0)