mirror of
https://gitgud.io/Stardust3D/rjw-plasticsurgeries.git
synced 2024-08-14 23:57:25 +00:00
Merge tag '5390.0.1.6' into develop
5390.0.1.6 5390.0.1.6
This commit is contained in:
Stardust3D
commit
476213ed08
14 changed files with 172 additions and 39 deletions
Binary file not shown.
Binary file not shown.
|
|
@ -2,5 +2,5 @@
|
|||
|
||||
<Manifest>
|
||||
<identifier>RJW PlasticSurgeries</identifier>
|
||||
<version>5371.0.1.6</version>
|
||||
<version>5390.0.1.6</version>
|
||||
</Manifest>
|
||||
|
|
@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.3",
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.4", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.4.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB72}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_PlasticSurgeries_1.5", "RJW_PlasticSurgeries\RJW_PlasticSurgeries_1.5.csproj", "{02AA6D85-913F-44B8-9C32-6E8024261824}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -21,6 +23,10 @@ Global
|
|||
{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
|
||||
{02AA6D85-913F-44B8-9C32-6E8024261824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{02AA6D85-913F-44B8-9C32-6E8024261824}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{02AA6D85-913F-44B8-9C32-6E8024261824}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{02AA6D85-913F-44B8-9C32-6E8024261824}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
|
||||
<Manifest>
|
||||
<identifier>RJW PlasticSurgeries</identifier>
|
||||
<version>5371.0.1.6</version>
|
||||
<version>5390.0.1.6</version>
|
||||
</Manifest>
|
||||
|
|
@ -13,10 +13,10 @@
|
|||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
<LangVersion>11</LangVersion>
|
||||
<Copyright>©2023 Stardust3D</Copyright>
|
||||
<Copyright>©2024 Stardust3D</Copyright>
|
||||
<Company>Stardust3D</Company>
|
||||
<AssemblyVersion>5371.0.1.6</AssemblyVersion>
|
||||
<FileVersion>5371.0.1.6</FileVersion>
|
||||
<AssemblyVersion>5390.0.1.6</AssemblyVersion>
|
||||
<FileVersion>5390.0.1.6</FileVersion>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
|
||||
<Description>Surgically alter pawn's genitals.</Description>
|
||||
|
|
@ -27,12 +27,13 @@
|
|||
<ItemGroup>
|
||||
<None Include="RJW_PlasticSurgeries.snk" />
|
||||
<None Remove="1.4\**" />
|
||||
<None Remove="1.5\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Lib.Harmony" Version="2.2.2" />
|
||||
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
||||
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.3.3389" />
|
||||
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="10.0.1" />
|
||||
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Dyspareunia">
|
||||
|
|
@ -46,9 +47,11 @@
|
|||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Remove="1.4\**" />
|
||||
<Compile Remove="1.4\**" />
|
||||
<Compile Remove="1.5\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Remove="1.4\**" />
|
||||
<EmbeddedResource Remove="1.4\**" />
|
||||
<EmbeddedResource Remove="1.5\**" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -13,10 +13,10 @@
|
|||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
<LangVersion>11</LangVersion>
|
||||
<Copyright>©2023 Stardust3D</Copyright>
|
||||
<Copyright>©2024 Stardust3D</Copyright>
|
||||
<Company>Stardust3D</Company>
|
||||
<AssemblyVersion>5371.0.1.6</AssemblyVersion>
|
||||
<FileVersion>5371.0.1.6</FileVersion>
|
||||
<AssemblyVersion>5390.0.1.6</AssemblyVersion>
|
||||
<FileVersion>5390.0.1.6</FileVersion>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
|
||||
<Description>Surgically alter pawn's genitals.</Description>
|
||||
|
|
@ -27,12 +27,13 @@
|
|||
<ItemGroup>
|
||||
<None Include="RJW_PlasticSurgeries.snk" />
|
||||
<None Remove="1.3\**" />
|
||||
<None Remove="1.5\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Lib.Harmony" Version="2.2.2" />
|
||||
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
||||
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" />
|
||||
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="10.0.1" />
|
||||
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" />
|
||||
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Dyspareunia">
|
||||
|
|
@ -46,10 +47,12 @@
|
|||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Remove="1.3\**" />
|
||||
<Compile Remove="1.3\**" />
|
||||
<Compile Remove="1.5\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Remove="1.3\**" />
|
||||
<EmbeddedResource Remove="1.3\**" />
|
||||
<EmbeddedResource Remove="1.5\**" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
58
Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj
Normal file
58
Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{02aa6d85-913f-44b8-9c32-6e8024261824}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>RJW_PlasticSurgeries</RootNamespace>
|
||||
<AssemblyName>RJW_PlasticSurgeries</AssemblyName>
|
||||
<TargetFramework>net48</TargetFramework>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
<LangVersion>11</LangVersion>
|
||||
<Copyright>©2024 Stardust3D</Copyright>
|
||||
<Company>Stardust3D</Company>
|
||||
<AssemblyVersion>5390.0.1.6</AssemblyVersion>
|
||||
<FileVersion>5390.0.1.6</FileVersion>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>RJW_PlasticSurgeries.snk</AssemblyOriginatorKeyFile>
|
||||
<Description>Surgically alter pawn's genitals.</Description>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<OutputPath>bin\Release\1.4\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="RJW_PlasticSurgeries.snk" />
|
||||
<None Remove="1.3\**" />
|
||||
<None Remove="1.4\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
||||
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4055-beta" />
|
||||
<PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Dyspareunia">
|
||||
<HintPath>..\..\..\dyspareunia\1.5\Assemblies\Dyspareunia.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="LicentiaLabs">
|
||||
<HintPath>..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="RJW">
|
||||
<HintPath>..\..\..\rjw-base\1.5\Assemblies\RJW.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Remove="1.3\**" />
|
||||
<Compile Remove="1.4\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Remove="1.3\**" />
|
||||
<EmbeddedResource Remove="1.4\**" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -7,10 +7,11 @@
|
|||
*/
|
||||
|
||||
plugins {
|
||||
id("com.ullink.msbuild") version "3.15"
|
||||
alias(libs.plugins.msbuild)
|
||||
alias(libs.plugins.versions)
|
||||
}
|
||||
|
||||
version = "5371.0.1.6"
|
||||
version = "5390.0.1.6"
|
||||
val friendlyName = "rjw-plasticsurgeries"
|
||||
|
||||
tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
|
||||
|
|
@ -37,6 +38,18 @@ tasks.register<com.ullink.Msbuild>("buildC#_1.4") {
|
|||
// destinationDir = "build/msbuild/bin"
|
||||
}
|
||||
|
||||
tasks.register<com.ullink.Msbuild>("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<Exec>("sign_1.3") {
|
||||
dependsOn("buildC#_1.3")
|
||||
workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48")
|
||||
|
|
@ -73,6 +86,24 @@ tasks.register<Exec>("sign_1.4") {
|
|||
)
|
||||
}
|
||||
|
||||
tasks.register<Exec>("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_about")
|
||||
}
|
||||
|
|
@ -94,6 +125,12 @@ tasks.register<Copy>("copy_1.4") {
|
|||
into(project.projectDir.parentFile.resolve("1.4"))
|
||||
}
|
||||
|
||||
tasks.register<Copy>("copy_1.5") {
|
||||
dependsOn("copyDll_1.5")
|
||||
from(project.projectDir.resolve("${rootProject.name}/1.5"))
|
||||
into(project.projectDir.parentFile.resolve("1.5"))
|
||||
}
|
||||
|
||||
tasks.register<Copy>("copyDll_1.3") {
|
||||
dependsOn("sign_1.3")
|
||||
from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${rootProject.name}.dll"))
|
||||
|
|
@ -106,6 +143,12 @@ tasks.register<Copy>("copyDll_1.4") {
|
|||
into(project.projectDir.parentFile.resolve("1.4/Assemblies"))
|
||||
}
|
||||
|
||||
tasks.register<Copy>("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<Zip>("buildZip") {
|
||||
dependsOn("clean", ":copy")
|
||||
into("$friendlyName/1.3") {
|
||||
|
|
@ -114,6 +157,9 @@ tasks.register<Zip>("buildZip") {
|
|||
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"))
|
||||
}
|
||||
|
|
@ -129,6 +175,7 @@ tasks.register<Zip>("buildZip") {
|
|||
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"))
|
||||
}
|
||||
|
||||
|
|
|
|||
11
Source/gradle/libs.versions.toml
Normal file
11
Source/gradle/libs.versions.toml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[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" }
|
||||
BIN
Source/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
Source/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
|
|
@ -1,6 +1,7 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
22
Source/gradlew
vendored
22
Source/gradlew
vendored
|
|
@ -83,7 +83,8 @@ done
|
|||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
# 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
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
|
@ -130,10 +131,13 @@ location of your Java installation."
|
|||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
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.
|
||||
|
||||
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.
|
||||
|
|
@ -141,7 +145,7 @@ 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=SC3045
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
|
|
@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
|
|
@ -198,11 +202,11 @@ 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, 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.
|
||||
# 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.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
|
|
|
|||
20
Source/gradlew.bat
vendored
20
Source/gradlew.bat
vendored
|
|
@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
|||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
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.
|
||||
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
|
||||
|
||||
goto fail
|
||||
|
||||
|
|
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
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.
|
||||
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
|
||||
|
||||
goto fail
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue