diff --git a/build.cake b/build.cake index 8667441a77d..65b106613a2 100644 --- a/build.cake +++ b/build.cake @@ -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}"; @@ -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}"; diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt index 825edffa823..e7f04a98c04 100644 --- a/scripts/VERSIONS.txt +++ b/scripts/VERSIONS.txt @@ -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 diff --git a/scripts/cake/UpdateDocs.cake b/scripts/cake/UpdateDocs.cake index 97a77d12c17..bffef8f1f2e 100644 --- a/scripts/cake/UpdateDocs.cake +++ b/scripts/cake/UpdateDocs.cake @@ -25,10 +25,10 @@ async Task 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"); diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index 11b742213fa..c871c476503 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -80,10 +80,10 @@ 10.0.19041.0 36.0 - 26.2 - 26.2 - 26.2 - 26.2 + 26.0 + 26.0 + 26.0 + 26.0 10.0 10.0.19041.0 @@ -159,15 +159,15 @@ $(MauiTargetFrameworksCurrent);$(MauiTargetFrameworksPrevious) - + - $(TFMCurrent)-ios$(TPViOSCurrent);$(TFMCurrent)-maccatalyst$(TPVMacCatalystCurrent);$(TFMCurrent)-android$(TPVAndroidCurrent) - $(TFMCurrent)-android$(TPVAndroidCurrent) + $(TFMCurrent)-ios;$(TFMCurrent)-maccatalyst;$(TFMCurrent)-android + $(TFMCurrent)-android $(MauiTargetFrameworksAppCurrent);$(TFMCurrent)-windows$(TPVWindowsCurrent) - $(TFMPrevious)-ios$(TPViOSPrevious);$(TFMPrevious)-maccatalyst$(TPVMacCatalystPrevious);$(TFMPrevious)-android$(TPVAndroidPrevious) - $(TFMPrevious)-android$(TPVAndroidPrevious) + $(TFMPrevious)-ios;$(TFMPrevious)-maccatalyst;$(TFMPrevious)-android + $(TFMPrevious)-android $(MauiTargetFrameworksAppPrevious);$(TFMPrevious)-windows$(TPVWindowsPrevious)