diff --git a/Source/RJW_PlasticSurgeries.sln b/Source/RJW_PlasticSurgeries.sln
index 8ff40f0..a650eca 100644
--- a/Source/RJW_PlasticSurgeries.sln
+++ b/Source/RJW_PlasticSurgeries.sln
@@ -1,11 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31911.196
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33110.190
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_PlasticSurgeries", "RJW_PlasticSurgeries\RJW_PlasticSurgeries.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.3", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.3.csproj", "{EB363145-6DB4-42CB-B2CB-82DA7AE02A97}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_PlasticSurgeries_1.3", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.3.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.4", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.4.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB72}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,15 +13,19 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F17C6B3F-BA9D-4133-A201-1265A64BCB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {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
+ {EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+ {EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Debug|Any CPU.Build.0 = Release|Any CPU
+ {EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EB363145-6DB4-42CB-B2CB-82DA7AE02A97}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+ {F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Debug|Any CPU.Build.0 = Release|Any CPU
+ {F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F17C6B3F-BA9D-4133-A201-1265A64BCB72}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {DBAFE1CE-D76E-4E7B-9E31-5DBC343D7281}
+ SolutionGuid = {15F5DAE6-1B45-498F-879B-03AE78172AD8}
EndGlobalSection
EndGlobal
diff --git a/Source/RJW_PlasticSurgeries/App.config b/Source/RJW_PlasticSurgeries/App.config
deleted file mode 100644
index ded10ad..0000000
--- a/Source/RJW_PlasticSurgeries/App.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs b/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs
deleted file mode 100644
index 756a071..0000000
--- a/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +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 PlasticSurgeries")]
-[assembly: AssemblyDescription("Surgically alter pawn's genitals.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RJW_PlasticSurgeries")]
-[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("eefbb469-e5e0-48be-bf4d-c5e838d1362b")]
-
-// 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("5230.0.1.6")]
-[assembly: AssemblyFileVersion("5230.0.1.6")]
\ No newline at end of file
diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj
deleted file mode 100644
index b41b959..0000000
--- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {F17C6B3F-BA9D-4133-A201-1265A64BCB71}
- Library
- Properties
- RJW_PlasticSurgeries
- RJW_PlasticSurgeries
- v4.7.2
- 512
-
-
-
-
- true
- portable
- false
- ..\..\1.4\Assemblies\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
-
-
- portable
- true
- ..\..\1.4\Assemblies\
-
-
- prompt
- 4
- false
- ..\..\1.4\Assemblies\RJW_PlasticSurgeries.xml
- true
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- RJW_PlasticSurgeries.snk
-
-
-
- ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
- False
-
-
- ..\..\..\dyspareunia\1.4\Assemblies\Dyspareunia.dll
-
-
- ..\packages\UnlimitedHugs.Rimworld.HugsLib.10.0.1\lib\net472\HugsLib.dll
-
-
- ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll
-
-
- ..\..\..\rjw-base\1.4\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/RJW_PlasticSurgeries_1.3.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj
index 44097ab..6d546c4 100644
--- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj
+++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj
@@ -1,111 +1,47 @@
-
-
-
-
- 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
-
-
-
-
-
-
-
-
+
+
+
+ Debug
+ AnyCPU
+ {EB363145-6DB4-42CB-B2CB-82DA7AE02A97}
+ Library
+ Properties
+ RJW_PlasticSurgeries
+ RJW_PlasticSurgeries
+ net48
+ 512
+
+
+ 7.3
+ ©2022 Stardust3D
+ Stardust3D
+ 5230.0.1.6
+ 5230.0.1.6
+ true
+ RJW_PlasticSurgeries.snk
+ Surgically alter pawn's genitals.
+
+
+ bin\Release\1.3\
+
+
+
+
+
+
+
+
+
+
+
+
+ ..\..\..\dyspareunia\1.3\Assemblies\Dyspareunia.dll
+
+
+ ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll
+
+
+ ..\..\..\rjw-base\1.3\Assemblies\RJW.dll
+
+
\ No newline at end of file
diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj
new file mode 100644
index 0000000..a028e93
--- /dev/null
+++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj
@@ -0,0 +1,48 @@
+
+
+
+ Debug
+ AnyCPU
+ {F17C6B3F-BA9D-4133-A201-1265A64BCB72}
+ Library
+ Properties
+ RJW_PlasticSurgeries
+ RJW_PlasticSurgeries
+ net48
+ 512
+
+
+ 7.3
+ ©2022 Stardust3D
+ Stardust3D
+ 5230.0.1.6
+ 5230.0.1.6
+ true
+ RJW_PlasticSurgeries.snk
+ Surgically alter pawn's genitals.
+
+
+ bin\Release\1.4\
+
+
+
+
+
+
+
+
+
+
+
+
+ ..\..\..\dyspareunia\1.4\Assemblies\Dyspareunia.dll
+
+
+ ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll
+
+
+ ..\..\..\rjw-base\1.4\Assemblies\RJW.dll
+
+
+
+
diff --git a/Source/RJW_PlasticSurgeries/packages.config b/Source/RJW_PlasticSurgeries/packages.config
deleted file mode 100644
index 77533c7..0000000
--- a/Source/RJW_PlasticSurgeries/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 17b62bb..d35adc6 100644
--- a/Source/build.gradle.kts
+++ b/Source/build.gradle.kts
@@ -29,7 +29,7 @@ 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}.csproj")
+ projectFile = file("${rootProject.name}/${rootProject.name}_1.4.csproj")
targets = listOf("Clean", "Rebuild")
configuration = "Release"
@@ -39,7 +39,7 @@ tasks.register("buildC#_1.4") {
tasks.register("sign_1.3") {
dependsOn("buildC#_1.3")
- workingDir = project.projectDir.resolve("../1.3/Assemblies")
+ workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48")
executable = "H:\\Windows Kits\\10\\bin\\10.0.22000.0\\x64\\signtool.exe"
args = listOf(
"sign",
@@ -57,7 +57,7 @@ tasks.register("sign_1.3") {
tasks.register("sign_1.4") {
dependsOn("buildC#_1.4")
- workingDir = project.projectDir.resolve("../1.4/Assemblies")
+ workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48")
executable = "H:\\Windows Kits\\10\\bin\\10.0.22000.0\\x64\\signtool.exe"
args = listOf(
"sign",
@@ -79,18 +79,18 @@ tasks.register("copyDll") {
tasks.register("copyDll_1.3") {
dependsOn("sign_1.3")
- from(project.projectDir.resolve("${rootProject.name}/obj/Release/1.3/${rootProject.name}.dll"))
+ 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}/obj/Release/1.4/${rootProject.name}.dll"))
+ 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", ":copyDll")
into("$friendlyName/1.3") {
from(project.projectDir.parentFile.resolve("1.3"))
}
@@ -110,8 +110,8 @@ tasks.register("buildZip") {
}
tasks.clean {
- delete.add(project.projectDir.parentFile.resolve("1.3/Assemblies"))
- delete.add(project.projectDir.parentFile.resolve("1.4/Assemblies"))
+ delete.add(project.projectDir.parentFile.resolve("1.3"))
+ delete.add(project.projectDir.parentFile.resolve("1.4"))
}
tasks.build {
diff --git a/Source/global.json b/Source/global.json
new file mode 100644
index 0000000..1bcf6c0
--- /dev/null
+++ b/Source/global.json
@@ -0,0 +1,7 @@
+{
+ "sdk": {
+ "version": "6.0.0",
+ "rollForward": "latestMinor",
+ "allowPrerelease": false
+ }
+}
\ No newline at end of file