From 4e04867aef3c9110ef3583c93acae2aed70e74a0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 13:51:56 +0200 Subject: [PATCH 01/24] Update maui to Preview 12 --- VERSIONS.txt | 2 +- scripts/azure-pipelines.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index b24e941fde..81159ada5e 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -23,7 +23,7 @@ System.Drawing.Common release 4.5.1 SharpVk release 0.4.2 Uno.UI release 4.0.8 Microsoft.WindowsAppSDK release 1.0.0 -Microsoft.Maui.Graphics release 6.0.101-preview.9.512 +Microsoft.Maui.Graphics release 6.0.200-preview.12.852 Microsoft.Windows.SDK.NET.Ref release 10.0.18362.18 Microsoft.AspNetCore.Components.Web release 6.0.0 diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index ef9fcf7f19..5c3997d916 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -31,8 +31,8 @@ variables: XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.413 DOTNET_VERSION: 5.0.401 - DOTNET_VERSION_PREVIEW: 6.0.100 - DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.101/preview.11.json' + DOTNET_VERSION_PREVIEW: 6.0.200 + DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.12.json' VS_VERSION_PREVIEW: 17/release CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2022 From 0dd9394232d0ca01e8ec663d7bcb1790a730988b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 16:46:45 +0200 Subject: [PATCH 02/24] might be the preview sdk --- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-bootstrapper.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 5c3997d916..67f601dc3a 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -31,7 +31,7 @@ variables: XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.413 DOTNET_VERSION: 5.0.401 - DOTNET_VERSION_PREVIEW: 6.0.200 + DOTNET_VERSION_PREVIEW: 6.0.200-preview.22054.7 DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.12.json' VS_VERSION_PREVIEW: 17/release CONFIGURATION: 'Release' diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 3cdbee4ab3..64d994f093 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -17,7 +17,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '' # the build number to download externals from + buildExternals: '5661299' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build From bea80d068edf82751b4d7e60cd99283e67b2f1f9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 17:06:57 +0200 Subject: [PATCH 03/24] not here --- scripts/azure-templates-bootstrapper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 64d994f093..3cdbee4ab3 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -17,7 +17,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '5661299' # the build number to download externals from + buildExternals: '' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build From cc9bc9b2feb718802bb56bb8287f2ff8505316c5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 18:31:17 +0200 Subject: [PATCH 04/24] require preview --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 67f601dc3a..32e0e2a56d 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -33,7 +33,7 @@ variables: DOTNET_VERSION: 5.0.401 DOTNET_VERSION_PREVIEW: 6.0.200-preview.22054.7 DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.12.json' - VS_VERSION_PREVIEW: 17/release + VS_VERSION_PREVIEW: 17/preview CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2022 VM_IMAGE_WINDOWS_PREVIOUS: windows-2019 From 1612abdd9b3b5f2184d35f136ce2ee596e726e5b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 21:24:04 +0200 Subject: [PATCH 05/24] use the new vs where it needs to be used --- scripts/azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 32e0e2a56d..f0dac148fa 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -384,6 +384,7 @@ stages: vmImage: $(VM_IMAGE_WINDOWS) target: libs additionalArgs: --skipExternals="all" + installPreviewVs: true requiredArtifacts: - native artifactName: managed @@ -473,7 +474,6 @@ stages: vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS) target: docs-api-diff additionalArgs: --nugetDiffPrerelease=$(NUGET_DIFF_PRERELEASE) - installPreviewVs: false shouldPublish: false requiredArtifacts: - package_windows @@ -518,6 +518,7 @@ stages: vmImage: $(VM_IMAGE_WINDOWS) target: tests-netfx additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE) + installPreviewVs: true installWindowsSdk: false shouldPublish: false requiredArtifacts: From 9618c0d50e2a86fe977df7974fbf48ef0d993595 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 21:38:34 +0200 Subject: [PATCH 06/24] pre not preview --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index f0dac148fa..7138b4d94f 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -33,7 +33,7 @@ variables: DOTNET_VERSION: 5.0.401 DOTNET_VERSION_PREVIEW: 6.0.200-preview.22054.7 DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.12.json' - VS_VERSION_PREVIEW: 17/preview + VS_VERSION_PREVIEW: 17/pre CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2022 VM_IMAGE_WINDOWS_PREVIOUS: windows-2019 From 6a105c7c4e5f6509ced80663b51e1333d515c571 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 23:01:27 +0200 Subject: [PATCH 07/24] ok --- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 7138b4d94f..ad95d1a07d 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -12,7 +12,7 @@ parameters: - name: buildExternals displayName: 'The specific native artifacts to use for this build.' type: number - default: 0 + default: 5661678 variables: SKIASHARP_VERSION: 2.88.0 diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index df72e1d5d6..27ff6f959b 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -107,14 +107,14 @@ jobs: performMultiLevelLookup: true displayName: Install the correct version of .NET Core # install the bits needed for .NET 6 builds - - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" - displayName: Install the preview version of .NET Core - ${{ if endsWith(parameters.name, '_windows') }}: - ${{ if eq(parameters.installPreviewVs, 'true') }}: - pwsh: .\scripts\install-vs.ps1 -Version $env:VS_VERSION_PREVIEW displayName: Install Visual Studio - pwsh: .\scripts\select-vs.ps1 displayName: Select Visual Studio + - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + displayName: Install the preview version of .NET Core - ${{ if not(endsWith(parameters.name, '_linux')) }}: - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" displayName: Install the .NET Core workloads From 3b2256ffacd1c57be356e83637727c7f3a166dbe Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Mon, 24 Jan 2022 23:37:49 +0200 Subject: [PATCH 08/24] ok, this --- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index ad95d1a07d..aa2cb5b3e0 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -31,7 +31,7 @@ variables: XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.413 DOTNET_VERSION: 5.0.401 - DOTNET_VERSION_PREVIEW: 6.0.200-preview.22054.7 + DOTNET_VERSION_PREVIEW: 6.0.200-preview.22055.15 DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.12.json' VS_VERSION_PREVIEW: 17/pre CONFIGURATION: 'Release' diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 27ff6f959b..df72e1d5d6 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -107,14 +107,14 @@ jobs: performMultiLevelLookup: true displayName: Install the correct version of .NET Core # install the bits needed for .NET 6 builds + - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + displayName: Install the preview version of .NET Core - ${{ if endsWith(parameters.name, '_windows') }}: - ${{ if eq(parameters.installPreviewVs, 'true') }}: - pwsh: .\scripts\install-vs.ps1 -Version $env:VS_VERSION_PREVIEW displayName: Install Visual Studio - pwsh: .\scripts\select-vs.ps1 displayName: Select Visual Studio - - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" - displayName: Install the preview version of .NET Core - ${{ if not(endsWith(parameters.name, '_linux')) }}: - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" displayName: Install the .NET Core workloads From f19d166f845bf13de0cc466a700a6301899aa3b0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 01:51:02 +0200 Subject: [PATCH 09/24] fix the new things --- binding/Binding/GRContext.cs | 4 ++-- binding/Binding/GRDefinitions.cs | 2 +- binding/Binding/SKSurface.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/binding/Binding/GRContext.cs b/binding/Binding/GRContext.cs index c95292cae8..0d1b6b2ece 100644 --- a/binding/Binding/GRContext.cs +++ b/binding/Binding/GRContext.cs @@ -115,10 +115,10 @@ public static GRContext CreateMetal (GRMtlBackendContext backendContext, GRConte var queue = backendContext.Queue; if (options == null) { - return GetObject (SkiaApi.gr_direct_context_make_metal ((void*)device.Handle, (void*)queue.Handle)); + return GetObject (SkiaApi.gr_direct_context_make_metal ((void*)(IntPtr)device.Handle, (void*)(IntPtr)queue.Handle)); } else { var opts = options.ToNative (); - return GetObject (SkiaApi.gr_direct_context_make_metal_with_options ((void*)device.Handle, (void*)queue.Handle, &opts)); + return GetObject (SkiaApi.gr_direct_context_make_metal_with_options ((void*)(IntPtr)device.Handle, (void*)(IntPtr)queue.Handle, &opts)); } } diff --git a/binding/Binding/GRDefinitions.cs b/binding/Binding/GRDefinitions.cs index 8e14d942ba..a4dc22bb19 100644 --- a/binding/Binding/GRDefinitions.cs +++ b/binding/Binding/GRDefinitions.cs @@ -123,7 +123,7 @@ public GRMtlTextureInfo (Metal.IMTLTexture texture) internal GRMtlTextureInfoNative ToNative () => new GRMtlTextureInfoNative { - fTexture = (void*)Texture.Handle + fTexture = (void*)(IntPtr)Texture.Handle }; public readonly bool Equals (GRMtlTextureInfo obj) => diff --git a/binding/Binding/SKSurface.cs b/binding/Binding/SKSurface.cs index b98654b1f5..abae4d61fe 100644 --- a/binding/Binding/SKSurface.cs +++ b/binding/Binding/SKSurface.cs @@ -373,7 +373,7 @@ public static SKSurface Create (GRRecordingContext context, CoreAnimation.CAMeta public static SKSurface Create (GRRecordingContext context, CoreAnimation.CAMetalLayer layer, GRSurfaceOrigin origin, int sampleCount, SKColorType colorType, SKColorSpace colorspace, SKSurfaceProperties props, out CoreAnimation.ICAMetalDrawable drawable) { void* drawablePtr; - var surface = GetObject (SkiaApi.sk_surface_new_metal_layer (context.Handle, (void*)layer.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero, &drawablePtr)); + var surface = GetObject (SkiaApi.sk_surface_new_metal_layer (context.Handle, (void*)(IntPtr)layer.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero, &drawablePtr)); drawable = ObjCRuntime.Runtime.GetINativeObject<CoreAnimation.ICAMetalDrawable> ((IntPtr)drawablePtr, true); return surface; } @@ -385,7 +385,7 @@ public static SKSurface Create (GRRecordingContext context, MetalKit.MTKView vie Create (context, view, origin, sampleCount, colorType, colorspace, null); public static SKSurface Create (GRRecordingContext context, MetalKit.MTKView view, GRSurfaceOrigin origin, int sampleCount, SKColorType colorType, SKColorSpace colorspace, SKSurfaceProperties props) => - GetObject (SkiaApi.sk_surface_new_metal_view (context.Handle, (void*)view.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero)); + GetObject (SkiaApi.sk_surface_new_metal_view (context.Handle, (void*)(IntPtr)view.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero)); #endif From 7134ea84c9d4719e4b8277096827245f1fa1e7e5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 02:16:02 +0200 Subject: [PATCH 10/24] copy the bad vibes --- scripts/azure-templates-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index df72e1d5d6..d5fc2f4f5c 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -233,6 +233,9 @@ jobs: - ${{ parameters.postBuildSteps }} # publish artifacts + - bash: | + cp $HOME/.config/NuGet/NuGet.Config ./logs/ + condition: failed() - task: PublishBuildArtifacts@1 displayName: Publish the ${{ parameters.name }} artifacts condition: or(${{ parameters.shouldPublish }}, failed()) From 1171315eddc2a38e3e4869ef6e871280b3b1cf66 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 04:25:13 +0200 Subject: [PATCH 11/24] final fixes --- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-build.yml | 8 +++++--- .../SkiaSharp.Views.Forms.iOS/SKTouchHandler.cs | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index aa2cb5b3e0..3157851faf 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -12,7 +12,7 @@ parameters: - name: buildExternals displayName: 'The specific native artifacts to use for this build.' type: number - default: 5661678 + default: 0 variables: SKIASHARP_VERSION: 2.88.0 diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index d5fc2f4f5c..631b270c06 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -233,9 +233,11 @@ jobs: - ${{ parameters.postBuildSteps }} # publish artifacts - - bash: | - cp $HOME/.config/NuGet/NuGet.Config ./logs/ - condition: failed() + - ${{ if endsWith(parameters.name, '_linux') }}: + - bash: | + cp $HOME/.config/NuGet/NuGet.Config ./logs/ + condition: failed() + displayName: Copy the sometimes corrupt NuGet.Config to the logs - task: PublishBuildArtifacts@1 displayName: Publish the ${{ parameters.name }} artifacts condition: or(${{ parameters.shouldPublish }}, failed()) diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKTouchHandler.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKTouchHandler.cs index 97f3fede5a..29dd3593da 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKTouchHandler.cs +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKTouchHandler.cs @@ -103,7 +103,7 @@ private bool FireEvent(SKTouchAction actionType, UITouch touch, bool inContact) if (onTouchAction == null || scalePixels == null) return false; - var id = touch.Handle.ToInt64(); + var id = ((IntPtr)touch.Handle).ToInt64(); var cgPoint = touch.LocationInView(View); var point = scalePixels(cgPoint.X, cgPoint.Y); From ceb10292b3cd9c742e41b19c45443ad913949884 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 05:21:58 +0200 Subject: [PATCH 12/24] ensure dir exists --- scripts/azure-templates-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 631b270c06..dd5c84ecb0 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -235,7 +235,8 @@ jobs: # publish artifacts - ${{ if endsWith(parameters.name, '_linux') }}: - bash: | - cp $HOME/.config/NuGet/NuGet.Config ./logs/ + mkdir -p ./output/logs/ + cp $HOME/.config/NuGet/NuGet.Config ./output/logs/ condition: failed() displayName: Copy the sometimes corrupt NuGet.Config to the logs - task: PublishBuildArtifacts@1 From 9a893ffa5494891ebe31b1a57839065f06b6234f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 06:28:58 +0200 Subject: [PATCH 13/24] Mac Catalyst does not support GL --- .../SKGLViewRendererBase.cs | 2 +- .../SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs | 4 +++- .../AppHostBuilderExtensions.cs | 2 +- source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLLayer.cs | 2 +- source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLView.cs | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs index 656280e9a9..fccf4a45dc 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs @@ -1,4 +1,4 @@ -#if !__GTK__ && !WINDOWS && !NETSTANDARD +#if !__GTK__ && !WINDOWS && !__MACCATALYST__ && !NETSTANDARD using System; using System.ComponentModel; diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs index 1846b80a23..f8016e4ddb 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs @@ -1,4 +1,5 @@ -using System; +#if !__MACCATALYST__ +using System; using CoreAnimation; using Foundation; @@ -98,3 +99,4 @@ protected override void SetupRenderLoop(bool oneShot) } } } +#endif diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs index 518237732c..cf593b97dc 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs @@ -31,7 +31,7 @@ public static MauiAppBuilder UseSkiaSharp(this MauiAppBuilder builder, bool regi else handlers.TryAddCompatibilityRenderer(typeof(SKCanvasView), typeof(SKCanvasViewRenderer)); -#if !WINDOWS +#if !WINDOWS && !__MACCATALYST__ handlers.AddCompatibilityRenderer(typeof(SKGLView), typeof(SKGLViewRenderer)); #endif diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLLayer.cs b/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLLayer.cs index 77c99fdcad..0965e518ca 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLLayer.cs +++ b/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLLayer.cs @@ -1,4 +1,4 @@ -#if !__WATCHOS__ +#if !__WATCHOS__ && !__MACCATALYST__ using System; using System.ComponentModel; diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLView.cs b/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLView.cs index 97b5aef4ff..79b3fd1a86 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLView.cs +++ b/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKGLView.cs @@ -1,4 +1,4 @@ -#if !__WATCHOS__ +#if !__WATCHOS__ && !__MACCATALYST__ using System; using System.ComponentModel; From a639c56c7a49379a8e56966b0a1ce238df5ee100 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 07:33:29 +0200 Subject: [PATCH 14/24] clean this up a bit --- .../Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/Info.plist | 2 -- samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/Info.plist | 2 -- .../SkiaSharp.Views/SkiaSharp.Views.Shared/GlesInterop/Gles.cs | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/Info.plist b/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/Info.plist index 77eae1458d..c96dd0a225 100644 --- a/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/Info.plist +++ b/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/Info.plist @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>LSMinimumSystemVersion</key> - <string>10.15</string> <key>UIDeviceFamily</key> <array> <integer>1</integer> diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/Info.plist b/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/Info.plist index ed2ffb61b4..0004a4fdee 100644 --- a/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/Info.plist +++ b/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/Info.plist @@ -4,8 +4,6 @@ <dict> <key>LSRequiresIPhoneOS</key> <true/> - <key>MinimumOSVersion</key> - <string>10.3.4</string> <key>UIDeviceFamily</key> <array> <integer>1</integer> diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Shared/GlesInterop/Gles.cs b/source/SkiaSharp.Views/SkiaSharp.Views.Shared/GlesInterop/Gles.cs index 0a860d9bd9..bdd06d522f 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Shared/GlesInterop/Gles.cs +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Shared/GlesInterop/Gles.cs @@ -1,4 +1,4 @@ -#if !__WATCHOS__ && !__WASM__ && !UNO_REFERENCE_API +#if !__WATCHOS__ && !__WASM__ && !UNO_REFERENCE_API && !__MACCATALYST__ using System.Runtime.InteropServices; namespace SkiaSharp.Views.GlesInterop From b8b4dca8bb530f60843714d8fee5f09a84d4783b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 17:10:45 +0200 Subject: [PATCH 15/24] Try a newer extras --- VERSIONS.txt | 2 +- binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj | 2 +- binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj | 2 +- binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj | 2 +- binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj | 2 +- binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj | 2 +- binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj | 2 +- binding/SkiaSharp.Android/SkiaSharp.Android.csproj | 2 +- binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj | 2 +- binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj | 2 +- binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj | 2 +- binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj | 2 +- binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj | 2 +- .../SkiaSharp.Views.Forms.Android.csproj | 2 +- .../SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj | 2 +- .../SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj | 2 +- .../SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj | 2 +- .../SkiaSharp.Views.Uno.Android.csproj | 2 +- .../SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj | 2 +- .../SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj | 2 +- .../SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj | 2 +- .../SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj | 2 +- .../SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj | 2 +- .../SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj | 2 +- .../SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj | 2 +- .../SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 81159ada5e..bdafaa4fc9 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -11,7 +11,7 @@ Tizen.NET release 4.0.0 Tizen.NET.Sdk release 1.0.9 OpenTK release 3.1.0 OpenTK.GLControl release 3.1.0 -MSBuild.Sdk.Extras release 3.0.23 +MSBuild.Sdk.Extras release 3.0.44 Cake release 0.38.4 GtkSharp release 3.22.24.37 GdkSharp release 3.22.24.37 diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj index 5102bb273a..2a66e78eec 100644 --- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj +++ b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>monoandroid9.0</TargetFramework> <RootNamespace>HarfBuzzSharp</RootNamespace> diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj index 96164b56e9..3aabe54c99 100644 --- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj +++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinmac2.0</TargetFramework> <RootNamespace>HarfBuzzSharp</RootNamespace> diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj index 4ceef30de4..0963948089 100644 --- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj +++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks> <RootNamespace>HarfBuzzSharp</RootNamespace> diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj index a94a6f30e3..3160dcc6ed 100644 --- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj +++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinios1.0</TargetFramework> <RootNamespace>HarfBuzzSharp</RootNamespace> diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj index 332f247a74..518774fdfb 100644 --- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj +++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarintvos1.0</TargetFramework> <RootNamespace>HarfBuzzSharp</RootNamespace> diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj index a44ba487e5..62d7abbcdc 100644 --- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj +++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinwatchos1.0</TargetFramework> <RootNamespace>HarfBuzzSharp</RootNamespace> diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj index b249e9e3b3..503c4c9507 100644 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>monoandroid9.0</TargetFramework> <RootNamespace>SkiaSharp</RootNamespace> diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj index 55b1117faa..ff286833a2 100644 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinmac2.0</TargetFramework> <RootNamespace>SkiaSharp</RootNamespace> diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj index dd54f3eabe..c62cc55a95 100644 --- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj +++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks> <RootNamespace>SkiaSharp</RootNamespace> diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj index 48e259d3f6..f8f6f023bc 100644 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinios1.0</TargetFramework> <RootNamespace>SkiaSharp</RootNamespace> diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj index 9d0566dc41..2729cb06f4 100644 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarintvos1.0</TargetFramework> <RootNamespace>SkiaSharp</RootNamespace> diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj index 00bfb68105..7272c8c462 100644 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinwatchos1.0</TargetFramework> <RootNamespace>SkiaSharp</RootNamespace> diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj index 05ccad7fc6..82ae6d8159 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>monoandroid9.0</TargetFramework> <RootNamespace>SkiaSharp.Views.Forms</RootNamespace> diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj index ba01fc78c4..7f3214c0a6 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinmac2.0</TargetFramework> <RootNamespace>SkiaSharp.Views.Forms</RootNamespace> diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj index 2f7ed67721..71494587c7 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>uap10.0.16299</TargetFramework> <RootNamespace>SkiaSharp.Views.Forms</RootNamespace> diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj index 18621c32b6..2c7b12a0c4 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinios1.0</TargetFramework> <RootNamespace>SkiaSharp.Views.Forms</RootNamespace> diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj index 0124f55954..6325b2cda8 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>monoandroid10.0</TargetFramework> <RootNamespace>SkiaSharp.Views.UWP</RootNamespace> diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj index 10055fbdd4..f23fdc922a 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinmac2.0</TargetFramework> <RootNamespace>SkiaSharp.Views.UWP</RootNamespace> diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj index ea69ce16bf..1df08a77ac 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinios1.0</TargetFramework> <RootNamespace>SkiaSharp.Views.UWP</RootNamespace> diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj index 0eb6e9feea..73308d0718 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>monoandroid9.0</TargetFramework> <RootNamespace>SkiaSharp.Views.Android</RootNamespace> diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj index a26d88971a..7f44294315 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinmac2.0</TargetFramework> <RootNamespace>SkiaSharp.Views.Mac</RootNamespace> diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj index 4dccf918a4..fc5ab8e347 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>uap10.0.10240</TargetFramework> <RootNamespace>SkiaSharp.Views.UWP</RootNamespace> diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj index 7bbe624e91..722de74fc6 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinios1.0</TargetFramework> <RootNamespace>SkiaSharp.Views.iOS</RootNamespace> diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj index 157a5a49fc..9af4bc7e09 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarintvos1.0</TargetFramework> <RootNamespace>SkiaSharp.Views.tvOS</RootNamespace> diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj index 143e42f59e..60db3148a2 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj @@ -1,4 +1,4 @@ -<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> +<Project Sdk="MSBuild.Sdk.Extras/3.0.44"> <PropertyGroup> <TargetFramework>xamarinwatchos1.0</TargetFramework> <RootNamespace>SkiaSharp.Views.watchOS</RootNamespace> From ca2c5713afdf64d40b54d14dde04a3633d2f7898 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 18:59:06 +0200 Subject: [PATCH 16/24] test this --- scripts/install-vs.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 2a9dc0df77..c7a6377f18 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -37,4 +37,9 @@ Get-ChildItem "$env:TEMP\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" +dir C:\Program Files\Microsoft Visual Studio\2022\ +dir C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\ +dir C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\ +dir C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\Android\ + exit $LASTEXITCODE From 43f45191147fab0dc187067eb133bd45bf51a0c0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 19:39:53 +0200 Subject: [PATCH 17/24] work around a potential bug --- source/SkiaSharp.Build.targets | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index 5d161f206c..7b20577d79 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -255,4 +255,11 @@ internal partial class VersionConstants { </ItemGroup> </Target> + <!-- try work around a potential bug --> + <Target Name="After_InjectAdditionalFiles" AfterTargets="_InjectAdditionalFiles"> + <ItemGroup> + <AdditionalFiles Remove="@(Analyzer)" /> + </ItemGroup> + </Target> + </Project> From 4e9d4ea960c1bae22c166a959c79bc158b2417d5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 19:40:27 +0200 Subject: [PATCH 18/24] text --- source/SkiaSharp.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index 7b20577d79..b61a0802f6 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -255,7 +255,7 @@ internal partial class VersionConstants { </ItemGroup> </Target> - <!-- try work around a potential bug --> + <!-- HACK: the new IDE seems to not like Analyzers in AdditionalFiles --> <Target Name="After_InjectAdditionalFiles" AfterTargets="_InjectAdditionalFiles"> <ItemGroup> <AdditionalFiles Remove="@(Analyzer)" /> From 5b34e12764e43c76bcc439d57ddb384e88c84ff6 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 19:47:28 +0200 Subject: [PATCH 19/24] oops --- scripts/install-vs.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index c7a6377f18..8352a0cf37 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -37,9 +37,9 @@ Get-ChildItem "$env:TEMP\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" -dir C:\Program Files\Microsoft Visual Studio\2022\ -dir C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\ -dir C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\ -dir C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\Android\ +dir 'C:\Program Files\Microsoft Visual Studio\2022\' +dir 'C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\' +dir 'C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\' +dir 'C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\Android\' exit $LASTEXITCODE From 59ef4e2260d8bf92722a1ce1da894fd6bf51e93a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Tue, 25 Jan 2022 23:10:02 +0200 Subject: [PATCH 20/24] --includeRecommended --- scripts/install-vs.ps1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 8352a0cf37..60499dc826 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -23,6 +23,7 @@ Invoke-WebRequest -UseBasicParsing ` Write-Host "Installing Visual Studio..." $exitCode = & "$env:TEMP\dd_vs_community.exe" --quiet --norestart --wait ` + --includeRecommended ` --add Microsoft.VisualStudio.Workload.NetCrossPlat ` --add Microsoft.VisualStudio.Workload.NetCoreTools ` --add Microsoft.VisualStudio.Workload.ManagedDesktop ` @@ -37,9 +38,4 @@ Get-ChildItem "$env:TEMP\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" -dir 'C:\Program Files\Microsoft Visual Studio\2022\' -dir 'C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\' -dir 'C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\' -dir 'C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Xamarin\Android\' - exit $LASTEXITCODE From 04c7683ddce1aaf8c0646177d1e7c21839324a16 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Wed, 26 Jan 2022 01:27:37 +0200 Subject: [PATCH 21/24] need the new things here too --- scripts/azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 3157851faf..f7465ca783 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -781,6 +781,7 @@ stages: displayName: Windows vmImage: $(VM_IMAGE_WINDOWS) target: samples + installPreviewVs: true requiredArtifactsMap: - src: nuget dst: nugets From 77ee7db4de6069dc827dc8ba5c113d4789d72e04 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Wed, 26 Jan 2022 04:58:40 +0200 Subject: [PATCH 22/24] Fix this --- samples/Directory.Build.targets | 7 +++++++ scripts/azure-templates-build.yml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index 4de98b5c73..79779ee836 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -1,3 +1,10 @@ <Project> + <!-- HACK: the new IDE seems to not like Analyzers in AdditionalFiles --> + <Target Name="After_InjectAdditionalFiles" AfterTargets="_InjectAdditionalFiles"> + <ItemGroup> + <AdditionalFiles Remove="@(Analyzer)" /> + </ItemGroup> + </Target> + </Project> \ No newline at end of file diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index dd5c84ecb0..e2a91234a3 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -32,7 +32,7 @@ parameters: jobs: - job: ${{ parameters.name }} displayName: ${{ parameters.displayName }} - timeoutInMinutes: 120 + timeoutInMinutes: 180 pool: vmImage: ${{ parameters.vmImage }} demands: ${{ parameters.demands }} From 54e9d138973ba7ae20bc15b589889c3d5503e4cd Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Wed, 26 Jan 2022 16:52:53 +0200 Subject: [PATCH 23/24] needs to be more general --- samples/Directory.Build.targets | 2 +- source/SkiaSharp.Build.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index 79779ee836..5181c73b26 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -3,7 +3,7 @@ <!-- HACK: the new IDE seems to not like Analyzers in AdditionalFiles --> <Target Name="After_InjectAdditionalFiles" AfterTargets="_InjectAdditionalFiles"> <ItemGroup> - <AdditionalFiles Remove="@(Analyzer)" /> + <AdditionalFiles Remove="@(AdditionalFiles)" Condition="'%(Extension)' == '.dll'" /> </ItemGroup> </Target> diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index b61a0802f6..1efc4d0c98 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -258,7 +258,7 @@ internal partial class VersionConstants { <!-- HACK: the new IDE seems to not like Analyzers in AdditionalFiles --> <Target Name="After_InjectAdditionalFiles" AfterTargets="_InjectAdditionalFiles"> <ItemGroup> - <AdditionalFiles Remove="@(Analyzer)" /> + <AdditionalFiles Remove="@(AdditionalFiles)" Condition="'%(Extension)' == '.dll'" /> </ItemGroup> </Target> From 6268ecce25323dd4ded2f15ce412ea1f4d3f4d40 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Wed, 26 Jan 2022 22:06:23 +0200 Subject: [PATCH 24/24] Remove hard coded versions --- VERSIONS.txt | 2 +- .../Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj | 1 - samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj | 1 - samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj | 2 -- .../Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj | 2 -- .../SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj | 1 - .../Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj | 1 - .../SkiaSharpSample.WPF.Host/SkiaSharpSample.WPF.Host.csproj | 1 - utils/WasmTestRunner/WasmTestRunner.csproj | 1 - 12 files changed, 1 insertion(+), 14 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index bdafaa4fc9..5fb1b34f19 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -24,7 +24,7 @@ SharpVk release 0.4.2 Uno.UI release 4.0.8 Microsoft.WindowsAppSDK release 1.0.0 Microsoft.Maui.Graphics release 6.0.200-preview.12.852 -Microsoft.Windows.SDK.NET.Ref release 10.0.18362.18 +Microsoft.Windows.SDK.NET.Ref release 10.0.18362.22 Microsoft.AspNetCore.Components.Web release 6.0.0 # additional references used by the tooling diff --git a/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj index 922c899655..66399a97a2 100644 --- a/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,6 @@ <OutputType>Exe</OutputType> <TargetFramework>netcoreapp3.1</TargetFramework> <LangVersion>8.0</LangVersion> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> diff --git a/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj index ac70a98287..1cc25f8d9f 100644 --- a/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj @@ -3,7 +3,6 @@ <PropertyGroup> <TargetFramework>netcoreapp3.1</TargetFramework> <LangVersion>8.0</LangVersion> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> diff --git a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj index 6bbd0991a0..a76a3f7307 100644 --- a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,6 @@ <OutputType>WinExe</OutputType> <TargetFramework>netcoreapp3.1</TargetFramework> <LangVersion>8.0</LangVersion> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> diff --git a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj index 1eb0c8a4de..e9f16c2b81 100644 --- a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,6 @@ <OutputType>Exe</OutputType> <TargetFramework>netcoreapp3.1</TargetFramework> <LangVersion>8.0</LangVersion> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> diff --git a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj index ac9ee51800..dd06d8a264 100644 --- a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -6,7 +6,6 @@ <UseWPF>true</UseWPF> <LangVersion>8.0</LangVersion> <ApplicationIcon>icon.ico</ApplicationIcon> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> diff --git a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj index 2e3acb3e4a..48a3e4f9bf 100644 --- a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj @@ -8,11 +8,9 @@ <ApplicationManifest>app.manifest</ApplicationManifest> <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling> <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers> - <RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> - <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.18" TargetingPackVersion="10.0.19041.18" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" /> <Manifest Include="$(ApplicationManifest)" /> </ItemGroup> diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj index 164bfe84e1..1095b30841 100644 --- a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj @@ -8,11 +8,9 @@ <ApplicationManifest>app.manifest</ApplicationManifest> <Platforms>x86;x64;arm64</Platforms> <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers> - <RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> - <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.18" TargetingPackVersion="10.0.19041.18" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" /> <Manifest Include="$(ApplicationManifest)" /> </ItemGroup> diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj index 7f5dd0fc10..cd7614a237 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj @@ -13,7 +13,6 @@ <UseWindowsForms>true</UseWindowsForms> <EnableDefaultXamlItems>false</EnableDefaultXamlItems> <EnableDefaultCssItems>false</EnableDefaultCssItems> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> diff --git a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj index 21c032097e..664d737d30 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj @@ -3,7 +3,6 @@ <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType> <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType> <TargetFramework>net5.0</TargetFramework> - <RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup Condition="exists('..\SkiaSharpSample.UWP')"> <EmbeddedResource Include="..\SkiaSharpSample.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" /> diff --git a/samples/Gallery/Uno/SkiaSharpSample.WPF.Host/SkiaSharpSample.WPF.Host.csproj b/samples/Gallery/Uno/SkiaSharpSample.WPF.Host/SkiaSharpSample.WPF.Host.csproj index ee710c44ca..405c7cd499 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.WPF.Host/SkiaSharpSample.WPF.Host.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.WPF.Host/SkiaSharpSample.WPF.Host.csproj @@ -4,7 +4,6 @@ <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType> <TargetFramework>netcoreapp3.1</TargetFramework> <UseWPF>true</UseWPF> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.0.8" /> diff --git a/utils/WasmTestRunner/WasmTestRunner.csproj b/utils/WasmTestRunner/WasmTestRunner.csproj index 08775a1692..7f73c189b1 100644 --- a/utils/WasmTestRunner/WasmTestRunner.csproj +++ b/utils/WasmTestRunner/WasmTestRunner.csproj @@ -5,7 +5,6 @@ <TargetFramework>netcoreapp3.1</TargetFramework> <LangVersion>8.0</LangVersion> <AssemblyName>wasm-test</AssemblyName> - <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup>