Merge pull request #1014 from lepoco/development

Sync development with main, update

.editorconfig

@@ -15,24 +15,8 @@ indent_size = 4
 indent_style = space
 
 # New line preferences
-end_of_line = crlf
+end_of_line = unset
 insert_final_newline = false
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
-dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
-dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_conditional_expression_over_return = true:silent
-dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_compound_assignment = true:suggestion
-dotnet_style_prefer_simplified_interpolation = true:suggestion
-dotnet_style_namespace_match_folder = true:suggestion
 
 #### Build files ####
 
@@ -73,7 +57,7 @@ dotnet_style_qualification_for_property = false:warning
 
 # Language keywords vs BCL types preferences
 dotnet_style_predefined_type_for_locals_parameters_members = true:warning
-dotnet_style_predefined_type_for_member_access = false:warning
+dotnet_style_predefined_type_for_member_access = true:warning
 
 # Parentheses preferences
 dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
@@ -111,8 +95,8 @@ dotnet_style_readonly_field = true:warning
 
 # var preferences
 csharp_style_var_elsewhere = false:warning
-csharp_style_var_for_built_in_types = true:warning
-csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_for_built_in_types = false:warning
+csharp_style_var_when_type_is_apparent = false:warning
 
 # Expression-bodied members
 csharp_style_expression_bodied_accessors = false:silent
@@ -241,9 +225,9 @@ dotnet_naming_style.prefix_interface_interface_with_i.required_prefix
 # Naming Rules
 
 # Async
-dotnet_naming_rule.async_methods_end_in_async.severity = silent
+dotnet_naming_rule.async_methods_end_in_async.severity                            = silent
 dotnet_naming_rule.async_methods_end_in_async.symbols                             = any_async_methods
-dotnet_naming_rule.async_methods_end_in_async.style = end_in_async
+dotnet_naming_rule.async_methods_end_in_async.style                               = end_in_async
 
 dotnet_naming_symbols.any_async_methods.applicable_kinds                          = method
 dotnet_naming_symbols.any_async_methods.applicable_accessibilities                = *
@@ -253,45 +237,45 @@ dotnet_naming_style.end_in_async.required_suffix
 dotnet_naming_style.end_in_async.capitalization                                   = pascal_case
 
 # Constant fields must be PascalCase
-dotnet_naming_rule.constant_fields_must_be_pascal_case.severity = silent
+dotnet_naming_rule.constant_fields_must_be_pascal_case.severity                   = silent
 dotnet_naming_rule.constant_fields_must_be_pascal_case.symbols                    = constant_fields
-dotnet_naming_rule.constant_fields_must_be_pascal_case.style = pascal_case
+dotnet_naming_rule.constant_fields_must_be_pascal_case.style                      = pascal_case
 # Public, internal and protected readonly fields must be PascalCase
-dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = silent
+dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity       = silent
 dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.symbols        = non_private_readonly_fields
-dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case
+dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style          = pascal_case
 # Static readonly fields must be PascalCase
-dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity = silent
+dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity            = silent
 dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.symbols             = static_readonly_fields
-dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style = pascal_case
+dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style               = pascal_case
 # Private readonly fields must be camelCase
-dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity = silent
+dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity            = silent
 dotnet_naming_rule.private_readonly_fields_must_be_camel_case.symbols             = private_readonly_fields
-dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style = camel_case
+dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style               = camel_case
 # Public and internal fields must be PascalCase
-dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.severity = silent
+dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.severity  = silent
 dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.symbols   = public_internal_protected_fields
-dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.style = pascal_case
+dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.style     = pascal_case
 # Private and protected fields must be camelCase
-dotnet_naming_rule.private_fields_must_be_camel_case.severity = silent
+dotnet_naming_rule.private_fields_must_be_camel_case.severity                     = silent
 dotnet_naming_rule.private_fields_must_be_camel_case.symbols                      = private_protected_fields
-dotnet_naming_rule.private_fields_must_be_camel_case.style = prefix_private_field_with_underscore
+dotnet_naming_rule.private_fields_must_be_camel_case.style                        = prefix_private_field_with_underscore
 # Public members must be capitalized
-dotnet_naming_rule.public_members_must_be_capitalized.severity = silent
+dotnet_naming_rule.public_members_must_be_capitalized.severity                    = silent
 dotnet_naming_rule.public_members_must_be_capitalized.symbols                     = public_symbols
