diff --git a/1.3/Assemblies/RJW_patch_Autopsy.dll b/1.3/Assemblies/RJW_patch_Autopsy.dll index 71963e7..48a2f57 100644 Binary files a/1.3/Assemblies/RJW_patch_Autopsy.dll and b/1.3/Assemblies/RJW_patch_Autopsy.dll differ diff --git a/1.4/Assemblies/RJW_patch_Autopsy.dll b/1.4/Assemblies/RJW_patch_Autopsy.dll new file mode 100644 index 0000000..d4163a1 Binary files /dev/null and b/1.4/Assemblies/RJW_patch_Autopsy.dll differ diff --git a/About/About.xml b/About/About.xml index 479cb48..fca2ce6 100644 --- a/About/About.xml +++ b/About/About.xml @@ -5,6 +5,7 @@ Stardust3D
  • 1.3
    • +
  • 1.4
    •  Stardust3D.RJW.patch.Autopsy This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. @@ -27,8 +28,9 @@ +
  • Ludeon.RimWorld
  • UnlimitedHugs.HugsLib
  • Smuffle.HarvestOrgansPostMortem
    • - +
  • rim.job.world
    •  \ No newline at end of file diff --git a/About/Manifest.xml b/About/Manifest.xml index e890ac9..0f66f59 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -2,5 +2,5 @@ RJW patch - Harvest Organs Post Mortem - 4945.0.1.4 + 5371.0.1.4 \ No newline at end of file diff --git a/Assemblies/RJW_patch_Autopsy.dll b/Assemblies/RJW_patch_Autopsy.dll deleted file mode 100644 index 71963e7..0000000 Binary files a/Assemblies/RJW_patch_Autopsy.dll and /dev/null differ diff --git a/Source/RJW_patch_Autopsy.sln b/Source/RJW_patch_Autopsy.sln index 62fd520..6c92d17 100644 --- a/Source/RJW_patch_Autopsy.sln +++ b/Source/RJW_patch_Autopsy.sln @@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32113.165 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_patch_Autopsy", "RJW_patch_Autopsy\RJW_patch_Autopsy.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_patch_Autopsy_1.3", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.3.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RimJobWorld.Main", "..\..\rjw-base\1.3\Source\RimJobWorld.Main.csproj", "{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autopsy", "..\..\RimwoldAutopsy\Source\Autopsy\Autopsy.csproj", "{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_patch_Autopsy_1.4", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.4.csproj", "{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,14 +17,10 @@ Global {F17C6B3F-BA9D-4133-A201-1265A64BCB71}.Debug|Any CPU.Build.0 = Debug|Any CPU {F17C6B3F-BA9D-4133-A201-1265A64BCB71}.Release|Any CPU.ActiveCfg = Release|Any CPU {F17C6B3F-BA9D-4133-A201-1265A64BCB71}.Release|Any CPU.Build.0 = Release|Any CPU - {22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Release|Any CPU.Build.0 = Release|Any CPU - {CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Release|Any CPU.Build.0 = Release|Any CPU + {FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/RJW_patch_Autopsy/About/About.xml b/Source/RJW_patch_Autopsy/About/About.xml new file mode 100644 index 0000000..fca2ce6 --- /dev/null +++ b/Source/RJW_patch_Autopsy/About/About.xml @@ -0,0 +1,36 @@ + + + + RJW patch - Harvest Organs Post Mortem + Stardust3D + +
  • 1.3
    • +
  • 1.4
    • +     + Stardust3D.RJW.patch.Autopsy + This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. + + +
  • + UnlimitedHugs.HugsLib + HugsLib + steam://url/CommunityFilePage/818773962 +
    • +
  • + Smuffle.HarvestOrgansPostMortem + HarvestOrgansPostMortem + https://github.com/DenJur/RimwoldAutopsy +
    • +
  • + rim.job.world + RimJobWorld + https://gitgud.io/Ed86/rjw +
    • +     + +
  • Ludeon.RimWorld
    • +
  • UnlimitedHugs.HugsLib
    • +
  • Smuffle.HarvestOrgansPostMortem
    • +
  • rim.job.world
    • +     +     \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/About/Manifest.xml b/Source/RJW_patch_Autopsy/About/Manifest.xml new file mode 100644 index 0000000..0f66f59 --- /dev/null +++ b/Source/RJW_patch_Autopsy/About/Manifest.xml @@ -0,0 +1,6 @@ + + + + RJW patch - Harvest Organs Post Mortem + 5371.0.1.4 + \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/About/Preview.png b/Source/RJW_patch_Autopsy/About/Preview.png new file mode 100644 index 0000000..fa92cdf Binary files /dev/null and b/Source/RJW_patch_Autopsy/About/Preview.png differ diff --git a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs deleted file mode 100644 index 9c0dd45..0000000 --- a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("RJW patch - Harvest Organs Post Mortem")] -[assembly: - AssemblyDescription( - "This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RJW_patch_Autopsy")] -[assembly: AssemblyCopyright("©2022 Stardust3D")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4a00fc3e-123a-492b-96de-06af9c982b7a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4945.0.1.4")] -[assembly: AssemblyFileVersion("4945.0.1.4")] \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj deleted file mode 100644 index d2ab116..0000000 --- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - - Debug - AnyCPU - {F17C6B3F-BA9D-4133-A201-1265A64BCB71} - Library - Properties - RJW_patch_Autopsy - RJW_patch_Autopsy - v4.8 - 512 - - - RJW_patch_Autopsy.snk - - - true - portable - false - ..\..\Assemblies\ - DEBUG;TRACE - prompt - 4 - false - - - - - portable - true - ..\..\Assemblies\ - - - prompt - 4 - false - ..\..\Assemblies\RJW_patch_Autopsy.xml - true - - - true - - - true - - - false - - - - ..\packages\Lib.Harmony.2.2.0\lib\net48\0Harmony.dll - True - - - ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - False - - - ..\packages\UnlimitedHugs.Rimworld.HugsLib.9.0.1\lib\net472\HugsLib.dll - True - - - - - - - - - - - - About\About.xml - - - About\Manifest.xml - - - - - - - - - {f17c6b3f-ba9d-4133-a201-1265a64bcb71} - Autopsy - - - {22f82fff-8bd4-4cee-9f22-c7da71281e72} - RimJobWorld.Main - - - - \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj new file mode 100644 index 0000000..43b2568 --- /dev/null +++ b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj @@ -0,0 +1,53 @@ + + + + Debug + AnyCPU + {F17C6B3F-BA9D-4133-A201-1265A64BCB71} + Library + Properties + RJW_patch_Autopsy + RJW_patch_Autopsy + net48 + 512 + + + 11 + ©2023 Stardust3D + Stardust3D + 5371.0.1.4 + 5371.0.1.4 + true + RJW_patch_Autopsy.snk + This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. + + + bin\Release\1.3\ + + + + + + + + + + + + + ..\..\..\RimwoldAutopsy\1.3\Assemblies\Autopsy.dll + + + ..\..\..\rjw-base\1.3\Assemblies\RJW.dll + + + + + + + + + + + + diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj new file mode 100644 index 0000000..b684e2e --- /dev/null +++ b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj @@ -0,0 +1,53 @@ + + + + Debug + AnyCPU + {fc20ca27-4400-4aac-99af-f18cafac942e} + Library + Properties + RJW_patch_Autopsy + RJW_patch_Autopsy + net48 + 512 + + + 11 + ©2023 Stardust3D + Stardust3D + 5371.0.1.4 + 5371.0.1.4 + true + RJW_patch_Autopsy.snk + This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. + + + bin\Release\1.4\ + + + + + + + + + + + + + ..\..\..\RimwoldAutopsy\1.4\Assemblies\Autopsy.dll + + + ..\..\..\rjw-base\1.4\Assemblies\RJW.dll + + + + + + + + + + + + diff --git a/Source/RJW_patch_Autopsy/packages.config b/Source/RJW_patch_Autopsy/packages.config deleted file mode 100644 index dcd1369..0000000 --- a/Source/RJW_patch_Autopsy/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts index 810b2b8..c12dc85 100644 --- a/Source/build.gradle.kts +++ b/Source/build.gradle.kts @@ -8,17 +8,16 @@ plugins { id("com.ullink.msbuild") version "3.15" - //id("com.ullink.nunit") version "1.12" } -version = "4945.0.1.4" +version = "5371.0.1.4" val friendlyName = "rjw-patch-autopsy" -tasks.register("buildC#") { +tasks.register("buildC#_1.3") { // either a solution file // solutionFile = "${rootProject.name}.sln" // or a project file (.csproj or .vbproj) - projectFile = file("${rootProject.name}/${rootProject.name}.csproj") + projectFile = file("${rootProject.name}/${rootProject.name}_1.3.csproj") targets = listOf("Clean", "Rebuild") configuration = "Release" @@ -26,10 +25,22 @@ tasks.register("buildC#") { // destinationDir = "build/msbuild/bin" } -tasks.register("sign") { - dependsOn("buildC#") - workingDir = project.projectDir.resolve("${rootProject.name}/obj/Release") - executable = "H:\\Windows Kits\\10\\bin\\10.0.22000.0\\x64\\signtool.exe" +tasks.register("buildC#_1.4") { + // either a solution file + // solutionFile = "${rootProject.name}.sln" + // or a project file (.csproj or .vbproj) + projectFile = file("${rootProject.name}/${rootProject.name}_1.4.csproj") + + targets = listOf("Clean", "Rebuild") + configuration = "Release" + + // destinationDir = "build/msbuild/bin" +} + +tasks.register("sign_1.3") { + dependsOn("buildC#_1.3") + workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48") + executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe" args = listOf( "sign", "/seal", @@ -44,36 +55,71 @@ tasks.register("sign") { ) } -tasks.register("copyDll") { - dependsOn("copyDll_Assemblies", "copyDll_1.3") +tasks.register("sign_1.4") { + dependsOn("buildC#_1.4") + workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48") + executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe" + args = listOf( + "sign", + "/seal", + "/t", + "http://timestamp.digicert.com", + "/a", + "/n", + "Stardust3D", + "/fd", + "certHash", + "${rootProject.name}.dll" + ) } -tasks.register("copyDll_Assemblies") { - dependsOn("sign", "clean") - from(project.projectDir.resolve("${rootProject.name}/obj/Release/${rootProject.name}.dll")) - into(project.projectDir.parentFile.resolve("Assemblies")) +tasks.register("copy") { + dependsOn("copy_1.3", "copy_1.4", "copy_about") +} + +tasks.register("copy_about") { + from(project.projectDir.resolve("${rootProject.name}/About")) + into(project.projectDir.parentFile.resolve("About")) +} + +tasks.register("copy_1.3") { + dependsOn("copyDll_1.3") + from(project.projectDir.resolve("${rootProject.name}/1.3")) + into(project.projectDir.parentFile.resolve("1.3")) +} + +tasks.register("copy_1.4") { + dependsOn("copyDll_1.4") + from(project.projectDir.resolve("${rootProject.name}/1.4")) + into(project.projectDir.parentFile.resolve("1.4")) } tasks.register("copyDll_1.3") { - dependsOn("sign", "clean") - from(project.projectDir.resolve("${rootProject.name}/obj/Release/${rootProject.name}.dll")) + dependsOn("sign_1.3") + from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${rootProject.name}.dll")) into(project.projectDir.parentFile.resolve("1.3/Assemblies")) } +tasks.register("copyDll_1.4") { + dependsOn("sign_1.4") + from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48/${rootProject.name}.dll")) + into(project.projectDir.parentFile.resolve("1.4/Assemblies")) +} + tasks.register("buildZip") { - dependsOn(":copyDll") + dependsOn("clean", ":copy") into("$friendlyName/1.3") { from(project.projectDir.parentFile.resolve("1.3")) } + into("$friendlyName/1.4") { + from(project.projectDir.parentFile.resolve("1.4")) + } into("$friendlyName/About") { from(project.projectDir.parentFile.resolve("About")) } - into("$friendlyName/Assemblies") { - from(project.projectDir.parentFile.resolve("Assemblies")) - } - /*into("${rootProject.friendlyName}/Defs") { + into("$friendlyName/Defs") { from(project.projectDir.parentFile.resolve("Defs")) - }*/ + } into("$friendlyName/Source/${rootProject.name}") { from(project.projectDir.parentFile.resolve("Source/${rootProject.name}")) excludes.add("**/obj/**") @@ -81,9 +127,9 @@ tasks.register("buildZip") { } tasks.clean { - dependsOn("buildC#") - delete.add(project.projectDir.parentFile.resolve("Assemblies")) - delete.add(project.projectDir.parentFile.resolve("1.3/Assemblies")) + delete.add(project.projectDir.parentFile.resolve("1.3")) + delete.add(project.projectDir.parentFile.resolve("1.4")) + delete.add(project.projectDir.parentFile.resolve("About")) } tasks.build { diff --git a/Source/gradle/wrapper/gradle-wrapper.properties b/Source/gradle/wrapper/gradle-wrapper.properties index 2e6e589..e411586 100644 --- a/Source/gradle/wrapper/gradle-wrapper.properties +++ b/Source/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists