Merge branch 'master' into pr/136

AvaloniaUI · Apr 2, 2024 · 62b1eb4 · 62b1eb4
2 parents f1bc929 + 0f87e47
commit 62b1eb4
Show file tree

Hide file tree

Showing 177 changed files with 2,280 additions and 352 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -157,4 +157,14 @@ indent_size = 2
 [*.sh]
 end_of_line = lf
 [*.{cmd, bat}]
-end_of_line = crlf
+end_of_line = crlf
+
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,10 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+
+# VerifyTests
+*.png binary
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
+*.verified.xml text eol=lf working-tree-encoding=UTF-8
+*.verified.json text eol=lf working-tree-encoding=UTF-8
diff --git a/.gitignore b/.gitignore
@@ -289,3 +289,6 @@ tools/**
 
 # macOS
 .DS_Store
+
+# VerifyTests
+*.received.*
diff --git a/AvaloniaBehaviors.sln b/AvaloniaBehaviors.sln
@@ -79,12 +79,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.DragAndDrop", "src\Avalonia.Xaml.Interactions.DragAndDrop\Avalonia.Xaml.Interactions.DragAndDrop.csproj", "{EF243B1A-FF29-41E9-B44B-2E55A73F6CCE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.Reactive", "src\Avalonia.Xaml.Interactions.Reactive\Avalonia.Xaml.Interactions.Reactive.csproj", "{D647E09E-BBF2-4432-A4E0-80FBB921C1EE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.Custom", "src\Avalonia.Xaml.Interactions.Custom\Avalonia.Xaml.Interactions.Custom.csproj", "{D647E09E-BBF2-4432-A4E0-80FBB921C1EE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.Events", "src\Avalonia.Xaml.Interactions.Events\Avalonia.Xaml.Interactions.Events.csproj", "{648FFF6A-A8F5-491C-AC1C-19FC2061D6B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.Custom", "src\Avalonia.Xaml.Interactions.Custom\Avalonia.Xaml.Interactions.Custom.csproj", "{0BB3669E-45E4-41E8-B765-7F4A5201C4E0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -147,10 +145,6 @@ Global
 		{648FFF6A-A8F5-491C-AC1C-19FC2061D6B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{648FFF6A-A8F5-491C-AC1C-19FC2061D6B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{648FFF6A-A8F5-491C-AC1C-19FC2061D6B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BB3669E-45E4-41E8-B765-7F4A5201C4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BB3669E-45E4-41E8-B765-7F4A5201C4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BB3669E-45E4-41E8-B765-7F4A5201C4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BB3669E-45E4-41E8-B765-7F4A5201C4E0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -174,7 +168,6 @@ Global
 		{EF243B1A-FF29-41E9-B44B-2E55A73F6CCE} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
 		{D647E09E-BBF2-4432-A4E0-80FBB921C1EE} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
 		{648FFF6A-A8F5-491C-AC1C-19FC2061D6B4} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
-		{0BB3669E-45E4-41E8-B765-7F4A5201C4E0} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E64CD420-15B1-487C-9806-41EBE6DC15A4}

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,15 +1,16 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>11.0.2</VersionPrefix>
+    <VersionPrefix>11.0.10.2</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
-    <Copyright>Copyright © Wiesław Šoltés 2023</Copyright>
+    <Copyright>Copyright © Wiesław Šoltés 2024</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/wieslawsoltes/AvaloniaBehaviors</PackageProjectUrl>
   </PropertyGroup>
   <PropertyGroup>
     <AnalysisLevel>latest</AnalysisLevel>
     <LangVersion>latest</LangVersion>
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,20 +1,20 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <AvaloniaVersion>11.0.0</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.0" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.0" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.0" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.0" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.0" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.0.0" />
-    <PackageVersion Include="Avalonia.Browser" Version="11.0.0" />
-    <PackageVersion Include="Avalonia.Headless.XUnit" Version="11.0.0" />
+    <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Headless.XUnit" Version="$(AvaloniaVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
-    <PackageVersion Include="System.Reactive" Version="5.0.0" />
+    <PackageVersion Include="System.Reactive" Version="6.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
     <PackageVersion Include="Nuke.Common" Version="5.3.0" />
   </ItemGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,7 +11,7 @@ resources:
 variables:
   BuildConfiguration: 'Release'
   BuildPlatform: 'Any CPU'
-  PublishFramework: 'net7.0'
+  PublishFramework: 'net8.0'
   PublishProject: 'BehaviorsTestApplication'
   PublishRuntime: ''
 
@@ -53,31 +53,31 @@ jobs:
       BuildConfiguration: ${{ variables.BuildConfiguration }}
       PublishFramework: ${{ variables.PublishFramework }}
       PublishProject: ${{ variables.PublishProject }}
-      PublishRuntime: 'win7-x64'
+      PublishRuntime: 'win-x64'
 
   - template: Publish-Bash.yml@templates
     parameters:
-      name: 'Publish_Ubuntu'
+      name: 'Publish_Linux'
       vmImage: 'ubuntu-20.04'
       BuildConfiguration: ${{ variables.BuildConfiguration }}
       PublishFramework: ${{ variables.PublishFramework }}
       PublishProject: ${{ variables.PublishProject }}
-      PublishRuntime: 'ubuntu.14.04-x64'
+      PublishRuntime: 'linux-x64'
 
   - template: Publish-Bash.yml@templates
     parameters:
-      name: 'Publish_Debian'
-      vmImage: 'ubuntu-20.04'
+      name: 'Publish_macOS_x64'
+      vmImage: 'macOS-11'
       BuildConfiguration: ${{ variables.BuildConfiguration }}
       PublishFramework: ${{ variables.PublishFramework }}
       PublishProject: ${{ variables.PublishProject }}
-      PublishRuntime: 'debian.8-x64'
+      PublishRuntime: 'osx-x64'
 
   - template: Publish-Bash.yml@templates
     parameters:
-      name: 'Publish_macOS'
-      vmImage: 'macOS-11'
-      BuildConfiguration: ${{ variables.BuildConfiguration }}
-      PublishFramework: ${{ variables.PublishFramework }}
-      PublishProject: ${{ variables.PublishProject }}
-      PublishRuntime: 'osx.10.12-x64'
+        name: 'Publish_macOS_arm64'
+        vmImage: 'macOS-11'
+        BuildConfiguration: ${{ variables.BuildConfiguration }}
+        PublishFramework: ${{ variables.PublishFramework }}
+        PublishProject: ${{ variables.PublishProject }}
+        PublishRuntime: 'osx-arm64'
diff --git a/build/build/_build.csproj b/build/build/_build.csproj
@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }

diff --git a/samples/BehaviorsTestApplication/BehaviorsTestApplication.csproj b/samples/BehaviorsTestApplication/BehaviorsTestApplication.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
@@ -15,7 +15,6 @@
     <PackageReference Include="Avalonia.Themes.Fluent" />
     <PackageReference Include="Avalonia.Fonts.Inter" />
     <PackageReference Include="Avalonia.ReactiveUI" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
   </ItemGroup>
 
   <!--<Import Project="..\..\build\SignAssembly.props" />-->
@@ -26,7 +25,6 @@
     <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions.DragAndDrop\Avalonia.Xaml.Interactions.DragAndDrop.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions.Draggable\Avalonia.Xaml.Interactions.Draggable.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions.Events\Avalonia.Xaml.Interactions.Events.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions.Reactive\Avalonia.Xaml.Interactions.Reactive.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions.Responsive\Avalonia.Xaml.Interactions.Responsive.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
   </ItemGroup>

diff --git a/samples/BehaviorsTestApplication/ViewModels/ItemViewModel.cs b/samples/BehaviorsTestApplication/ViewModels/ItemViewModel.cs
@@ -4,15 +4,14 @@
 
 namespace BehaviorsTestApplication.ViewModels;
 
-public class ItemViewModel : ViewModelBase
+public class ItemViewModel(string name) : ViewModelBase
 {
-    private string _name;
     private ObservableCollection<ItemViewModel>? _items;
 
     public string Name
     {
-        get => _name;
-        set => this.RaiseAndSetIfChanged(ref _name, value);
+        get => name;
+        set => this.RaiseAndSetIfChanged(ref name, value);
     }
 
     public ObservableCollection<ItemViewModel>? Items
@@ -21,10 +20,5 @@ public ObservableCollection<ItemViewModel>? Items
         set => this.RaiseAndSetIfChanged(ref _items, value);
     }
 
-    public ItemViewModel(string name)
-    {
-        _name = name;
-    }
-
-    public override string ToString() => _name;
+    public override string ToString() => name;
 }
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -1,19 +1,19 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <AvaloniaVersion>11.0.10</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.2" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.2" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.2" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.2" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.2" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.0.2" />
-    <PackageVersion Include="Avalonia.Browser" Version="11.0.2" />
-    <PackageVersion Include="Avalonia.Headless.XUnit" Version="11.0.2" />
+    <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Headless.XUnit" Version="$(AvaloniaVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
-    <PackageVersion Include="System.Reactive" Version="5.0.0" />
+    <PackageVersion Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/DragAndDropSample/Behaviors/NodesTreeViewDropHandler.cs b/samples/DragAndDropSample/Behaviors/NodesTreeViewDropHandler.cs
@@ -20,10 +20,10 @@ private bool Validate<T>(TreeView treeView, DragEventArgs e, object? sourceConte
 
         var sourceParent = sourceNode.Parent;
         var targetParent = targetNode.Parent;
-        var sourceNodes = sourceParent is { } ? sourceParent.Nodes : vm.Nodes;
-        var targetNodes = targetParent is { } ? targetParent.Nodes : vm.Nodes;
+        var sourceNodes = sourceParent is not null ? sourceParent.Nodes : vm.Nodes;
+        var targetNodes = targetParent is not null ? targetParent.Nodes : vm.Nodes;
 
-        if (sourceNodes is { } && targetNodes is { })
+        if (sourceNodes is not null && targetNodes is not null)
         {
             var sourceIndex = sourceNodes.IndexOf(sourceNode);
             var targetIndex = targetNodes.IndexOf(targetNode);

diff --git a/samples/DragAndDropSample/DragAndDropSample.csproj b/samples/DragAndDropSample/DragAndDropSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
@@ -19,7 +19,6 @@
     <PackageReference Include="Avalonia.Themes.Fluent" />
     <PackageReference Include="Avalonia.Fonts.Inter" />
     <PackageReference Include="Avalonia.ReactiveUI" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
   </ItemGroup>
 
   <!--<Import Project="..\..\build\SignAssembly.props" />-->

diff --git a/samples/DraggableDemo/DraggableDemo.csproj b/samples/DraggableDemo/DraggableDemo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
@@ -19,7 +19,6 @@
     <PackageReference Include="Avalonia.Themes.Fluent" />
     <PackageReference Include="Avalonia.Fonts.Inter" />
     <PackageReference Include="Avalonia.ReactiveUI" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
   </ItemGroup>
 
   <!--<Import Project="..\..\build\SignAssembly.props" />-->

diff --git a/src/Avalonia.Xaml.Behaviors/Avalonia.Xaml.Behaviors.csproj b/src/Avalonia.Xaml.Behaviors/Avalonia.Xaml.Behaviors.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <IncludeBuildOutput>False</IncludeBuildOutput>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);NU5128</NoWarn>
@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="..\..\build\SignAssembly.props" />
@@ -28,7 +27,6 @@
     <ProjectReference Include="..\Avalonia.Xaml.Interactions.DragAndDrop\Avalonia.Xaml.Interactions.DragAndDrop.csproj" />
     <ProjectReference Include="..\Avalonia.Xaml.Interactions.Draggable\Avalonia.Xaml.Interactions.Draggable.csproj" />
     <ProjectReference Include="..\Avalonia.Xaml.Interactions.Events\Avalonia.Xaml.Interactions.Events.csproj" />
-    <ProjectReference Include="..\Avalonia.Xaml.Interactions.Reactive\Avalonia.Xaml.Interactions.Reactive.csproj" />
     <ProjectReference Include="..\Avalonia.Xaml.Interactions.Responsive\Avalonia.Xaml.Interactions.Responsive.csproj" />
   </ItemGroup>
 

diff --git a/src/Avalonia.Xaml.Interactions.Custom/AddClassAction.cs b/src/Avalonia.Xaml.Interactions.Custom/AddClassAction.cs
@@ -62,7 +62,7 @@ public bool RemoveIfExists
     /// <returns>True if the class is successfully added; else false.</returns>
     public object Execute(object? sender, object? parameter)
     {
-        var target = GetValue(StyledElementProperty) is { } ? StyledElement : sender as StyledElement;
+        var target = GetValue(StyledElementProperty) is not null ? StyledElement : sender as StyledElement;
         if (target is null || string.IsNullOrEmpty(ClassName))
         {
             return false;

diff --git a/....Reactive/AttachedToVisualTreeBehavior.cs → ...ns.Custom/AttachedToVisualTreeBehavior.cs b/....Reactive/AttachedToVisualTreeBehavior.cs → ...ns.Custom/AttachedToVisualTreeBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/Avalonia.Xaml.Interactions.Custom.csproj b/src/Avalonia.Xaml.Interactions.Custom/Avalonia.Xaml.Interactions.Custom.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <Nullable>enable</Nullable>
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
+    <PackageReference Include="System.Reactive" />
   </ItemGroup>
 
   <Import Project="..\..\build\SignAssembly.props" />

diff --git a/src/Avalonia.Xaml.Interactions.Custom/BindTagToVisualRootDataContextBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/BindTagToVisualRootDataContextBehavior.cs
@@ -16,7 +16,7 @@ public class BindTagToVisualRootDataContextBehavior : Behavior<Control>
     protected override void OnAttachedToVisualTree()
     {
         var visualRoot = (Control?)AssociatedObject?.GetVisualRoot();
-        if (visualRoot is { })
+        if (visualRoot is not null)
         {
             _disposable = BindDataContextToTag(visualRoot, AssociatedObject);
         }
@@ -37,6 +37,6 @@ protected override void OnDetachedFromVisualTree()
             throw new ArgumentNullException(nameof(target));
 
         var data = source.GetObservable(StyledElement.DataContextProperty);
-        return data is { } ? target.Bind(Control.TagProperty, data) : null;
+        return data is not null ? target.Bind(Control.TagProperty, data) : null;
     }
 }