Merge pull request #329 from Insire/dev

Dev
Insire · May 26, 2024 · 5bc28ad · 5bc28ad
2 parents c15b553 + 8f60623
commit 5bc28ad
Show file tree

Hide file tree

Showing 167 changed files with 867 additions and 32,171 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -72,7 +72,7 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
 # object initializers
 
 dotnet_style_object_initializer = true:warning
-dotnet_style_collection_initializer = true:warning
+dotnet_style_collection_initializer = false:none
 
 # conditionals
 
@@ -177,6 +177,13 @@ csharp_style_prefer_null_check_over_type_check = true:suggestion
 csharp_style_prefer_local_over_anonymous_function = true:suggestion
 csharp_style_prefer_index_operator = true:suggestion
 csharp_style_prefer_range_operator = true:suggestion
-csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = false:suggestion
 csharp_style_prefer_tuple_swap = true:suggestion
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+
+# IDE0290: Use primary constructor
+csharp_style_prefer_primary_constructors = false
+# IDE0028: Simplify collection initialization
+dotnet_diagnostic.IDE0028.severity = none
+# IDE0301: Simplify collection initialization
+dotnet_style_prefer_collection_expression = never
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020
+Copyright (c) 2024
 
 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/MvvmScarletToolkit.sln b/MvvmScarletToolkit.sln
