Migrate to .net 6.0 framework

x64dbg · May 27, 2022 · 41282a4 · 41282a4
1 parent 83bb9ff
commit 41282a4
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dotnet-version: ['5.0.x']
+        dotnet-version: ['6.0.x']
         platform: 
           - {arch: 'x86', dir: 'x32'}
           - {arch: 'x64', dir: 'x64'}

diff --git a/src/Bindings/Bindings.vcxproj b/src/Bindings/Bindings.vcxproj
@@ -4,7 +4,7 @@
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
-	  <UseWindowsForms>true</UseWindowsForms>
+      <UseWindowsForms>true</UseWindowsForms>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -26,7 +26,7 @@
     <Keyword>NetCoreCProj</Keyword>
     <RootNamespace>Bindings</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/src/Dotx64Dbg/Dotx64Dbg.vcxproj b/src/Dotx64Dbg/Dotx64Dbg.vcxproj
@@ -27,7 +27,7 @@
     <Keyword>NetCoreCProj</Keyword>
     <RootNamespace>Loader</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ProjectName>Dotx64Dbg</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/src/Dotx64DbgLoader/Dotx64DbgLoader.vcxproj b/src/Dotx64DbgLoader/Dotx64DbgLoader.vcxproj
@@ -24,7 +24,7 @@
     <Keyword>NetCoreCProj</Keyword>
     <RootNamespace>Loader</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ProjectName>Dotx64Dbg.Loader</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/src/Dotx64DbgLoader/Loader.cpp b/src/Dotx64DbgLoader/Loader.cpp
@@ -1,4 +1,4 @@
-#include "pluginsdk/bridgemain.h"
+#include "pluginsdk/bridgemain.h"
 #include "pluginsdk/_plugins.h"
 #include "pluginsdk/_scriptapi_memory.h"
 #include "pluginsdk/_scriptapi_register.h"
@@ -181,7 +181,7 @@ PLUG_EXPORT bool pluginit(PLUG_INITSTRUCT* initStruct)
     if (_module == nullptr)
     {
         _plugin_logprintf("Unable to load Dotx64Dbg, make sure you have following installed:\n"
-            "- .NET 5.0 Runtime (https://dotnet.microsoft.com/download/dotnet/5.0)\n"
+            "- .NET 6.0 Runtime (https://dotnet.microsoft.com/download/dotnet/6.0)\n"
             "- Visual Studio 2019 Runtime (https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0)\n"
         );
         return false;

diff --git a/src/Dotx64DbgManagedTests/Tests.csproj b/src/Dotx64DbgManagedTests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <SatelliteResourceLanguages>neutral</SatelliteResourceLanguages>
     <Platforms>x86;x64</Platforms>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/src/Dotx64Managed/Dotx64Dbg.Managed.csproj b/src/Dotx64Managed/Dotx64Dbg.Managed.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
     <Platforms>x64;x86</Platforms>

diff --git a/src/Dotx64Managed/ProjectGenerator.cs b/src/Dotx64Managed/ProjectGenerator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml;
 
 namespace Dotx64Dbg
@@ -7,7 +7,7 @@ class ProjectGenerator
     {
         public string Sdk = "Microsoft.NET.Sdk";
 
-        public string TargetFramework = "net5.0";
+        public string TargetFramework = "net6.0";
 
         public string Platforms = "x64;x86";