Merge branch 'master' into feature/guilds

ethanmoffat · Oct 29, 2024 · 26fec8c · 26fec8c
2 parents e4dde4b + 5efbdef
commit 26fec8c
Show file tree

Hide file tree

Showing 43 changed files with 215 additions and 1,605 deletions.
diff --git a/BatchMap/BatchMap.csproj b/BatchMap/BatchMap.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\utils\BatchMap</OutputPath>

diff --git a/BatchPub/BatchPub.csproj b/BatchPub/BatchPub.csproj
diff --git a/BatchPub/Program.cs b/BatchPub/Program.cs
diff --git a/BatchPub/Properties/AssemblyInfo.cs b/BatchPub/Properties/AssemblyInfo.cs
diff --git a/BatchPub/Properties/Resources.Designer.cs b/BatchPub/Properties/Resources.Designer.cs
diff --git a/BatchPub/Properties/Resources.resx b/BatchPub/Properties/Resources.resx
diff --git a/BatchPub/Properties/Settings.Designer.cs b/BatchPub/Properties/Settings.Designer.cs
diff --git a/BatchPub/Properties/Settings.settings b/BatchPub/Properties/Settings.settings