diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 3f43834..f982f87 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -31,7 +31,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.202'
+        dotnet-version: '6.x'
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.1
@@ -44,17 +44,14 @@ jobs:
     - name: Build WpfExtended project
       run: dotnet build WpfExtended -c $env:Configuration -p:SolutionDir=$env:GITHUB_WORKSPACE
 
-    - name: Push WpfExtended Nuget package
-      uses: brandedoutcast/publish-nuget@v2.5.5
-      with:
-         PROJECT_FILE_PATH: WpfExtended\WpfExtended.csproj
-         NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+    - name: Package WpfExtended
+      run: dotnet pack -c Release -o . WpfExtended\WpfExtended.csproj
 
     - name: Build WpfExtended.SourceGeneration project
       run: dotnet build WpfExtended.SourceGeneration -c $env:Configuration
 
-    - name: Push WpfExtended.SourceGeneration Nuget package
-      uses: brandedoutcast/publish-nuget@v2.5.5
-      with:
-         PROJECT_FILE_PATH: WpfExtended.SourceGeneration\WpfExtended.SourceGeneration.csproj
-         NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+    - name: Package WpfExtended.SourceGeneration
+      run: dotnet pack -c Release -o . WpfExtended.SourceGeneration\WpfExtended.SourceGeneration.csproj
+
+    - name: Publish
+      run: dotnet nuget push *.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 34b8852..8ac11b4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,7 +32,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.202'
+        dotnet-version: '6.x'
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.1
diff --git a/WpfExtended.Test/TestApplication/Launcher.cs b/WpfExtended.Test/TestApplication/Launcher.cs
index 55c3c83..170ce05 100644
--- a/WpfExtended.Test/TestApplication/Launcher.cs
+++ b/WpfExtended.Test/TestApplication/Launcher.cs
@@ -15,6 +15,12 @@ namespace WpfExtended.Tests
     {
         private static Launcher Instance { get; } = new Launcher();
 
+        [STAThread]
+        public static void Main()
+        {
+            Instance.Run();
+        }
+
         protected override void SetupServiceManager(IServiceManager serviceManager)
         {
             serviceManager.RegisterDebugLoggerFactory();
diff --git a/WpfExtended.Test/TestApplication/MainWindow.xaml.cs b/WpfExtended.Test/TestApplication/MainWindow.xaml.cs
index 5d363b7..82fb1c4 100644
--- a/WpfExtended.Test/TestApplication/MainWindow.xaml.cs
+++ b/WpfExtended.Test/TestApplication/MainWindow.xaml.cs
@@ -1,8 +1,8 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Extensions;
-using System.Http;
 using System.IO;
+using System.Net.Http;
 using System.Windows;
 using System.Windows.Extensions;
 using System.Windows.Media;
diff --git a/WpfExtended.Test/WpfExtended.Tests.csproj b/WpfExtended.Test/WpfExtended.Tests.csproj
index d11f0b0..fb9cedb 100644
--- a/WpfExtended.Test/WpfExtended.Tests.csproj
+++ b/WpfExtended.Test/WpfExtended.Tests.csproj
@@ -2,21 +2,22 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
+    <StartupObject>WpfExtended.Tests.Launcher</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FlaUI.UIA3" Version="3.2.0" />
-    <PackageReference Include="FluentAssertions" Version="6.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="Microsoft.TestPlatform" Version="16.11.0" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.11.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.1" />
+    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.TestPlatform" Version="17.2.0" />
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.2.0" />
+    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WpfExtended/WpfExtended.csproj b/WpfExtended/WpfExtended.csproj
index 2409514..c5dccb2 100644
--- a/WpfExtended/WpfExtended.csproj
+++ b/WpfExtended/WpfExtended.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>License.txt</PackageLicenseFile>
-    <Version>0.6.1</Version>
+    <Version>0.6.2</Version>
     <LangVersion>latest</LangVersion>
     <Description>Extension library for Windows Presentation Platform.
 
@@ -84,11 +84,11 @@ http://www.java2s.com/Open-Source/CSharp_Free_Code/Windows_Presentation_Foundati
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-    <PackageReference Include="Slim" Version="1.5.2" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.1" />
-    <PackageReference Include="SystemExtensions.NetStandard.DependencyInjection" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+    <PackageReference Include="Slim" Version="1.7.3" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.5.0" />
+    <PackageReference Include="SystemExtensions.NetStandard.DependencyInjection" Version="1.1.8" />
   </ItemGroup>
   <Import Project="ShaderCompiler.target" />
 </Project>