Merge pull request #835 from lepoco/development

Merge dvelopment
lepoco · Nov 22, 2023 · cc4f708 · cc4f708
2 parents 5ed3786 + e77ea4e
commit cc4f708
Show file tree

Hide file tree

Showing 27 changed files with 198 additions and 87 deletions.
diff --git a/.github/workflows/wpf-ui-cd-docs.yaml b/.github/workflows/wpf-ui-cd-docs.yaml
@@ -33,10 +33,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
-      - name: Setup .NET Core SDK 7.x
+      - name: Setup .NET Core SDK 8.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x
+          dotnet-version: 8.x
 
       - name: Install docfx
         run: dotnet tool update -g docfx

diff --git a/.github/workflows/wpf-ui-cd-nuget.yaml b/.github/workflows/wpf-ui-cd-nuget.yaml
@@ -17,10 +17,10 @@ jobs:
       - uses: nuget/setup-nuget@v1
         with:
           nuget-api-key: ${{ secrets.NUGET_API_KEY }}
-      - name: Setup .NET Core SDK 7.x
+      - name: Setup .NET Core SDK 8.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x
+          dotnet-version: 8.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/.github/workflows/wpf-ui-lock.yml b/.github/workflows/wpf-ui-lock.yml
@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           # https://github.com/dessant/lock-threads
           github-token: ${{ github.token }}

diff --git a/.github/workflows/wpf-ui-pr-validator.yaml b/.github/workflows/wpf-ui-pr-validator.yaml
@@ -19,10 +19,10 @@ jobs:
       - uses: nuget/setup-nuget@v1
         with:
           nuget-api-key: ${{ secrets.NUGET_API_KEY }}
-      - name: Setup .NET Core SDK 7.x
+      - name: Setup .NET Core SDK 8.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x
+          dotnet-version: 8.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.0-preview.9</Version>
-    <LangVersion>11.0</LangVersion>
+    <Version>3.0.0-preview.10</Version>
+    <LangVersion>12.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
 
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackagesCommonFrameworks>net7.0-windows;net6.0-windows;net481;net472;net462</PackagesCommonFrameworks>
+    <PackagesCommonFrameworks>net8.0-windows;net7.0-windows;net6.0-windows;net481;net472;net462</PackagesCommonFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,24 +1,24 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.2.3194" />
     <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.3.32804.24" />
-    <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.4.2118" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1462.37" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.7.2196" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2151.40" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
     <PackageVersion Include="NativeMethods" Version="0.0.3" />
-    <PackageVersion Include="NSubstitute" Version="5.0.0" />
+    <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="PolySharp" Version="1.13.2" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
-    <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
+    <PackageVersion Include="xunit" Version="2.6.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Wpf.Ui.Demo.Mvvm/Wpf.Ui.Demo.Mvvm.csproj b/src/Wpf.Ui.Demo.Mvvm/Wpf.Ui.Demo.Mvvm.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Wpf.Ui.Demo.Simple/Wpf.Ui.Demo.Simple.csproj b/src/Wpf.Ui.Demo.Simple/Wpf.Ui.Demo.Simple.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>

diff --git a/src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj b/src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>

diff --git a/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj b/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>

diff --git a/src/Wpf.Ui/Appearance/ResourceDictionaryManager.cs b/src/Wpf.Ui/Appearance/ResourceDictionaryManager.cs
@@ -13,7 +13,7 @@ namespace Wpf.Ui.Appearance;
 internal class ResourceDictionaryManager
 {
     /// <summary>
-    /// Namespace, e.g. the library the resource is being searched for.
+    /// Gets the namespace, e.g. the library the resource is being searched for.
     /// </summary>
     public string SearchNamespace { get; }
 

diff --git a/src/Wpf.Ui/Appearance/SystemTheme.cs b/src/Wpf.Ui/Appearance/SystemTheme.cs
@@ -51,22 +51,22 @@ public enum SystemTheme
     HC2,
 
     /// <summary>
-    /// First custom, kinda purple Windows 11 theme.
+    /// Dark theme: Glow
     /// </summary>
     Glow,
 
     /// <summary>
-    /// Second custom, kinda red Windows 11 theme.
+    /// Dark theme: Captured Motion
     /// </summary>
     CapturedMotion,
 
     /// <summary>
-    /// Third custom, kinda washed off cyan Windows 11 theme.
+    /// Light theme: Sunrise
     /// </summary>
     Sunrise,
 
     /// <summary>
-    /// Fourth custom, kinda gray Windows 11 theme.
+    /// Light theme: Flow
     /// </summary>
     Flow
 }
