Skip to content

Fix Apple platform TFMs: use 26.0 for libraries, unversioned for apps #3798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 3 commits into from
Apr 30, 2026
Merged

Fix Apple platform TFMs: use 26.0 for libraries, unversioned for apps #3798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2432902
Fix Apple platform TPVs to use 26.0 instead of 26.2
mattleibow Apr 29, 2026
26f05f3
Use unversioned Apple TFMs for app projects
mattleibow Apr 29, 2026
4db5009
Remove all platform TPVs from app TFMs, not just Apple
mattleibow Apr 29, 2026
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
4 changes: 2 additions & 2 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ Task ("tests-ios")

FilePath csproj = "./tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj";
var configuration = "Debug";
var tfm = "net10.0-ios26.2";
var tfm = "net10.0-ios";
var rid = "iossimulator-" + RuntimeInformation.ProcessArchitecture.ToString ().ToLower ();
var outputDir = $"./tests/SkiaSharp.Tests.Devices/bin/{configuration}/{tfm}/{rid}";

Expand Down Expand Up @@ -413,7 +413,7 @@ Task ("tests-maccatalyst")

FilePath csproj = "./tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj";
var configuration = "Debug";
var tfm = "net10.0-maccatalyst26.2";
var tfm = "net10.0-maccatalyst";
var rid = "maccatalyst-" + RuntimeInformation.ProcessArchitecture.ToString ().ToLower ();
var outputDir = $"./tests/SkiaSharp.Tests.Devices/bin/{configuration}/{tfm}/{rid}";

Expand Down
8 changes: 4 additions & 4 deletions scripts/VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ GLibSharp release 3.24.24.95
GtkSharp release 3.24.24.95
Microsoft.AspNetCore.Components release 6.0.0
Microsoft.AspNetCore.Components.Web release 6.0.0
Microsoft.iOS.Ref.net10.0_26.2 release 26.2.10217
Microsoft.MacCatalyst.Ref.net10.0_26.2 release 26.2.10217
Microsoft.macOS.Ref.net10.0_26.2 release 26.2.10217
Microsoft.iOS.Ref.net10.0_26.0 release 26.0.11017
Microsoft.MacCatalyst.Ref.net10.0_26.0 release 26.0.11017
Microsoft.macOS.Ref.net10.0_26.0 release 26.0.11017
Microsoft.Maui.Controls release 10.0.31
Microsoft.Maui.Controls.Core release 10.0.31
Microsoft.Maui.Core release 10.0.31
Microsoft.Maui.Graphics release 7.0.92
Microsoft.tvOS.Ref.net10.0_26.2 release 26.2.10217
Microsoft.tvOS.Ref.net10.0_26.0 release 26.0.11017
Microsoft.Windows.SDK.Contracts release 10.0.19041.1
Microsoft.Windows.SDK.NET.Ref release 10.0.19041.27
Microsoft.WindowsAppSDK release 1.4.230913002
Expand Down
8 changes: 4 additions & 4 deletions scripts/cake/UpdateDocs.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
await AddDep("OpenTK.GLWpfControl", "netcoreapp3.1");
await AddDep("Microsoft.Maui.Core", "net10.0");
await AddDep("Microsoft.Maui.Controls.Core", "net10.0");
await AddDep("Microsoft.iOS.Ref.net10.0_26.2", "net10.0");
await AddDep("Microsoft.MacCatalyst.Ref.net10.0_26.2", "net10.0");
await AddDep("Microsoft.tvOS.Ref.net10.0_26.2", "net10.0");
await AddDep("Microsoft.macOS.Ref.net10.0_26.2", "net10.0");
await AddDep("Microsoft.iOS.Ref.net10.0_26.0", "net10.0");
await AddDep("Microsoft.MacCatalyst.Ref.net10.0_26.0", "net10.0");
await AddDep("Microsoft.tvOS.Ref.net10.0_26.0", "net10.0");
await AddDep("Microsoft.macOS.Ref.net10.0_26.0", "net10.0");
await AddDep("Samsung.Tizen.Ref", "net10.0");
await AddVsixDep("Xamarin.VisualStudio.Apple.Sdk", "$ReferenceAssemblies/Microsoft/Framework/Xamarin.iOS/v1.0");
await AddVsixDep("Xamarin.VisualStudio.Apple.Sdk", "$ReferenceAssemblies/Microsoft/Framework/Xamarin.TVOS/v1.0");
Expand Down
18 changes: 9 additions & 9 deletions source/SkiaSharp.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@
<TPVWindowsPrevious>10.0.19041.0</TPVWindowsPrevious>
<!-- Current (net10.0) -->
<TPVAndroidCurrent>36.0</TPVAndroidCurrent>
<TPViOSCurrent>26.2</TPViOSCurrent>
<TPVMacCatalystCurrent>26.2</TPVMacCatalystCurrent>
<TPVtvOSCurrent>26.2</TPVtvOSCurrent>
<TPVmacOSCurrent>26.2</TPVmacOSCurrent>
<TPViOSCurrent>26.0</TPViOSCurrent>
<TPVMacCatalystCurrent>26.0</TPVMacCatalystCurrent>
<TPVtvOSCurrent>26.0</TPVtvOSCurrent>
<TPVmacOSCurrent>26.0</TPVmacOSCurrent>
<TPVTizenCurrent>10.0</TPVTizenCurrent>
<TPVWindowsCurrent>10.0.19041.0</TPVWindowsCurrent>
<!-- Minimum (net6.0) — for platforms where device runtime lags behind SDK -->
Expand Down Expand Up @@ -159,15 +159,15 @@
<MauiTargetFrameworks>$(MauiTargetFrameworksCurrent);$(MauiTargetFrameworksPrevious)</MauiTargetFrameworks>
</PropertyGroup>

<!-- .NET MAUI Apps (no TPV) -->
<!-- .NET MAUI Apps (no TPV — apps should use latest installed workload) -->
<PropertyGroup>
<MauiTargetFrameworksAppCurrent Condition="!$(IsLinux)">$(TFMCurrent)-ios$(TPViOSCurrent);$(TFMCurrent)-maccatalyst$(TPVMacCatalystCurrent);$(TFMCurrent)-android$(TPVAndroidCurrent)</MauiTargetFrameworksAppCurrent>
<MauiTargetFrameworksAppCurrent Condition="$(IsLinux)">$(TFMCurrent)-android$(TPVAndroidCurrent)</MauiTargetFrameworksAppCurrent>
<MauiTargetFrameworksAppCurrent Condition="!$(IsLinux)">$(TFMCurrent)-ios;$(TFMCurrent)-maccatalyst;$(TFMCurrent)-android</MauiTargetFrameworksAppCurrent>
<MauiTargetFrameworksAppCurrent Condition="$(IsLinux)">$(TFMCurrent)-android</MauiTargetFrameworksAppCurrent>
<MauiTargetFrameworksAppCurrent Condition="$(IsWindows)">$(MauiTargetFrameworksAppCurrent);$(TFMCurrent)-windows$(TPVWindowsCurrent)</MauiTargetFrameworksAppCurrent>
</PropertyGroup>
<PropertyGroup Condition="'$(TFMPrevious)' != ''">
<MauiTargetFrameworksAppPrevious Condition="!$(IsLinux)">$(TFMPrevious)-ios$(TPViOSPrevious);$(TFMPrevious)-maccatalyst$(TPVMacCatalystPrevious);$(TFMPrevious)-android$(TPVAndroidPrevious)</MauiTargetFrameworksAppPrevious>
<MauiTargetFrameworksAppPrevious Condition="$(IsLinux)">$(TFMPrevious)-android$(TPVAndroidPrevious)</MauiTargetFrameworksAppPrevious>
<MauiTargetFrameworksAppPrevious Condition="!$(IsLinux)">$(TFMPrevious)-ios;$(TFMPrevious)-maccatalyst;$(TFMPrevious)-android</MauiTargetFrameworksAppPrevious>
<MauiTargetFrameworksAppPrevious Condition="$(IsLinux)">$(TFMPrevious)-android</MauiTargetFrameworksAppPrevious>
<MauiTargetFrameworksAppPrevious Condition="$(IsWindows)">$(MauiTargetFrameworksAppPrevious);$(TFMPrevious)-windows$(TPVWindowsPrevious)</MauiTargetFrameworksAppPrevious>
</PropertyGroup>

Expand Down
Loading