diff --git a/appveyor.yml b/appveyor.yml
index c40d3fa..3658477 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.4.{build}
+version: 2.2.5.{build}
 init:
 - dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
 configuration: Release
@@ -17,7 +17,7 @@ after_test:
 - cd devops
 - cd pack
 - pack-all
-image: Visual Studio 2019
+image: Visual Studio 2022
 artifacts:
 - name: Packages
   path: ./output/*.nupkg
diff --git a/devops/deploy/deploy-all.bat b/devops/deploy/deploy-all.bat
index 55bd151..fc5bc06 100644
--- a/devops/deploy/deploy-all.bat
+++ b/devops/deploy/deploy-all.bat
@@ -1,5 +1,5 @@
 rem TODO: Use common source for all version instances
-SET version=2.2.4
+SET version=2.2.5
 rem TODO: Refactor using loop and automatic discovery
 call deploy-single.bat LogoFX.Client.Mvvm.Core %version% 
 call deploy-single.bat LogoFX.Client.Mvvm.Commanding.Core %version% 
diff --git a/devops/pack/LogoFX.Client.Mvvm.Commanding.Core/contents/LogoFX.Client.Mvvm.Commanding.Core.nuspec b/devops/pack/LogoFX.Client.Mvvm.Commanding.Core/contents/LogoFX.Client.Mvvm.Commanding.Core.nuspec
index aadb8c7..7902f8a 100644
--- a/devops/pack/LogoFX.Client.Mvvm.Commanding.Core/contents/LogoFX.Client.Mvvm.Commanding.Core.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.Commanding.Core/contents/LogoFX.Client.Mvvm.Commanding.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.Commanding.Core</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.Commanding.Core</title>
     <authors>Gennady Verdel, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -14,7 +14,7 @@
     <summary>LogoFX Client Mvvm Commanding containing implementation of ICommand with Fluent API.</summary>
     <releaseNotes>Using System.Reactive.Linq 5</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.4" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.5" />
       <dependency id="System.Reactive.Linq" version="5.0.0" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
diff --git a/devops/pack/LogoFX.Client.Mvvm.Commanding/contents/LogoFX.Client.Mvvm.Commanding.nuspec b/devops/pack/LogoFX.Client.Mvvm.Commanding/contents/LogoFX.Client.Mvvm.Commanding.nuspec
index fab989d..b1bcf71 100644
--- a/devops/pack/LogoFX.Client.Mvvm.Commanding/contents/LogoFX.Client.Mvvm.Commanding.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.Commanding/contents/LogoFX.Client.Mvvm.Commanding.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.Commanding</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.Commanding</title>
     <authors>Gennady Verdel, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -15,12 +15,12 @@
     <releaseNotes>Added support for .NET Core</releaseNotes>
     <dependencies>
       <group>
-        <dependency id="Solid.Practices.Middleware" version="2.3.2" />
-        <dependency id="Solid.Bootstrapping" version="2.3.2" />
-        <dependency id="Solid.Extensibility" version="2.3.2" />
-        <dependency id="LogoFX.Client.Core" version="2.2.4" />
-        <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.4" />
-        <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.4" />
+        <dependency id="Solid.Practices.Middleware" version="2.3.3" />
+        <dependency id="Solid.Bootstrapping" version="2.3.3" />
+        <dependency id="Solid.Extensibility" version="2.3.3" />
+        <dependency id="LogoFX.Client.Core" version="2.2.5" />
+        <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.5" />
+        <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.5" />
       </group>
       <group targetFramework="UAP10.0">
         <dependency id="Microsoft.Xaml.Behaviors.Uwp.Managed" version="2.0.1" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.Core/contents/LogoFX.Client.Mvvm.Core.nuspec b/devops/pack/LogoFX.Client.Mvvm.Core/contents/LogoFX.Client.Mvvm.Core.nuspec
index c63fd53..389e5ab 100644
--- a/devops/pack/LogoFX.Client.Mvvm.Core/contents/LogoFX.Client.Mvvm.Core.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.Core/contents/LogoFX.Client.Mvvm.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.Core</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.Core</title>
     <authors>Gennady Verdel, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -16,7 +16,7 @@ common MVVM-related operations and utilities</description>
 common MVVM-related operations and utilities</summary>
     <releaseNotes>Added support for .NET Core.</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Core" version="2.2.4" />
+      <dependency id="LogoFX.Core" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.Model/contents/LogoFX.Client.Mvvm.Model.nuspec b/devops/pack/LogoFX.Client.Mvvm.Model/contents/LogoFX.Client.Mvvm.Model.nuspec
index af30ff9..275a401 100644
--- a/devops/pack/LogoFX.Client.Mvvm.Model/contents/LogoFX.Client.Mvvm.Model.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.Model/contents/LogoFX.Client.Mvvm.Model.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.Model</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.Model</title>
     <authors>Gennady Verdel, Vlad Spivak, Dmitry Bublik, David Kossoglyad</authors>
     <owners>Gennady Verdel</owners>
@@ -16,10 +16,10 @@ model layer objects facilitating development by MVVM pattern</description>
 model layer objects facilitating development by MVVM pattern</summary>
     <releaseNotes>Added SetProperty with options parameter</releaseNotes>
     <dependencies>
-      <dependency id="Solid.Patterns.Memento" version="2.3.2" />
-      <dependency id="Solid.Patterns.ChainOfResponsibility" version="2.3.2" />
-      <dependency id="LogoFX.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.4" />
+      <dependency id="Solid.Patterns.Memento" version="2.3.3" />
+      <dependency id="Solid.Patterns.ChainOfResponsibility" version="2.3.3" />
+      <dependency id="LogoFX.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.5" />
       <dependency id="System.ComponentModel.Annotations" version="5.0.0" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
diff --git a/devops/pack/LogoFX.Client.Mvvm.View.Core/contents/LogoFX.Client.Mvvm.View.Core.nuspec b/devops/pack/LogoFX.Client.Mvvm.View.Core/contents/LogoFX.Client.Mvvm.View.Core.nuspec
index 02b8c3f..47b1527 100644
--- a/devops/pack/LogoFX.Client.Mvvm.View.Core/contents/LogoFX.Client.Mvvm.View.Core.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.View.Core/contents/LogoFX.Client.Mvvm.View.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.View.Core</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.View.Core</title>
     <authors>David Kossoglyad, Dmitry Bublik, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
diff --git a/devops/pack/LogoFX.Client.Mvvm.View.Extensions/contents/LogoFX.Client.Mvvm.View.Extensions.nuspec b/devops/pack/LogoFX.Client.Mvvm.View.Extensions/contents/LogoFX.Client.Mvvm.View.Extensions.nuspec
index 02efedc..a453efb 100644
--- a/devops/pack/LogoFX.Client.Mvvm.View.Extensions/contents/LogoFX.Client.Mvvm.View.Extensions.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.View.Extensions/contents/LogoFX.Client.Mvvm.View.Extensions.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.View.Extensions</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.View.Extensions</title>
     <authors>Dmitry Bublik, Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Extensions" version="2.2.4" />
+      <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Extensions" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.View/contents/LogoFX.Client.Mvvm.View.nuspec b/devops/pack/LogoFX.Client.Mvvm.View/contents/LogoFX.Client.Mvvm.View.nuspec
index 6e16376..f958265 100644
--- a/devops/pack/LogoFX.Client.Mvvm.View/contents/LogoFX.Client.Mvvm.View.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.View/contents/LogoFX.Client.Mvvm.View.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.View</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.View</title>
     <authors>David Kossoglyad, Dmitry Bublik, Vlad Spivak, Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -16,8 +16,8 @@ view layer objects facilitating development by MVVM pattern</description>
 view layer objects facilitating development by MVVM pattern</summary>
     <releaseNotes>Added support for .NET Core</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.View.Core" version="2.2.4" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.View.Core" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Contracts/contents/LogoFX.Client.Mvvm.ViewModel.Contracts.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Contracts/contents/LogoFX.Client.Mvvm.ViewModel.Contracts.nuspec
index ab074d4..42b172d 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Contracts/contents/LogoFX.Client.Mvvm.ViewModel.Contracts.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Contracts/contents/LogoFX.Client.Mvvm.ViewModel.Contracts.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel.Contracts</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel.Contracts</title>
     <authors>Gennady Verdel, David Kossoglyad, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Core/contents/LogoFX.Client.Mvvm.ViewModel.Core.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Core/contents/LogoFX.Client.Mvvm.ViewModel.Core.nuspec
index a082ed0..a61cf09 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Core/contents/LogoFX.Client.Mvvm.ViewModel.Core.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Core/contents/LogoFX.Client.Mvvm.ViewModel.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel.Core</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel.Core</title>
     <authors>Gennady Verdel, David Kossoglyad, Vlad Spivak, Dmitry Bublik</authors>
     <owners>Gennady Verdel</owners>
@@ -14,9 +14,9 @@
     <summary>LogoFX Client Mvvm ViewModel Core containing core view model layer objects facilitating development by MVVM pattern</summary>
     <releaseNotes>Updated dependent packages</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.4" />
+      <dependency id="LogoFX.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions.Core/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.Core.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions.Core/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.Core.nuspec
index 5750100..08db1ae 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions.Core/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.Core.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions.Core/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel.Extensions.Core</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel.Extensions.Core</title>
     <authors>Dmitry Bublik, Gennady Verdel, David Kossoglyad</authors>
     <owners>Gennady Verdel</owners>
@@ -16,13 +16,13 @@ for the most common view models (including editing, paging and virtualization)</
 for the most common view models (including editing, paging and virtualization)</summary>
     <releaseNotes>Updated dependent packages</releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Core.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.Model" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.4" />
+      <dependency id="LogoFX.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Core.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.Model" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.nuspec
index 3efa602..ce186ae 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Extensions/contents/LogoFX.Client.Mvvm.ViewModel.Extensions.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel.Extensions</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel.Extensions</title>
     <authors>Dmitry Bublik, Gennady Verdel, David Kossoglyad</authors>
     <owners>Gennady Verdel</owners>
@@ -17,15 +17,15 @@ for the most common view models (including editing, paging and virtualization)</
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.Model" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Extensions.Core" version="2.2.4" />
+      <dependency id="LogoFX.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.Model" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Extensions.Core" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services.Core/contents/LogoFX.Client.Mvvm.ViewModel.Services.Core.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services.Core/contents/LogoFX.Client.Mvvm.ViewModel.Services.Core.nuspec
index 8b9ee86..081d7f8 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services.Core/contents/LogoFX.Client.Mvvm.ViewModel.Services.Core.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services.Core/contents/LogoFX.Client.Mvvm.ViewModel.Services.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel.Services.Core</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel.Services.Core</title>
     <authors>Gennady Verdel,Dmitry Bublik</authors>
     <owners>Gennady Verdel</owners>
@@ -15,13 +15,13 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Solid.Practices.IoC" version="2.3.2" />
-      <dependency id="Solid.Practices.Middleware" version="2.3.2" />
-      <dependency id="Solid.Bootstrapping" version="2.3.2" />
-      <dependency id="Solid.Extensibility" version="2.3.2" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.4" />
+      <dependency id="Solid.Practices.IoC" version="2.3.3" />
+      <dependency id="Solid.Practices.Middleware" version="2.3.3" />
+      <dependency id="Solid.Bootstrapping" version="2.3.3" />
+      <dependency id="Solid.Extensibility" version="2.3.3" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services/contents/LogoFX.Client.Mvvm.ViewModel.Services.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services/contents/LogoFX.Client.Mvvm.ViewModel.Services.nuspec
index 1b2c975..292f8dc 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services/contents/LogoFX.Client.Mvvm.ViewModel.Services.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Services/contents/LogoFX.Client.Mvvm.ViewModel.Services.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel.Services</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel.Services</title>
     <authors>Gennady Verdel, Dmitry Bublik</authors>
     <owners>Gennady Verdel</owners>
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Shared/contents/LogoFX.Client.Mvvm.ViewModel.Shared.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Shared/contents/LogoFX.Client.Mvvm.ViewModel.Shared.nuspec
index fcfbb63..14036f2 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel.Shared/contents/LogoFX.Client.Mvvm.ViewModel.Shared.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel.Shared/contents/LogoFX.Client.Mvvm.ViewModel.Shared.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel.Shared</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel.Shared</title>
     <authors>Dmitry Bublik,Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModel/contents/LogoFX.Client.Mvvm.ViewModel.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModel/contents/LogoFX.Client.Mvvm.ViewModel.nuspec
index 9885f35..f2b2eb8 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModel/contents/LogoFX.Client.Mvvm.ViewModel.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModel/contents/LogoFX.Client.Mvvm.ViewModel.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModel</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModel</title>
     <authors>Gennady Verdel, David Kossoglyad, Vlad Spivak</authors>
     <owners>Gennady Verdel</owners>
@@ -15,9 +15,9 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="LogoFX.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.4" />
+      <dependency id="LogoFX.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.Core" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/main" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/contents/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/contents/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.nuspec
index 302eaa7..da1417b 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/contents/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/contents/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -15,10 +15,10 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Solid.Bootstrapping" version="2.3.2" />
-      <dependency id="Solid.Extensibility" version="2.3.2" />
-      <dependency id="LogoFX.Practices.IoC" version="2.2.4" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.4" />
+      <dependency id="Solid.Bootstrapping" version="2.3.3" />
+      <dependency id="Solid.Extensibility" version="2.3.3" />
+      <dependency id="LogoFX.Practices.IoC" version="2.2.5" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.Unity/contents/LogoFX.Client.Mvvm.ViewModelFactory.Unity.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.Unity/contents/LogoFX.Client.Mvvm.ViewModelFactory.Unity.nuspec
index 6147284..9cef11a 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.Unity/contents/LogoFX.Client.Mvvm.ViewModelFactory.Unity.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory.Unity/contents/LogoFX.Client.Mvvm.ViewModelFactory.Unity.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModelFactory.Unity</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModelFactory.Unity</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -15,9 +15,9 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Solid.Bootstrapping" version="2.3.2" />
-      <dependency id="Solid.Extensibility" version="2.3.2" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.4" />
+      <dependency id="Solid.Bootstrapping" version="2.3.3" />
+      <dependency id="Solid.Extensibility" version="2.3.3" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.5" />
       <dependency id="Unity" version="5.11.10" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
diff --git a/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory/contents/LogoFX.Client.Mvvm.ViewModelFactory.nuspec b/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory/contents/LogoFX.Client.Mvvm.ViewModelFactory.nuspec
index c7d825b..aaca55b 100644
--- a/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory/contents/LogoFX.Client.Mvvm.ViewModelFactory.nuspec
+++ b/devops/pack/LogoFX.Client.Mvvm.ViewModelFactory/contents/LogoFX.Client.Mvvm.ViewModelFactory.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>LogoFX.Client.Mvvm.ViewModelFactory</id>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
     <title>LogoFX.Client.Mvvm.ViewModelFactory</title>
     <authors>Gennady Verdel</authors>
     <owners>Gennady Verdel</owners>
@@ -15,10 +15,10 @@
     <releaseNotes>
     </releaseNotes>
     <dependencies>
-      <dependency id="Solid.Bootstrapping" version="2.3.2" />
-      <dependency id="Solid.Extensibility" version="2.3.2" />
-      <dependency id="Solid.Practices.Middleware" version="2.3.2" />
-      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.4" />
+      <dependency id="Solid.Bootstrapping" version="2.3.3" />
+      <dependency id="Solid.Extensibility" version="2.3.3" />
+      <dependency id="Solid.Practices.Middleware" version="2.3.3" />
+      <dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.5" />
     </dependencies>
     <tags>framework logofx dotnet</tags>
     <repository type="Open Source" url="https://github.com/LogoFX/mvvm" />
diff --git a/devops/publish/publish-all.bat b/devops/publish/publish-all.bat
index b2a58e4..cded31c 100644
--- a/devops/publish/publish-all.bat
+++ b/devops/publish/publish-all.bat
@@ -2,7 +2,7 @@ cd ../../src
 nuget restore
 cd ../devops/publish
 PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '../build/build-all.ps1'"
-SET package_version=2.2.4
+SET package_version=2.2.5
 cd ../test
 call test-all
 cd ../pack
diff --git a/devops/publish/publish-single.bat b/devops/publish/publish-single.bat
index 66e2280..ceee6a7 100644
--- a/devops/publish/publish-single.bat
+++ b/devops/publish/publish-single.bat
@@ -1,5 +1,5 @@
 SET package_name=%1
-SET package_version=2.2.4
+SET package_version=2.2.5
 SET target=../../../../packages/Tests-All
 cd ../build
 call build-all
diff --git a/devops/update/UpdateUtil/Properties/launchSettings.json b/devops/update/UpdateUtil/Properties/launchSettings.json
index 552ca5f..4ee3956 100644
--- a/devops/update/UpdateUtil/Properties/launchSettings.json
+++ b/devops/update/UpdateUtil/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "UpdateUtil": {
       "commandName": "Project",
-      "commandLineArgs": "Solid 2.3.2"
+      "commandLineArgs": "Solid 2.3.3"
     }
   }
 }
\ No newline at end of file
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj b/src/LogoFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj
index 4d4de21..867ca37 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <UseWPF>true</UseWPF>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <AssemblyName>LogoFX.Client.Mvvm.Commanding.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.Commanding</RootNamespace>
   </PropertyGroup>
@@ -31,8 +31,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
-    <PackageReference Include="LogoFX.Client.Core" Version="2.2.4" />
-    <PackageReference Include="Solid.Bootstrapping" Version="2.3.2" />
+    <PackageReference Include="LogoFX.Client.Core" Version="2.2.5" />
+    <PackageReference Include="Solid.Bootstrapping" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LogoFX.Client.Mvvm.Commanding\LogoFX.Client.Mvvm.Commanding.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/netcore/LogoFX.Client.Mvvm.Commanding.Platform.NETCore.csproj b/src/LogoFX.Client.Mvvm.Commanding.Platform/netcore/LogoFX.Client.Mvvm.Commanding.Platform.NETCore.csproj
index a5bea8f..2986cba 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/netcore/LogoFX.Client.Mvvm.Commanding.Platform.NETCore.csproj
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/netcore/LogoFX.Client.Mvvm.Commanding.Platform.NETCore.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <UseWPF>true</UseWPF>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <AssemblyName>LogoFX.Client.Mvvm.Commanding.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.Commanding</RootNamespace>
   </PropertyGroup>
@@ -31,8 +31,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
-    <PackageReference Include="LogoFX.Client.Core" Version="2.2.4" />
-    <PackageReference Include="Solid.Bootstrapping" Version="2.3.2" />
+    <PackageReference Include="LogoFX.Client.Core" Version="2.2.5" />
+    <PackageReference Include="Solid.Bootstrapping" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LogoFX.Client.Mvvm.Commanding\LogoFX.Client.Mvvm.Commanding.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/LogoFX.Client.Mvvm.Commanding.Platform.NETFramework.csproj b/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/LogoFX.Client.Mvvm.Commanding.Platform.NETFramework.csproj
index b2c04e7..1bb85c1 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/LogoFX.Client.Mvvm.Commanding.Platform.NETFramework.csproj
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/LogoFX.Client.Mvvm.Commanding.Platform.NETFramework.csproj
@@ -75,13 +75,13 @@
     <PackageReference Include="Expression.Blend.Sdk">
       <Version>1.0.2</Version>
     </PackageReference>
-    <PackageReference Include="LogoFX.Client.Core" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Core" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
     <PackageReference Include="Solid.Bootstrapping">
-      <Version>2.3.2</Version>
+      <Version>2.3.3</Version>
     </PackageReference>
     <PackageReference Include="Solid.Extensibility">
-      <Version>2.3.2</Version>
+      <Version>2.3.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/Properties/AssemblyInfo.cs
index 6b7de40..572c7a4 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalysisResult.cs b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalysisResult.cs
index e6d3c06..ced1927 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalysisResult.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalysisResult.cs
@@ -1,22 +1,11 @@
-using System;
 using System.Windows.Input;
-using System.Reflection;
 
 #if NET || NETCORE || NETFRAMEWORK
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Interactivity;
-using System.Windows.Markup;
-using System.Windows.Media;
 #endif
 
 #if NETFX_CORE
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
 #endif
 
 namespace LogoFX.Client.Mvvm.Commanding
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalyzer.cs b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalyzer.cs
index 18c8c9a..654c11d 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalyzer.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ElementAnalyzer.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Windows.Input;
 using System.Reflection;
 using LogoFX.Client.Core;
@@ -6,17 +5,11 @@
 #if NET || NETCORE || NETFRAMEWORK
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Interactivity;
-using System.Windows.Markup;
 using System.Windows.Media;
 #endif
 
 #if NETFX_CORE
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 #endif
 
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ExecuteNamedCommandAction.cs b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ExecuteNamedCommandAction.cs
index c887528..e4bf293 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ExecuteNamedCommandAction.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/ExecuteNamedCommandAction.cs
@@ -1,16 +1,12 @@
 using System;
 using System.Windows.Input;
 using System.Globalization;
-using System.Reflection;
-using LogoFX.Client.Core;
 
 #if NET || NETCORE || NETFRAMEWORK
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Interactivity;
 using System.Windows.Markup;
-using System.Windows.Media;
 #endif
 
 #if NETFX_CORE
@@ -18,7 +14,6 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
 #endif
 
 namespace LogoFX.Client.Mvvm.Commanding
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/Extensions.cs b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/Extensions.cs
index aca0144..1ec6208 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/src/Extensions.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/src/Extensions.cs
@@ -1,6 +1,5 @@
 using Solid.Bootstrapping;
 using Solid.Extensibility;
-using Solid.Practices.Middleware;
 
 namespace LogoFX.Client.Mvvm.Commanding
 {
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj b/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj
index 98faf15..cd20d1d 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj
@@ -136,8 +136,8 @@
     <EmbeddedResource Include="Properties\LogoFX.Client.Mvvm.Commanding.Platform.UWP.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Core" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
@@ -145,13 +145,13 @@
       <Version>2.0.1</Version>
     </PackageReference>
     <PackageReference Include="Solid.Bootstrapping">
-      <Version>2.3.2</Version>
+      <Version>2.3.3</Version>
     </PackageReference>
     <PackageReference Include="Solid.Extensibility">
-      <Version>2.3.2</Version>
+      <Version>2.3.3</Version>
     </PackageReference>
     <PackageReference Include="Solid.Practices.Middleware">
-      <Version>2.3.2</Version>
+      <Version>2.3.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/Properties/AssemblyInfo.cs
index 9a712c3..15b4625 100644
--- a/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding.Platform/uwp/Properties/AssemblyInfo.cs
@@ -20,6 +20,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
 [assembly: ComVisible(false)]
diff --git a/src/LogoFX.Client.Mvvm.Commanding/ActionCommandExtensions.cs b/src/LogoFX.Client.Mvvm.Commanding/ActionCommandExtensions.cs
index 00faab2..6115088 100644
--- a/src/LogoFX.Client.Mvvm.Commanding/ActionCommandExtensions.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding/ActionCommandExtensions.cs
@@ -4,7 +4,7 @@
 using System.Linq.Expressions;
 using System.Reactive.Linq;
 using System.Windows.Input;
-using LogoFX.Client.Core;
+using LogoFX.Core;
 
 namespace LogoFX.Client.Mvvm.Commanding
 {
diff --git a/src/LogoFX.Client.Mvvm.Commanding/CommandBaseOfT.cs b/src/LogoFX.Client.Mvvm.Commanding/CommandBaseOfT.cs
index 8f88b14..203e079 100644
--- a/src/LogoFX.Client.Mvvm.Commanding/CommandBaseOfT.cs
+++ b/src/LogoFX.Client.Mvvm.Commanding/CommandBaseOfT.cs
@@ -4,7 +4,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Windows.Input;
-using LogoFX.Client.Core;
+using LogoFX.Core;
 
 namespace LogoFX.Client.Mvvm.Commanding
 {
diff --git a/src/LogoFX.Client.Mvvm.Commanding/LogoFX.Client.Mvvm.Commanding.csproj b/src/LogoFX.Client.Mvvm.Commanding/LogoFX.Client.Mvvm.Commanding.csproj
index 4ee21f5..01c1115 100644
--- a/src/LogoFX.Client.Mvvm.Commanding/LogoFX.Client.Mvvm.Commanding.csproj
+++ b/src/LogoFX.Client.Mvvm.Commanding/LogoFX.Client.Mvvm.Commanding.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />
     <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/net/LogoFX.Client.Mvvm.Core.Platform.NET.csproj b/src/LogoFX.Client.Mvvm.Core.Platform/net/LogoFX.Client.Mvvm.Core.Platform.NET.csproj
index 9ef57f8..741a215 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/net/LogoFX.Client.Mvvm.Core.Platform.NET.csproj
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/net/LogoFX.Client.Mvvm.Core.Platform.NET.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.Core.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.Core</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\net\Release\</OutputPath>
@@ -20,6 +20,6 @@
     <Compile Include="..\src\NotificationHelperDp.cs" Link="NotificationHelperDp.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/netcore/LogoFX.Client.Mvvm.Core.Platform.NETCore.csproj b/src/LogoFX.Client.Mvvm.Core.Platform/netcore/LogoFX.Client.Mvvm.Core.Platform.NETCore.csproj
index 6d89178..649b538 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/netcore/LogoFX.Client.Mvvm.Core.Platform.NETCore.csproj
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/netcore/LogoFX.Client.Mvvm.Core.Platform.NETCore.csproj
@@ -5,7 +5,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.Core.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.Core</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\netcore\Release\</OutputPath>
@@ -20,6 +20,6 @@
     <Compile Include="..\src\NotificationHelperDp.cs" Link="NotificationHelperDp.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/netframework/LogoFX.Client.Mvvm.Core.Platform.NETFramework.csproj b/src/LogoFX.Client.Mvvm.Core.Platform/netframework/LogoFX.Client.Mvvm.Core.Platform.NETFramework.csproj
index dc6c804..71a2659 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/netframework/LogoFX.Client.Mvvm.Core.Platform.NETFramework.csproj
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/netframework/LogoFX.Client.Mvvm.Core.Platform.NETFramework.csproj
@@ -53,7 +53,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />    
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />    
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.Core.Platform/netframework/Properties/AssemblyInfo.cs
index 396c777..9ff33ea 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/src/BindNotifier.cs b/src/LogoFX.Client.Mvvm.Core.Platform/src/BindNotifier.cs
index c260882..ce7b3e5 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/src/BindNotifier.cs
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/src/BindNotifier.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 #if NET || NETCORE || NETFRAMEWORK
-using System.Windows;
 using System.Windows.Data;
 #endif
 #if NETFX_CORE
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/src/NotificationHelperDp.cs b/src/LogoFX.Client.Mvvm.Core.Platform/src/NotificationHelperDp.cs
index 9a18489..9c59d80 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/src/NotificationHelperDp.cs
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/src/NotificationHelperDp.cs
@@ -5,7 +5,6 @@
 #endif
 #if NETFX_CORE
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
 #endif
 
 namespace LogoFX.Client.Mvvm.Core
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/uwp/LogoFX.Client.Mvvm.Core.Platform.UWP.csproj b/src/LogoFX.Client.Mvvm.Core.Platform/uwp/LogoFX.Client.Mvvm.Core.Platform.UWP.csproj
index af9259a..7cd5fb7 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/uwp/LogoFX.Client.Mvvm.Core.Platform.UWP.csproj
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/uwp/LogoFX.Client.Mvvm.Core.Platform.UWP.csproj
@@ -116,7 +116,7 @@
     <EmbeddedResource Include="Properties\LogoFX.Client.Mvvm.Core.Platform.UWP.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
diff --git a/src/LogoFX.Client.Mvvm.Core.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.Core.Platform/uwp/Properties/AssemblyInfo.cs
index b6d5f3f..c0ed567 100644
--- a/src/LogoFX.Client.Mvvm.Core.Platform/uwp/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.Core.Platform/uwp/Properties/AssemblyInfo.cs
@@ -20,6 +20,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
 [assembly: ComVisible(false)]
diff --git a/src/LogoFX.Client.Mvvm.Model.Contracts/LogoFX.Client.Mvvm.Model.Contracts.csproj b/src/LogoFX.Client.Mvvm.Model.Contracts/LogoFX.Client.Mvvm.Model.Contracts.csproj
index f57f20d..be60c22 100644
--- a/src/LogoFX.Client.Mvvm.Model.Contracts/LogoFX.Client.Mvvm.Model.Contracts.csproj
+++ b/src/LogoFX.Client.Mvvm.Model.Contracts/LogoFX.Client.Mvvm.Model.Contracts.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <IsPackable>false</IsPackable>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>LogoFX.pfx</AssemblyOriginatorKeyFile>
diff --git a/src/LogoFX.Client.Mvvm.Model.Specs/LogoFX.Client.Mvvm.Model.Specs.csproj b/src/LogoFX.Client.Mvvm.Model.Specs/LogoFX.Client.Mvvm.Model.Specs.csproj
index 3993dfc..6293950 100644
--- a/src/LogoFX.Client.Mvvm.Model.Specs/LogoFX.Client.Mvvm.Model.Specs.csproj
+++ b/src/LogoFX.Client.Mvvm.Model.Specs/LogoFX.Client.Mvvm.Model.Specs.csproj
@@ -8,13 +8,13 @@
     <OutputPath>bin\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.3" />
     <PackageReference Include="FluentAssertions" Version="6.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="SpecFlow" Version="3.9.22" />
+    <PackageReference Include="SpecFlow" Version="3.9.40" />
     <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
-    <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.22" />
-    <PackageReference Include="SpecFlow.xUnit" Version="3.9.22" />
+    <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
+    <PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/LogoFX.Client.Mvvm.Model/EditableModel/EditableModel.SetPropertyOptions.cs b/src/LogoFX.Client.Mvvm.Model/EditableModel/EditableModel.SetPropertyOptions.cs
index 3d90889..e11b7d9 100644
--- a/src/LogoFX.Client.Mvvm.Model/EditableModel/EditableModel.SetPropertyOptions.cs
+++ b/src/LogoFX.Client.Mvvm.Model/EditableModel/EditableModel.SetPropertyOptions.cs
@@ -1,4 +1,4 @@
-using LogoFX.Client.Core;
+using LogoFX.Core;
 
 namespace LogoFX.Client.Mvvm.Model
 {
diff --git a/src/LogoFX.Client.Mvvm.Model/LogoFX.Client.Mvvm.Model.csproj b/src/LogoFX.Client.Mvvm.Model/LogoFX.Client.Mvvm.Model.csproj
index 10d4784..905550c 100644
--- a/src/LogoFX.Client.Mvvm.Model/LogoFX.Client.Mvvm.Model.csproj
+++ b/src/LogoFX.Client.Mvvm.Model/LogoFX.Client.Mvvm.Model.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>LogoFX.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -19,10 +19,10 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
-    <PackageReference Include="Solid.Patterns.ChainOfResponsibility" Version="2.3.2" />
-    <PackageReference Include="Solid.Patterns.Memento" Version="2.3.2" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
+    <PackageReference Include="Solid.Patterns.ChainOfResponsibility" Version="2.3.3" />
+    <PackageReference Include="Solid.Patterns.Memento" Version="2.3.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/LogoFX.Client.Mvvm.View.Extensions/net/LogoFX.Client.Mvvm.View.Extensions.NET.csproj b/src/LogoFX.Client.Mvvm.View.Extensions/net/LogoFX.Client.Mvvm.View.Extensions.NET.csproj
index 078c37e..9ad09cc 100644
--- a/src/LogoFX.Client.Mvvm.View.Extensions/net/LogoFX.Client.Mvvm.View.Extensions.NET.csproj
+++ b/src/LogoFX.Client.Mvvm.View.Extensions/net/LogoFX.Client.Mvvm.View.Extensions.NET.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>LogoFX.Client.Mvvm.View.Extensions</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.View.Extensions</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\net\Release\</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.View.Extensions/netcore/LogoFX.Client.Mvvm.View.Extensions.NETCore.csproj b/src/LogoFX.Client.Mvvm.View.Extensions/netcore/LogoFX.Client.Mvvm.View.Extensions.NETCore.csproj
index a76a63a..7111d9d 100644
--- a/src/LogoFX.Client.Mvvm.View.Extensions/netcore/LogoFX.Client.Mvvm.View.Extensions.NETCore.csproj
+++ b/src/LogoFX.Client.Mvvm.View.Extensions/netcore/LogoFX.Client.Mvvm.View.Extensions.NETCore.csproj
@@ -5,7 +5,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>LogoFX.Client.Mvvm.View.Extensions</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.View.Extensions</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\netcore\Release\</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.View.Extensions/netframework/LogoFX.Client.Mvvm.View.Extensions.NETFramework.csproj b/src/LogoFX.Client.Mvvm.View.Extensions/netframework/LogoFX.Client.Mvvm.View.Extensions.NETFramework.csproj
index 1caa164..1bd540b 100644
--- a/src/LogoFX.Client.Mvvm.View.Extensions/netframework/LogoFX.Client.Mvvm.View.Extensions.NETFramework.csproj
+++ b/src/LogoFX.Client.Mvvm.View.Extensions/netframework/LogoFX.Client.Mvvm.View.Extensions.NETFramework.csproj
@@ -62,11 +62,11 @@
       <Name>LogoFX.Client.Mvvm.Core.Platform.NETFramework</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\LogoFX.Client.Mvvm.ViewModel.Extensions.Platform\netframework\LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETFramework.csproj">
-      <Project>{f7e89e24-85a4-4b72-b726-af623a039e3d}</Project>
+      <Project>{F7E89E24-85A4-4B72-B726-AF623A039E3D}</Project>
       <Name>LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETFramework</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\LogoFX.Client.Mvvm.ViewModel.Extensions\LogoFX.Client.Mvvm.ViewModel.Extensions.csproj">
-      <Project>{da4a44fa-f705-47b6-b1b5-15bd8f80d811}</Project>
+      <Project>{DA4A44FA-F705-47B6-B1B5-15BD8F80D811}</Project>
       <Name>LogoFX.Client.Mvvm.ViewModel.Extensions</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/LogoFX.Client.Mvvm.View.Extensions/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.View.Extensions/netframework/Properties/AssemblyInfo.cs
index 39b7c9d..1768204 100644
--- a/src/LogoFX.Client.Mvvm.View.Extensions/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.View.Extensions/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.View.Platform.Tests/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.View.Platform.Tests/Properties/AssemblyInfo.cs
index 341ac8b..0da56cb 100644
--- a/src/LogoFX.Client.Mvvm.View.Platform.Tests/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.View.Platform.Tests/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("96e00ce9-3fc1-47c7-a2ea-51bb168a605a")]
 
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.View.Platform/net/LogoFX.Client.Mvvm.View.Platform.NET.csproj b/src/LogoFX.Client.Mvvm.View.Platform/net/LogoFX.Client.Mvvm.View.Platform.NET.csproj
index 76e9732..59926e2 100644
--- a/src/LogoFX.Client.Mvvm.View.Platform/net/LogoFX.Client.Mvvm.View.Platform.NET.csproj
+++ b/src/LogoFX.Client.Mvvm.View.Platform/net/LogoFX.Client.Mvvm.View.Platform.NET.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.View.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.View</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NET</DefineConstants>
@@ -98,7 +98,7 @@
     <Folder Include="TriggerActions\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LogoFX.Client.Mvvm.View\LogoFX.Client.Mvvm.View.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.View.Platform/netcore/LogoFX.Client.Mvvm.View.Platform.NETCore.csproj b/src/LogoFX.Client.Mvvm.View.Platform/netcore/LogoFX.Client.Mvvm.View.Platform.NETCore.csproj
index f9040cf..b377fb4 100644
--- a/src/LogoFX.Client.Mvvm.View.Platform/netcore/LogoFX.Client.Mvvm.View.Platform.NETCore.csproj
+++ b/src/LogoFX.Client.Mvvm.View.Platform/netcore/LogoFX.Client.Mvvm.View.Platform.NETCore.csproj
@@ -5,7 +5,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.View.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.View</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETCORE</DefineConstants>
@@ -98,7 +98,7 @@
     <Folder Include="TriggerActions\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LogoFX.Client.Mvvm.View\LogoFX.Client.Mvvm.View.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.View.Platform/netframework/LogoFX.Client.Mvvm.View.Platform.NETFramework.csproj b/src/LogoFX.Client.Mvvm.View.Platform/netframework/LogoFX.Client.Mvvm.View.Platform.NETFramework.csproj
index 57e16e0..4559796 100644
--- a/src/LogoFX.Client.Mvvm.View.Platform/netframework/LogoFX.Client.Mvvm.View.Platform.NETFramework.csproj
+++ b/src/LogoFX.Client.Mvvm.View.Platform/netframework/LogoFX.Client.Mvvm.View.Platform.NETFramework.csproj
@@ -256,7 +256,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />   
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />   
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LogoFX.Client.Mvvm.View\LogoFX.Client.Mvvm.View.csproj">
diff --git a/src/LogoFX.Client.Mvvm.View.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.View.Platform/netframework/Properties/AssemblyInfo.cs
index d47e028..1aa0841 100644
--- a/src/LogoFX.Client.Mvvm.View.Platform/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.View.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.View.Platform/src/MarkupExtensions/LocalizedStringMarkupExtension.cs b/src/LogoFX.Client.Mvvm.View.Platform/src/MarkupExtensions/LocalizedStringMarkupExtension.cs
index 56381cf..82a5002 100644
--- a/src/LogoFX.Client.Mvvm.View.Platform/src/MarkupExtensions/LocalizedStringMarkupExtension.cs
+++ b/src/LogoFX.Client.Mvvm.View.Platform/src/MarkupExtensions/LocalizedStringMarkupExtension.cs
@@ -1,7 +1,7 @@
 #if NET || NETCORE || NETFRAMEWORK
 using System;
-using LogoFX.Client.Core;
 using LogoFX.Client.Mvvm.View.Localization;
+using LogoFX.Core;
 
 namespace LogoFX.Client.Mvvm.View.MarkupExtensions
 {
diff --git a/src/LogoFX.Client.Mvvm.View.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.View.Platform/uwp/Properties/AssemblyInfo.cs
index 838e613..b641fe7 100644
--- a/src/LogoFX.Client.Mvvm.View.Platform/uwp/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.View.Platform/uwp/Properties/AssemblyInfo.cs
@@ -21,6 +21,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
 [assembly: ComVisible(false)]
diff --git a/src/LogoFX.Client.Mvvm.View/LogoFX.Client.Mvvm.View.csproj b/src/LogoFX.Client.Mvvm.View/LogoFX.Client.Mvvm.View.csproj
index 0f75063..07fc01a 100644
--- a/src/LogoFX.Client.Mvvm.View/LogoFX.Client.Mvvm.View.csproj
+++ b/src/LogoFX.Client.Mvvm.View/LogoFX.Client.Mvvm.View.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Contracts/LogoFX.Client.Mvvm.ViewModel.Contracts.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Contracts/LogoFX.Client.Mvvm.ViewModel.Contracts.csproj
index b1b8a4f..5202ccf 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Contracts/LogoFX.Client.Mvvm.ViewModel.Contracts.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Contracts/LogoFX.Client.Mvvm.ViewModel.Contracts.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests.csproj
index 49d5d1c..92a60aa 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests/LogoFX.Client.Mvvm.ViewModel.Extensions.IntegrationTests.csproj
@@ -12,11 +12,11 @@
     <PackageReference Include="FluentAssertions">
       <Version>5.10.3</Version>
     </PackageReference>
-    <PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Testing.Integration.xUnit" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Testing.Integration.xUnit" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="xunit.core">
       <Version>2.4.1</Version>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/net/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NET.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/net/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NET.csproj
index 22d8809..b702241 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/net/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NET.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/net/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NET.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.ViewModel.Extensions.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.ViewModel.Extensions</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\net\Release\</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETCore.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETCore.csproj
index 8d9f293..a778830 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETCore.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETCore.csproj
@@ -5,7 +5,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.ViewModel.Extensions.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.ViewModel.Extensions</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\netcore\Release\</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETFramework.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETFramework.csproj
index 3d414ab..df50764 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETFramework.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.NETFramework.csproj
@@ -125,7 +125,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/Properties/AssemblyInfo.cs
index dbce3e2..aefd7d8 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.UWP.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.UWP.csproj
index 2b948c7..7656c53 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.UWP.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform.UWP.csproj
@@ -185,7 +185,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/Properties/AssemblyInfo.cs
index 3b73ed0..af4c65b 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Platform/uwp/Properties/AssemblyInfo.cs
@@ -20,6 +20,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
 [assembly: ComVisible(false)]
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs.csproj
index 329ac2b..4983501 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs/LogoFX.Client.Mvvm.ViewModel.Extensions.Specs.csproj
@@ -12,24 +12,24 @@
     <Compile Include="..\LogoFX.Client.Mvvm.ViewModel.Extensions.Tests\SimpleEditableModel.cs" Link="Model\SimpleEditableModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.2" />
+    <PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.3" />
     <PackageReference Include="FluentAssertions" Version="6.1.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
-    <PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Bootstrapping.Testing" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Tests.Shared" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Bootstrapping.Testing" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Tests.Shared" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SpecFlow" Version="3.9.22" />
+    <PackageReference Include="SpecFlow" Version="3.9.40" />
     <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
-    <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.22" />
-    <PackageReference Include="SpecFlow.xUnit" Version="3.9.22" />
+    <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.40" />
+    <PackageReference Include="SpecFlow.xUnit" Version="3.9.40" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Mvvm.Model\LogoFX.Client.Mvvm.Model.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Extensions/LogoFX.Client.Mvvm.ViewModel.Extensions.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Extensions/LogoFX.Client.Mvvm.ViewModel.Extensions.csproj
index 0a20829..b4cffcc 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Extensions/LogoFX.Client.Mvvm.ViewModel.Extensions.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Extensions/LogoFX.Client.Mvvm.ViewModel.Extensions.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Mvvm.Commanding\LogoFX.Client.Mvvm.Commanding.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Platform/net/LogoFX.Client.Mvvm.ViewModel.Platform.NET.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Platform/net/LogoFX.Client.Mvvm.ViewModel.Platform.NET.csproj
index f4472f6..2321a7f 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Platform/net/LogoFX.Client.Mvvm.ViewModel.Platform.NET.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Platform/net/LogoFX.Client.Mvvm.ViewModel.Platform.NET.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.ViewModel.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.ViewModel</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\net\Release\</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Platform.NETCore.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Platform.NETCore.csproj
index b2109e6..e393527 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Platform.NETCore.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Platform.NETCore.csproj
@@ -5,7 +5,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>LogoFX.Client.Mvvm.ViewModel.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.ViewModel</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\Bin\netcore\Release\</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.ViewModel.Platform/netframework/Properties/AssemblyInfo.cs
index 843009b..44b677c 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Platform/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Platform.UWP.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Platform.UWP.csproj
index acc4288..38e902f 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Platform.UWP.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/LogoFX.Client.Mvvm.ViewModel.Platform.UWP.csproj
@@ -129,8 +129,8 @@
     <EmbeddedResource Include="Properties\LogoFX.Client.Mvvm.ViewModel.Platform.UWP.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.13</Version>
     </PackageReference>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/Properties/AssemblyInfo.cs
index b27ba7a..34554c2 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Platform/uwp/Properties/AssemblyInfo.cs
@@ -21,7 +21,7 @@
 //      Revision
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:[assembly: AssemblyVersion("2.2.4")
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+// by using the '*' as shown below:[assembly: AssemblyVersion("2.2.5")
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
 [assembly: ComVisible(false)]
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Services.Middleware/LogoFX.Client.Mvvm.ViewModel.Services.Middleware.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Services.Middleware/LogoFX.Client.Mvvm.ViewModel.Services.Middleware.csproj
index b379b44..e110237 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Services.Middleware/LogoFX.Client.Mvvm.ViewModel.Services.Middleware.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Services.Middleware/LogoFX.Client.Mvvm.ViewModel.Services.Middleware.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Solid.Bootstrapping" Version="2.3.2" />
+    <PackageReference Include="Solid.Bootstrapping" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Mvvm.ViewModel.Services\LogoFX.Client.Mvvm.ViewModel.Services.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/net/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NET.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/net/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NET.csproj
index e00cd39..fdeb317 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/net/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NET.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/net/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NET.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>LogoFX.Client.Mvvm.ViewModel.Services.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.ViewModel.Services</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETCORE</DefineConstants>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NETCore.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NETCore.csproj
index a30acfa..a742d96 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NETCore.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netcore/LogoFX.Client.Mvvm.ViewModel.Services.Platform.NETCore.csproj
@@ -4,7 +4,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>LogoFX.Client.Mvvm.ViewModel.Services.Platform</AssemblyName>
     <RootNamespace>LogoFX.Client.Mvvm.ViewModel.Services</RootNamespace>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETCORE</DefineConstants>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netframework/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netframework/Properties/AssemblyInfo.cs
index ebef71a..5cd45e6 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netframework/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/netframework/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/uwp/Properties/AssemblyInfo.cs b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/uwp/Properties/AssemblyInfo.cs
index 68d2b49..43c5be4 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/uwp/Properties/AssemblyInfo.cs
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Services.Platform/uwp/Properties/AssemblyInfo.cs
@@ -20,6 +20,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.2.4")]
-[assembly: AssemblyFileVersion("2.2.4")]
+[assembly: AssemblyVersion("2.2.5")]
+[assembly: AssemblyFileVersion("2.2.5")]
 [assembly: ComVisible(false)]
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Services/LogoFX.Client.Mvvm.ViewModel.Services.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Services/LogoFX.Client.Mvvm.ViewModel.Services.csproj
index 2502328..4185d94 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Services/LogoFX.Client.Mvvm.ViewModel.Services.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Services/LogoFX.Client.Mvvm.ViewModel.Services.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,7 +12,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Solid.Practices.IoC" Version="2.3.2" />
+    <PackageReference Include="Solid.Practices.IoC" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Mvvm.ViewModel.Contracts\LogoFX.Client.Mvvm.ViewModel.Contracts.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Shared/LogoFX.Client.Mvvm.ViewModel.Shared.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Shared/LogoFX.Client.Mvvm.ViewModel.Shared.csproj
index 2c705ff..afe9799 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Shared/LogoFX.Client.Mvvm.ViewModel.Shared.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Shared/LogoFX.Client.Mvvm.ViewModel.Shared.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
diff --git a/src/LogoFX.Client.Mvvm.ViewModel.Tests/LogoFX.Client.Mvvm.ViewModel.Tests.csproj b/src/LogoFX.Client.Mvvm.ViewModel.Tests/LogoFX.Client.Mvvm.ViewModel.Tests.csproj
index 0dd2a28..f091078 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel.Tests/LogoFX.Client.Mvvm.ViewModel.Tests.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel.Tests/LogoFX.Client.Mvvm.ViewModel.Tests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="LogoFX.Client.Tests.Shared" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Tests.Shared" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
diff --git a/src/LogoFX.Client.Mvvm.ViewModel/LogoFX.Client.Mvvm.ViewModel.csproj b/src/LogoFX.Client.Mvvm.ViewModel/LogoFX.Client.Mvvm.ViewModel.csproj
index eb93000..4f18ff8 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel/LogoFX.Client.Mvvm.ViewModel.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModel/LogoFX.Client.Mvvm.ViewModel.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,8 +12,8 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
-    <PackageReference Include="LogoFX.Core" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.5" />
+    <PackageReference Include="LogoFX.Core" Version="2.2.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Mvvm.ViewModel.Contracts\LogoFX.Client.Mvvm.ViewModel.Contracts.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.ViewModel/ViewModelBase.cs b/src/LogoFX.Client.Mvvm.ViewModel/ViewModelBase.cs
index 2e6d256..c0b9ac7 100644
--- a/src/LogoFX.Client.Mvvm.ViewModel/ViewModelBase.cs
+++ b/src/LogoFX.Client.Mvvm.ViewModel/ViewModelBase.cs
@@ -5,6 +5,7 @@
 using System.Linq.Expressions;
 using LogoFX.Client.Core;
 using LogoFX.Client.Mvvm.ViewModel.Contracts;
+using LogoFX.Core;
 
 namespace LogoFX.Client.Mvvm.ViewModel
 {
diff --git a/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests.csproj b/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests.csproj
index 3d4a2aa..f5986c6 100644
--- a/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.1.0" />
-    <PackageReference Include="LogoFX.Practices.IoC" Version="2.2.4" />
+    <PackageReference Include="LogoFX.Practices.IoC" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
diff --git a/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.csproj b/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.csproj
index 40b02de..5e05c44 100644
--- a/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer/LogoFX.Client.Mvvm.ViewModelFactory.SimpleContainer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,9 +12,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LogoFX.Practices.IoC" Version="2.2.4" />
-    <PackageReference Include="Solid.Bootstrapping" Version="2.3.2" />
-    <PackageReference Include="Solid.Extensibility" Version="2.3.2" />
+    <PackageReference Include="LogoFX.Practices.IoC" Version="2.2.5" />
+    <PackageReference Include="Solid.Bootstrapping" Version="2.3.3" />
+    <PackageReference Include="Solid.Extensibility" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Mvvm.ViewModelFactory\LogoFX.Client.Mvvm.ViewModelFactory.csproj" />
diff --git a/src/LogoFX.Client.Mvvm.ViewModelFactory.Unity/LogoFX.Client.Mvvm.ViewModelFactory.Unity.csproj b/src/LogoFX.Client.Mvvm.ViewModelFactory.Unity/LogoFX.Client.Mvvm.ViewModelFactory.Unity.csproj
index 4cd3b81..c2bf09d 100644
--- a/src/LogoFX.Client.Mvvm.ViewModelFactory.Unity/LogoFX.Client.Mvvm.ViewModelFactory.Unity.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModelFactory.Unity/LogoFX.Client.Mvvm.ViewModelFactory.Unity.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release\</OutputPath>
@@ -12,8 +12,8 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Solid.Bootstrapping" Version="2.3.2" />
-    <PackageReference Include="Solid.Extensibility" Version="2.3.2" />
+    <PackageReference Include="Solid.Bootstrapping" Version="2.3.3" />
+    <PackageReference Include="Solid.Extensibility" Version="2.3.3" />
     <PackageReference Include="Unity" Version="5.11.10" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/LogoFX.Client.Mvvm.ViewModelFactory/LogoFX.Client.Mvvm.ViewModelFactory.csproj b/src/LogoFX.Client.Mvvm.ViewModelFactory/LogoFX.Client.Mvvm.ViewModelFactory.csproj
index 1c81bc8..e69a4c5 100644
--- a/src/LogoFX.Client.Mvvm.ViewModelFactory/LogoFX.Client.Mvvm.ViewModelFactory.csproj
+++ b/src/LogoFX.Client.Mvvm.ViewModelFactory/LogoFX.Client.Mvvm.ViewModelFactory.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Version>2.2.4</Version>
+    <Version>2.2.5</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\Bin\netstandard\Release</OutputPath>
@@ -12,9 +12,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Solid.Bootstrapping" Version="2.3.2" />
-    <PackageReference Include="Solid.Extensibility" Version="2.3.2" />
-    <PackageReference Include="Solid.Practices.Middleware" Version="2.3.2" />
+    <PackageReference Include="Solid.Bootstrapping" Version="2.3.3" />
+    <PackageReference Include="Solid.Extensibility" Version="2.3.3" />
+    <PackageReference Include="Solid.Practices.Middleware" Version="2.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LogoFX.Client.Mvvm.ViewModel.Contracts\LogoFX.Client.Mvvm.ViewModel.Contracts.csproj" />