From 52eb5eda424ef604187b39a7f00ba244d2815019 Mon Sep 17 00:00:00 2001 From: Peter Taylor Date: Sun, 31 Jul 2022 14:20:51 +0100 Subject: [PATCH 1/2] Updated Monogame MG: 3.8 -> 3.8.1 dotnet: + coreapp3.1 -> net6 + netstandard2.0 -> net6 --- .../MonoGame.Extended.Animations.csproj | 2 +- .../MonoGame.Extended.Collisions.csproj | 4 ++-- .../MonoGame.Extended.Content.Pipeline.csproj | 8 ++++---- .../MonoGame.Extended.Entities.csproj | 4 ++-- .../MonoGame.Extended.Graphics.csproj | 4 ++-- src/cs/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj | 4 ++-- .../MonoGame.Extended.Input.csproj | 4 ++-- .../MonoGame.Extended.Particles.csproj | 4 ++-- .../MonoGame.Extended.Tiled.csproj | 4 ++-- .../MonoGame.Extended.Tweening.csproj | 4 ++-- src/cs/MonoGame.Extended/MonoGame.Extended.csproj | 6 +++--- .../MonoGame.Extended.Collisions.Tests.csproj | 4 ++-- .../MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj | 6 +++--- .../MonoGame.Extended.Content.Pipeline.Tests.csproj | 6 +++--- .../MonoGame.Extended.Entities.Tests.csproj | 4 ++-- .../MonoGame.Extended.Gui.Tests.csproj | 4 ++-- .../MonoGame.Extended.Tests.csproj | 4 ++-- .../MonoGame.Extended.Tiled.Tests.csproj | 4 ++-- 18 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/cs/MonoGame.Extended.Animations/MonoGame.Extended.Animations.csproj b/src/cs/MonoGame.Extended.Animations/MonoGame.Extended.Animations.csproj index 8de0c376..4cde0df1 100644 --- a/src/cs/MonoGame.Extended.Animations/MonoGame.Extended.Animations.csproj +++ b/src/cs/MonoGame.Extended.Animations/MonoGame.Extended.Animations.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net6.0 diff --git a/src/cs/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj b/src/cs/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj index 331f68f4..2c28c9c7 100644 --- a/src/cs/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj +++ b/src/cs/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 @@ -22,7 +22,7 @@ - + All diff --git a/src/cs/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj b/src/cs/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj index 96b73a8e..a2d6ae9c 100644 --- a/src/cs/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj +++ b/src/cs/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + net6.0 True - + @@ -28,10 +28,10 @@ - + All - + All diff --git a/src/cs/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj b/src/cs/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj index c013972c..4d5ce7c1 100644 --- a/src/cs/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj +++ b/src/cs/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net6.0 @@ -21,7 +21,7 @@ - + All diff --git a/src/cs/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj b/src/cs/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj index eda697f1..c6fb9bbd 100644 --- a/src/cs/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj +++ b/src/cs/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 @@ -42,7 +42,7 @@ - + All diff --git a/src/cs/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj b/src/cs/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj index e39eff9c..e8364864 100644 --- a/src/cs/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj +++ b/src/cs/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 @@ -23,7 +23,7 @@ - + All diff --git a/src/cs/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj b/src/cs/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj index ba4f18bf..3c69c1af 100644 --- a/src/cs/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj +++ b/src/cs/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 @@ -22,7 +22,7 @@ - + All diff --git a/src/cs/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj b/src/cs/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj index 545ee743..a39b6ab2 100644 --- a/src/cs/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj +++ b/src/cs/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 @@ -26,7 +26,7 @@ - + All diff --git a/src/cs/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj b/src/cs/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj index cc8fa1f7..ece0263b 100644 --- a/src/cs/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj +++ b/src/cs/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net6.0 @@ -26,7 +26,7 @@ - + All diff --git a/src/cs/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj b/src/cs/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj index aead719f..b0c9c653 100644 --- a/src/cs/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj +++ b/src/cs/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net6.0 @@ -21,7 +21,7 @@ - + All diff --git a/src/cs/MonoGame.Extended/MonoGame.Extended.csproj b/src/cs/MonoGame.Extended/MonoGame.Extended.csproj index 03334e39..c63b9025 100644 --- a/src/cs/MonoGame.Extended/MonoGame.Extended.csproj +++ b/src/cs/MonoGame.Extended/MonoGame.Extended.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 @@ -18,10 +18,10 @@ - + All - + All diff --git a/src/cs/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj b/src/cs/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj index e77e29f8..729c105c 100644 --- a/src/cs/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj +++ b/src/cs/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj @@ -1,12 +1,12 @@  - netcoreapp3.1 + net6.0 false - + diff --git a/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj b/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj index 44233859..06a67b14 100644 --- a/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj +++ b/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net6.0 false @@ -37,8 +37,8 @@ - - + + diff --git a/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj b/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj index c9c81e50..2a3f9cdc 100644 --- a/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj +++ b/src/cs/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj @@ -1,12 +1,12 @@  - netcoreapp3.1 + net6.0 false - - + + diff --git a/src/cs/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj b/src/cs/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj index e78622b3..73d4479f 100644 --- a/src/cs/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj +++ b/src/cs/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + net6.0 false - + diff --git a/src/cs/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj b/src/cs/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj index 9dbb59e6..2dca7dd8 100644 --- a/src/cs/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj +++ b/src/cs/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + net6.0 false - + diff --git a/src/cs/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj b/src/cs/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj index c912b928..66ec6d54 100644 --- a/src/cs/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj +++ b/src/cs/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj @@ -1,11 +1,11 @@ - netcoreapp3.1 + net6.0 false - + diff --git a/src/cs/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj b/src/cs/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj index 2576d4e5..a6fc12ae 100644 --- a/src/cs/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj +++ b/src/cs/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + net6.0 false - + From c6b32fea8bb2525c558cc0fdf806cdb7e1afa8ca Mon Sep 17 00:00:00 2001 From: Peter Taylor Date: Sun, 31 Jul 2022 14:27:27 +0100 Subject: [PATCH 2/2] Updated dotnet version in CI --- .github/workflows/build-test-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 4b92f32c..f14d9a04 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -3,7 +3,7 @@ name: "Build test deploy" env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CORE_SDK_VERSION: 3.1.301 + DOTNET_CORE_SDK_VERSION: 6.0.302 MYGET_ACCESS_TOKEN: ${{ secrets.MYGET_ACCESS_TOKEN }} MYGET_SOURCE_URL: 'https://www.myget.org/F/lithiumtoast/api/v3/index.json'