From 770d18859b618210d0917b7491ef94433f558b85 Mon Sep 17 00:00:00 2001 From: Bishbash777 <50243964+Bishbash777@users.noreply.github.com> Date: Sun, 16 Jan 2022 02:48:27 +0000 Subject: [PATCH] Update Torch.csproj --- Torch/Torch.csproj | 456 ++++++++------------------------------------- 1 file changed, 76 insertions(+), 380 deletions(-) diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index 3aecd28..fc99793 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -1,380 +1,76 @@ - - - - - {7E01635C-3B67-472E-BCD6-C5539564F214} - Library - Properties - Torch - Torch - v4.6.1 - 512 - - - - 7.3 - - - true - $(SolutionDir)\bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - $(SolutionDir)\bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - $(SolutionDir)\bin\x64\Release\Torch.xml - true - 1591 - - - - - - - - - ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - True - - - False - ..\GameBinaries\HavokWrapper.dll - False - - - ..\packages\MahApps.Metro.1.6.1\lib\net45\MahApps.Metro.dll - - - ..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll - - - False - ..\GameBinaries\Newtonsoft.Json.dll - - - ..\packages\NLog.4.4.12\lib\net45\NLog.dll - True - - - - - ..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll - - - ..\GameBinaries\Sandbox.Common.dll - False - - - ..\GameBinaries\Sandbox.Game.dll - False - - - ..\GameBinaries\Sandbox.Graphics.dll - False - - - ..\GameBinaries\SpaceEngineers.Game.dll - False - - - ..\GameBinaries\SpaceEngineers.ObjectBuilders.dll - False - - - ..\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll - False - - - ..\packages\SteamKit2.2.1.0\lib\netstandard2.0\SteamKit2.dll - - - ..\GameBinaries\Steamworks.NET.dll - - - - ..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll - True - - - - - - - - - ..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll - - - ..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll - - - - ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll - True - - - - - - - - - - ..\GameBinaries\VRage.dll - False - - - ..\GameBinaries\VRage.Audio.dll - False - - - ..\GameBinaries\VRage.Dedicated.dll - False - - - ..\GameBinaries\VRage.EOS.dll - False - - - ..\GameBinaries\VRage.Game.dll - False - - - ..\GameBinaries\VRage.Game.XmlSerializers.dll - False - - - ..\GameBinaries\VRage.Input.dll - False - - - ..\GameBinaries\VRage.Library.dll - False - - - ..\GameBinaries\VRage.Math.dll - False - - - ..\GameBinaries\VRage.Mod.Io.dll - False - - - ..\GameBinaries\VRage.Platform.Windows.dll - False - - - ..\GameBinaries\VRage.Platform.Windows.dll - - - ..\GameBinaries\VRage.Render.dll - False - - - ..\GameBinaries\VRage.Render11.dll - False - - - ..\GameBinaries\VRage.Scripting.dll - False - - - ..\GameBinaries\VRage.Steam.dll - False - - - - - - Properties\AssemblyVersion.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CollectionEditor.xaml - - - DictionaryEditor.xaml - - - - EmbeddedCollectionEditor.xaml - - - FlagsEditor.xaml - - - ObjectCollectionEditor.xaml - - - ObjectEditor.xaml - - - PropertyGrid.xaml - - - - - - {fba5d932-6254-4a1e-baf4-e229fa94e3c2} - Torch.API - False - - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - - - - - - - \ No newline at end of file +def packageAndArchive(buildMode, packageName) { + zipFile = "bin\\${packageName}.zip" + packageDir = "bin\\${packageName}\\" + + bat "IF EXIST ${zipFile} DEL ${zipFile}" + bat "IF EXIST ${packageDir} RMDIR /S /Q ${packageDir}" + + bat "xcopy bin\\x64\\${buildMode} ${packageDir}" + + bat "del ${packageDir}VRage.*" + bat "del ${packageDir}Sandbox.*" + bat "del ${packageDir}SpaceEngineers.*" + + powershell "Add-Type -Assembly System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::CreateFromDirectory(\"\$PWD\\${packageDir}\", \"\$PWD\\${zipFile}\")" + archiveArtifacts artifacts: zipFile, caseSensitive: false, onlyIfSuccessful: true +} + +node('windows') { + stage('Checkout') { + checkout scm + bat 'git pull --tags' + } + + stage('Acquire SE') { + bat 'powershell -File Jenkins/jenkins-grab-se.ps1' + bat 'IF EXIST GameBinaries RMDIR GameBinaries' + bat 'mklink /J GameBinaries "C:/Steam/Data/DedicatedServer64/"' + bat 'dir GameBinaries' + } + + stage('Acquire NuGet Packages') { + bat 'nuget restore Torch.sln' + } + + stage('Build') { + currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim() + if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "Patron" || env.BRANCH_NAME == "publictest") { + buildMode = "Release" + } else { + buildMode = "Debug" + } + bat "IF EXIST \"bin\" rmdir /Q /S \"bin\"" + bat "IF EXIST \"bin-test\" rmdir /Q /S \"bin-test\"" + bat "\"${tool 'MSBuild'}msbuild\" Torch.sln /p:Configuration=${buildMode} /p:Platform=x64 /t:Clean" + bat "\"${tool 'MSBuild'}msbuild\" Torch.sln /p:Configuration=${buildMode} /p:Platform=x64" + } + + stage('Archive') { + archiveArtifacts artifacts: "bin/x64/${buildMode}/Torch*", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true + + packageAndArchive(buildMode, "torch-server") + + /*packageAndArchive(buildMode, "torch-client", "Torch.Server*")*/ + } + + /* Disabled because they fail builds more often than they detect actual problems + stage('Test') { + bat 'IF NOT EXIST reports MKDIR reports' + bat "\"packages/xunit.runner.console.2.2.0/tools/xunit.console.exe\" \"bin-test/x64/${buildMode}/Torch.Tests.dll\" \"bin-test/x64/${buildMode}/Torch.Server.Tests.dll\" \"bin-test/x64/${buildMode}/Torch.Client.Tests.dll\" -parallel none -xml \"reports/Torch.Tests.xml\"" + + step([ + $class: 'XUnitBuilder', + thresholdMode: 1, + thresholds: [[$class: 'FailedThreshold', failureThreshold: '1']], + tools: [[ + $class: 'XUnitDotNetTestType', + deleteOutputFiles: true, + failIfNotNew: true, + pattern: 'reports/*.xml', + skipNoTestFiles: false, + stopProcessingIfError: true + ]] + ]) + } + */ +}