Skip to content

Commit

Permalink
v2.1 now contains Harmony v2.3.2 and enhances stacktraces
Browse files Browse the repository at this point in the history
  • Loading branch information
pardeike committed Mar 25, 2024
1 parent f407807 commit cc50eb1
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 28 deletions.
3 changes: 2 additions & 1 deletion About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<name>Harmony</name>
<author>Andreas Pardeike</author>
<packageId>brrainz.harmony</packageId>
<modVersion>2.0.0.0</modVersion>
<modVersion>2.1.0.0</modVersion>
<modIconPath IgnoreIfNoMatchingField="True">ModIcon</modIconPath>
<url>https://github.com/pardeike/HarmonyRimWorld</url>
<supportedVersions>
<li>1.2</li>
Expand Down
2 changes: 1 addition & 1 deletion About/Manifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>net.pardeike.rimworld.mod.harmony</identifier>
<version>2.0.0.0</version>
<version>2.1.0.0</version>
<targetVersions>
<li>1.2.0</li>
<li>1.3.0</li>
Expand Down
Binary file modified Current/Assemblies/0Harmony.dll
Binary file not shown.
Binary file modified Current/Assemblies/HarmonyMod.dll
Binary file not shown.
14 changes: 7 additions & 7 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>

<PropertyGroup>
<ModName>HarmonyMod</ModName>
<ModFileName>HarmonyMod</ModFileName>
<Repository>https://github.com/pardeike/HarmonyRimworld</Repository>
<ModVersion>2.0.0.0</ModVersion>
<ProjectGuid>{C0C9BB35-9100-47A8-886E-32932EF301ED}</ProjectGuid>
</PropertyGroup>
<PropertyGroup>
<ModName>HarmonyMod</ModName>
<ModFileName>HarmonyMod</ModFileName>
<Repository>https://github.com/pardeike/HarmonyRimworld</Repository>
<ModVersion>2.1.0.0</ModVersion>
<ProjectGuid>{C0C9BB35-9100-47A8-886E-32932EF301ED}</ProjectGuid>
</PropertyGroup>

</Project>
24 changes: 5 additions & 19 deletions Source/HarmonyRimWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,51 +44,37 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4042-beta" />
<PackageReference Include="Lib.Harmony" Version="2.3.2.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\Current\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule">
<HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

<Target Name="PostBuildAction" AfterTargets="Build">
<XmlPoke XmlInputPath="$(MSBuildProjectDirectory)\..\About\About.xml" Query="//ModMetaData/modVersion" Value="$(ModVersion)" />
<XmlPoke XmlInputPath="$(MSBuildProjectDirectory)\..\About\Manifest.xml" Query="//Manifest/version" Value="$(ModVersion)" />
</Target>

<Target Name="CopyToRimworld" AfterTargets="PostBuildAction" Condition="'$(RIMWORLD_MOD_DIR)' != ''">
<Copy SourceFiles="bin\0Harmony.dll" DestinationFiles="..\Current\Assemblies\0Harmony.dll" />
<Copy SourceFiles="bin\HarmonyMod.dll" DestinationFiles="..\Current\Assemblies\HarmonyMod.dll" />
<RemoveDir Directories="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
<ItemGroup>
<CopyAbout Include="..\About\**" />
<Copy14 Include="..\1.4\**" />
<CopyCurrent Include="..\Current\**" />
<CopyTextures Include="..\Textures\**" />
<CopyLicense Include="..\LICENSE" />
<CopyLoadFolders Include="..\LoadFolders.xml" />
<CopyReadme Include="..\Readme.md" />
</ItemGroup>
<Copy SourceFiles="@(CopyAbout)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\About\%(RecursiveDir)" />
<Copy SourceFiles="@(Copy14)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\1.4\%(RecursiveDir)" />
<Copy SourceFiles="@(CopyCurrent)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\Current\%(RecursiveDir)" />
<Copy SourceFiles="@(CopyTextures)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\Textures\%(RecursiveDir)" />
<Copy SourceFiles="@(CopyLicense)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
<Copy SourceFiles="@(CopyLoadFolders)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
<Copy SourceFiles="@(CopyReadme)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
Expand Down
Binary file added Textures/ModIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cc50eb1

Please sign in to comment.