diff --git a/1.3/Assemblies/RJW_patch_Autopsy.dll b/1.3/Assemblies/RJW_patch_Autopsy.dll
index 4d67d80..d9df314 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
deleted file mode 100644
index cde287c..0000000
Binary files a/1.4/Assemblies/RJW_patch_Autopsy.dll and /dev/null differ
diff --git a/1.5/Assemblies/RJW_patch_Autopsy.dll b/1.5/Assemblies/RJW_patch_Autopsy.dll
deleted file mode 100644
index f558298..0000000
Binary files a/1.5/Assemblies/RJW_patch_Autopsy.dll and /dev/null differ
diff --git a/About/About.xml b/About/About.xml
index f056244..479cb48 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -5,8 +5,6 @@
Stardust3D
1.3
- 1.4
- 1.5
Stardust3D.RJW.patch.Autopsy
This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.
@@ -29,9 +27,8 @@
- 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 ec3aae2..0c1a845 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -2,5 +2,5 @@
RJW patch - Harvest Organs Post Mortem
- 5400.0.1.5
+ 4943.0.1.4
\ No newline at end of file
diff --git a/Assemblies/RJW_patch_Autopsy.dll b/Assemblies/RJW_patch_Autopsy.dll
new file mode 100644
index 0000000..d9df314
Binary files /dev/null and b/Assemblies/RJW_patch_Autopsy.dll differ
diff --git a/README.md b/README.md
deleted file mode 100644
index 000cba3..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-I am sorry for the force push, but I had to remove some information from the repository's history.
diff --git a/Source/RJW_patch_Autopsy.sln b/Source/RJW_patch_Autopsy.sln
index 21e9453..62fd520 100644
--- a/Source/RJW_patch_Autopsy.sln
+++ b/Source/RJW_patch_Autopsy.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32113.165
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_patch_Autopsy_1.3", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.3.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_patch_Autopsy", "RJW_patch_Autopsy\RJW_patch_Autopsy.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_patch_Autopsy_1.4", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.4.csproj", "{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RimJobWorld.Main", "..\..\rjw-base\1.3\Source\RimJobWorld.Main.csproj", "{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_patch_Autopsy_1.5", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.5.csproj", "{25A0821A-6B42-4FB0-A454-0AD22A7716E7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autopsy", "..\..\RimwoldAutopsy\Source\Autopsy\Autopsy.csproj", "{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +19,14 @@ 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
- {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
- {25A0821A-6B42-4FB0-A454-0AD22A7716E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {25A0821A-6B42-4FB0-A454-0AD22A7716E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {25A0821A-6B42-4FB0-A454-0AD22A7716E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {25A0821A-6B42-4FB0-A454-0AD22A7716E7}.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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Source/RJW_patch_Autopsy/About/About.xml b/Source/RJW_patch_Autopsy/About/About.xml
deleted file mode 100644
index f056244..0000000
--- a/Source/RJW_patch_Autopsy/About/About.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- RJW patch - Harvest Organs Post Mortem
- Stardust3D
-
- 1.3
- 1.4
- 1.5
-
- 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
deleted file mode 100644
index ec3aae2..0000000
--- a/Source/RJW_patch_Autopsy/About/Manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- RJW patch - Harvest Organs Post Mortem
- 5400.0.1.5
-
\ No newline at end of file
diff --git a/Source/RJW_patch_Autopsy/About/Preview.png b/Source/RJW_patch_Autopsy/About/Preview.png
deleted file mode 100644
index fa92cdf..0000000
Binary files a/Source/RJW_patch_Autopsy/About/Preview.png and /dev/null differ
diff --git a/Source/RJW_patch_Autopsy/Patches/Harmony.cs b/Source/RJW_patch_Autopsy/Patches/Harmony.cs
index 5d6b2f4..2abc5c6 100644
--- a/Source/RJW_patch_Autopsy/Patches/Harmony.cs
+++ b/Source/RJW_patch_Autopsy/Patches/Harmony.cs
@@ -5,23 +5,10 @@ using Verse;
namespace RJW_patch_Autopsy
{
[StaticConstructorOnStartup]
- public class AutopsyPatch
+ internal static class First
{
- public static bool SizedApparelActive = false;
-
- static AutopsyPatch()
+ static First()
{
- //check SJW
- if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "SizedApparel"))
- {
- SizedApparelActive = true;
- }
-
- if (LoadedModManager.RunningModsListForReading.Any(x => x.PackageId == "OTYOTY.SizedApparel"))
- {
- SizedApparelActive = true;
- }
-
var har = new Harmony("Stardust3D.RJW.patch.Autopsy");
har.PatchAll(Assembly.GetExecutingAssembly());
}
diff --git a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs
index 01f7dd3..a11bf78 100644
--- a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs
+++ b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs
@@ -11,11 +11,11 @@ namespace RJW_patch_Autopsy
[HarmonyPatch(typeof(NewMedicalRecipesUtility), nameof(NewMedicalRecipesUtility.TraverseBody))]
public static class NewMedicalRecipesUtilityPatch
{
- private const bool DEBUG = false;
+ private const bool DO_LOG = false;
private static void log(String message)
{
- if (DEBUG)
+ if (DO_LOG)
{
Log.Message(message);
}
@@ -78,11 +78,11 @@ namespace RJW_patch_Autopsy
//Simulate success chance scaled with skill etc.
rjwNaturalThings.ForEach(t =>
{
- if (DEBUG || Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t);
+ if (Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t);
});
rjwArtificialThings.ForEach(t =>
{
- if (DEBUG || Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t);
+ if (Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t);
});
//Remove all parts that were tried to harvest from the corpse
diff --git a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..648c1dc
--- /dev/null
+++ b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+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("4943.0.1.4")]
+[assembly: AssemblyFileVersion("4943.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
new file mode 100644
index 0000000..da46f81
--- /dev/null
+++ b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj
@@ -0,0 +1,94 @@
+
+
+
+
+ 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
+
+
+ ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
+ False
+
+
+ ..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll
+ False
+
+
+
+
+
+
+
+
+
+
+
+ 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
deleted file mode 100644
index 6a3ad51..0000000
--- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {F17C6B3F-BA9D-4133-A201-1265A64BCB71}
- Library
- Properties
- RJW_patch_Autopsy
- RJW_patch_Autopsy
- net48
- 512
-
-
- 11
- ©2024 Stardust3D
- Stardust3D
- 5400.0.1.5
- 5400.0.1.5
- 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
deleted file mode 100644
index 7ceff2e..0000000
--- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {fc20ca27-4400-4aac-99af-f18cafac942e}
- Library
- Properties
- RJW_patch_Autopsy
- RJW_patch_Autopsy
- net48
- 512
-
-
- 11
- ©2024 Stardust3D
- Stardust3D
- 5400.0.1.5
- 5400.0.1.5
- 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/RJW_patch_Autopsy_1.5.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj
deleted file mode 100644
index e21a229..0000000
--- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {25a0821a-6b42-4fb0-a454-0ad22a7716e7}
- Library
- Properties
- RJW_patch_Autopsy
- RJW_patch_Autopsy
- net48
- 512
-
-
- 11
- ©2024 Stardust3D
- Stardust3D
- 5400.0.1.5
- 5400.0.1.5
- true
- RJW_patch_Autopsy.snk
- This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.
-
-
- bin\Release\1.5\
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\RimwoldAutopsy\1.5\Assemblies\Autopsy.dll
-
-
- ..\..\..\rjw-base\1.5\Assemblies\RJW.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Source/RJW_patch_Autopsy/packages.config b/Source/RJW_patch_Autopsy/packages.config
new file mode 100644
index 0000000..722dba4
--- /dev/null
+++ b/Source/RJW_patch_Autopsy/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts
index f74470a..cc978e1 100644
--- a/Source/build.gradle.kts
+++ b/Source/build.gradle.kts
@@ -7,18 +7,18 @@
*/
plugins {
- alias(libs.plugins.msbuild)
- alias(libs.plugins.versions)
+ id("com.ullink.msbuild") version "3.15"
+ //id("com.ullink.nunit") version "1.12"
}
-version = "5400.0.1.5"
+version = "4943.0.1.4"
val friendlyName = "rjw-patch-autopsy"
-tasks.register("buildC#_1.3") {
+tasks.register("buildC#") {
// either a solution file
// solutionFile = "${rootProject.name}.sln"
// or a project file (.csproj or .vbproj)
- projectFile = file("${rootProject.name}/${rootProject.name}_1.3.csproj")
+ projectFile = file("${rootProject.name}/${rootProject.name}.csproj")
targets = listOf("Clean", "Rebuild")
configuration = "Release"
@@ -26,34 +26,10 @@ tasks.register("buildC#_1.3") {
// destinationDir = "build/msbuild/bin"
}
-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("buildC#_1.5") {
- // either a solution file
- // solutionFile = "${rootProject.name}.sln"
- // or a project file (.csproj or .vbproj)
- projectFile = file("${rootProject.name}/${rootProject.name}_1.5.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"
+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"
args = listOf(
"sign",
"/seal",
@@ -68,116 +44,46 @@ tasks.register("sign_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") {
+ dependsOn("copyDll_Assemblies", "copyDll_1.3")
}
-tasks.register("sign_1.5") {
- dependsOn("buildC#_1.5")
- workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/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("copy") {
- dependsOn("copy_1.3", "copy_1.4", "copy_1.5", "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("copy_1.5") {
- dependsOn("copyDll_1.5")
- from(project.projectDir.resolve("${rootProject.name}/1.5"))
- into(project.projectDir.parentFile.resolve("1.5"))
+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("copyDll_1.3") {
- dependsOn("sign_1.3")
- from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${rootProject.name}.dll"))
+ dependsOn("sign", "clean")
+ from(project.projectDir.resolve("${rootProject.name}/obj/Release/${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("copyDll_1.5") {
- dependsOn("sign_1.5")
- from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48/${rootProject.name}.dll"))
- into(project.projectDir.parentFile.resolve("1.5/Assemblies"))
-}
-
tasks.register("buildZip") {
- dependsOn("clean", ":copy")
+ dependsOn(":copyDll")
into("$friendlyName/1.3") {
from(project.projectDir.parentFile.resolve("1.3"))
}
- into("$friendlyName/1.4") {
- from(project.projectDir.parentFile.resolve("1.4"))
- }
- into("$friendlyName/1.5") {
- from(project.projectDir.parentFile.resolve("1.5"))
- }
into("$friendlyName/About") {
from(project.projectDir.parentFile.resolve("About"))
}
- into("$friendlyName/Defs") {
- from(project.projectDir.parentFile.resolve("Defs"))
+ into("$friendlyName/Assemblies") {
+ from(project.projectDir.parentFile.resolve("Assemblies"))
}
+ /*into("${rootProject.friendlyName}/Defs") {
+ from(project.projectDir.parentFile.resolve("Defs"))
+ }*/
into("$friendlyName/Source/${rootProject.name}") {
from(project.projectDir.parentFile.resolve("Source/${rootProject.name}"))
excludes.add("**/obj/**")
- excludes.add("**/bin/**")
}
}
tasks.clean {
- delete.add(project.projectDir.parentFile.resolve("1.3"))
- delete.add(project.projectDir.parentFile.resolve("1.4"))
- delete.add(project.projectDir.parentFile.resolve("1.5"))
- delete.add(project.projectDir.parentFile.resolve("About"))
+ dependsOn("buildC#")
+ delete.add(project.projectDir.parentFile.resolve("Assemblies"))
+ delete.add(project.projectDir.parentFile.resolve("1.3/Assemblies"))
}
tasks.build {
diff --git a/Source/global.json b/Source/global.json
deleted file mode 100644
index b5b37b6..0000000
--- a/Source/global.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "sdk": {
- "version": "8.0.0",
- "rollForward": "latestMajor",
- "allowPrerelease": false
- }
-}
\ No newline at end of file
diff --git a/Source/gradle/libs.versions.toml b/Source/gradle/libs.versions.toml
deleted file mode 100644
index de22e81..0000000
--- a/Source/gradle/libs.versions.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[versions]
-versions = "0.51.0"
-msbuild = "4.6"
-
-[libraries]
-
-[bundles]
-
-[plugins]
-versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
-msbuild = { id = "com.ullink.msbuild", version.ref = "msbuild" }
diff --git a/Source/gradle/wrapper/gradle-wrapper.jar b/Source/gradle/wrapper/gradle-wrapper.jar
index e644113..7454180 100644
Binary files a/Source/gradle/wrapper/gradle-wrapper.jar and b/Source/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Source/gradle/wrapper/gradle-wrapper.properties b/Source/gradle/wrapper/gradle-wrapper.properties
index a441313..2e6e589 100644
--- a/Source/gradle/wrapper/gradle-wrapper.properties
+++ b/Source/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/Source/gradlew b/Source/gradlew
index b740cf1..c53aefa 100644
--- a/Source/gradlew
+++ b/Source/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
-# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-# * compound commands having a testable exit status, especially «case»;
-# * various built-in commands including «command», «set», and «ulimit».
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,11 +80,13 @@ do
esac
done
-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -131,29 +133,22 @@ location of your Java installation."
fi
else
JAVACMD=java
- if ! command -v java >/dev/null 2>&1
- then
- die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
- fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
- # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
- # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -198,15 +193,11 @@ if "$cygwin" || "$msys" ; then
done
fi
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-# and any embedded shellness will be escaped.
-# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-# treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -214,12 +205,6 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
- die "xargs is not available"
-fi
-
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/Source/gradlew.bat b/Source/gradlew.bat
index 25da30d..107acd3 100644
--- a/Source/gradlew.bat
+++ b/Source/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,8 +25,7 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -41,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
goto fail
@@ -57,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
goto fail
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal