Skip to content

Commit

Permalink
Feature/replaceArialFont (#82)
Browse files Browse the repository at this point in the history
* Add font files and replace selected font in SpriteFont files to Roboto-Bold

* Rename SpriteFont Files

* Get csproj to point 3.8.* so to test things we only need to update the respective dotnet-tools.json file.

* Updated the READE.md with instructions on testing against newer CI builds.

* Have 1 sln with all the platforms, now that we share *.Core. This follows the upcoming sln templates.

* Get CI to build each game sample on Windows, to confirm everything still works.

* Update pipeline to build ShipGame content processor in release build

* update *.mgcbs to populate the config field.

* Remove internal references to icons, as it should be using the icon from the ApplicationIcon tag

---------

Co-authored-by: Dominique Louis <savagesoftware@gmail.com>
  • Loading branch information
SimonDarksideJ and CartBlanche authored Dec 23, 2024
1 parent 4f74078 commit a6adedd
Show file tree
Hide file tree
Showing 80 changed files with 418 additions and 1,122 deletions.
54 changes: 40 additions & 14 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,50 +11,76 @@ on:

jobs:
build:

runs-on: ubuntu-latest
runs-on: windows-latest

steps:
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Build Windows Binary for Tutorial/BasicCameraExample
run: dotnet build Tutorials/BasicCameraExample/BasicCameraExample.sln

- name: Archive Tutorial/BasicCameraExample
uses: actions/upload-artifact@v4
with:
name: BasicCameraExample
path: Tutorials/BasicCameraExample/**
include-hidden-files: true
- name: Archive ShipGame

- name: Build Windows Binary for AutoPong
run: dotnet build AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj

- name: Archive AutoPong
uses: actions/upload-artifact@v4
with:
name: ShipGame
path: ShipGame/**
name: AutoPong
path: AutoPong/**
include-hidden-files: true

- name: Build Windows Binary for FuelCell
run: dotnet build FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj

- name: Archive FuelCell
uses: actions/upload-artifact@v4
with:
name: FuelCell
path: FuelCell/**
include-hidden-files: true

- name: Build Windows Binary for NeonShooter
run: dotnet build NeonShooter/NeonShooter.WindowsDX/NeonShooter.WindowsDX.csproj

- name: Archive NeonShooter
uses: actions/upload-artifact@v4
with:
name: NeonShooter
path: NeonShooter/**
include-hidden-files: true

- name: Build Windows Binary for Platformer2D
run: dotnet build Platformer2D/Platformer2D.WindowsDX/Platformer2D.WindowsDX.csproj

- name: Archive Platformer2D
uses: actions/upload-artifact@v4
with:
name: Platformer2D
path: Platformer2D/**
include-hidden-files: true
- name: Archive AutoPong
uses: actions/upload-artifact@v4
with:
name: AutoPong
path: AutoPong/**
include-hidden-files: true
- name: Archive FuelCell

- name: Build ShipGame COntent Processor in Release mode
run: dotnet build ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj --configuration Release

- name: Build Windows Binary for ShipGame
run: dotnet build ShipGame/ShipGame.WindowsDX/ShipGame.WindowsDX.csproj

- name: Archive ShipGame
uses: actions/upload-artifact@v4
with:
name: FuelCell
path: FuelCell/**
name: ShipGame
path: ShipGame/**
include-hidden-files: true

deploy:
Expand Down
33 changes: 0 additions & 33 deletions AutoPong/AutoPong.Android.sln

This file was deleted.

4 changes: 2 additions & 2 deletions AutoPong/AutoPong.Android/AutoPong.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="Restore">
<Message Text="Restoring dotnet tools" Importance="High" />
Expand Down
2 changes: 1 addition & 1 deletion AutoPong/AutoPong.Core/AutoPong.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
31 changes: 0 additions & 31 deletions AutoPong/AutoPong.DesktopGL.sln

This file was deleted.

4 changes: 2 additions & 2 deletions AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="Restore">
<Message Text="Restoring dotnet tools" Importance="High" />
Expand Down
31 changes: 0 additions & 31 deletions AutoPong/AutoPong.WindowsDX.sln

This file was deleted.

4 changes: 2 additions & 2 deletions AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="Restore">
<Message Text="Restoring dotnet tools" Importance="High" />
Expand Down
51 changes: 0 additions & 51 deletions AutoPong/AutoPong.WindowsUWP.sln

This file was deleted.

4 changes: 2 additions & 2 deletions AutoPong/AutoPong.WindowsUWP/AutoPong.WindowsUWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.13</Version>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsUniversal" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Framework.WindowsUniversal" Version="3.8.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
Expand Down
33 changes: 0 additions & 33 deletions AutoPong/AutoPong.iOS.sln

This file was deleted.

4 changes: 2 additions & 2 deletions AutoPong/AutoPong.iOS/AutoPong.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.2.1105" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="Restore">
<Message Text="Restoring dotnet tools" Importance="High" />
Expand Down
Loading

0 comments on commit a6adedd

Please sign in to comment.