@@ -30,16 +30,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmScarletToolkit.Abstract
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmScarletToolkit.Wpf", "src\MvvmScarletToolkit.Wpf\MvvmScarletToolkit.Wpf.csproj", "{1B547A43-3DB6-48FD-AF9A-EC649B5C584F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmScarletToolkit.Xamarin.Forms", "src\MvvmScarletToolkit.Xamarin.Forms\MvvmScarletToolkit.Xamarin.Forms.csproj", "{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E302CFE9-12CC-4732-9CAF-3F2377667DBC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmScarletToolkit.Xamarin.Forms.Samples", "src\MvvmScarletToolkit.Xamarin.Forms.Samples\MvvmScarletToolkit.Xamarin.Forms.Samples.csproj", "{76483151-5FD5-4475-B4D8-E65C20C56471}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmScarletToolkit.Xamarin.Forms.Samples.Android", "src\MvvmScarletToolkit.Xamarin.Forms.Samples.Android\MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj", "{D23DD39F-0525-41EE-A278-19BDDB249730}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmScarletToolkit.Xamarin.Forms.Samples.iOS", "src\MvvmScarletToolkit.Xamarin.Forms.Samples.iOS\MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj", "{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmScarletToolkit.Wpf.Tests", "src\MvvmScarletToolkit.Wpf.Tests\MvvmScarletToolkit.Wpf.Tests.csproj", "{A9CE017F-B4C9-40DC-A092-DC5067956994}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmScarletToolkit.Observables.Tests", "src\MvvmScarletToolkit.Observables.Tests\MvvmScarletToolkit.Observables.Tests.csproj", "{F7EBB910-0AA9-4683-878B-06108492F2F8}"
@@ -228,106 +220,6 @@ Global
 		{1B547A43-3DB6-48FD-AF9A-EC649B5C584F}.Release|x64.Build.0 = Release|Any CPU
 		{1B547A43-3DB6-48FD-AF9A-EC649B5C584F}.Release|x86.ActiveCfg = Release|Any CPU
 		{1B547A43-3DB6-48FD-AF9A-EC649B5C584F}.Release|x86.Build.0 = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|x64.Build.0 = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Debug|x86.Build.0 = Debug|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|ARM.Build.0 = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|iPhone.Build.0 = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|x64.ActiveCfg = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|x64.Build.0 = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{CB537DC0-C7B6-4F6B-A66B-F9303EF4A1F0}.Release|x86.Build.0 = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|ARM.Build.0 = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|x64.Build.0 = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Debug|x86.Build.0 = Debug|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|ARM.ActiveCfg = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|ARM.Build.0 = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|iPhone.Build.0 = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|x64.ActiveCfg = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|x64.Build.0 = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|x86.ActiveCfg = Release|Any CPU
-		{76483151-5FD5-4475-B4D8-E65C20C56471}.Release|x86.Build.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|x64.Build.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|x86.Build.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|ARM.Build.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|ARM.Deploy.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|iPhone.Build.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|x64.ActiveCfg = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|x64.Build.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|x64.Deploy.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|x86.ActiveCfg = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|x86.Build.0 = Release|Any CPU
-		{D23DD39F-0525-41EE-A278-19BDDB249730}.Release|x86.Deploy.0 = Release|Any CPU
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|iPhone.Build.0 = Debug|iPhone
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|iPhone.ActiveCfg = Release|iPhone
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|iPhone.Build.0 = Release|iPhone
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|x64.ActiveCfg = Release|iPhoneSimulator
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F}.Release|x86.ActiveCfg = Release|iPhoneSimulator
 		{A9CE017F-B4C9-40DC-A092-DC5067956994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9CE017F-B4C9-40DC-A092-DC5067956994}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9CE017F-B4C9-40DC-A092-DC5067956994}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -382,9 +274,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{66BE74B3-937A-45AF-8F44-8024E930FAA7} = {E302CFE9-12CC-4732-9CAF-3F2377667DBC}
-		{76483151-5FD5-4475-B4D8-E65C20C56471} = {E302CFE9-12CC-4732-9CAF-3F2377667DBC}
-		{D23DD39F-0525-41EE-A278-19BDDB249730} = {E302CFE9-12CC-4732-9CAF-3F2377667DBC}
-		{A21F388C-1F38-49F7-9534-5A95ABF8FA3F} = {E302CFE9-12CC-4732-9CAF-3F2377667DBC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {57591B2A-CCBB-43A1-B8BE-5DA13ED5FE66}

diff --git a/README.md b/README.md
@@ -89,23 +89,6 @@ Pre release nuget packages are available [here](https://pkgs.dev.azure.com/SoftT
   - Extensions
     - DependencyObjectExtensions
 
-- [MvvmScarletToolkit.Xamarin.Forms](src/MvvmScarletToolkit.Xamarin.Forms/readme.md)
-
-  - BindingProxy
-  - Converters:
-    - IsNot (negate a boolean)
-    - IsNotNull (return whether something is not null)
-    - IsNotNullOrEmpty (return whether a string is not null or empty)
-    - IsNotNullOrWhiteSpace (return whether a string is not null or whitespace)
-    - IsNull (return whether something is null)
-    - IsNullOrEmpty (return whether a string is null or empty)
-    - IsNullOrWhiteSpace (return whether a string is null or whitespace)
-  - MarkupExtension
-    - ColorToHexExtension
-  - Behaviors
-    - BehaviorBase (provides the currently associated control that also forwwards updates to the bindingcontext as it changes on the control)
-    - EventToCommandBehavior
-
 - [MvvmScarletToolkit.Abstractions](src/MvvmScarletToolkit.Abstractions/readme.md)
 
   - EnumerableExtensions

diff --git a/cake/Build.csproj b/cake/Build.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net80</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <PackAsTool>true</PackAsTool>
 
         <!-- Make sure start same folder .NET Core CLI and Visual Studio -->

diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs
@@ -51,7 +51,6 @@ public BuildContext(ICakeContext context)
                 (Folder: @"src\MvvmScarletToolkit.Commands", ProjectFile:  "MvvmScarletToolkit.Commands.csproj"),
                 (Folder: @"src\MvvmScarletToolkit.Observables", ProjectFile:  "MvvmScarletToolkit.Observables.csproj"),
                 (Folder: @"src\MvvmScarletToolkit.Wpf", ProjectFile:  "MvvmScarletToolkit.Wpf.csproj"),
-                (Folder: @"src\MvvmScarletToolkit.Xamarin.Forms", ProjectFile:  "MvvmScarletToolkit.Xamarin.Forms.csproj"),
             }
             .Select(p =>
             {

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.100",
+        "version": "8.0.300",
         "rollForward": "disable"
     }
 }
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -7,12 +7,12 @@
 
     <PropertyGroup>
         <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-        <LangVersion>11.0</LangVersion>
+        <LangVersion>12.0</LangVersion>
         <CodeAnalysisRuleSet>..\..\MvvmScarletToolkit.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(Configuration)'=='Debug' ">
-        <PackageReference Include="Roslynator.Analyzers" Version="4.7.0">
+        <PackageReference Include="Roslynator.Analyzers" Version="4.12.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/MvvmScarletToolkit.Abstractions/IAsyncCommand.cs b/src/MvvmScarletToolkit.Abstractions/IAsyncCommand.cs
@@ -2,7 +2,5 @@
 
 namespace MvvmScarletToolkit
 {
-    public interface IAsyncCommand : IConcurrentCommand, IDisposable
-    {
-    }
+    public interface IAsyncCommand : IConcurrentCommand, IDisposable;
 }
diff --git a/src/MvvmScarletToolkit.Abstractions/IBusyStack.cs b/src/MvvmScarletToolkit.Abstractions/IBusyStack.cs
@@ -17,7 +17,6 @@ public interface IBusyStack
         /// <summary>
         /// add a token to the stack
         /// </summary>
-        /// <param name="token"></param>
         void Push();
     }
 }