-dotnet_naming_rule.public_members_must_be_capitalized.style = first_upper
+dotnet_naming_rule.public_members_must_be_capitalized.style                       = first_upper
 # Parameters must be camelCase
-dotnet_naming_rule.parameters_must_be_camel_case.severity = silent
+dotnet_naming_rule.parameters_must_be_camel_case.severity                         = silent
 dotnet_naming_rule.parameters_must_be_camel_case.symbols                          = parameters
-dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case
+dotnet_naming_rule.parameters_must_be_camel_case.style                            = camel_case
 # Class, struct, enum and delegates must be PascalCase
-dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity = silent
+dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity               = silent
 dotnet_naming_rule.non_interface_types_must_be_pascal_case.symbols                = non_interface_types
-dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case
+dotnet_naming_rule.non_interface_types_must_be_pascal_case.style                  = pascal_case
 # Interfaces must be PascalCase and start with an 'I'
-dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = silent
+dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity               = silent
 dotnet_naming_rule.interface_types_must_be_prefixed_with_i.symbols                = interface_types
-dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i
+dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style                  = prefix_interface_interface_with_i
 # prefix_private_field_with_underscore - Private fields must be prefixed with _
 dotnet_naming_style.prefix_private_field_with_underscore.capitalization           = camel_case
 dotnet_naming_style.prefix_private_field_with_underscore.required_prefix          = _
@@ -361,12 +345,6 @@ dotnet_diagnostic.CA2240.severity = warning
 dotnet_diagnostic.CA2241.severity = warning
 dotnet_diagnostic.CA2242.severity = warning
 
-# Stylecop Analyzers
-dotnet_diagnostic.SA1111.severity = none
-dotnet_diagnostic.SA1121.severity = none
-dotnet_diagnostic.SA1208.severity = none
-dotnet_diagnostic.SA1518.severity = none
-
 # Require file header OR A source file contains a header that does not match the required text
 dotnet_diagnostic.IDE0073.severity = error
 
@@ -409,8 +387,13 @@ dotnet_diagnostic.SA1629.severity = none
 dotnet_diagnostic.SA1633.severity = none
 dotnet_diagnostic.SA1634.severity = none
 dotnet_diagnostic.SA1652.severity = none
-csharp_prefer_simple_using_statement = true:suggestion
-csharp_style_prefer_method_group_conversion = true:silent
-csharp_style_prefer_top_level_statements = true:silent
-csharp_style_expression_bodied_local_functions = false:silent
-csharp_style_prefer_null_check_over_type_check = true:suggestion
+
+dotnet_diagnostic.IDE0009.severity = none
+
+# Additional Stylecop Analyzers
+dotnet_diagnostic.SA1111.severity = none
+dotnet_diagnostic.SA1121.severity = none
+dotnet_diagnostic.SA1204.severity = none
+dotnet_diagnostic.SA1208.severity = none
+dotnet_diagnostic.SA1518.severity = none
+dotnet_diagnostic.SA1615.severity = none

.github/labeler.yml

@@ -46,7 +46,7 @@ controls:
 
 navigation:
 - changed-files:
-  - any-glob-to-any-file: 'src/Wpf.Ui/Controls/NavigationView/'
+  - any-glob-to-any-file: 'src/Wpf.Ui/Controls/NavigationView/**'
 
 gallery:
 - changed-files:

Directory.Build.props

@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <LangVersion>12.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NuGetAudit>true</NuGetAudit>
-    <NuGetAuditLevel>moderate</NuGetAuditLevel>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-  </PropertyGroup>
-
   <PropertyGroup>
     <Authors>lepo.co</Authors>
     <Company>lepo.co</Company>
@@ -37,6 +30,14 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NuGetAudit>true</NuGetAudit>
+    <NuGetAuditLevel>moderate</NuGetAuditLevel>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>

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

@@ -7,6 +7,7 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>wpfui.ico</ApplicationIcon>
+    <NoWarn>$(NoWarn);SA1601</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -10,6 +10,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>applicationIcon.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64</Platforms>
+    <NoWarn>$(NoWarn);SA1601</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -9,6 +9,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>applicationIcon.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64</Platforms>
+    <NoWarn>$(NoWarn);SA1601</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

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

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

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

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

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

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WPF-UI" Version="3.0.0" />
+    <PackageReference Include="WPF-UI" Version="3.0.3" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0 " />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2 "/>
   </ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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