diff --git a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj
index 65375350..3c9cd228 100644
--- a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj
+++ b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj
@@ -17,7 +17,6 @@
-
RELEASE;NETSTANDARD2_0
@@ -29,10 +28,6 @@
-
-
-
-
diff --git a/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj b/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj
index f8fc4bcc..016fd0eb 100644
--- a/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj
+++ b/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj
@@ -13,11 +13,6 @@
snupkg
-
-
-
-
-
false
UAP,Version=v10.0
@@ -31,6 +26,10 @@
$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets
+
+
+
+
diff --git a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj
index f8fc4bcc..016fd0eb 100644
--- a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj
+++ b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj
@@ -13,11 +13,6 @@
snupkg
-
-
-
-
-
false
UAP,Version=v10.0
@@ -31,6 +26,10 @@
$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets
+
+
+
+
diff --git a/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj b/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj
index e04e711a..e5bb3be8 100644
--- a/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj
+++ b/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj
@@ -13,11 +13,6 @@
snupkg
-
-
-
-
-
false
UAP,Version=v10.0
@@ -31,6 +26,10 @@
$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets
+
+
+
+
diff --git a/Source/MQTTnet.Server/MQTTnet.Server.csproj b/Source/MQTTnet.Server/MQTTnet.Server.csproj
index 4f07a09d..e79b83f0 100644
--- a/Source/MQTTnet.Server/MQTTnet.Server.csproj
+++ b/Source/MQTTnet.Server/MQTTnet.Server.csproj
@@ -41,10 +41,10 @@
-
-
-
-
+
+
+
+
diff --git a/Source/MQTTnet/MQTTnet.csproj b/Source/MQTTnet/MQTTnet.csproj
index 970a4365..eddb941d 100644
--- a/Source/MQTTnet/MQTTnet.csproj
+++ b/Source/MQTTnet/MQTTnet.csproj
@@ -19,11 +19,6 @@
snupkg
-
-
-
-
-
false
UAP,Version=v10.0
@@ -49,6 +44,10 @@
RELEASE;NETSTANDARD1_3
+
+
+
+
diff --git a/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj b/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj
index 20094884..2e84d42f 100644
--- a/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj
+++ b/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj b/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj
index c7486d37..b709e804 100644
--- a/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj
+++ b/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/Tests/MQTTnet.Test.BlazorApp/Client/MQTTnet.Test.BlazorApp.Client.csproj b/Tests/MQTTnet.Test.BlazorApp/Client/MQTTnet.Test.BlazorApp.Client.csproj
index d1484fcc..cd4f7bb6 100644
--- a/Tests/MQTTnet.Test.BlazorApp/Client/MQTTnet.Test.BlazorApp.Client.csproj
+++ b/Tests/MQTTnet.Test.BlazorApp/Client/MQTTnet.Test.BlazorApp.Client.csproj
@@ -9,7 +9,7 @@
-
+