Merge remote-tracking branch 'upstream/main'

Calverin · Feb 6, 2024 · 4c4a618 · 4c4a618
2 parents df7615f + 15eacff
commit 4c4a618
Show file tree

Hide file tree

Showing 40 changed files with 16,184 additions and 15,827 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,13 +3,26 @@ name: Build and build
 on:
   push:
     tags:        
-      - '**' 
+      - '**'
+  workflow_dispatch:
 
 jobs:
   build:
     strategy:
       matrix:
-        platform: [macos-latest, ubuntu-latest, windows-latest]
+        include:
+          - platform: macos-latest
+            arch: x64
+          - platform: macos-latest
+            arch: arm64
+          - platform: ubuntu-latest
+            arch: x64
+          - platform: ubuntu-latest
+            arch: arm64
+          - platform: ubuntu-latest
+            arch: arm
+          - platform: windows-latest
+            arch: x64
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -24,17 +37,17 @@ jobs:
       env:
         os: ${{ runner.os == 'Windows' && 'win' || runner.os == 'macOS' && 'osx' || 'linux' }}
       run: |
-        dotnet publish -c Release -r ${{ env.os }}-x64 -p:ImportByWildcardBeforeSolution=false -o build && 
+        dotnet publish -c Release -r ${{ env.os }}-${{ matrix.arch }} -p:ImportByWildcardBeforeSolution=false -o build && 
         cp -r Content build
 
     - name: Compress (Windows)
       run: |
-        Compress-Archive build/* Celeste64-${{ github.ref_name }}-${{ runner.os }}-x64.zip
+        Compress-Archive build/* Celeste64-${{ github.ref_name }}-${{ runner.os }}-${{ matrix.arch }}.zip
       if: runner.os == 'Windows'
 
     - name: Compress (macOS and Linux)
       run: |
-        cd build && zip -r ../Celeste64-${{ github.ref_name }}-${{ runner.os }}-x64.zip *
+        cd build && zip -r ../Celeste64-${{ github.ref_name }}-${{ runner.os }}-${{ matrix.arch }}.zip *
       if: runner.os != 'Windows'
 
     - name: Release (GitHub)
@@ -50,6 +63,6 @@ jobs:
           # Requirements:
           
           - **Windows:** 10 or later, x64
-          - **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64
-          - **Mac:** Monterey or later, x64 Intel-based or Apple Silicon with Rosetta
-        files: Celeste64-${{ github.ref_name }}-${{ runner.os }}-x64.zip
+          - **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64, ARM64, and ARM32
+          - **Mac:** Monterey or later, x64, and ARM64
+        files: Celeste64-${{ github.ref_name }}-${{ runner.os }}-${{ matrix.arch }}.zip
diff --git a/Celeste64.csproj b/Celeste64.csproj
@@ -3,18 +3,17 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <Platforms>x64</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>1.0.1</Version>
+    <Version>1.1.1</Version>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishTrimmed>true</PublishTrimmed>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FosterFramework" Version="0.1.16-alpha" />
+    <PackageReference Include="FosterFramework" Version="0.1.18-alpha" />
     <PackageReference Include="SharpGLTF.Runtime" Version="1.0.0-alpha0031" />
     <PackageReference Include="Sledge.Formats.Map" Version="1.1.5" />
   </ItemGroup>
@@ -31,15 +30,29 @@
     <IsMacOS>true</IsMacOS>
   </PropertyGroup>
 
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'x64') or $(RuntimeIdentifier.EndsWith('x64'))">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+
   <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'Arm64') or $(RuntimeIdentifier.EndsWith('arm64'))">
     <IsArm64>true</IsArm64>
+    <PlatformTarget>ARM64</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'Arm') or $(RuntimeIdentifier.EndsWith('arm'))">
+    <IsArm>true</IsArm>
+    <PlatformTarget>ARM</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm64) == 'true'">
     <Content Include="Source/Audio/FMOD/libs/libarm64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm64) != 'true'">
+  <ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm) == 'true'">
+    <Content Include="Source/Audio/FMOD/libs/libarm/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm64) != 'true' and $(IsArm) != 'true'">
     <Content Include="Source/Audio/FMOD/libs/lib64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
   </ItemGroup>