diff --git a/src/Wpf.Ui/Appearance/WindowBackgroundManager.cs b/src/Wpf.Ui/Appearance/WindowBackgroundManager.cs
@@ -11,6 +11,16 @@ namespace Wpf.Ui.Appearance;
 /// <summary>
 /// Facilitates the management of the window background.
 /// </summary>
+/// <example>
+/// <code lang="csharp">
+/// WindowBackgroundManager.UpdateBackground(
+///     observedWindow.RootVisual,
+///     currentApplicationTheme,
+///     observedWindow.Backdrop,
+///     observedWindow.ForceBackgroundReplace
+/// );
+/// </code>
+/// </example>
 public static class WindowBackgroundManager
 {
     /// <summary>
@@ -70,11 +80,12 @@ bool forceBackground
         {
             backdrop = WindowBackdropType.None;
         }
-        else
-        {
-            _ = WindowBackdrop.RemoveBackground(window);
-        }
 
+        // This was required to update the background when moving from a HC theme to light/dark theme. However, this breaks theme proper light/dark theme changing on Windows 10.
+        // else
+        // {
+        //    _ = WindowBackdrop.RemoveBackground(window);
+        // }
         _ = WindowBackdrop.ApplyBackdrop(window, backdrop);
         if (applicationTheme is ApplicationTheme.Dark)
         {

diff --git a/src/Wpf.Ui/AutomationPeers/CardControlAutomationPeer.cs b/src/Wpf.Ui/AutomationPeers/CardControlAutomationPeer.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+// 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.Automation;
 using System.Windows.Automation.Peers;
 using Wpf.Ui.Controls;
@@ -17,7 +16,7 @@ internal class CardControlAutomationPeer : FrameworkElementAutomationPeer
     public CardControlAutomationPeer(CardControl owner)
         : base(owner)
     {
-        this._owner = owner;
+        _owner = owner;
     }
 
     protected override string GetClassNameCore()
@@ -42,7 +41,7 @@ public override object GetPattern(PatternInterface patternInterface)
 
     protected override AutomationPeer GetLabeledByCore()
     {
-        if (this._owner.Header is UIElement element)
+        if (_owner.Header is UIElement element)
         {
             return CreatePeerForElement(element);
         }
@@ -52,19 +51,19 @@ protected override AutomationPeer GetLabeledByCore()
 
     protected override string GetNameCore()
     {
-        string result = base.GetNameCore() ?? String.Empty;
+        var result = base.GetNameCore() ?? String.Empty;
 
         if (result == String.Empty)
         {
-            result = AutomationProperties.GetName(this._owner);
+            result = AutomationProperties.GetName(_owner);
         }
 
-        if (result == String.Empty && this._owner.Header is DependencyObject d)
+        if (result == String.Empty && _owner.Header is DependencyObject d)
         {
             result = AutomationProperties.GetName(d);
         }
 
-        if (result == String.Empty && this._owner.Header is string s)
+        if (result == String.Empty && _owner.Header is string s)
         {
             result = s;
         }

diff --git a/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs b/src/Wpf.Ui/Controls/ContentDialog/ContentDialog.cs
@@ -677,12 +677,13 @@ protected virtual void OnLoaded()
     private Size GetNewDialogSize(Size desiredSize)
     {
         var paddingWidth = Padding.Left + Padding.Right;
+        var paddingHeight = Padding.Top + Padding.Bottom;
 
         var marginHeight = DialogMargin.Bottom + DialogMargin.Top;
         var marginWidth = DialogMargin.Left + DialogMargin.Right;
 
         var width = desiredSize.Width - marginWidth + paddingWidth;
-        var height = desiredSize.Height - marginHeight;
+        var height = desiredSize.Height - marginHeight + paddingHeight;
 
         return new Size(width, height);
     }

diff --git a/src/Wpf.Ui/Controls/TextBlock/TextBlock.cs b/src/Wpf.Ui/Controls/TextBlock/TextBlock.cs
@@ -14,13 +14,6 @@ namespace Wpf.Ui.Controls;
 /// </summary>
 public class TextBlock : System.Windows.Controls.TextBlock
 {
-    static TextBlock()
-    {
-        TextElement
-            .FontSizeProperty
-            .OverrideMetadata(typeof(System.Windows.Controls.TextBlock), new FrameworkPropertyMetadata(14.0));
-    }
-
     /// <summary>
     /// Property for <see cref="FontTypography"/>.
     /// </summary>

diff --git a/src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml b/src/Wpf.Ui/Controls/TextBlock/TextBlock.xaml
@@ -14,6 +14,7 @@
         <!--  The Display option causes a large aliasing effect  -->
         <!--<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />-->
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Focusable" Value="False" />

diff --git a/src/Wpf.Ui/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml b/src/Wpf.Ui/Controls/VirtualizingWrapPanel/VirtualizingWrapPanel.xaml
@@ -15,8 +15,6 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-        <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Standard" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
     </Style>

diff --git a/src/Wpf.Ui/Converters/IconSourceElementConverter.cs b/src/Wpf.Ui/Converters/IconSourceElementConverter.cs
@@ -8,18 +8,43 @@
 
 namespace Wpf.Ui.Converters;
 
+/// <summary>
+/// Converts an <see cref="IconSourceElement"/> to an <see cref="IconElement"/>.
+/// </summary>
 public class IconSourceElementConverter : IValueConverter
 {
+    /// <summary>
+    /// Converts a value to an <see cref="IconElement"/>.
+    /// </summary>
+    /// <param name="value">The value to convert.</param>
+    /// <param name="targetType">The type of the binding target property.</param>
+    /// <param name="parameter">The converter parameter.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>The converted <see cref="IconElement"/>.</returns>
     public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         return ConvertToIconElement(value);
     }
 
+    /// <summary>
+    /// Converts an <see cref="IconElement"/> back to an IconSourceElement.
+    /// </summary>
+    /// <param name="value">The value to convert.</param>
+    /// <param name="targetType">The type of the binding target property.</param>
+    /// <param name="parameter">The converter parameter.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>The converted IconSourceElement.</returns>
     public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         throw new NotImplementedException();
     }
 
+    /// <summary>
+    /// Converts a value to an <see cref="IconElement"/>.
+    /// </summary>
+    /// <param name="_">The dependency object (not used).</param>
+    /// <param name="baseValue">The base value to convert.</param>
+    /// <returns>The converted IconElement.</returns>
     public static object ConvertToIconElement(DependencyObject _, object baseValue)
     {
         return ConvertToIconElement(baseValue);

diff --git a/src/Wpf.Ui/Extensions/NavigationServiceExtensions.cs b/src/Wpf.Ui/Extensions/NavigationServiceExtensions.cs
@@ -12,6 +12,12 @@ namespace Wpf.Ui.Extensions;
 /// </summary>
 public static class NavigationServiceExtensions
 {
+    /// <summary>
+    /// Sets the pane display mode of the navigation service.
+    /// </summary>
+    /// <param name="navigationService">The navigation service.</param>
+    /// <param name="paneDisplayMode">The pane display mode.</param>
+    /// <returns>Same <see cref="INavigationService"/> so multiple calls can be chained.</returns>
     public static INavigationService SetPaneDisplayMode(
         this INavigationService navigationService,
         NavigationViewPaneDisplayMode paneDisplayMode