Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update/upgrade monogame #424

Merged
merged 9 commits into from
Dec 2, 2024
Merged

Update/upgrade monogame #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f7e97fe
upgrade .net and monogame
brandmooffin Sep 9, 2024
8b85f54
Merge branch 'dev' into update/upgrade-monogame
brandmooffin Sep 9, 2024
8b277a0
replace system drawing for maui graphics
brandmooffin Sep 15, 2024
1fd5d12
Merge branch 'dev' into update/upgrade-monogame
brandmooffin Oct 9, 2024
80dad42
Merge branch 'dev' into update/upgrade-monogame
brandmooffin Nov 27, 2024
44f35da
update test projects with latest monogame
brandmooffin Dec 1, 2024
693188b
bump ci dotnet version
brandmooffin Dec 1, 2024
c30f5ec
specify dotnet platform
brandmooffin Dec 1, 2024
ea6a2d7
removed UWP
brandmooffin Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .github/workflows/android_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Install Android Workloads
run: |
dotnet workload update --version 8.0.400
dotnet workload install android --ignore-failed-sources

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/core_android_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Install Android Workloads
run: |
dotnet workload update --version 8.0.400
dotnet workload install android --ignore-failed-sources

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/core_desktopgl_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore ./cocos2d-mono.DesktopGL/cocos2d-mono.Core.DesktopGL.sln
- name: Build
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/core_ios_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Install iOS Workloads
run: |
dotnet workload update --version 8.0.400
dotnet workload install ios --ignore-failed-sources

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/core_uwp_build.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/core_windows_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktopgl_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore ./cocos2d-mono.DesktopGL/cocos2d-mono.DesktopGL.sln
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Install iOS Workloads
run: |
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/uwp_build.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/windows_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
Expand Down
4 changes: 2 additions & 2 deletions Nuget Packages/Cocos2D.Android.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<tags>mono monogame cocos2d game</tags>
<dependencies>
<group targetFramework="net7.0-android33.0">
<dependency id="MonoGame.Content.Builder.Task" version="3.8.1.303" />
<dependency id="MonoGame.Framework.Android" version="3.8.1.303" />
<dependency id="MonoGame.Content.Builder.Task" version="3.8.2.1105" />
<dependency id="MonoGame.Framework.Android" version="3.8.2.1105" />
<dependency id="SharpZipLib" version="1.4.2" />
<dependency id="OpenTK" version="4.7.7" />
</group>
Expand Down
2 changes: 1 addition & 1 deletion Nuget Packages/Cocos2D.Core.Android.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<tags>mono monogame cocos2d game</tags>
<dependencies>
<group targetFramework="net7.0-android33.0">
<dependency id="MonoGame.Framework.Android" version="3.8.1.303" />
<dependency id="MonoGame.Framework.Android" version="3.8.2.1105" />
<dependency id="SharpZipLib" version="1.4.2" />
<dependency id="OpenTK" version="4.7.7" />
</group>
Expand Down
2 changes: 1 addition & 1 deletion Nuget Packages/Cocos2D.Core.DesktopGL.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
<tags>mono monogame cocos2d game</tags>
<dependencies>
<dependency id="MonoGame.Framework.DesktopGL" version="3.8.1.303" />
<dependency id="MonoGame.Framework.DesktopGL" version="3.8.2.1105" />
<dependency id="OpenTK" version="4.4.0" />
<dependency id="SharpZipLib" version="1.3.3" />
<dependency id="System.Drawing.Common" version="5.0.3" />
Expand Down
31 changes: 0 additions & 31 deletions Nuget Packages/Cocos2D.Core.Uwp.nuspec
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Nuget Packages/Cocos2D.Core.Windows.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependencies>
<group targetFramework="net7.0-windows7.0">
<dependency id="BitMiracle.LibTiff.NET" version="2.4.639" exclude="Build,Analyzers" />
<dependency id="MonoGame.Framework.WindowsDX" version="3.8.1.303" exclude="Build,Analyzers" />
<dependency id="MonoGame.Framework.WindowsDX" version="3.8.2.1105" exclude="Build,Analyzers" />
<dependency id="SharpZipLib" version="1.3.3" exclude="Build,Analyzers" />
<dependency id="System.Drawing.Common" version="5.0.3" exclude="Build,Analyzers" />
</group>
Expand Down
2 changes: 1 addition & 1 deletion Nuget Packages/Cocos2D.Core.iOS.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
<tags>mono monogame cocos2d game</tags>
<dependencies>
<dependency id="MonoGame.Framework.iOS" version="3.8.1.303" />
<dependency id="MonoGame.Framework.iOS" version="3.8.2.1105" />
<dependency id="SharpZipLib" version="1.4.2" />
<dependency id="OpenTK" version="4.7.7" />
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions Nuget Packages/Cocos2D.DesktopGL.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
<tags>mono monogame cocos2d game</tags>
<dependencies>
<dependency id="MonoGame.Content.Builder.Task" version="3.8.1.303" />
<dependency id="MonoGame.Framework.DesktopGL" version="3.8.1.303" />
<dependency id="MonoGame.Content.Builder.Task" version="3.8.2.1105" />
<dependency id="MonoGame.Framework.DesktopGL" version="3.8.2.1105" />
<dependency id="OpenTK" version="4.4.0" />
<dependency id="SharpZipLib" version="1.3.3" />
<dependency id="System.Drawing.Common" version="5.0.3" />
Expand Down
32 changes: 0 additions & 32 deletions Nuget Packages/Cocos2D.Uwp.nuspec
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Nuget Packages/Cocos2D.Windows.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<dependencies>
<group targetFramework="net7.0-windows7.0">
<dependency id="BitMiracle.LibTiff.NET" version="2.4.639" exclude="Build,Analyzers" />
<dependency id="MonoGame.Content.Builder.Task" version="3.8.1.303" exclude="Build,Analyzers" />
<dependency id="MonoGame.Framework.WindowsDX" version="3.8.1.303" exclude="Build,Analyzers" />
<dependency id="MonoGame.Content.Builder.Task" version="3.8.2.1105" exclude="Build,Analyzers" />
<dependency id="MonoGame.Framework.WindowsDX" version="3.8.2.1105" exclude="Build,Analyzers" />
<dependency id="SharpZipLib" version="1.3.3" exclude="Build,Analyzers" />
<dependency id="System.Drawing.Common" version="5.0.3" exclude="Build,Analyzers" />
</group>
Expand Down
4 changes: 2 additions & 2 deletions Nuget Packages/Cocos2D.iOS.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<copyright>Copyright © 2024 Cocos2D-Mono Team; Broken Walls Studios, LLC.</copyright>
<tags>mono monogame cocos2d game</tags>
<dependencies>
<dependency id="MonoGame.Content.Builder.Task" version="3.8.1.303" />
<dependency id="MonoGame.Framework.iOS" version="3.8.1.303" />
<dependency id="MonoGame.Content.Builder.Task" version="3.8.2.1105" />
<dependency id="MonoGame.Framework.iOS" version="3.8.2.1105" />
<dependency id="SharpZipLib" version="1.4.2" />
<dependency id="OpenTK" version="4.7.7" />
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
[![DesktopGL (Windows/Linux/macOS)](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/desktopgl_build.yml/badge.svg)](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/desktopgl_build.yml)
[![Windows](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/windows_build.yml/badge.svg)](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/windows_build.yml)
[![Android](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/android_build.yml/badge.svg)](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/android_build.yml)
[![UWP](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/uwp_build.yml/badge.svg)](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/uwp_build.yml)
[![iOS](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/dotnet-desktop.yml/badge.svg)](https://github.com/brandmooffin/cocos2d-mono/actions/workflows/dotnet-desktop.yml)

</div>
Expand Down
Loading
Loading