Merged changes from master.

Author: Esper89

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
     - name: Build
-      run: msbuild -property:Configuration=Release
+      run: dotnet build --configuration Release
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:

README.md

@@ -159,13 +159,13 @@ contributions [as a pull request](https://github.com/Esper89/Subnautica-TerrainP
 
 ### Building
 
-To build Terrain Patcher, run `msbuild` in the project's root directory. This will build in debug
-mode, and the output will be placed in `target/Debug`. If you create a file in the project root
-called `game-dirs.txt` and input the paths to your Subnautica and/or Below Zero installations (one
-per line), the output of debug builds will be automatically installed into those game directories
-for easier testing.
+To build Terrain Patcher, run `dotnet build` in the project's root directory. This will build in
+debug mode, and the output will be placed in `target/Debug`. If you create a file in the project
+root called `game-dirs.txt` and input the paths to your Subnautica and/or Below Zero installations
+(one per line), the output of debug builds will be automatically installed into those game
+directories for easier testing.
 
-To build Terrain Patcher in release mode, run `msbuild -property:Configuration=Release`. This will
+To build Terrain Patcher in release mode, run `dotnet build --configuration Release`. This will
 also create a `dist.zip` file in `target` for easy distribution.
 
 ### Contributors

TerrainPatcher.csproj

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <OutputType>Library</OutputType>
-        <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+        <TargetFramework>net472</TargetFramework>
         <LangVersion>8.0</LangVersion>
         <Nullable>enable</Nullable>
         <WarningLevel>4</WarningLevel>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <OutputPath>bin/$(Configuration)</OutputPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
         <Optimize>false</Optimize>
@@ -43,23 +41,20 @@
             <HintPath>references/Nautilus.refasm.dll</HintPath>
         </Reference>
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="src/Mod.cs"/>
-        <Compile Include="src/Terrain.cs"/>
-        <Compile Include="src/FileLoading.cs"/>
-        <Compile Include="src/Options.cs"/>
-        <Compile Include="src/Patches/Batches.cs"/>
-        <Compile Include="src/Patches/Array3.cs"/>
-        <Compile Include="src/Patches/WorldStreamer.cs"/>
-    </ItemGroup>
-    <Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets"/>
     <Target Name="CopyToTargetDir" AfterTargets="Build">
-        <Copy SourceFiles="$(TargetPath);LICENSE;$(DocumentationFile)" DestinationFolder="target/$(Configuration)"/>
+        <Copy
+            SourceFiles="$(TargetPath);LICENSE;$(DocumentationFile)"
+            DestinationFolder="target/$(Configuration)"
+        />
         <Copy SourceFiles="dist-readme.md" DestinationFiles="target/$(Configuration)/README.md"/>
         <WriteLinesToFile File="target/$(Configuration)/load-order.txt" Overwrite="True"/>
         <MakeDir Directories="target/$(Configuration)/patches"/>
     </Target>
-    <Target Name="CopyToModsDir" AfterTargets="CopyToTargetDir" Condition="'$(Configuration)' == 'Debug' And Exists('game-dirs.txt')">
+    <Target
+        Name="CopyToModsDir"
+        AfterTargets="CopyToTargetDir"
+        Condition="'$(Configuration)' == 'Debug' And Exists('game-dirs.txt')"
+    >
         <ReadLinesFromFile File="game-dirs.txt">
             <Output TaskParameter="Lines" ItemName="GameDirs"/>
         </ReadLinesFromFile>
@@ -72,12 +67,20 @@
         <Copy SourceFiles="@(TargetFiles)" DestinationFolder="%(GameDirs.Identity)/$(PluginDir)"/>
         <MakeDir Directories="%(GameDirs.Identity)/$(PluginDir)/patches"/>
     </Target>
-    <Target Name="ZipDist" AfterTargets="CopyToTargetDir" Condition="'$(Configuration)' == 'Release'">
+    <Target
+        Name="ZipDist"
+        AfterTargets="CopyToTargetDir"
+        Condition="'$(Configuration)' == 'Release'"
+    >
         <CreateItem Include="target/$(Configuration)/**/*">
             <Output TaskParameter="Include" ItemName="TargetFiles"/>
         </CreateItem>
         <Copy SourceFiles="@(TargetFiles)" DestinationFolder="target/dist/$(ProjectName)"/>
         <MakeDir Directories="target/dist/$(ProjectName)/patches"/>
-        <ZipDirectory SourceDirectory="target/dist" DestinationFile="target/dist.zip" Overwrite="True"/>
+        <ZipDirectory
+            SourceDirectory="target/dist"
+            DestinationFile="target/dist.zip"
+            Overwrite="True"
+        />
     </Target>
 </Project>