From 663d7148fec753e49880dbf3294d7d363c2ca693 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 25 Jul 2022 18:38:23 +0200 Subject: [PATCH] Revert "restore android workload when building" This reverts commit 79f720668606379509f2fba9dde3d9116c85a270. --- Demos/GameImpl.cs | 9 +++++++++ Jenkinsfile | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Demos/GameImpl.cs b/Demos/GameImpl.cs index 6eb6930..55dcfd2 100644 --- a/Demos/GameImpl.cs +++ b/Demos/GameImpl.cs @@ -48,6 +48,15 @@ namespace Demos { } protected override void LoadContent() { + // TODO remove with MonoGame 3.8.1 https://github.com/MonoGame/MonoGame/issues/7298 + #if !FNA + if (PlatformInfo.MonoGamePlatform == MonoGamePlatform.DesktopGL) { + this.GraphicsDeviceManager.PreferredBackBufferWidth = 1280; + this.GraphicsDeviceManager.PreferredBackBufferHeight = 720; + this.GraphicsDeviceManager.ApplyChanges(); + } + #endif + base.LoadContent(); this.UiSystem.AutoScaleReferenceSize = new Point(1280, 720); this.UiSystem.AutoScaleWithScreen = true; diff --git a/Jenkinsfile b/Jenkinsfile index 2a4b5c2..50421f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,6 @@ pipeline { stage('Cake Build') { steps { sh 'dotnet tool restore' - sh 'dotnet workload restore' // we use xvfb to allow for graphics-dependent tests sh 'xvfb-run -a dotnet cake --target Publish --branch ' + env.BRANCH_NAME }