From a00783b9156d9b820ac3b51d8592588acea0c257 Mon Sep 17 00:00:00 2001
From: Magnus Lindhe <magnus.lindhe@emway.se>
Date: Tue, 1 Dec 2020 19:37:19 +0100
Subject: [PATCH] Migrate from netcoreapp3.0 to net5.0-windows

---
 .../AutomationTest/AvalonDockTest/AvalonDockTest.csproj   | 2 +-
 source/CaliburnDockTestApp/CaliburnDockTestApp.csproj     | 2 +-
 .../AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj  | 2 +-
 .../AvalonDock.Themes.Expression.csproj                   | 2 +-
 .../AvalonDock.Themes.Metro.csproj                        | 2 +-
 .../AvalonDock.Themes.VS2010.csproj                       | 2 +-
 .../AvalonDock.Themes.VS2013.csproj                       | 2 +-
 source/Components/AvalonDock/AvalonDock.csproj            | 4 ++--
 source/MLibTest/MLibTest/MLibTest.csproj                  | 8 ++++----
 .../ServiceLocator/ServiceLocator.csproj                  | 2 +-
 .../Settings/SettingsModel/SettingsModel.csproj           | 6 +++---
 source/MVVMTestApp/MVVMTestApp.csproj                     | 2 +-
 source/TestApp/TestApp.csproj                             | 2 +-
 source/WinFormsTestApp/WinFormsTestApp.csproj             | 4 ++--
 14 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj b/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj
index e6306b87..bca5175b 100644
--- a/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj
+++ b/source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net452</TargetFrameworks>
     <ProjectGuid>{FE4E16A2-876A-4356-9974-8A89C50B2A5A}</ProjectGuid>
     <RootNamespace>AvalonDockTest</RootNamespace>
     <AssemblyName>AvalonDockTest</AssemblyName>
diff --git a/source/CaliburnDockTestApp/CaliburnDockTestApp.csproj b/source/CaliburnDockTestApp/CaliburnDockTestApp.csproj
index ded258f2..69bf10fc 100644
--- a/source/CaliburnDockTestApp/CaliburnDockTestApp.csproj
+++ b/source/CaliburnDockTestApp/CaliburnDockTestApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net4.5.2</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4.5.2</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
diff --git a/source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj b/source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj
index adb11127..f92cb6d9 100644
--- a/source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj
+++ b/source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RootNamespace>AvalonDock.Themes</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj b/source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj
index 67303983..d7e59711 100644
--- a/source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj
+++ b/source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RootNamespace>AvalonDock.Themes</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/source/Components/AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj b/source/Components/AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj
index 98982e97..d1799bf2 100644
--- a/source/Components/AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj
+++ b/source/Components/AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RootNamespace>AvalonDock.Themes</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj b/source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj
index 94a45a51..1afd3338 100644
--- a/source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj
+++ b/source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RootNamespace>AvalonDock.Themes</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj b/source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj
index 3ff0f395..c96db58f 100644
--- a/source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj
+++ b/source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RootNamespace>AvalonDock.Themes</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/source/Components/AvalonDock/AvalonDock.csproj b/source/Components/AvalonDock/AvalonDock.csproj
index ac124054..c7c942d7 100644
--- a/source/Components/AvalonDock/AvalonDock.csproj
+++ b/source/Components/AvalonDock/AvalonDock.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RootNamespace>AvalonDock</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
@@ -19,7 +19,7 @@
     <Authors>https://github.com/Dirkster99/AvalonDock</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net.5.0-windows|AnyCPU'">
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/source/MLibTest/MLibTest/MLibTest.csproj b/source/MLibTest/MLibTest/MLibTest.csproj
index ea8b2504..68636244 100644
--- a/source/MLibTest/MLibTest/MLibTest.csproj
+++ b/source/MLibTest/MLibTest/MLibTest.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net4.5.2</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4.5.2</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0-windows|AnyCPU'">
     <DefineConstants />
   </PropertyGroup>
 
@@ -15,7 +15,7 @@
     <None Remove="Demos\Images\property-blue.png" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
       <Version>1.1.19</Version>
     </PackageReference>
diff --git a/source/MLibTest/MLibTest_Components/ServiceLocator/ServiceLocator.csproj b/source/MLibTest/MLibTest_Components/ServiceLocator/ServiceLocator.csproj
index 30341eb7..908108cd 100644
--- a/source/MLibTest/MLibTest_Components/ServiceLocator/ServiceLocator.csproj
+++ b/source/MLibTest/MLibTest_Components/ServiceLocator/ServiceLocator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net4.5</TargetFrameworks>
+    <TargetFrameworks>net5.0;net4.5</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/source/MLibTest/MLibTest_Components/Settings/SettingsModel/SettingsModel.csproj b/source/MLibTest/MLibTest_Components/Settings/SettingsModel/SettingsModel.csproj
index ce7fc99f..80769345 100644
--- a/source/MLibTest/MLibTest_Components/Settings/SettingsModel/SettingsModel.csproj
+++ b/source/MLibTest/MLibTest_Components/Settings/SettingsModel/SettingsModel.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net4.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net4.0</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <PackageReference Include="System.Security.Cryptography.ProtectedData">
       <Version>4.6.0</Version>
     </PackageReference>
diff --git a/source/MVVMTestApp/MVVMTestApp.csproj b/source/MVVMTestApp/MVVMTestApp.csproj
index 147851a2..3898ca5f 100644
--- a/source/MVVMTestApp/MVVMTestApp.csproj
+++ b/source/MVVMTestApp/MVVMTestApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
diff --git a/source/TestApp/TestApp.csproj b/source/TestApp/TestApp.csproj
index 0e2e2511..9b0413d8 100644
--- a/source/TestApp/TestApp.csproj
+++ b/source/TestApp/TestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
     <PropertyGroup>
         <RootNamespace>TestApp</RootNamespace>
-        <TargetFrameworks>netcoreapp3.0;net40</TargetFrameworks>
+        <TargetFrameworks>net5.0-windows;net40</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <UseWindowsForms>true</UseWindowsForms>
         <ApplicationIcon />
diff --git a/source/WinFormsTestApp/WinFormsTestApp.csproj b/source/WinFormsTestApp/WinFormsTestApp.csproj
index f3557ec2..21ff85f8 100644
--- a/source/WinFormsTestApp/WinFormsTestApp.csproj
+++ b/source/WinFormsTestApp/WinFormsTestApp.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net4.0</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;net4.0</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <StartupObject>AvalonDock.WinFormsTestApp.Program</StartupObject>