Merge pull request #1051 from lepoco/development

Merge development and bump version
lepoco · Apr 14, 2024 · 303f0ae · 303f0ae
2 parents bf3c4a6 + e5a24f1
commit 303f0ae
Show file tree

Hide file tree

Showing 300 changed files with 3,418 additions and 3,790 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -50,10 +50,10 @@ file_header_template = This Source Code Form is subject to the terms of the MIT
 #### .NET Coding Conventions ####
 
 # this. and Me. preferences
-dotnet_style_qualification_for_event = false:warning
-dotnet_style_qualification_for_field = false:warning
-dotnet_style_qualification_for_method = false:warning
-dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_event = false:silent
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_property = false:silent
 
 # Language keywords vs BCL types preferences
 dotnet_style_predefined_type_for_locals_parameters_members = true:warning
@@ -95,8 +95,8 @@ dotnet_style_readonly_field = true:warning
 
 # var preferences
 csharp_style_var_elsewhere = false:warning
-csharp_style_var_for_built_in_types = false:warning
-csharp_style_var_when_type_is_apparent = false:warning
+csharp_style_var_for_built_in_types = false:none
+csharp_style_var_when_type_is_apparent = false:none
 
 # Expression-bodied members
 csharp_style_expression_bodied_accessors = false:silent
@@ -388,7 +388,7 @@ dotnet_diagnostic.SA1633.severity = none
 dotnet_diagnostic.SA1634.severity = none
 dotnet_diagnostic.SA1652.severity = none
 
-dotnet_diagnostic.IDE0009.severity = none
+
 
 # Additional Stylecop Analyzers
 dotnet_diagnostic.SA1111.severity = none
@@ -397,3 +397,19 @@ dotnet_diagnostic.SA1204.severity = none
 dotnet_diagnostic.SA1208.severity = none
 dotnet_diagnostic.SA1518.severity = none
 dotnet_diagnostic.SA1615.severity = none
+dotnet_diagnostic.SA1502.severity = none
+dotnet_diagnostic.SA1010.severity = none # Opening square brackets should not be preceded by a space
+                                         # conflicts with collection expressions and IDE0028
+
+# Suppress some ValueConverter warnings
+dotnet_diagnostic.WPF0073.severity = none # Add ValueConversion attribute (unknown types)
+dotnet_diagnostic.WPF0071.severity = none # Add ValueConversion attribute
+dotnet_diagnostic.WPF0070.severity = none # Add default field to converter
+
+# Suppress some IDE warnings
+dotnet_diagnostic.IDE0290.severity = none # Use primary constructor
+dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
+                                         # 15000+ warnings in the solution
+dotnet_diagnostic.CA1510.severity = none # Use ArgumentNullException throw helper
+                                         # doesn't work with older versions of .NET
+
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -36,6 +36,10 @@ themes:
 - changed-files:
   - any-glob-to-any-file: 'src/Wpf.Ui/Appearance/**'
 
+titlebar:
+- changed-files:
+  - any-glob-to-any-file: 'src/Wpf.Ui/Controls/TitleBar/**'
+
 tray:
 - changed-files:
   - any-glob-to-any-file: 'src/Wpf.Ui.Tray/**'

diff --git a/.github/workflows/wpf-ui-cd-docs.yaml b/.github/workflows/wpf-ui-cd-docs.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
       - name: Use Node.js 18.x
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/wpf-ui-cd-extension.yaml b/.github/workflows/wpf-ui-cd-extension.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: microsoft/setup-msbuild@v1.3
+      - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
       - uses: nuget/setup-nuget@v2

diff --git a/.github/workflows/wpf-ui-cd-nuget.yaml b/.github/workflows/wpf-ui-cd-nuget.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: microsoft/setup-msbuild@v1.3
+      - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
       - uses: nuget/setup-nuget@v2
@@ -26,10 +26,10 @@ jobs:
         run: dotnet restore
 
       - name: Build
