Let's pray it all works

metalgearsloth · Dec 15, 2019 · a9f148c · a9f148c
1 parent a652e39
commit a9f148c
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 132 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,5 +1,5 @@
 version: 1.0.{build}
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 platform: x64
 configuration: Debug
@@ -12,10 +12,9 @@ build:
 before_build:
 - cmd: py -3 -m pip install --user requests
 - cmd: py -3 RUN_THIS.py --no-prompt
-- cmd: nuget restore SpaceStation14.sln
 
 build_script:
-- ps: msbuild SpaceStation14.sln /v:m /nologo /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform=x64 /p:Configuration=Debug /p:AppVeyor=yes
+- ps: dotnet build SpaceStation14.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:AppVeyor=yes
 
 test:
   assemblies:

diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@ language: csharp
 
 dist: trusty
 sudo: false
+mono: none
+# dotnet: 3.1.100 # Travis is shitting itself right now and it can't locate .NET Core packages.
 
 os:
 - linux
@@ -20,19 +22,19 @@ cache:
   directories:
   - packages/
   - RobustToolbox/Dependencies/
-  - RobustToolbox/SS14.Client.Godot/.mono/assemblies/
+
+install:
+- curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 3.1.100
 
 #before_install:
 #  - if [ $TRAVIS_OS_NAME = osx ]; then brew update && brew upgrade python; fi
 
 before_script:
 #- "if [ $TRAVIS_OS_NAME = linux ]; then pyenv shell 3.6; fi"
 - "python3.5 -m pip install --user requests"
-- "nuget restore SpaceStation14.sln"
 - "python3.5 RUN_THIS.py --no-prompt"
 
 script:
-- "msbuild /p:Configuration=Debug /p:Platform=x64 /nologo /m SpaceStation14.sln /p:Python=python3.5"
-- "mono packages/nunit.consolerunner/3.10.0/tools/nunit3-console.exe bin/Content.Tests/Content.Tests.dll bin/Content.IntegrationTests/Content.IntegrationTests.dll"
+- "Tools/run_travis.sh"
 
 
diff --git a/BuildFiles/Linux/SS14.Launcher b/BuildFiles/Linux/SS14.Launcher
diff --git a/BuildFiles/Mac/Space Station 14 Launcher.app/Contents/Info.plist b/BuildFiles/Mac/Space Station 14 Launcher.app/Contents/Info.plist
diff --git a/BuildFiles/Mac/Space Station 14 Launcher.app/Contents/MacOS/SS14 b/BuildFiles/Mac/Space Station 14 Launcher.app/Contents/MacOS/SS14
diff --git a/BuildFiles/Mac/Space Station 14 Launcher.app/Contents/Resources/ss14.icns b/BuildFiles/Mac/Space Station 14 Launcher.app/Contents/Resources/ss14.icns
diff --git a/BuildFiles/Mac/Space Station 14.app/Contents/MacOS/SS14 b/BuildFiles/Mac/Space Station 14.app/Contents/MacOS/SS14
@@ -5,4 +5,4 @@ BASEDIR=$(dirname "$0")
 echo "$BASEDIR"
 cd "$BASEDIR"
 
-exec /Library/Frameworks/Mono.framework/Versions/Current/Commands/mono ../Resources/Robust.Client.exe
+exec ../Resources/Robust.Client "$@"
diff --git a/BuildFiles/Windows/run_me.bat b/BuildFiles/Windows/run_me.bat
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
@@ -29,7 +29,4 @@
     </ProjectReference>
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Condition="'$(UseNetCore)' != 'true'" Include="System.Net.Http" />
-  </ItemGroup>
 </Project>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,6 @@ pipeline {
         stage('Setup') {
             steps {
                 sh 'git submodule update --init --recursive'
-                sh 'TMP=~/.cache/NuGet/ nuget restore'
             }
         }
         stage('Build') {

diff --git a/RobustToolbox b/RobustToolbox
diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
@@ -18,10 +18,6 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Lite\Robust.Lite.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Condition="'$(UseNetCore)' != 'true'" Include="System.IO.Compression" />
-    <Reference Condition="'$(UseNetCore)' != 'true'" Include="System.Net.Http" />
-  </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Engine.targets" />
   <PropertyGroup>
     <RobustToolsPath>..\RobustToolbox\Tools\</RobustToolsPath>
+3 −6		.appveyor.yml
+6 −3		.travis.yml
+0 −3		Robust.Server/Robust.Server.csproj
+10 −0		Tools/run_travis.sh