General Improvements

harry-cpp · Mar 13, 2024 · 74c0b5d · 74c0b5d
1 parent 58085fc
commit 74c0b5d
Show file tree

Hide file tree

Showing 50 changed files with 409 additions and 784 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/build-and-deploy.yml → .github/workflows/main.yml b/.github/workflows/build-and-deploy.yml → .github/workflows/main.yml
@@ -1,9 +1,6 @@
-name: Build And Deploy
+name: Build
 
-on:
-  push:
-    branches:
-      develop
+on: [push, pull_request]
 
 jobs:
   build:
@@ -12,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-
+      fail-fast: false
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -44,29 +41,26 @@ jobs:
               fi
         shell: bash
 
-      - name: Run MonoGame.Framework.Build
-        run: dotnet run --project build/MonoGame.Framework.Build.csproj -- --target=Default
+      - name: Build
+        run: dotnet run --project build/Build.csproj -- --target=Default
 
       - name: Expose GitHub Runtime
         uses: crazy-max/ghaction-github-runtime@v3
 
       - name: Upload Artifacts
-        run: dotnet run --project build/MonoGame.Framework.Build.csproj -- --target=UploadArtifacts
+        run: dotnet run --project build/Build.csproj -- --target=UploadArtifacts
         env:
           ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }}
           ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}"
-
   deploy:
       name: Deploy
       needs: [ build ]
       runs-on: ubuntu-latest
+      if: ${{ github.event_name == 'push' }}
       permissions:
           packages: write
           contents: write
       steps:
-          - name: Expose GitHub Runtime
-            uses: crazy-max/ghaction-github-runtime@v3
-
           - name: Clone Repository
             uses: actions/checkout@v4
 
@@ -75,7 +69,10 @@ jobs:
             with:
               dotnet-version: '8.0.x'
 
+          - name: Expose GitHub Runtime
+            uses: crazy-max/ghaction-github-runtime@v3
+
           - name: Push GitHub Nugets
-            run: dotnet run --project build/MonoGame.Framework.Build.csproj -- --target=DeployNuGetsToGithub
+            run: dotnet run --project build/Build.csproj -- --target=DeployNuGetsToGithub
             env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build/MonoGame.Framework.Build.sln → Build.sln b/build/MonoGame.Framework.Build.sln → Build.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Build", "MonoGame.Framework.Build.csproj", "{2FDDBAF1-F6B2-4770-8218-FC3681DE1017}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build", "build/Build.csproj", "{2FDDBAF1-F6B2-4770-8218-FC3681DE1017}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/build.sh b/build.sh
diff --git a/build/Build.csproj b/build/Build.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Using Include="Cake.Frosting" />
+    <Using Include="Cake.Common.Build" />
+    <Using Include="Cake.Common.Build.GitHubActions" />
+    <Using Include="Cake.Common.Build.GitHubActions.Data" />
+    <Using Include="Cake.Common.Diagnostics" />
+    <Using Include="Cake.Common.Tools.DotNet" />
+    <Using Include="Cake.Common.Tools.DotNet.MSBuild" />
+    <Using Include="Cake.Common.Tools.DotNet.Pack" />
+    <Using Include="Cake.Common.Tools.DotNet.Publish" />
+    <Using Include="Cake.Common.Tools.MSBuild" />
+    <Using Include="Cake.Common.IO" />
+    <Using Include="Cake.Common" />
+    <Using Include="Cake.Core" />
+    <Using Include="Cake.Core.Diagnostics" />
+    <Using Include="Cake.Core.IO" />
+    <Using Include="Cake.FileHelpers" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Cake.FileHelpers" Version="7.0.0" />
+    <PackageReference Include="Cake.Frosting" Version="4.0.0" />
+  </ItemGroup>
+
+</Project>