Nb1X/BepInEx
1
0 Fork 0
mirror of https://github.com/BepInEx/BepInEx.git synced 2026-10-20 01:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/BepInEx/BepInEx

Browse Source
This commit is contained in:
ManlyMarco committed 2019-10-21 22:40:52 +02:00
2 parents eb65de062d a0ba72dac2
commit f2e88d46cb
6 files changed
+64 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

BepInEx.Patcher/BepInEx.Patcher.csproj
+4 -4
View File
@@ -31,7 +31,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil, Version=0.10.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.10.3\lib\net35\Mono.Cecil.dll</HintPath>
<HintPath>$(SolutionDir)\packages\Mono.Cecil.0.10.3\lib\net35\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -54,8 +54,8 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\ILRepack.2.0.16\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.2.0.16\build\ILRepack.props'))" />
<Error Condition="!Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\ILRepack.2.0.16\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.2.0.16\build\ILRepack.props'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets'))" />
</Target>
<Import Project="..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets')" />
<Import Project="$(SolutionDir)\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('$(SolutionDir)\packages\ILRepack.Lib.MSBuild.Task.2.0.16.1\build\ILRepack.Lib.MSBuild.Task.targets')" />
</Project>
BepInEx.Preloader/BepInEx.Preloader.csproj
+1 -1
View File
@@ -24,7 +24,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil, Version=0.10.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.10.3\lib\net35\Mono.Cecil.dll</HintPath>
<HintPath>$(SolutionDir)\packages\Mono.Cecil.0.10.3\lib\net35\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
BepInEx/BepInEx.csproj
+1 -1
View File
@@ -40,7 +40,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil, Version=0.10.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.10.3\lib\net35\Mono.Cecil.dll</HintPath>
<HintPath>$(SolutionDir)\packages\Mono.Cecil.0.10.3\lib\net35\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">
README.md
+1 -1
View File
@@ -15,7 +15,7 @@ Unity plugin framework
**[Latest releases](https://github.com/BepInEx/BepInEx/releases)**
**[Bleeding Edge builds](http://builds.bepis.io/bepinex_be)**
**[Bleeding Edge builds](https://builds.bepis.io/projects/bepinex_be)**
**[How to install](https://github.com/bbepis/BepInEx/wiki/How-to-install)**
scripts/jenkins_master.groovy
+56 -13
View File
@@ -10,6 +10,12 @@ pipeline {
stages {
stage('Pull Projects') {
steps {
script {
if(fileExists('./last_build_commit'))
lastBuildCommit = readFile 'last_build_commit'
else
lastBuildCommit = ""
}
// Clean up old project before starting
cleanWs()
@@ -36,6 +42,12 @@ Changes since ${latestTag}:
* [{{hash}}] ({{authorName}}) {{messageTitle}}
{{/merge}}
{{/commits}}""", to: [type: 'COMMIT', value: "${longCommit}"]
if(lastBuildCommit != "") {
htmlChangelog = gitChangelog from: [type: 'COMMIT', value: lastBuildCommit], returnType: 'STRING',
template: """<ul>{{#commits}}{{^merge}}<li>[<code>{{hash}}</code>] ({{authorName}}) {{messageTitle}}</li>{{/merge}}{{/commits}}</ul>""", to: [type: 'COMMIT', value: "${longCommit}"] }
else
htmlChangelog = ""
}
sh 'git submodule update --init --recursive'
@@ -139,29 +151,60 @@ Changes since ${latestTag}:
archiveArtifacts "*.zip"
}
dir('Artifacts') {
sh 'mv ../Build/patcher/*.zip .'
sh 'mv ../Build/dist/*.zip .'
}
}
}
}
post {
success {
/*
post {
cleanup {
script {
writeFile file: 'last_build_commit', text: lastBuildCommit
}
}
success {
script {
lastBuildCommit = longCommit
if(params.IS_BE) {
// Write built BepInEx into bepisbuilds
dir('Build/dist') {
sh "cp BepInEx_x86_${shortCommit}_${versionNumber}.zip /var/www/bepisbuilds/builds/bepinex_be"
sh "cp BepInEx_x64_${shortCommit}_${versionNumber}.zip /var/www/bepisbuilds/builds/bepinex_be"
dir('Artifacts') {
def data = [
id: env.BUILD_NUMBER,
date: sh(returnStdout: true, script: 'date -Iseconds -u'),
changelog: htmlChangelog,
artifacts: [
[
file: "BepInEx_x64${commitPrefix}${versionNumber}.zip",
description: "BepInEx for x64 machines"
],
[
file: "BepInEx_x86${commitPrefix}${versionNumber}.zip",
description: "BepInEx for x86 machines"
],
[
file: "BepInEx_Patcher${commitPrefix}${versionNumber}.zip",
description: "Hardpatcher for BepInEx. IMPORTANT: USE ONLY IF DOORSTOP DOES NOT WORK FOR SOME REASON!"
]
]
]
def json = groovy.json.JsonOutput.toJson(data)
json = groovy.json.JsonOutput.prettyPrint(json)
writeFile file: 'info.json', text: json
def filesToSend = findFiles(glob: '*').collect {it.name}
withCredentials([string(credentialsId: 'bepisbuilds_addr', variable: 'BEPISBUILDS_ADDR')]) {
sh """curl --upload-file "{${filesToSend.join(',')}}" --ftp-pasv --ftp-skip-pasv-ip --ftp-create-dirs --ftp-method singlecwd --disable-epsv ftp://${BEPISBUILDS_ADDR}/bepinex_be/artifacts/${env.BUILD_NUMBER}/"""
}
}
dir('Build/v2018/patcher') {
sh "cp BepInEx_v2018_Patcher_${shortCommit}_${versionNumber}.zip /var/www/bepisbuilds/builds/bepinex_be"
}
sh "echo \"`date -Iseconds -u`;${env.BUILD_NUMBER};${shortCommit};BepInEx_x86_${shortCommit}_${versionNumber}.zip;BepInEx_x64_${shortCommit}_${versionNumber}.zip\" >> /var/www/bepisbuilds/builds/bepinex_be/artifacts_list"
}
}
*/
//Notify Bepin Discord of successfull build
withCredentials([string(credentialsId: 'discord-notify-webhook', variable: 'DISCORD_WEBHOOK')]) {
discordSend description: "**Build:** [${currentBuild.id}](${env.BUILD_URL})\n**Status:** [${currentBuild.currentResult}](${env.BUILD_URL})\n\n[**Artifacts on BepisBuilds**](http://builds.bepis.io/bepinex_be)", footer: 'Jenkins via Discord Notifier', link: env.BUILD_URL, successful: currentBuild.resultIsBetterOrEqualTo('SUCCESS'), title: "${env.JOB_NAME} #${currentBuild.id}", webhookURL: DISCORD_WEBHOOK
discordSend description: "**Build:** [${currentBuild.id}](${env.BUILD_URL})\n**Status:** [${currentBuild.currentResult}](${env.BUILD_URL})\n\n[**Artifacts on BepisBuilds**](https://builds.bepis.io/projects/bepinex_be)", footer: 'Jenkins via Discord Notifier', link: env.BUILD_URL, successful: currentBuild.resultIsBetterOrEqualTo('SUCCESS'), title: "${env.JOB_NAME} #${currentBuild.id}", webhookURL: DISCORD_WEBHOOK
}
}
failure {
submodules/BepInEx.Harmony
+1 -1
Submodule submodules/BepInEx.Harmony updated: e312b4d073...a71acb2f2e.