Updated .NET to 6.0.3, fixes some ITileData issues.

zhouzheng95 · Apr 10, 2022 · 641d6f0 · 641d6f0
1 parent 40c04ab
commit 641d6f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -128,7 +128,7 @@ jobs:
       - name: Install .NET SDKs
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '6.0.3'
 
       # Runs a set of commands using the runners shell
       - name: Build script

diff --git a/patches/TerrariaNetCore/Configuration.targets.patch b/patches/TerrariaNetCore/Configuration.targets.patch
@@ -1,14 +1,16 @@
 --- src/Terraria/Configuration.targets
 +++ src/TerrariaNetCore/Configuration.targets
-@@ -1,26 +_,13 @@
+@@ -1,26 +_,15 @@
  <Project>
    <PropertyGroup>
 -    <TargetFramework>net40</TargetFramework>
 -    <Configurations>WindowsDebug;WindowsRelease;WindowsServerDebug;WindowsServerRelease;LinuxRelease;LinuxServerRelease;MacRelease;MacServerRelease</Configurations>
 -    <PlatformTarget>x86</PlatformTarget>
 +    <TargetFramework>net6.0</TargetFramework>
 +    <!-- Defines the Minimum patch version that is required to play. -->
-+    <RuntimeFrameworkVersion>6.0.0</RuntimeFrameworkVersion>
++    <RuntimeFrameworkVersion>6.0.3</RuntimeFrameworkVersion>
++    <!-- Eliminates the Refs folder from output-->
++    <ProduceReferenceAssembly>false</ProduceReferenceAssembly> 
 +    <Configurations>Debug;Release</Configurations>
 +    <PlatformTarget>AnyCPU</PlatformTarget>
      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/patches/tModLoader/Configuration.targets.patch b/patches/tModLoader/Configuration.targets.patch
diff --git a/setup/Setup/HookGenTask.cs b/setup/Setup/HookGenTask.cs
@@ -9,7 +9,7 @@ namespace Terraria.ModLoader.Setup
 {
 	internal class HookGenTask : SetupOperation
 	{
-		private const string dotnetSdkVersion = "6.0.0";
+		private const string dotnetSdkVersion = "6.0.3";
 		private const string libsPath = "src/tModLoader/Terraria/Libraries";
 		private const string binLibsPath = "src/tModLoader/Terraria/bin/Release/net6.0/Libraries";
 		private const string tmlAssemblyPath = @"src/tModLoader/Terraria/bin/Release/net6.0/tModLoader.dll";