diff --git a/Source/RJW_PlasticSurgeries.sln b/Source/RJW_PlasticSurgeries.sln index d2c09ea..8ff40f0 100644 --- a/Source/RJW_PlasticSurgeries.sln +++ b/Source/RJW_PlasticSurgeries.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.31911.196 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_PlasticSurgeries", "RJW_PlasticSurgeries\RJW_PlasticSurgeries.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_PlasticSurgeries_1.3", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.3.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/Source/RJW_PlasticSurgeries/App.config b/Source/RJW_PlasticSurgeries/App.config new file mode 100644 index 0000000..ded10ad --- /dev/null +++ b/Source/RJW_PlasticSurgeries/App.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj index 74f0732..b41b959 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj @@ -9,7 +9,7 @@ Properties RJW_PlasticSurgeries RJW_PlasticSurgeries - v4.8 + v4.7.2 512 @@ -18,7 +18,7 @@ true portable false - ..\..\Assemblies\ + ..\..\1.4\Assemblies\ DEBUG;TRACE prompt 4 @@ -29,14 +29,15 @@ portable true - ..\..\Assemblies\ + ..\..\1.4\Assemblies\ prompt 4 false - ..\..\Assemblies\RJW_PlasticSurgeries.xml + ..\..\1.4\Assemblies\RJW_PlasticSurgeries.xml true + true true @@ -56,17 +57,16 @@ False - ..\..\..\dyspareunia\Assemblies\Dyspareunia.dll + ..\..\..\dyspareunia\1.4\Assemblies\Dyspareunia.dll - - ..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll - False + + ..\packages\UnlimitedHugs.Rimworld.HugsLib.10.0.1\lib\net472\HugsLib.dll ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll - ..\..\..\rjw-base\1.3\Assemblies\RJW.dll + ..\..\..\rjw-base\1.4\Assemblies\RJW.dll diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj new file mode 100644 index 0000000..44097ab --- /dev/null +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj @@ -0,0 +1,111 @@ + + + + + Debug + AnyCPU + {F17C6B3F-BA9D-4133-A201-1265A64BCB71} + Library + Properties + RJW_PlasticSurgeries + RJW_PlasticSurgeries + v6.0 + 512 + + + + + true + portable + false + ..\..\1.3\Assemblies\ + DEBUG;TRACE + prompt + 4 + false + + + + + portable + true + ..\..\1.3\Assemblies\ + + + prompt + 4 + false + ..\..\1.3\Assemblies\RJW_PlasticSurgeries.xml + true + true + + + true + + + true + + + false + + + RJW_PlasticSurgeries.snk + + + + ..\packages\Lib.Harmony.2.2.2\lib\net472\0Harmony.dll + + + ..\..\..\dyspareunia\1.3\Assemblies\Dyspareunia.dll + + + ..\packages\UnlimitedHugs.Rimworld.HugsLib.10.0.1\lib\net472\HugsLib.dll + + + ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll + + + ..\..\..\rjw-base\1.3\Assemblies\RJW.dll + + + + + + + + + + + + + + + + About\About.xml + + + About\Manifest.xml + + + Defs\Recipe_Surgery\Recipes_Surgery_Beautify.xml + + + Defs\Recipe_Surgery\Recipes_Surgery_Mammoplasty.xml + + + Defs\Recipe_Surgery\Recipes_Surgery_Penoplasty.xml + + + Defs\Recipe_Surgery\Recipes_Surgery_Sphinctoplasty.xml + + + Defs\Recipe_Surgery\Recipes_Surgery_Vaginoplasty.xml + + + + + + + + + \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/packages.config b/Source/RJW_PlasticSurgeries/packages.config new file mode 100644 index 0000000..77533c7 --- /dev/null +++ b/Source/RJW_PlasticSurgeries/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts index 5401167..17b62bb 100644 --- a/Source/build.gradle.kts +++ b/Source/build.gradle.kts @@ -8,13 +8,24 @@ plugins { id("com.ullink.msbuild") version "3.15" - //id("com.ullink.nunit") version "1.12" } version = "5230.0.1.6" val friendlyName = "rjw-plasticsurgeries" -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}_1.3.csproj") + + targets = listOf("Clean", "Rebuild") + configuration = "Release" + + // destinationDir = "build/msbuild/bin" +} + +tasks.register("buildC#_1.4") { // either a solution file // solutionFile = "${rootProject.name}.sln" // or a project file (.csproj or .vbproj) @@ -26,9 +37,27 @@ tasks.register("buildC#") { // destinationDir = "build/msbuild/bin" } -tasks.register("sign") { - dependsOn("buildC#") - workingDir = project.projectDir.resolve("${rootProject.name}/obj/Release") +tasks.register("sign_1.3") { + dependsOn("buildC#_1.3") + workingDir = project.projectDir.resolve("../1.3/Assemblies") + executable = "H:\\Windows Kits\\10\\bin\\10.0.22000.0\\x64\\signtool.exe" + args = listOf( + "sign", + "/seal", + "/t", + "http://timestamp.digicert.com", + "/a", + "/n", + "Stardust3D", + "/fd", + "certHash", + "${rootProject.name}.dll" + ) +} + +tasks.register("sign_1.4") { + dependsOn("buildC#_1.4") + workingDir = project.projectDir.resolve("../1.4/Assemblies") executable = "H:\\Windows Kits\\10\\bin\\10.0.22000.0\\x64\\signtool.exe" args = listOf( "sign", @@ -45,32 +74,32 @@ tasks.register("sign") { } tasks.register("copyDll") { - dependsOn("copyDll_Assemblies", "copyDll_1.3") -} - -tasks.register("copyDll_Assemblies") { - dependsOn("sign", "clean") - from(project.projectDir.resolve("${rootProject.name}/obj/Release/${rootProject.name}.dll")) - into(project.projectDir.parentFile.resolve("Assemblies")) + dependsOn("copyDll_1.3", "copyDll_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}/obj/Release/1.3/${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}/obj/Release/1.4/${rootProject.name}.dll")) + into(project.projectDir.parentFile.resolve("1.4/Assemblies")) +} + tasks.register("buildZip") { 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/About") { from(project.projectDir.parentFile.resolve("About")) } - into("$friendlyName/Assemblies") { - from(project.projectDir.parentFile.resolve("Assemblies")) - } into("$friendlyName/Defs") { from(project.projectDir.parentFile.resolve("Defs")) } @@ -81,9 +110,8 @@ 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.4/Assemblies")) } tasks.build {