-        run: dotnet build src\Wpf.Ui\Wpf.Ui.csproj --configuration Release --no-restore
+        run: dotnet build src\Wpf.Ui\Wpf.Ui.csproj --configuration Release --no-restore -p:SourceLinkEnabled=true
 
       - name: Build
-        run: dotnet build src\Wpf.Ui.Tray\Wpf.Ui.Tray.csproj --configuration Release --no-restore
+        run: dotnet build src\Wpf.Ui.Tray\Wpf.Ui.Tray.csproj --configuration Release --no-restore -p:SourceLinkEnabled=true
 
       - name: Publish the package to NuGet.org
         run: nuget push **\*.nupkg -NonInteractive -SkipDuplicate -Source 'https://api.nuget.org/v3/index.json'

diff --git a/.github/workflows/wpf-ui-pr-validator.yaml b/.github/workflows/wpf-ui-pr-validator.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: microsoft/setup-msbuild@v1.3
+      - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
       - uses: nuget/setup-nuget@v2

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,27 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.3</Version>
+    <Version>3.0.4</Version>
     <LangVersion>12.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Authors>lepo.co</Authors>
-    <Company>lepo.co</Company>
-    <Copyright>Copyright (C) 2021-2024 Leszek Pomianowski and WPF UI Contributors</Copyright>
-  </PropertyGroup>
-
   <PropertyGroup>
     <PackagesCommonFrameworks>net8.0-windows;net7.0-windows;net6.0-windows;net481;net472;net462</PackagesCommonFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
     <PackageVersion>$(Version)</PackageVersion>
+    <Authors>lepo.co</Authors>
+    <Company>lepo.co</Company>
+    <Copyright>Copyright (C) 2021-2024 Leszek Pomianowski and WPF UI Contributors</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageLicense>https://raw.githubusercontent.com/lepoco/wpfui/main/LICENSE</PackageLicense>
     <PackageProjectUrl>https://github.com/lepoco/wpfui</PackageProjectUrl>
+    <PackageReleaseNotes>https://github.com/lepoco/wpfui/releases</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/lepoco/wpfui</RepositoryUrl>
     <RepositoryBranch>main</RepositoryBranch>
     <RepositoryType>git</RepositoryType>
@@ -30,6 +29,10 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+  </PropertyGroup>
+
   <PropertyGroup>
     <NuGetAudit>true</NuGetAudit>
     <NuGetAuditLevel>moderate</NuGetAuditLevel>
@@ -52,4 +55,20 @@
     </AssemblyAttribute>
   </ItemGroup>
 
+  <Choose>
+    <When Condition="'$(SourceLinkEnabled)' != 'false'">
+      <PropertyGroup>
+        <!-- Declare that the Repository URL can be published to NuSpec -->
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <!-- Embed source files that are not tracked by the source control manager to the PDB -->
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <!-- Include PDB in the built .nupkg -->
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+      </PropertyGroup>
+      <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,16 +1,16 @@
 <Project>
-    <Target Name="WpfSourceLinkWorkaround" BeforeTargets="InitializeSourceRootMappedPaths" Condition="'$(UseWPF)' == 'true'">
-        <!-- WPF causes an error with SourceLink because its build targets create a temporary project without a PackageReference to SourceLink, see https://github.com/dotnet/sourcelink/issues/91,
+  <Target Name="WpfSourceLinkWorkaround" BeforeTargets="InitializeSourceRootMappedPaths" Condition="'$(UseWPF)' == 'true'">
+    <!-- WPF causes an error with SourceLink because its build targets create a temporary project without a PackageReference to SourceLink, see https://github.com/dotnet/sourcelink/issues/91,
          causing the @SourceRoot property to be unexpectedly empty for the MapSourceRoot task
         
          For context, see https://github.com/dotnet/roslyn/blob/main/src/Compilers/Core/MSBuildTask/Microsoft.Managed.Core.targets
          and https://github.com/dotnet/roslyn/blob/main/src/Compilers/Core/MSBuildTask/MapSourceRoots.cs
          
          This workaround sets the SourceRoot manually to some deterministic value to keep the promise given by having DeterministicSourcePaths set to true -->
-        <Message Text="using deterministic source path workaround for WPF project instead of SourceLink" />
-        <ItemGroup>
-            <!-- There needs to be at least one SourceRoot defined, its value does not seem to matter as long as it ends with a directory separator -->
-            <SourceRoot Include="\" />
-        </ItemGroup>
-    </Target>
-</Project>
+    <Message Text="using deterministic source path workaround for WPF project instead of SourceLink" />
+    <ItemGroup>
+      <!-- There needs to be at least one SourceRoot defined, its value does not seem to matter as long as it ends with a directory separator -->
+      <SourceRoot Include="\" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2023 Leszek Pomianowski and WPF UI Contributors. https://dev.lepo.co/
+Copyright (c) 2021-2024 Leszek Pomianowski and WPF UI Contributors. https://dev.lepo.co/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/docfx.json b/docs/docfx.json
@@ -40,7 +40,7 @@
       "_appName": "WPF UI",
       "_appFaviconPath": "images/favicon.ico",
       "_appLogoPath": "images/wpfui.png",
-      "_appFooter": "<span>Made with <a href=\"https://dotnet.github.io/docfx\" rel=\"noreferrer\">docfx</a>, <a href=\"https://chat.openai.com/\" rel=\"noreferrer\">ChatGPT</a> and <a href=\"https://www.deepl.com/\" rel=\"noreferrer\">DeepL</a> | Copyright © 2023 <a href=\"https://dev.lepo.co/\">lepo.co</a></span>"
+      "_appFooter": "<span>Made with <a href=\"https://dotnet.github.io/docfx\" rel=\"noreferrer\">docfx</a>, <a href=\"https://chat.openai.com/\" rel=\"noreferrer\">ChatGPT</a> and <a href=\"https://www.deepl.com/\" rel=\"noreferrer\">DeepL</a> | Copyright © 2024 <a href=\"https://dev.lepo.co/\">lepo.co</a></span>"
     },
     "dest": "_site",
     "template": ["default", "templates/wpfui"],

diff --git a/docs/templates/wpfui/layout/_master.tmpl b/docs/templates/wpfui/layout/_master.tmpl
@@ -134,7 +134,7 @@
 
     <footer class="border-top">
       <div class="container-xxl">
-        <div class="row"><div class="col-12">WPF UI<a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/lepoco/wpfui"><code> https://github.com/lepoco/wpfui </code></a></div><div class="col-12">Build with<a target="_blank" rel="noopener nofollow noreferrer" href="https://dotnet.github.io/docfx/"><code> docfx </code></a>using <a target="_blank" rel="noopener nofollow noreferrer" href="https://www.deepl.com/en/translator"><code> deepl</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://highlightjs.org/"><code> highlight.js</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://getbootstrap.com/"><code> bootstrap</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/microsoft/fluentui-system-icons"><code> fluent-system-icons</code></a></div><div class="col-12">Copyright © 2023 lepo.co | Leszek Pomianowski</div></div>
+        <div class="row"><div class="col-12">WPF UI<a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/lepoco/wpfui"><code> https://github.com/lepoco/wpfui </code></a></div><div class="col-12">Build with<a target="_blank" rel="noopener nofollow noreferrer" href="https://dotnet.github.io/docfx/"><code> docfx </code></a>using <a target="_blank" rel="noopener nofollow noreferrer" href="https://www.deepl.com/en/translator"><code> deepl</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://highlightjs.org/"><code> highlight.js</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://getbootstrap.com/"><code> bootstrap</code></a><a target="_blank" rel="noopener nofollow noreferrer" href="https://github.com/microsoft/fluentui-system-icons"><code> fluent-system-icons</code></a></div><div class="col-12">Copyright © 2024 lepo.co | Leszek Pomianowski</div></div>
       </div>
     </footer>
   </body>

diff --git a/nuget.config b/nuget.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageRestore>
     <add key="enabled" value="True" />
     <add key="automatic" value="True" />
   </packageRestore>
 
   <packageSources>
+    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 

diff --git a/src/Wpf.Ui.Demo.Console/Program.cs b/src/Wpf.Ui.Demo.Console/Program.cs
@@ -3,11 +3,15 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+using System.Diagnostics;
+
 public static class Program
 {
     [STAThread]
     public static void Main(string[] args)
     {
+        Debug.WriteLine("Args: " + string.Join(", ", args));
+
         if (Application.Current is null)
         {
             Console.WriteLine($"Application.Current is null.");

diff --git a/src/Wpf.Ui.Demo.Console/Utilities/ThemeUtilities.cs b/src/Wpf.Ui.Demo.Console/Utilities/ThemeUtilities.cs
@@ -12,25 +12,27 @@ public static void ApplyTheme(this FrameworkElement frameworkElement)
     {
         ApplicationThemeManager.Apply(frameworkElement);
 
-        ThemeChangedEvent themeChanged = (sender, args) =>
+        void themeChanged(ApplicationTheme sender, Color args)
         {
             ApplicationThemeManager.Apply(frameworkElement);
             if (frameworkElement is Window window)
             {
                 if (window != UiApplication.Current.MainWindow)
+                {
                     WindowBackgroundManager.UpdateBackground(
                         window,
                         sender,
-                        Wpf.Ui.Controls.WindowBackdropType.None,
-                        true
+                        Wpf.Ui.Controls.WindowBackdropType.None
                     );
+                }
             }
-        };
+        }
 
         if (frameworkElement.IsLoaded)
         {
             ApplicationThemeManager.Changed += themeChanged;
         }
+
         frameworkElement.Loaded += (s, e) =>
         {
             ApplicationThemeManager.Changed += themeChanged;
@@ -85,6 +87,7 @@ public static void ChangeTheme()
         ApplicationThemeManager.Apply(applicationTheme, updateAccent: false);
     }
 
+    /*
     /// <summary>
     /// Applies Resources in the <paramref name="frameworkElement"/>.
     /// </summary>
@@ -128,4 +131,5 @@ private static void Apply(FrameworkElement frameworkElement)
             frameworkElement.Resources[resource.Key] = resource.Value;
         }
     }
+    */
 }
diff --git a/src/Wpf.Ui.Demo.Console/Views/Pages/DataPage.xaml.cs b/src/Wpf.Ui.Demo.Console/Views/Pages/DataPage.xaml.cs
@@ -13,7 +13,7 @@ namespace Wpf.Ui.Demo.Console.Views.Pages;
 /// </summary>
 public partial class DataPage
 {
-    public ObservableCollection<DataColor> ColorsCollection = new();
+    public ObservableCollection<DataColor> ColorsCollection = [];
 
     public DataPage()
     {
@@ -30,6 +30,7 @@ private void InitializeData()
         var random = new Random();
 
         for (int i = 0; i < 8192; i++)
+        {
             ColorsCollection.Add(
                 new DataColor
                 {
@@ -43,5 +44,6 @@ private void InitializeData()
                     )
                 }
             );
+        }
     }
 }
diff --git a/src/Wpf.Ui.Demo.Console/Views/Pages/SettingsPage.xaml.cs b/src/Wpf.Ui.Demo.Console/Views/Pages/SettingsPage.xaml.cs
@@ -43,6 +43,6 @@ private void OnDarkThemeRadioButtonChecked(object sender, RoutedEventArgs e)
     private string GetAssemblyVersion()
     {
         return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString()
-            ?? String.Empty;
+            ?? string.Empty;
     }
 }
diff --git a/src/Wpf.Ui.Demo.Console/Wpf.Ui.Demo.Console.csproj b/src/Wpf.Ui.Demo.Console/Wpf.Ui.Demo.Console.csproj
@@ -3,11 +3,10 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net4.8</TargetFramework>
-    <ImplicitUsings>false</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>wpfui.ico</ApplicationIcon>
     <NoWarn>$(NoWarn);SA1601</NoWarn>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>