Skip to content

Commit 19068e0

Browse files
jasminegamedevjasminegamedev
committed
Merge branch 'dev'
2 parents 71ed49f + 8c1d346 commit 19068e0

File tree

101 files changed

+7791
-6097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+7791
-6097
lines changed

‎.github/workflows/build-beta.yml‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,19 @@ jobs:
1616
build:
1717
strategy:
1818
matrix:
19-
platform: [ubuntu-latest, macos-latest, windows-latest]
19+
include:
20+
- platform: macos-latest
21+
arch: x64
22+
- platform: macos-latest
23+
arch: arm64
24+
- platform: ubuntu-latest
25+
arch: x64
26+
- platform: ubuntu-latest
27+
arch: arm64
28+
- platform: ubuntu-latest
29+
arch: arm
30+
- platform: windows-latest
31+
arch: x64
2032

2133
runs-on: ${{ matrix.platform }}
2234
steps:
@@ -47,40 +59,40 @@ jobs:
4759
env:
4860
os: ${{ runner.os == 'Windows' && 'win' || runner.os == 'macOS' && 'osx' || 'linux' }}
4961
run: |
50-
dotnet publish Celeste64Launcher/Celeste64Launcher.csproj -c Release -r ${{env.os}}-x64 -p:ImportByWildcardBeforeSolution=false "-p:EmbeddedBuildProperty=ModVersion=${{ env.SHORT_SHA }}" -o build && cp -r Content Mods build
62+
dotnet publish Celeste64.Launcher/Celeste64.Launcher.csproj -c Release -r ${{env.os}}-${{ matrix.arch }} -p:ImportByWildcardBeforeSolution=false "-p:EmbeddedBuildProperty=ModVersion=${{ env.SHORT_SHA }}" -o build && cp -r Content Mods build
5163
if: runner.os != 'Windows'
5264
- name: Build (windows)
5365
env:
5466
os: ${{ runner.os == 'Windows' && 'win' || runner.os == 'macOS' && 'osx' || 'linux' }}
5567
run: |
56-
dotnet publish Celeste64Launcher/Celeste64Launcher.csproj -c Release -r win-x64 -p:ImportByWildcardBeforeSolution=false "-p:EmbeddedBuildProperty=ModVersion=${{steps.vars.outputs.SHORT_SHA}}" -o build && xcopy Mods build\Mods /s /e /h /i /y && xcopy Content build\Content /s /e /h /i /y
68+
dotnet publish Celeste64.Launcher/Celeste64.Launcher.csproj -c Release -r win-${{ matrix.arch }} -p:ImportByWildcardBeforeSolution=false "-p:EmbeddedBuildProperty=ModVersion=${{steps.vars.outputs.SHORT_SHA}}" -o build && xcopy Mods build\Mods /s /e /h /i /y && xcopy Content build\Content /s /e /h /i /y
5769
if: runner.os == 'Windows'
5870
- name: Compress (Windows)
5971
run: |
60-
Compress-Archive build/* Celeste64-Fuji-${{ runner.os }}-x64.zip
72+
Compress-Archive build/* Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip
6173
if: runner.os == 'Windows'
6274

6375
- name: Compress (macOS and Linux)
6476
run: |
65-
cd build && zip -r ../Celeste64-Fuji-${{ runner.os }}-x64.zip *
77+
cd build && zip -r ../Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip *
6678
if: runner.os != 'Windows'
6779

6880
- name: Publish Github Release Windows
6981
uses: ncipollo/release-action@v1
7082
with:
71-
artifacts: Celeste64-Fuji-${{ runner.os }}-x64.zip
83+
artifacts: Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip
7284
tag: "beta-${{steps.vars.outputs.SHORT_SHA}}"
7385
body: |
7486
# Instructions:
7587
7688
- Download and extract the zip file below according to your computer
77-
- Run the Celeste64 application from the extracted files
89+
- Run the Celeste64-Fuji application from the extracted files
7890
7991
# Requirements:
8092
81-
- **Windows:** 10 or later, x64
93+
- **Windows:** 10 or later, x64 or arm
8294
- **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64
83-
- **macOS:** Monterey or later, x64 Intel-based or Apple Silicon with Rosetta
95+
- **macOS:** Monterey or later, x64 or arm sIntel-based or Apple Silicon with Rosetta
8496
allowUpdates: true
8597
name: "Fuji Beta Build ${{steps.vars.outputs.SHORT_SHA}}"
8698
prerelease: true
@@ -91,19 +103,19 @@ jobs:
91103
- name: Publish Github Release Linux and Mac
92104
uses: ncipollo/release-action@v1
93105
with:
94-
artifacts: Celeste64-Fuji-${{ runner.os }}-x64.zip
106+
artifacts: Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip
95107
tag: "beta-${{ env.SHORT_SHA }}"
96108
body: |
97109
# Instructions:
98110
99111
- Download and extract the zip file below according to your computer
100-
- Run the Celeste64 application from the extracted files
112+
- Run the Celeste64-Fuji application from the extracted files
101113
102114
# Requirements:
103115
104116
- **Windows:** 10 or later, x64
105-
- **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64
106-
- **macOS:** Monterey or later, x64 Intel-based or Apple Silicon with Rosetta
117+
- **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64 or arm
118+
- **macOS:** Monterey or later, x64 or arm Intel-based or Apple Silicon with Rosetta
107119
allowUpdates: true
108120
name: "Fuji Beta Build ${{ env.SHORT_SHA }}"
109121
prerelease: true

‎.github/workflows/build-stable.yml‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,19 @@ jobs:
1616
build:
1717
strategy:
1818
matrix:
19-
platform: [ubuntu-latest, macos-latest, windows-latest]
19+
include:
20+
- platform: macos-latest
21+
arch: x64
22+
- platform: macos-latest
23+
arch: arm64
24+
- platform: ubuntu-latest
25+
arch: x64
26+
- platform: ubuntu-latest
27+
arch: arm64
28+
- platform: ubuntu-latest
29+
arch: arm
30+
- platform: windows-latest
31+
arch: x64
2032

2133
runs-on: ${{ matrix.platform }}
2234
steps:
@@ -47,40 +59,40 @@ jobs:
4759
env:
4860
os: ${{ runner.os == 'Windows' && 'win' || runner.os == 'macOS' && 'osx' || 'linux' }}
4961
run: |
50-
dotnet publish Celeste64Launcher/Celeste64Launcher.csproj -c Release -r ${{env.os}}-x64 -p:ImportByWildcardBeforeSolution=false -o build && cp -r Content Mods build
62+
dotnet publish Celeste64.Launcher/Celeste64.Launcher.csproj -c Release -r ${{env.os}}-${{ matrix.arch }} -p:ImportByWildcardBeforeSolution=false -o build && cp -r Content Mods build
5163
if: runner.os != 'Windows'
5264
- name: Build (windows)
5365
env:
5466
os: ${{ runner.os == 'Windows' && 'win' || runner.os == 'macOS' && 'osx' || 'linux' }}
5567
run: |
56-
dotnet publish Celeste64Launcher/Celeste64Launcher.csproj -c Release -r win-x64 -p:ImportByWildcardBeforeSolution=false -o build && xcopy Mods build\Mods /s /e /h /i /y && xcopy Content build\Content /s /e /h /i /y
68+
dotnet publish Celeste64.Launcher/Celeste64.Launcher.csproj -c Release -r win-${{ matrix.arch }} -p:ImportByWildcardBeforeSolution=false -o build && xcopy Mods build\Mods /s /e /h /i /y && xcopy Content build\Content /s /e /h /i /y
5769
if: runner.os == 'Windows'
5870
- name: Compress (Windows)
5971
run: |
60-
Compress-Archive build/* Celeste64-Fuji-${{ runner.os }}-x64.zip
72+
Compress-Archive build/* Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip
6173
if: runner.os == 'Windows'
6274

6375
- name: Compress (macOS and Linux)
6476
run: |
65-
cd build && zip -r ../Celeste64-Fuji-${{ runner.os }}-x64.zip *
77+
cd build && zip -r ../Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip *
6678
if: runner.os != 'Windows'
6779

6880
- name: Publish Github Release Windows
6981
uses: ncipollo/release-action@v1
7082
with:
71-
artifacts: Celeste64-Fuji-${{ runner.os }}-x64.zip
83+
artifacts: Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip
7284
tag: "stable-${{steps.vars.outputs.SHORT_SHA}}"
7385
body: |
7486
# Instructions:
7587
7688
- Download and extract the zip file below according to your computer
77-
- Run the Celeste64 application from the extracted files
89+
- Run the Celeste64-Fuji application from the extracted files
7890
7991
# Requirements:
8092
8193
- **Windows:** 10 or later, x64
82-
- **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64
83-
- **macOS:** Monterey or later, x64 Intel-based or Apple Silicon with Rosetta
94+
- **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64 or arm
95+
- **macOS:** Monterey or later, x64 or arm Intel-based or Apple Silicon with Rosetta
8496
allowUpdates: true
8597
name: "Fuji ${{steps.vars.outputs.SHORT_SHA}}"
8698
prerelease: false
@@ -92,19 +104,19 @@ jobs:
92104
- name: Publish Github Release Linux and Mac
93105
uses: ncipollo/release-action@v1
94106
with:
95-
artifacts: Celeste64-Fuji-${{ runner.os }}-x64.zip
107+
artifacts: Celeste64-Fuji-${{ runner.os }}-${{ matrix.arch }}.zip
96108
tag: "stable-${{ env.SHORT_SHA }}"
97109
body: |
98110
# Instructions:
99111
100112
- Download and extract the zip file below according to your computer
101-
- Run the Celeste64 application from the extracted files
113+
- Run the Celeste64-Fuji application from the extracted files
102114
103115
# Requirements:
104116
105117
- **Windows:** 10 or later, x64
106-
- **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64
107-
- **macOS:** Monterey or later, x64 Intel-based or Apple Silicon with Rosetta
118+
- **Linux:** [Distro support list](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md), x64 pr arm
119+
- **macOS:** Monterey or later, x64 or arm Intel-based or Apple Silicon with Rosetta
108120
allowUpdates: true
109121
name: "Fuji ${{ env.SHORT_SHA }}"
110122
prerelease: false

‎Celeste64.HookGen/Celeste64.HookGen.csproj‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
<IsPackable>false</IsPackable>
5+
<Nullable>enable</Nullable>
6+
<LangVersion>latest</LangVersion>
7+
8+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
9+
<IsRoslynComponent>true</IsRoslynComponent>
10+
11+
<RootNamespace>Celeste64.HookGen</RootNamespace>
12+
<PackageId>Celeste64.HookGen</PackageId>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0"/>
21+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0"/>
22+
</ItemGroup>
23+
</Project>

0 commit comments

Comments
 (0)