From 4108895749759a9b98d14fe07387337403be893a Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Sat, 22 Feb 2020 21:47:30 +0000 Subject: [PATCH] Build server fix --- CompileFix.bat | 3 +-- Jenkinsfile | 18 ++++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/CompileFix.bat b/CompileFix.bat index 3580950..f075191 100644 --- a/CompileFix.bat +++ b/CompileFix.bat @@ -1,5 +1,4 @@ cd Facepunch.Steamworks -dotnet restore .\Facepunch.Steamworks.Posix32.csproj -dotnet restore .\Facepunch.Steamworks.Posix64.csproj +dotnet restore .\Facepunch.Steamworks.Posix.csproj dotnet restore .\Facepunch.Steamworks.Win32.csproj dotnet restore .\Facepunch.Steamworks.Win64.csproj \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 3aa7ccc..85291bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,20 +8,17 @@ node ( 'vs2017' ) stage 'Restore' bat "dotnet restore Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj" bat "dotnet restore Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj" - bat "dotnet restore Facepunch.Steamworks/Facepunch.Steamworks.Posix32.csproj" - bat "dotnet restore Facepunch.Steamworks/Facepunch.Steamworks.Posix64.csproj" + bat "dotnet restore Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj" stage 'Build Release' bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj --configuration Release" bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj --configuration Release" - bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Posix32.csproj --configuration Release" - bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Posix64.csproj --configuration Release" + bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj --configuration Release" stage 'Build Debug' bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj --configuration Debug" bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj --configuration Debug" - bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Posix32.csproj --configuration Debug" - bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Posix64.csproj --configuration Debug" + bat "dotnet build Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj --configuration Debug" stage 'Archive' archiveArtifacts artifacts: 'Facepunch.Steamworks/bin/**/*' @@ -31,12 +28,9 @@ node ( 'vs2017' ) bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Win64.dll UnityPlugin\\" ) bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Win64.pdb UnityPlugin\\" ) bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Win64.xml UnityPlugin\\" ) - bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix32.dll UnityPlugin\\" ) - bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix32.pdb UnityPlugin\\" ) - bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix32.xml UnityPlugin\\" ) - bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix64.dll UnityPlugin\\" ) - bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix64.pdb UnityPlugin\\" ) - bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix64.xml UnityPlugin\\" ) + bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix.dll UnityPlugin\\" ) + bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix.pdb UnityPlugin\\" ) + bat( "copy /Y Facepunch.Steamworks\\bin\\Debug\\netstandard2.0\\Facepunch.Steamworks.Posix.xml UnityPlugin\\" ) archiveArtifacts artifacts: 'UnityPlugin/**/*' } finally