Directory cleanup and re-org (#500)

Author: Bishbash777

Jenkinsfile

@@ -5,11 +5,17 @@ def packageAndArchive(buildMode, 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.*"
+	bat "del bin\\x64\\${buildMode}\\lib\\Content"
+	bat "del bin\\x64\\${buildMode}\\lib\\DedicatedServer64"
+	bat "del bin\\x64\\${buildMode}\\lib\\steamapps"
+	bat "del bin\\x64\\${buildMode}\\lib\\TempContent"
+	bat "del bin\\x64\\${buildMode}\\lib\\Content"
+
+
+	bat "xcopy bin\\x64\\${buildMode} ${packageDir} /S"
+
+
 
 	powershell "Add-Type -Assembly System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::CreateFromDirectory(\"\$PWD\\${packageDir}\", \"\$PWD\\${zipFile}\")"
 	archiveArtifacts artifacts: zipFile, caseSensitive: false, onlyIfSuccessful: true
@@ -18,7 +24,7 @@ def packageAndArchive(buildMode, packageName) {
 node('windows') {
 	stage('Checkout') {
 		checkout scm
-		bat "git pull https://github.com/TorchAPI/Torch/ $env.BRANCH_NAME --tags"
+		//bat "git pull https://github.com/TorchAPI/Torch/ $env.BRANCH_NAME --tags"
 	}
 
 	stage('Acquire SE') {
@@ -47,7 +53,7 @@ node('windows') {
 	}
 
 	stage('Archive') {
-		archiveArtifacts artifacts: "bin/x64/${buildMode}/Torch*", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
+		archiveArtifacts artifacts: "bin/x64/${buildMode}/*", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
 
 		packageAndArchive(buildMode, "torch-server")
 

Torch.API/Torch.API.csproj

@@ -16,22 +16,22 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\x64\Debug\</OutputPath>
+    <OutputPath>..\bin\x64\Debug\lib\Torch\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>$(SolutionDir)\bin\x64\Release\</OutputPath>
+    <OutputPath>..\bin\x64\Release\lib\Torch\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.API.xml</DocumentationFile>
+    <DocumentationFile>..\bin\x64\Release\lib\Torch\Torch.API.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -44,13 +44,11 @@
       <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

Torch.API/WebAPI/JenkinsQuery.cs

@@ -13,6 +13,7 @@ namespace Torch.API.WebAPI
 {
     public class JenkinsQuery
     {
+        //Revert when ready
         private const string BRANCH_QUERY = "http://136.243.80.164:2690/job/Torch/job/{0}/" + API_PATH;
         private const string ARTIFACT_PATH = "artifact/bin/torch-server.zip";
         private const string API_PATH = "api/json";

Torch.API/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
-  <package id="NLog" version="4.4.12" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="NLog" version="4.7.15" targetFramework="net48" />
 </packages>