From 2ccacd4ae86a11890f6dfe96f472eff57bd96ba3 Mon Sep 17 00:00:00 2001
From: William Cameron <gnomorian@gmail.com>
Date: Thu, 25 Nov 2021 21:26:08 +1300
Subject: [PATCH 1/3] Migrate C++/CLI library to .NET 6

---
 CppCliInterop/CppCliInterop.vcxproj  | 20 ++++++++++----------
 ManagedLibrary/ManagedLibrary.csproj |  2 +-
 NativeApp/NativeApp.vcxproj          |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CppCliInterop/CppCliInterop.vcxproj b/CppCliInterop/CppCliInterop.vcxproj
index 8841fee..95ef59c 100644
--- a/CppCliInterop/CppCliInterop.vcxproj
+++ b/CppCliInterop/CppCliInterop.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{D72A5A0F-4FB0-4E11-ADE7-40CC377D06E9}</ProjectGuid>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>CppCliInterop</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
@@ -30,28 +30,28 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -143,16 +143,16 @@
     <!-- Reference all of Windows Forms -->
     <FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ManagedLibrary\ManagedLibrary.csproj">
-      <Project>{14da10c8-ac12-4456-aa41-740a5699ed97}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="CppCliInterop.runtimeconfig.json" CopyToOutputDirectory="PreserveNewest">
       <DeploymentContent>true</DeploymentContent>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ManagedLibrary\ManagedLibrary.csproj">
+      <Project>{14da10c8-ac12-4456-aa41-740a5699ed97}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/ManagedLibrary/ManagedLibrary.csproj b/ManagedLibrary/ManagedLibrary.csproj
index 46eef71..27f74cd 100644
--- a/ManagedLibrary/ManagedLibrary.csproj
+++ b/ManagedLibrary/ManagedLibrary.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net47;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
diff --git a/NativeApp/NativeApp.vcxproj b/NativeApp/NativeApp.vcxproj
index 95777f2..13a9dcd 100644
--- a/NativeApp/NativeApp.vcxproj
+++ b/NativeApp/NativeApp.vcxproj
@@ -29,26 +29,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

From 41e83d5601453b724f90d9f862dafe0722214004 Mon Sep 17 00:00:00 2001
From: William <gnomorian@gmail.com>
Date: Thu, 25 Nov 2021 21:38:12 +1300
Subject: [PATCH 2/3] Update ReadMe.md

added steps to migrate the .NET core project to .NET
---
 ReadMe.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ReadMe.md b/ReadMe.md
index 5fca30b..46de24c 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,3 +1,9 @@
+# Porting this project to .NET 5/6
+You can check out the dotnet branch for a buildable example.
+- Use Visual Studio 2022 and migrage the projects to v143
+- change the targetframework or targetframeworks in the ManagedLibrary to `net6.0-windows`. This is much easier in 2022 as targetframeworks is now listed in the properties rather than having to go hunting through the .csproj file.
+- Change the CppCliInterop library's TargetFramework to net6.0-windows either in the vcxproj file or in the properties project under Advanced.
+
 # Porting a C++/CLI Project to .NET Core
 
 One of the new features of Visual Studio 2019 version 16.4 and .NET Core 3.1 is the ability to build C++/CLI projects targeting .NET Core. This can be done either directly with *cl.exe* and *link.exe* (using the new `/clr:netcore` option) or via MSBuild (using `<CLRSupport>NetCore</CLRSupport>`). In this post, I'll walk through the steps necessary to migrate a simple C++/CLI interop project to .NET Core. More details can be found in [.NET Core documentation](https://docs.microsoft.com/dotnet/core/porting/cpp-cli).
@@ -78,4 +84,4 @@ Hopefully this sample shows how to take advantage of the new functionality in Vi
 
 * [C++/CLI .NET Core migration docs](https://docs.microsoft.com/dotnet/core/porting/cpp-cli)
 * [The sample used in this post](https://github.com/mjrousos/CppCliMigrationSample) (the original sample is in the master branch and the .NET Core updates are in the netcore branch)
-* [.NET Portability Analyzer](https://github.com/Microsoft/dotnet-apiport)
\ No newline at end of file
+* [.NET Portability Analyzer](https://github.com/Microsoft/dotnet-apiport)

From 7b64b691a20804516e03801ad2978d4b3987f8a4 Mon Sep 17 00:00:00 2001
From: William <gnomorian@gmail.com>
Date: Thu, 25 Nov 2021 21:41:18 +1300
Subject: [PATCH 3/3] added link to the dotnet branch

---
 ReadMe.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReadMe.md b/ReadMe.md
index 46de24c..8c0e2fd 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,5 +1,5 @@
 # Porting this project to .NET 5/6
-You can check out the dotnet branch for a buildable example.
+You can check out the [dotnet branch](https://github.com/Gnomorian/CppCliMigrationSample/tree/dotnet) for a buildable example.
 - Use Visual Studio 2022 and migrage the projects to v143
 - change the targetframework or targetframeworks in the ManagedLibrary to `net6.0-windows`. This is much easier in 2022 as targetframeworks is now listed in the properties rather than having to go hunting through the .csproj file.
 - Change the CppCliInterop library's TargetFramework to net6.0-windows either in the vcxproj file or in the properties project under Advanced.