diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 3ab588b8..990e9a56 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -30,13 +30,13 @@ jobs:
run: git fetch --prune --unshallow
- name: "Install GitVersion"
- uses: gittools/actions/gitversion/setup@v0.9.2
+ uses: gittools/actions/gitversion/setup@v0.9.3
with:
versionSpec: '5.2.x'
- name: "Use GitVersion"
id: gitversion # step id used as reference for output values
- uses: gittools/actions/gitversion/execute@v0.9.2
+ uses: gittools/actions/gitversion/execute@v0.9.3
- run: |
echo "Major: ${{ steps.gitversion.outputs.major }}"
@@ -83,7 +83,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [macos-latest]
+ os: [windows-latest, macos-latest, ubuntu-latest]
steps:
@@ -123,9 +123,6 @@ jobs:
- name: "Install dependencies"
run: dotnet restore '${{ env.SOLUTION_PATH }}' --verbosity quiet
- - name: "HACK: Build the Pipeline project first to avoid build errors."
- run: dotnet build ./Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj
-
- name: "Build solution"
run: dotnet build '${{ env.SOLUTION_PATH }}' --nologo --verbosity minimal --configuration Release --no-restore /p:Version=${{ steps.version.outputs.nuGetVersion }}
@@ -133,9 +130,11 @@ jobs:
run: dotnet test '${{ env.SOLUTION_PATH }}' --nologo --verbosity normal --configuration Release --no-build
- name: "Pack solution"
+ if: matrix.os == 'ubuntu-latest'
run: dotnet pack '${{ env.SOLUTION_PATH }}' --nologo --output './nuget-packages' --verbosity minimal --configuration Release --no-build -p:PackageVersion=${{ steps.version.outputs.nuGetVersion }}
- name: 'Upload packed artifacts'
+ if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v2
with:
name: nuget-packages
diff --git a/Source/Demos/Gui/.config/dotnet-tools.json b/Source/Demos/Gui/.config/dotnet-tools.json
deleted file mode 100644
index c429d1a6..00000000
--- a/Source/Demos/Gui/.config/dotnet-tools.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "version": 1,
- "isRoot": true,
- "tools": {
- "dotnet-mgcb": {
- "version": "3.8.0.1375-develop",
- "commands": [
- "mgcb"
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/Source/Demos/Gui/Content/Content.mgcb b/Source/Demos/Gui/Content/Content.mgcb
deleted file mode 100644
index d31243f7..00000000
--- a/Source/Demos/Gui/Content/Content.mgcb
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#----------------------------- Global Properties ----------------------------#
-
-/outputDir:bin/$(Platform)
-/intermediateDir:obj/$(Platform)
-/platform:DesktopGL
-/config:
-/profile:Reach
-/compress:False
-
-#-------------------------------- References --------------------------------#
-
-/reference:..\..\..\MonoGame.Extended.Content.Pipeline\bin\netcoreapp3.1\MonoGame.Extended.Content.Pipeline.dll
-
-#---------------------------------- Content ---------------------------------#
-
-#begin Sensation.fnt
-/importer:BitmapFontImporter
-/processor:BitmapFontProcessor
-/build:Sensation.fnt
-
-#begin Sensation_0.png
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-/build:Sensation_0.png
-
diff --git a/Source/Demos/Gui/Content/Sensation.fnt b/Source/Demos/Gui/Content/Sensation.fnt
deleted file mode 100644
index 47145d09..00000000
--- a/Source/Demos/Gui/Content/Sensation.fnt
+++ /dev/null
@@ -1,461 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Source/Demos/Gui/Content/Sensation_0.png b/Source/Demos/Gui/Content/Sensation_0.png
deleted file mode 100644
index 3d76fb67..00000000
Binary files a/Source/Demos/Gui/Content/Sensation_0.png and /dev/null differ
diff --git a/Source/Demos/Gui/Features/MainWindow.mgeml b/Source/Demos/Gui/Features/MainWindow.mgeml
deleted file mode 100644
index 720fed59..00000000
--- a/Source/Demos/Gui/Features/MainWindow.mgeml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Source/Demos/Gui/Features/StackPanelView.cs b/Source/Demos/Gui/Features/StackPanelView.cs
deleted file mode 100644
index b8f1312a..00000000
--- a/Source/Demos/Gui/Features/StackPanelView.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using MonoGame.Extended;
-using MonoGame.Extended.Gui;
-using MonoGame.Extended.Gui.Controls;
-
-namespace Gui.Features
-{
- public class StackPanelView
- {
- public StackPanelView()
- {
- }
-
- public Control Content = new StackPanel
- {
- Items =
- {
- new Button
- {
- Content = "Press Me",
- HorizontalAlignment = HorizontalAlignment.Left,
- VerticalAlignment = VerticalAlignment.Top,
- Padding = new Thickness(5),
- Margin = new Thickness(5)
- },
- new Button
- {
- Content = "Press Me",
- HorizontalAlignment = HorizontalAlignment.Right,
- VerticalAlignment = VerticalAlignment.Bottom,
- Padding = new Thickness(5),
- Margin = new Thickness(5)
- },
- new Button
- {
- Content = "Press Me",
- HorizontalAlignment = HorizontalAlignment.Centre,
- VerticalAlignment = VerticalAlignment.Centre,
- Padding = new Thickness(5),
- Margin = new Thickness(5)
- },
- new Button
- {
- Content = "Press Me",
- HorizontalAlignment = HorizontalAlignment.Stretch,
- VerticalAlignment = VerticalAlignment.Stretch,
- Padding = new Thickness(5),
- Margin = new Thickness(5)
- },
- }
- };
- }
-}
diff --git a/Source/Demos/Gui/Gui.csproj b/Source/Demos/Gui/Gui.csproj
deleted file mode 100644
index d4bab871..00000000
--- a/Source/Demos/Gui/Gui.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- WinExe
- netcoreapp3.1
-
-
- false
- false
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Source/Demos/Gui/Icon.bmp b/Source/Demos/Gui/Icon.bmp
deleted file mode 100644
index 2b481653..00000000
Binary files a/Source/Demos/Gui/Icon.bmp and /dev/null differ
diff --git a/Source/Demos/Gui/Icon.ico b/Source/Demos/Gui/Icon.ico
deleted file mode 100644
index 7d9dec18..00000000
Binary files a/Source/Demos/Gui/Icon.ico and /dev/null differ
diff --git a/Source/Demos/Gui/MainGame.cs b/Source/Demos/Gui/MainGame.cs
deleted file mode 100644
index 7db341d3..00000000
--- a/Source/Demos/Gui/MainGame.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Input;
-using MonoGame.Extended;
-using MonoGame.Extended.BitmapFonts;
-using MonoGame.Extended.Gui;
-using MonoGame.Extended.Gui.Controls;
-using MonoGame.Extended.Gui.Markup;
-using MonoGame.Extended.ViewportAdapters;
-
-namespace Gui
-{
- public class MainGame : Game
- {
- // ReSharper disable once NotAccessedField.Local
- private readonly GraphicsDeviceManager _graphicsDeviceManager;
- private GuiSystem _guiSystem;
-
- public MainGame()
- {
- _graphicsDeviceManager = new GraphicsDeviceManager(this);
-
- Content.RootDirectory = "Content";
- IsMouseVisible = true;
- Window.AllowUserResizing = true;
- Window.ClientSizeChanged += WindowOnClientSizeChanged;
- }
-
- private void WindowOnClientSizeChanged(object sender, EventArgs eventArgs)
- {
- _guiSystem.ClientSizeChanged();
- }
-
- protected override void LoadContent()
- {
- var viewportAdapter = new DefaultViewportAdapter(GraphicsDevice);
- var guiRenderer = new GuiSpriteBatchRenderer(GraphicsDevice, () => Matrix.Identity);
- var font = Content.Load("Sensation");
- BitmapFont.UseKernings = false;
- Skin.CreateDefault(font);
-
- //var parser = new MarkupParser();
-
- //var mainScreen = new Screen
- //{
- // Content = parser.Parse("Features/MainWindow.mgeml", new object())
- //};
-
- //var textBox = mainScreen.FindControl("TextBox");
- //var statusLabel = mainScreen.FindControl