From bfb3a141933f42e6d1c6b0c84fea108029322a8d Mon Sep 17 00:00:00 2001 From: Xon <635541+Xon@users.noreply.github.com> Date: Tue, 20 Oct 2026 19:38:57 +0800 Subject: [PATCH 1/6] Update project templates to support multi-version rim development, debug file creation without leaking the solution and hopefully better auto-configuring of the build --- .../.template.config/template.json | 21 +- .../Source/Directory.Build.props | 39 ++++ .../Source/Directory.Build.targets | 216 ++++++++++++++++++ .../Source/MyRimWorldMod.csproj | 60 +---- 4 files changed, 268 insertions(+), 68 deletions(-) create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json index b0fea6b..e8714e8 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json @@ -34,10 +34,10 @@ "isRequired": "true", "defaultValue": "" }, - "RimworldDLL": { + "RimworldDir": { "type": "parameter", "datatype": "text", - "replaces": "Assembly-CSharp.dll", + "replaces": "RimworldDir", "isRequired": "false", "defaultValue": "" }, @@ -73,20 +73,13 @@ "isRequired": "false", "defaultValue": "true" }, - "AssemblyDir": { - "type": "derived", - "valueSource": "RimworldDLL", - "valueTransform": "BaseDirectory", - "replaces": "AssemblyDir", - "description": "The directory containing the RimWorld DLL" - }, - "assemblyExists": { + "RimworldDirExists": { "type": "generated", "generator": "regexMatch", "datatype": "bool", "parameters": { "pattern": "[a-zA-Z0-9]", - "source": "RimworldDLL" + "source": "RimworldDir" } } }, @@ -157,6 +150,12 @@ { "path": "Source/MyRimWorldMod.csproj" }, + { + "path": "Source/Directory.Build.props" + }, + { + "path": "Source/Directory.Build.targets" + }, { "path": "Source/MyRimWorldMod.cs" }, diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props new file mode 100644 index 0000000..e777fb0 --- /dev/null +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props @@ -0,0 +1,39 @@ + + + + 1.5;1.6;1.7 + 1.6 + false + true + net472 + net10.0 + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))/../$(Configuration)/Assemblies + + + $(NoWarn);MSB3246;MSB3052 + + true + true + + true + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./ + true + portable + + false + false + latest + false + false + TRACE + prompt + 4 + false + false + + + + + + + \ No newline at end of file diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets new file mode 100644 index 0000000..bca1183 --- /dev/null +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets @@ -0,0 +1,216 @@ + + + + + + + + + + + + false + + + true + false + + + + $([System.String]::Copy('$(RimWorldDirectory)').Trim()) + + + $([System.String]::Copy('$(SteamModsDirectory)').Trim()) + + + + + + + $(USERPROFILE)\AppData\Local\Steam\steamapps\common\RimWorld + + + + + $(MSBuildProgramFiles32)\Steam\steamapps\common\RimWorld + + + + + $(HOME)/.local/share/Steam/steamapps/common/RimWorld + + + + + $(HOME)/.steam/steam/steamapps/common/RimWorld + + + + + $(HOME)/Library/Application Support/Steam/steamapps/common/RimWorld + + + + RimWorldWin64.exe + RimWorld.exe + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)')) + $(RimWorldDirectoryProbe) + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/../')) + $(RimWorldDirectoryProbe) + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/../../')) + $(RimWorldDirectoryProbe) + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/../../../')) + $(RimWorldDirectoryProbe) + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/../../../../')) + $(RimWorldDirectoryProbe) + + + + + $([System.String]::Copy('$(RimWorldDirectory)').Trim()) + $([MSBuild]::NormalizeDirectory('$(RimWorldDirectory)')) + $(RimWorldDirectory)Version.txt + + + + + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/workshop')) + $(SteamModsDirectoryProbe) + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/../workshop')) + $(SteamModsDirectoryProbe) + + workshop/content/294100 + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/$(SteamModsDirectorySuffix)')) + $(SteamModsDirectoryProbe) + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)/../$(SteamModsDirectorySuffix)')) + $(SteamModsDirectoryProbe) + $([MSBuild]::NormalizeDirectory('$(RimWorldDirectory)/../../$(SteamModsDirectorySuffix)')) + $(SteamModsDirectoryProbe) + + + + $([System.String]::Copy('$(SteamModsDirectory)').Trim()) + $([MSBuild]::NormalizeDirectory('$(SteamModsDirectory)')) + + + + + + + + + + + + + + + + + + + $(SteamModsDirectory)2009463077/$(Configuration)/Assemblies/0Harmony.dll + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $([System.String]::Copy('%(VersionFileLine.Identity)').Split(' ')[0]) + $([System.String]::Copy('$(RimWorldVersion)').Split('.')[1]) + $([System.String]::Copy('$(RimWorldVersion)').Split('.')[2]) + + + + + + + + %(RimRefPackageReference.Version) + $([System.String]::Copy('$(RimRefVersion)').Split('.')[1]) + $([System.String]::Copy('$(RimRefVersion)').Split('.')[2]) + $([System.String]::Copy('$(RimRefVersionPatch)').Split('-')[0]) + + + + + + + + + true + true + true + true + false + + + + + + + + + + + + + + + + + + + + diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj index 0579493..838a42d 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj @@ -1,66 +1,13 @@  - MyRimWorldMod MyRimWorldMod - net472 - false - false - latest - - - - true - portable - false - ../Assemblies - DEBUG;TRACE - prompt - 4 - - - - none - true - ../Assemblies - TRACE - prompt - 4 + + RimworldDir + - - - - AssemblyDir\System.dll - False - - - AssemblyDir\System.Core.dll - False - - - AssemblyDir\System.Xml.dll - False - - - Assembly-CSharp.dll - False - - - AssemblyDir\UnityEngine.CoreModule.dll - False - - - - - - - - - - From cc4a0e9f7bb4fcae57034e3ecfafd4ddac035a28 Mon Sep 17 00:00:00 2001 From: Xon <635541+Xon@users.noreply.github.com> Date: Thu, 22 Oct 2026 01:47:02 +0800 Subject: [PATCH 2/6] Source Link feature causes the git revision to be included into the assembly metadata, which while useful for a library probably isn't help for a rimworld mod --- .../RimworldProjectTemplate/Source/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props index e777fb0..bd5a382 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props @@ -14,6 +14,7 @@ true true + false true $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./ From 2b0980849021f99d22a103af9d5770acccfad535 Mon Sep 17 00:00:00 2001 From: Xon <635541+Xon@users.noreply.github.com> Date: Thu, 22 Oct 2026 05:08:07 +0800 Subject: [PATCH 3/6] Use RimWorldVersion to be less confusing on what is being acted on --- .../RimworldProjectTemplate/Source/Directory.Build.props | 8 +++++--- .../Source/Directory.Build.targets | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props index bd5a382..f5007f5 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props @@ -3,11 +3,13 @@ 1.5;1.6;1.7 1.6 - false - true + $(Configuration) + false + true net472 net10.0 - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))/../$(Configuration)/Assemblies + + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))/../$(RimWorldVersion)/Assemblies $(NoWarn);MSB3246;MSB3052 diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets index bca1183..8769ac5 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets @@ -116,7 +116,7 @@ - + @@ -131,7 +131,7 @@ - $(SteamModsDirectory)2009463077/$(Configuration)/Assemblies/0Harmony.dll + $(SteamModsDirectory)2009463077/$(RimWorldVersion)/Assemblies/0Harmony.dll False From 10a4752d370a1116b6d9fba443beb9566587252d Mon Sep 17 00:00:00 2001 From: Xon <635541+Xon@users.noreply.github.com> Date: Thu, 22 Oct 2026 18:48:19 +0800 Subject: [PATCH 4/6] Fix typo --- .../RimworldProjectTemplate/Source/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props index f5007f5..ec444bb 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props @@ -3,7 +3,7 @@ 1.5;1.6;1.7 1.6 - $(Configuration) + $(Configuration) false true net472 From 51e3999c4b2a76da174f9bd075d97f6ffb06e697 Mon Sep 17 00:00:00 2001 From: Xon <635541+Xon@users.noreply.github.com> Date: Thu, 22 Oct 2026 18:50:01 +0800 Subject: [PATCH 5/6] Simplify adding Krafs.Rimworld.Ref --- .../RimworldProjectTemplate/Source/Directory.Build.targets | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets index 8769ac5..c894779 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets @@ -115,12 +115,9 @@ $([MSBuild]::NormalizeDirectory('$(SteamModsDirectory)')) - - + + - - - From ff39b4f34a7e354ffb21ca19bb57dbdd410f2161 Mon Sep 17 00:00:00 2001 From: Xon <635541+Xon@users.noreply.github.com> Date: Sun, 1 Nov 2026 06:14:52 +0800 Subject: [PATCH 6/6] Inject v1.5/v1.6/v1.7/etc constants --- .../RimworldProjectTemplate/Source/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props index ec444bb..08fd82c 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props @@ -8,7 +8,7 @@ true net472 net10.0 - + $(DefineConstants);v$(RimWorldVersion) $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))/../$(RimWorldVersion)/Assemblies