From aa433a2e30ece628663d5d59baa5dde92940c6f0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 30 Sep 2022 04:08:03 +0800 Subject: [PATCH 01/11] Removing all .NET 5 SDK requirements --- nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec | 4 ++-- nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec | 4 ++-- nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec | 4 ++-- nuget/HarfbuzzSharp.nuspec | 7 ------- nuget/SkiaSharp.HarfBuzz.nuspec | 7 ------- nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec | 4 ++-- nuget/SkiaSharp.NativeAssets.Linux.nuspec | 4 ++-- nuget/SkiaSharp.NativeAssets.Win32.nuspec | 4 ++-- nuget/SkiaSharp.NativeAssets.macOS.nuspec | 4 ++-- nuget/SkiaSharp.Skottie.nuspec | 9 --------- nuget/SkiaSharp.Views.Uno.WinUI.nuspec | 4 ++-- nuget/SkiaSharp.Views.WinUI.nuspec | 7 ------- nuget/SkiaSharp.Vulkan.SharpVk.nuspec | 7 ------- nuget/SkiaSharp.nuspec | 7 ------- .../Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../SkiaSharpSample.Package.wapproj | 2 +- .../WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../SkiaSharpSample.Skia.Gtk.csproj | 2 +- .../Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj | 2 +- source/SkiaSharp.Build.props | 2 +- .../SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj | 2 +- 22 files changed, 24 insertions(+), 68 deletions(-) diff --git a/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec b/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec index 727d97b1ba7..dd91888e1ab 100644 --- a/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec +++ b/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec @@ -33,7 +33,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -56,7 +56,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec b/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec index f09ddde3055..bd6597b36db 100644 --- a/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec +++ b/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec @@ -37,7 +37,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -61,7 +61,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec index dc3fed871d7..f371d7696e2 100644 --- a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec +++ b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec @@ -36,7 +36,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -58,7 +58,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/HarfbuzzSharp.nuspec b/nuget/HarfbuzzSharp.nuspec index c2edd68b4ab..fe19545b7a4 100644 --- a/nuget/HarfbuzzSharp.nuspec +++ b/nuget/HarfbuzzSharp.nuspec @@ -78,10 +78,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - @@ -146,9 +142,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - diff --git a/nuget/SkiaSharp.HarfBuzz.nuspec b/nuget/SkiaSharp.HarfBuzz.nuspec index 2bb0201b831..ee095add75a 100644 --- a/nuget/SkiaSharp.HarfBuzz.nuspec +++ b/nuget/SkiaSharp.HarfBuzz.nuspec @@ -47,10 +47,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - @@ -76,9 +72,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - diff --git a/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec index 7f6e27c7944..e2dd49ee057 100644 --- a/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec +++ b/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec @@ -49,7 +49,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -71,7 +71,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.NativeAssets.Linux.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.nuspec index 9492359fb63..f874caadbf2 100644 --- a/nuget/SkiaSharp.NativeAssets.Linux.nuspec +++ b/nuget/SkiaSharp.NativeAssets.Linux.nuspec @@ -37,7 +37,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -59,7 +59,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.NativeAssets.Win32.nuspec b/nuget/SkiaSharp.NativeAssets.Win32.nuspec index f2c26e7dd15..54910c544d1 100644 --- a/nuget/SkiaSharp.NativeAssets.Win32.nuspec +++ b/nuget/SkiaSharp.NativeAssets.Win32.nuspec @@ -34,7 +34,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -57,7 +57,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.NativeAssets.macOS.nuspec b/nuget/SkiaSharp.NativeAssets.macOS.nuspec index 32352b09184..3dda764c5f3 100644 --- a/nuget/SkiaSharp.NativeAssets.macOS.nuspec +++ b/nuget/SkiaSharp.NativeAssets.macOS.nuspec @@ -38,7 +38,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -62,7 +62,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.Skottie.nuspec b/nuget/SkiaSharp.Skottie.nuspec index 17c50bb5110..d9c628cb017 100644 --- a/nuget/SkiaSharp.Skottie.nuspec +++ b/nuget/SkiaSharp.Skottie.nuspec @@ -57,9 +57,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - @@ -117,9 +114,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - @@ -174,9 +168,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - diff --git a/nuget/SkiaSharp.Views.Uno.WinUI.nuspec b/nuget/SkiaSharp.Views.Uno.WinUI.nuspec index 24796b430bd..a90314e8a22 100644 --- a/nuget/SkiaSharp.Views.Uno.WinUI.nuspec +++ b/nuget/SkiaSharp.Views.Uno.WinUI.nuspec @@ -48,7 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -82,7 +82,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.Views.WinUI.nuspec b/nuget/SkiaSharp.Views.WinUI.nuspec index 4ae67d5e33c..16bbd12034d 100644 --- a/nuget/SkiaSharp.Views.WinUI.nuspec +++ b/nuget/SkiaSharp.Views.WinUI.nuspec @@ -27,10 +27,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - - - @@ -45,9 +41,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - diff --git a/nuget/SkiaSharp.Vulkan.SharpVk.nuspec b/nuget/SkiaSharp.Vulkan.SharpVk.nuspec index 7166673387b..ab181080c21 100644 --- a/nuget/SkiaSharp.Vulkan.SharpVk.nuspec +++ b/nuget/SkiaSharp.Vulkan.SharpVk.nuspec @@ -39,10 +39,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - @@ -62,9 +58,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec index 2fa214ff1bb..c23ce830cae 100644 --- a/nuget/SkiaSharp.nuspec +++ b/nuget/SkiaSharp.nuspec @@ -79,10 +79,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - @@ -150,9 +146,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj index b68a523c98c..0ea79b0b309 100644 --- a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj @@ -33,7 +33,7 @@ - --> + --> diff --git a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj index e46d2a01795..33447e14971 100644 --- a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows10.0.19041.0 + net6.0-windows10.0.19041.0 10.0.17763.0 SkiaSharpSample app.manifest diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj index 71b6fbc3d8e..c8593ff796e 100644 --- a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj +++ b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj @@ -41,7 +41,7 @@ en-US false ..\SkiaSharpSample\SkiaSharpSample.csproj - net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback) + net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback) diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj index 156b7d9bae9..d0d6095ce96 100644 --- a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows10.0.19041.0 + net6.0-windows10.0.19041.0 10.0.17763.0 SkiaSharpSample app.manifest diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj index 227d06bbe67..dfbb0ddbf31 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj @@ -2,7 +2,7 @@ WinExe Exe - net5.0 + net6.0 $(DefineConstants);WINUI diff --git a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj index 112e0cee732..be5ce9104cd 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj @@ -2,7 +2,7 @@ WinExe Exe - net5.0 + net6.0 diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index 61180910130..3734b769043 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -48,7 +48,7 @@ netstandard1.3 - netstandard2.0;netstandard2.1;net462;netcoreapp3.1;net5.0 + netstandard2.0;netstandard2.1;net462;netcoreapp3.1 $(BasicTargetFrameworksWithoutAncient);net6.0 $(AncientTargetFrameworks);$(BasicTargetFrameworksWithoutAncient) net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0-android diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj index f20745b9afe..cfd5f2f424e 100644 --- a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj +++ b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-windows10.0.19041.0 + net6.0-windows10.0.18362.0;net6.0-windows10.0.19041.0 10.0.17763.0 SkiaSharp.Views.Windows SkiaSharp.Views.Windows From 9c98fd3a967f027613c6cb978cefd93e3812ce07 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 30 Sep 2022 04:21:51 +0800 Subject: [PATCH 02/11] Remove the old code --- binding/HarfBuzzSharp.Shared/NativeObject.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/binding/HarfBuzzSharp.Shared/NativeObject.cs b/binding/HarfBuzzSharp.Shared/NativeObject.cs index a881a31c451..70088e35c1d 100644 --- a/binding/HarfBuzzSharp.Shared/NativeObject.cs +++ b/binding/HarfBuzzSharp.Shared/NativeObject.cs @@ -60,18 +60,9 @@ public void Dispose () GC.SuppressFinalize (this); } - internal static int SizeOf () - { -#if WINDOWS_UWP || NETSTANDARD || NET5_0_OR_GREATER - return Marshal.SizeOf (); -#else - return Marshal.SizeOf (typeof (T)); -#endif - } - internal static IntPtr StructureArrayToPtr (IReadOnlyList items) { - var size = SizeOf (); + var size = Marshal.SizeOf (); var memory = Marshal.AllocCoTaskMem (size * items.Count); for (var i = 0; i < items.Count; i++) { var ptr = new IntPtr (memory.ToInt64 () + (i * size)); From 681920d30729bce800f7860f1bcfb5fc90bc163b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 30 Sep 2022 12:08:55 +0800 Subject: [PATCH 03/11] Update azure-templates-bootstrapper.yml --- scripts/azure-templates-bootstrapper.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 29a14eed511..96699096d61 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -174,13 +174,6 @@ jobs: version: 3.1.x retryCountOnTaskFailure: 3 displayName: Install .NET Core 3.1.x - - task: UseDotNet@2 - condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - inputs: - packageType: 'sdk' - version: 5.0.x - retryCountOnTaskFailure: 3 - displayName: Install .NET Core 5.0.x - task: UseDotNet@2 condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: From 81c60e2ac0378999827a3d646b41e783ecc104f8 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 4 Oct 2022 10:40:23 +0800 Subject: [PATCH 04/11] Fix the casing on linux --- scripts/azure-templates-bootstrapper.yml | 4 ++++ scripts/patch-dotnet.ps1 | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 scripts/patch-dotnet.ps1 diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 96699096d61..786ecb49be8 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -185,6 +185,10 @@ jobs: displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne(variables.DOTNET_VERSION_PREVIEW, '')) + - ${{ if endsWith(parameters.name, '_linux') }}: + - pwsh: .\scripts\patch-dotnet.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + displayName: Fix the Microsoft.WinFX.* file + condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) # display dotnet info - pwsh: dotnet --info displayName: Display all the .NET information diff --git a/scripts/patch-dotnet.ps1 b/scripts/patch-dotnet.ps1 new file mode 100644 index 00000000000..2524448a22e --- /dev/null +++ b/scripts/patch-dotnet.ps1 @@ -0,0 +1,21 @@ +Param( + [string] $InstallDir +) + +$ErrorActionPreference = 'Stop' + +$dotnetSdk = Join-Path "$InstallDir" "sdk" +if (Test-Path $dotnetSdk) { + $versions = Get-ChildItem $dotnetSdk + foreach ($version in $versions) { + $root = Join-Path $version "Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets" + if (Test-Path $root) { + Move-Item (Join-Path $root Microsoft.WinFx.props) (Join-Path $root Microsoft.WinFX.props) + Move-Item (Join-Path $root Microsoft.WinFx.targets) (Join-Path $root Microsoft.WinFX.targets) + } + } +} else { + Write-Host "No .NET installed." +} + +exit $LASTEXITCODE From 787f2d741de3e11572b625b49466ab7a6d0d132a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 4 Oct 2022 14:00:12 +0800 Subject: [PATCH 05/11] list it all --- scripts/azure-pipelines-complete.yml | 2 +- scripts/patch-dotnet.ps1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index fe5ecfd32a2..5b66b95ab3a 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -12,7 +12,7 @@ parameters: - name: buildExternals displayName: 'The specific native artifacts to use for this build.' type: string - default: 'latest' + default: '71272' - name: VM_IMAGE_HOST type: object default: diff --git a/scripts/patch-dotnet.ps1 b/scripts/patch-dotnet.ps1 index 2524448a22e..1e754db988d 100644 --- a/scripts/patch-dotnet.ps1 +++ b/scripts/patch-dotnet.ps1 @@ -10,6 +10,7 @@ if (Test-Path $dotnetSdk) { foreach ($version in $versions) { $root = Join-Path $version "Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets" if (Test-Path $root) { + dir $root Move-Item (Join-Path $root Microsoft.WinFx.props) (Join-Path $root Microsoft.WinFX.props) Move-Item (Join-Path $root Microsoft.WinFx.targets) (Join-Path $root Microsoft.WinFX.targets) } From ace83ece5393e96587d6e203fb47651841020010 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 4 Oct 2022 20:22:10 +0800 Subject: [PATCH 06/11] try this --- scripts/azure-templates-bootstrapper.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 786ecb49be8..8d7fc4be047 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -186,6 +186,7 @@ jobs: retryCountOnTaskFailure: 3 condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne(variables.DOTNET_VERSION_PREVIEW, '')) - ${{ if endsWith(parameters.name, '_linux') }}: + - pwsh: ls -l /opt/hostedtoolcache/dotnet/sdk/6.0.401/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ - pwsh: .\scripts\patch-dotnet.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Fix the Microsoft.WinFX.* file condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) From 1cc70e3858132f7c7a790eddbfd514c1274e308a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 4 Oct 2022 22:09:19 +0800 Subject: [PATCH 07/11] Seems to only be there partially --- scripts/azure-templates-bootstrapper.yml | 1 - scripts/patch-dotnet.ps1 | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 8d7fc4be047..786ecb49be8 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -186,7 +186,6 @@ jobs: retryCountOnTaskFailure: 3 condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne(variables.DOTNET_VERSION_PREVIEW, '')) - ${{ if endsWith(parameters.name, '_linux') }}: - - pwsh: ls -l /opt/hostedtoolcache/dotnet/sdk/6.0.401/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ - pwsh: .\scripts\patch-dotnet.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Fix the Microsoft.WinFX.* file condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) diff --git a/scripts/patch-dotnet.ps1 b/scripts/patch-dotnet.ps1 index 1e754db988d..3912f7c3d0a 100644 --- a/scripts/patch-dotnet.ps1 +++ b/scripts/patch-dotnet.ps1 @@ -10,9 +10,12 @@ if (Test-Path $dotnetSdk) { foreach ($version in $versions) { $root = Join-Path $version "Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets" if (Test-Path $root) { - dir $root - Move-Item (Join-Path $root Microsoft.WinFx.props) (Join-Path $root Microsoft.WinFX.props) - Move-Item (Join-Path $root Microsoft.WinFx.targets) (Join-Path $root Microsoft.WinFX.targets) + if (Test-Path (Join-Path $root Microsoft.WinFx.props)) { + Move-Item (Join-Path $root Microsoft.WinFx.props) (Join-Path $root Microsoft.WinFX.props) + } + if (Test-Path (Join-Path $root Microsoft.WinFx.targets)) { + Move-Item (Join-Path $root Microsoft.WinFx.targets) (Join-Path $root Microsoft.WinFX.targets) + } } } } else { From e35d0b953b49f6065b63c23dccbd7542159f86d9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 5 Oct 2022 07:11:22 +0800 Subject: [PATCH 08/11] Update WinAppSDK --- VERSIONS.txt | 2 +- samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj | 2 +- .../Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 2aa2b3d9b98..12474799e47 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 Uno.WinUI release 4.0.13 -Microsoft.WindowsAppSDK release 1.0.3 +Microsoft.WindowsAppSDK release 1.1.5 Microsoft.Maui.Graphics release 6.0.300-rc.2.1310 Microsoft.Windows.SDK.NET.Ref release 10.0.18362.22 Microsoft.AspNetCore.Components.Web release 6.0.0 diff --git a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj index 33447e14971..8f1967ac880 100644 --- a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj index c8593ff796e..4338085b71c 100644 --- a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj +++ b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj @@ -64,7 +64,7 @@ - + \ No newline at end of file diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj index d0d6095ce96..19a28c5040c 100644 --- a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj index cfd5f2f424e..691b4600b3b 100644 --- a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj +++ b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj @@ -10,7 +10,7 @@ false - + From 5502ea7924f8061d70610a6e2a34c226231d6c03 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 6 Oct 2022 00:35:49 +0800 Subject: [PATCH 09/11] 71356 --- scripts/azure-pipelines-complete.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 5b66b95ab3a..8de6a5dc82d 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -12,7 +12,7 @@ parameters: - name: buildExternals displayName: 'The specific native artifacts to use for this build.' type: string - default: '71272' + default: '71356' - name: VM_IMAGE_HOST type: object default: From 1ec3c7fa2e81cb1d21756e1d1352ae4140930340 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 7 Oct 2022 16:32:52 +0800 Subject: [PATCH 10/11] Xamarin.Mac.dll is missing from VS? --- cake/UtilsManaged.cake | 1 + 1 file changed, 1 insertion(+) diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake index f63cc3f83c6..ec373fd5bef 100644 --- a/cake/UtilsManaged.cake +++ b/cake/UtilsManaged.cake @@ -244,6 +244,7 @@ async Task CreateNuGetDiffAsync() comparer.SearchPaths.AddRange(GetDotNetPacksSearchPaths()); comparer.SearchPaths.AddRange(GetReferenceSearchPaths()); comparer.PackageCache = PACKAGE_CACHE_PATH.FullPath; + comparer.IgnoreResolutionErrors = true; await AddDep("OpenTK.GLControl", "NET20"); await AddDep("Tizen.NET", "netstandard2.0"); From cbedcf4eb88c71314c3a96be6e174383e4420149 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 12 Oct 2022 17:27:36 +0300 Subject: [PATCH 11/11] Update azure-pipelines-complete.yml --- scripts/azure-pipelines-complete.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 8de6a5dc82d..fe5ecfd32a2 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -12,7 +12,7 @@ parameters: - name: buildExternals displayName: 'The specific native artifacts to use for this build.' type: string - default: '71356' + default: 'latest' - name: VM_IMAGE_HOST type: object default: