Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"vpk": {
"version": "0.0.1298",
"version": "1.2.0",
"commands": [
"vpk"
]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
- uses: actions/checkout@main
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'
- run: dotnet build osu-deploy.sln
2 changes: 1 addition & 1 deletion Builders/AndroidBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public AndroidBuilder(string version, string? codeSigningPassword)
this.codeSigningPassword = codeSigningPassword ?? Program.ReadLineMasked("Enter code signing password: ");
}

protected override string TargetFramework => "net8.0-android";
protected override string TargetFramework => "net10.0-android";
protected override string RuntimeIdentifier => "android-arm64";

public override Uploader CreateUploader() => new GitHubUploader();
Expand Down
2 changes: 1 addition & 1 deletion Builders/Builder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected void AttachSatoriGC(string? outputDir = null)
{
Logger.Write("Downloading Satori GC release...");
string satoriArchivePath = Path.GetTempFileName();
using (var req = new FileWebRequest(satoriArchivePath, $"https://github.com/ppy/Satori/releases/download/2025.807.0/{RuntimeIdentifier}.zip"))
using (var req = new FileWebRequest(satoriArchivePath, $"https://github.com/ppy/Satori/releases/download/2026.824.0/{RuntimeIdentifier}.zip"))
req.Perform();

Logger.Write("Extracting Satori GC into staging folder...");
Expand Down
2 changes: 1 addition & 1 deletion Builders/IOSBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public IOSBuilder(string version)
{
}

protected override string TargetFramework => "net8.0-ios";
protected override string TargetFramework => "net10.0-ios";
protected override string RuntimeIdentifier => "ios-arm64";

public override Uploader CreateUploader() => new GitHubUploader();
Expand Down
2 changes: 1 addition & 1 deletion Builders/LinuxBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public LinuxBuilder(string version)
publishTarget = Path.Combine(stagingTarget, "usr", "bin");
}

protected override string TargetFramework => "net8.0";
protected override string TargetFramework => "net10.0";
protected override string RuntimeIdentifier => $"{os_name}-x64";

public override Uploader CreateUploader()
Expand Down
7 changes: 5 additions & 2 deletions Builders/MacOSBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public MacOSBuilder(string version, string? arch)
publishTarget = Path.Combine(stagingTarget, "Contents", "MacOS");
}

protected override string TargetFramework => "net8.0";
protected override string TargetFramework => "net10.0";
protected override string RuntimeIdentifier { get; }

public override Uploader CreateUploader()
Expand Down Expand Up @@ -62,7 +62,10 @@ public override void Build()
Program.RunCommand("cp", $"-r \"{Path.Combine(Program.TemplatesPath, app_dir)}\" \"{stagingTarget}\"");

RunDotnetPublish(outputDir: publishTarget);
AttachSatoriGC(outputDir: publishTarget);

// Satori is not supported on .NET 10 on osx-x64 (https://github.com/VSadov/Satori/pull/83)
if (RuntimeIdentifier.EndsWith("arm64", StringComparison.OrdinalIgnoreCase))
AttachSatoriGC(outputDir: publishTarget);

// without touching the app bundle itself, changes to file associations / icons / etc. will be cached at a macOS level and not updated.
Program.RunCommand("touch", $"\"{stagingTarget}\" {Program.StagingPath}", false);
Expand Down
2 changes: 1 addition & 1 deletion Builders/WindowsBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public WindowsBuilder(string version)
{
}

protected override string TargetFramework => "net8.0";
protected override string TargetFramework => "net10.0";
protected override string RuntimeIdentifier => $"{os_name}-x64";

public override Uploader CreateUploader()
Expand Down
2 changes: 1 addition & 1 deletion osu.Desktop.Deploy.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="Project">
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Exe</OutputType>
<PlatformTarget>AnyCPU</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
Loading