diff --git a/src/MvvmScarletToolkit.Abstractions/IObservableBusyStack.cs b/src/MvvmScarletToolkit.Abstractions/IObservableBusyStack.cs
@@ -2,7 +2,5 @@
 
 namespace MvvmScarletToolkit
 {
-    public interface IObservableBusyStack : IObservable<bool>, IBusyStack, IDisposable
-    {
-    }
+    public interface IObservableBusyStack : IObservable<bool>, IBusyStack, IDisposable;
 }
diff --git a/src/MvvmScarletToolkit.Commands/Core/NotifyTaskCompletion.cs b/src/MvvmScarletToolkit.Commands/Core/NotifyTaskCompletion.cs
@@ -48,7 +48,6 @@ public NotifyTaskCompletion(in Task task, in IScarletExceptionHandler exceptionH
             TaskCompletion = task == Task.CompletedTask ? Task.CompletedTask : WatchTaskAsync(task);
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "RCS1090:Add call to 'ConfigureAwait' (or vice versa).", Justification = "dont configureawait(false) here since we want to raise OnPropertyChanged on the ui thread if possible, but we are not going to enforce that")]
         private async Task WatchTaskAsync(Task task)
         {
             try

diff --git a/src/MvvmScarletToolkit.Incubator/DialogResultViewModel.cs b/src/MvvmScarletToolkit.Incubator/DialogResultViewModel.cs
@@ -13,6 +13,7 @@ public abstract class DialogResultViewModel : ViewModelBase
         public ICommand CloseCommand { get; }
 
         private bool _isOpen;
+
         public bool IsOpen
         {
             get { return _isOpen; }
@@ -44,7 +45,7 @@ public Task Show()
         public async Task Show(CancellationToken token)
         {
             var tcs = new TaskCompletionSource<object>();
-            using (var registration = token.Register(() => tcs.TrySetCanceled()))
+            await using (var registration = token.Register(() => tcs.TrySetCanceled()))
             {
                 try
                 {

diff --git a/src/MvvmScarletToolkit.Incubator/DialogResultViewModel_generic.cs b/src/MvvmScarletToolkit.Incubator/DialogResultViewModel_generic.cs
@@ -44,7 +44,7 @@ public Task Show()
         public async Task Show(CancellationToken token)
         {
             var tcs = new TaskCompletionSource<object>();
-            using (var registration = token.Register(() => tcs.TrySetCanceled()))
+            await using (var registration = token.Register(() => tcs.TrySetCanceled()))
             {
                 try
                 {

diff --git a/src/MvvmScarletToolkit.Incubator/MvvmScarletToolkit.Incubator.csproj b/src/MvvmScarletToolkit.Incubator/MvvmScarletToolkit.Incubator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
         <OutputType>Library</OutputType>
@@ -7,9 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DynamicData" Version="8.3.27" />
+        <PackageReference Include="DynamicData" Version="8.4.1" />
         <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
-        <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.5" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj b/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj
@@ -6,12 +6,12 @@
 
     <ItemGroup>
         <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.16" />
+        <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
 
-        <PackageReference Include="nunit" Version="4.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="nunit" Version="4.1.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+        <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>