From fbfc319ac1e3d6b08aa7de5c81563026fb93d645 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Tue, 12 Mar 2024 19:08:14 +0100
Subject: [PATCH] build: Make dotnet script loader initialize properly with
 newer SDK version

---
 .../dotnet/AssemblyLoader/AssemblyLoader.csproj            | 6 +++++-
 .../Properties/PublishProfiles/FolderProfile.pubxml        | 2 +-
 plugins/script_loader/dotnet/CMakeLists.txt                | 2 +-
 .../script_loader/dotnet/post_process_runtimeconfig.cmake  | 7 -------
 4 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 plugins/script_loader/dotnet/post_process_runtimeconfig.cmake

diff --git a/plugins/script_loader/dotnet/AssemblyLoader/AssemblyLoader.csproj b/plugins/script_loader/dotnet/AssemblyLoader/AssemblyLoader.csproj
index 1623914df..73a16c058 100644
--- a/plugins/script_loader/dotnet/AssemblyLoader/AssemblyLoader.csproj
+++ b/plugins/script_loader/dotnet/AssemblyLoader/AssemblyLoader.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AssemblyName>AssemblyLoader</AssemblyName>
@@ -14,4 +14,8 @@
 	    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <RollForward>Major</RollForward>
+    </PropertyGroup>
+
 </Project>
diff --git a/plugins/script_loader/dotnet/AssemblyLoader/Properties/PublishProfiles/FolderProfile.pubxml b/plugins/script_loader/dotnet/AssemblyLoader/Properties/PublishProfiles/FolderProfile.pubxml
index 34e4f3aff..df5633ac5 100644
--- a/plugins/script_loader/dotnet/AssemblyLoader/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/plugins/script_loader/dotnet/AssemblyLoader/Properties/PublishProfiles/FolderProfile.pubxml
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net7.0\publish\</PublishDir>
+    <PublishDir>bin\Release\net8.0\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
   </PropertyGroup>
diff --git a/plugins/script_loader/dotnet/CMakeLists.txt b/plugins/script_loader/dotnet/CMakeLists.txt
index 47505a747..c1326ab1b 100644
--- a/plugins/script_loader/dotnet/CMakeLists.txt
+++ b/plugins/script_loader/dotnet/CMakeLists.txt
@@ -7,7 +7,7 @@ function(add_dotnet_assembly name)
     file(GLOB_RECURSE sources ${CMAKE_CURRENT_SOURCE_DIR}/${name}/*.cs)
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/../../${name}.dll
-        COMMAND ${DOTNET_EXECUTABLE} build ${CMAKE_CURRENT_SOURCE_DIR}/${name}/${name}.csproj -nologo -consoleLoggerParameters:NoSummary -verbosity:quiet -c Release -o ${CMAKE_CURRENT_BINARY_DIR}/../.. && ${CMAKE_COMMAND} -DOUTPUT_RUNTIMECONFIG="\"${OUTPUT_RUNTIMECONFIG}\"" -P ${CMAKE_CURRENT_SOURCE_DIR}/post_process_runtimeconfig.cmake
+        COMMAND ${DOTNET_EXECUTABLE} build ${CMAKE_CURRENT_SOURCE_DIR}/${name}/${name}.csproj -nologo -consoleLoggerParameters:NoSummary -verbosity:quiet -c Release -o ${CMAKE_CURRENT_BINARY_DIR}/../..
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}/${name}.csproj ${sources}
         COMMENT "Building ${name}.dll"
     )
diff --git a/plugins/script_loader/dotnet/post_process_runtimeconfig.cmake b/plugins/script_loader/dotnet/post_process_runtimeconfig.cmake
deleted file mode 100644
index 7008f79cc..000000000
--- a/plugins/script_loader/dotnet/post_process_runtimeconfig.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-file(READ "${OUTPUT_RUNTIMECONFIG}" FILE_CONTENTS)
-
-set(VERSION_REGEX [["version": "([0-9]+\.[0-9]+\.[0-9]+)"]])
-set(REPLACE_VALUE [["version": "7.0.0"]])
-string(REGEX REPLACE "${VERSION_REGEX}" ${REPLACE_VALUE} FILE_CONTENTS_OUT "${FILE_CONTENTS}")
-
-file(WRITE "${OUTPUT_RUNTIMECONFIG}" "${FILE_CONTENTS_OUT}")
\ No newline at end of file