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..08fd82c --- /dev/null +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.props @@ -0,0 +1,42 @@ + + + + 1.5;1.6;1.7 + 1.6 + $(Configuration) + false + true + net472 + net10.0 + $(DefineConstants);v$(RimWorldVersion) + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))/../$(RimWorldVersion)/Assemblies + + + $(NoWarn);MSB3246;MSB3052 + + true + true + false + + 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..c894779 --- /dev/null +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/Directory.Build.targets @@ -0,0 +1,213 @@ + + + + + + + + + + + + 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/$(RimWorldVersion)/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 - - - - - - - - - -