Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
23 changes: 9 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Install .NET 8.0.x
- name: Install .NET 10.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"
cache: false

- name: Restore Tools
Expand Down Expand Up @@ -75,10 +75,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Install .NET 8.0.x
- name: Install .NET 10.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"
cache: false

- name: Compile
Expand Down Expand Up @@ -125,10 +125,10 @@ jobs:
distribution: microsoft
java-version: 11

- name: Install .NET 8.0.x
- name: Install .NET 10.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"
cache: false

- name: Install .NET workloads
Expand All @@ -146,19 +146,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Install .NET 8.0.x
- name: Install .NET 10.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"
cache: false

- name: Install .NET Workloads
run: dotnet workload install ios

# https://github.com/dotnet/macios/issues/19157
# https://github.com/actions/runner-images/issues/12758
- name: Use Xcode 16.4
run: sudo xcode-select -switch /Applications/Xcode_16.4.app

- name: Build
run: dotnet build -c Debug osu.iOS.slnf
run: dotnet build -c Debug osu.iOS.slnf -p:_SuppressXcodeVersionCheck=true
20 changes: 10 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'
cache: false

- name: Install Android Workload
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Build Android (Signed)
if: env.ANDROID_KEYSTORE_FILE != ''
run: >
dotnet publish -c Release -f net8.0-android osu.Android/osu.Android.csproj
dotnet publish -c Release -f net10.0-android osu.Android/osu.Android.csproj
-p:AndroidKeyStore=true
-p:AndroidSigningKeyStore=keystore.jks
-p:AndroidSigningStorePass="$env:ANDROID_KEYSTORE_PASSWORD"
Expand All @@ -80,13 +80,13 @@ jobs:

- name: Build Android (Unsigned)
if: env.ANDROID_KEYSTORE_FILE == ''
run: dotnet publish -c Release -f net8.0-android osu.Android/osu.Android.csproj -p:Version=${{ needs.prepare-release.outputs.version }}
run: dotnet publish -c Release -f net10.0-android osu.Android/osu.Android.csproj -p:Version=${{ needs.prepare-release.outputs.version }}

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: osu-android
path: osu.Android/bin/Release/net8.0-android/*.apk
path: osu.Android/bin/Release/net10.0-android/*.apk

build-windows:
name: Build Windows
Expand All @@ -99,7 +99,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'
cache: true
cache-dependency-path: '**/packages.lock.json'

Expand All @@ -126,7 +126,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'
cache: true
cache-dependency-path: '**/packages.lock.json'

Expand All @@ -153,23 +153,23 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'
cache: true
cache-dependency-path: '**/packages.lock.json'

- name: Install iOS Workload
run: dotnet workload install ios

- name: Build iOS
run: dotnet publish -c Release -r ios-arm64 osu.iOS/osu.iOS.csproj -p:ArchiveOnBuild=true -p:Version=${{ needs.prepare-release.outputs.version }}
run: dotnet publish -c Release -r ios-arm64 osu.iOS/osu.iOS.csproj -p:ArchiveOnBuild=true -p:Version=${{ needs.prepare-release.outputs.version }} -p:_SuppressXcodeVersionCheck=true

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: osu-ios
path: |
osu.iOS/bin/Release/net8.0-ios/ios-arm64/**/*.ipa
osu.iOS/bin/Release/net8.0-ios/ios-arm64/**/*.app
osu.iOS/bin/Release/net10.0-ios/ios-arm64/**/*.ipa
osu.iOS/bin/Release/net10.0-ios/ios-arm64/**/*.app

release:
name: Upload Release Assets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>
<PropertyGroup Label="Project">
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>osu.Game.Rulesets.EmptyFreeform.Tests</RootNamespace>
</PropertyGroup>
</Project>
Loading
Loading