diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 79bc706..c16194a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,14 +19,6 @@ jobs: distribution: 'corretto' java-version: '21' cache: 'gradle' - - uses: actions/cache@v4 - with: - path: | - build/gradle-jvm - ~/.nuget/packages - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-Build-${{ hashFiles('gradlew.bat', 'src/dotnet/*/*.csproj', './*.props', 'gradle-wrapper.properties') }} - run: ./gradlew :buildPlugin --no-daemon - run: ./gradlew :buildResharperPlugin --no-daemon - uses: actions/upload-artifact@v4 @@ -46,13 +38,4 @@ jobs: distribution: 'corretto' java-version: '17' cache: 'gradle' - - uses: actions/cache@v4 - with: - path: | - build/gradle-jvm - packages - ~/.nuget/packages - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-Test-${{ hashFiles('gradlew.bat', 'src/dotnet/*/*.csproj', './*.props', 'gradle-wrapper.properties') }} - run: ./gradlew :testDotNet --no-daemon \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7986537..7a6fe60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ * Adds support for [Parent=""] attributes * Makes the New Mod template modular, allowing you to select the components you want included in your mod * Bundled in Zetrith's Remodder code into this plugin + * Update the Rimworld template for 1.6 + * Automatically detect and use the user-installed Harmony version for debugging, if available ## 2024.1.7 * Solved some incompatibilities for ReSharper diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj index 2c6e5ec..0579493 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj +++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj @@ -28,15 +28,21 @@ prompt 4 - - - - - - - + + + AssemblyDir\System.dll + False + + + AssemblyDir\System.Core.dll + False + + + AssemblyDir\System.Xml.dll + False + Assembly-CSharp.dll False @@ -52,7 +58,7 @@ If that reference does not exist, it will add Krafs Rimworld Ref to the project. If it does exist, Krafs won't be added as a reference. This basically means that Krafs is treated as a fallback if Assembly-CSharp is not found --> - +