From e71f15d3a09665e62dd42c26594b9e3c0e70e7c2 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Mar 2023 01:33:32 +0200 Subject: [PATCH 01/39] Update to some new tools --- scripts/azure-pipelines-variables.yml | 10 +++++----- scripts/azure-templates-bootstrapper.yml | 4 ++-- scripts/install-dotnet-workloads.ps1 | 21 +++++++++------------ scripts/install-vs.ps1 | 4 +++- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 994b1d6617b..6b0e51b34fc 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -11,12 +11,12 @@ variables: BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build - MONO_VERSION_MACOS: '6_12_13' + MONO_VERSION_MACOS: '6_12_16' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' - XCODE_VERSION: 13.2.1 - VISUAL_STUDIO_VERSION: '17/pre' - DOTNET_VERSION_PREVIEW: '6.0.403' - DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/6.0.547.json' + XCODE_VERSION: 14.2 + VISUAL_STUDIO_VERSION: '' + DOTNET_VERSION_PREVIEW: '7.0.202' + DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 786ecb49be8..5ca1da317f6 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -178,9 +178,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: packageType: 'sdk' - version: 6.0.x + version: 7.0.x retryCountOnTaskFailure: 3 - displayName: Install .NET Core 6.0.x + displayName: Install .NET Core 7.0.x - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 diff --git a/scripts/install-dotnet-workloads.ps1 b/scripts/install-dotnet-workloads.ps1 index 8248c7f0349..e18d2c65a2c 100644 --- a/scripts/install-dotnet-workloads.ps1 +++ b/scripts/install-dotnet-workloads.ps1 @@ -6,15 +6,13 @@ Param( $ErrorActionPreference = 'Stop' -$previewFeed = 'https://api.nuget.org/v3/index.json' -$previewNextFeed = 'https://api.nuget.org/v3/index.json' -$previewRuntime = 'https://api.nuget.org/v3/index.json' -$previewEmscripten = 'https://api.nuget.org/v3/index.json' +$feed1 = 'https://api.nuget.org/v3/index.json' +$feed2 = 'https://api.nuget.org/v3/index.json' +$feed3 = 'https://api.nuget.org/v3/index.json' if ($IsPreview) { - $previewFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' - $previewNextFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json' - $previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json' - $previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json' + $feed1 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' + $feed2 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json' + $feed3 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json' } Write-Host "Installing .NET workloads..." @@ -22,10 +20,9 @@ Write-Host "Installing .NET workloads..." android ios tvos macos maccatalyst wasm-tools maui ` --from-rollback-file $SourceUrl ` --source https://api.nuget.org/v3/index.json ` - --source $previewFeed ` - --source $previewNextFeed ` - --source $previewRuntime ` - --source $previewEmscripten ` + --source $feed1 ` + --source $feed2 ` + --source $feed3 ` --skip-sign-check Write-Host "Installing Tizen workloads..." diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 485a3b26f6a..9a553d9ef0e 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -43,7 +43,6 @@ Write-Host "Installing Visual Studio..." $exitCode = & "$temp\dd_vs_community.exe" --quiet --norestart --wait ` --includeRecommended ` --add Microsoft.VisualStudio.Workload.NetCrossPlat ` - --add Microsoft.VisualStudio.Workload.NetCoreTools ` --add Microsoft.VisualStudio.Workload.ManagedDesktop ` --add Microsoft.VisualStudio.Workload.Universal ` | Out-Null @@ -55,5 +54,8 @@ New-Item -ItemType Directory -Force -Path "$vsLogs" | Out-Null Get-ChildItem "$temp\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" +Get-ChildItem "$env:TEMP\dd_*" | + Where-Object { $_.CreationTime -gt $startTime } | + Copy-Item -Destination "$vsLogs" exit $LASTEXITCODE From 25ed217e4de823d44b475c6341bdf6e26facf6b0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Mar 2023 01:50:44 +0200 Subject: [PATCH 02/39] Use new macos --- scripts/azure-pipelines-complete.yml | 2 +- scripts/azure-pipelines-tests.yml | 2 +- scripts/azure-pipelines.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index fe5ecfd32a2..3a0e9a57a63 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -30,7 +30,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-11 + vmImage: macos-12 - name: VM_IMAGE_LINUX type: object default: diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml index 4b1e67b72dc..3598053960a 100644 --- a/scripts/azure-pipelines-tests.yml +++ b/scripts/azure-pipelines-tests.yml @@ -20,7 +20,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-11 + vmImage: macos-12 - name: VM_IMAGE_LINUX type: object default: diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 0ae2f7e9434..2f34477a628 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -30,7 +30,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-11 + vmImage: macos-12 - name: VM_IMAGE_LINUX type: object default: From 5b239b3dd592b3c3c5686b63bfcf34b5d00c761d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Mar 2023 01:52:33 +0200 Subject: [PATCH 03/39] new --- scripts/azure-pipelines-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 6b0e51b34fc..189a5cede42 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -11,7 +11,7 @@ variables: BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build - MONO_VERSION_MACOS: '6_12_16' + MONO_VERSION_MACOS: '6_12_24' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 14.2 VISUAL_STUDIO_VERSION: '' From c91f52d132eafe3c458d7c393f8e2c4d8146655b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Mar 2023 02:21:35 +0200 Subject: [PATCH 04/39] just a bit less --- scripts/azure-pipelines-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 189a5cede42..5d6e14d65e9 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -13,7 +13,7 @@ variables: MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_24' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' - XCODE_VERSION: 14.2 + XCODE_VERSION: 14.1 VISUAL_STUDIO_VERSION: '' DOTNET_VERSION_PREVIEW: '7.0.202' DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' From d33d771d7dcf52c74a929592476722925b602799 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Mar 2023 02:41:46 +0200 Subject: [PATCH 05/39] this --- scripts/azure-pipelines-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 5d6e14d65e9..3ccdd273d3d 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -13,7 +13,7 @@ variables: MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_24' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' - XCODE_VERSION: 14.1 + XCODE_VERSION: 14.0 VISUAL_STUDIO_VERSION: '' DOTNET_VERSION_PREVIEW: '7.0.202' DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' From 3cd0e060868eda9a53a85edf9f3b0002643bd040 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Mar 2023 03:01:39 +0200 Subject: [PATCH 06/39] try this --- native/ios/build.cake | 1 + scripts/azure-pipelines-variables.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/native/ios/build.cake b/native/ios/build.cake index 8a3f3e51bfc..c5a718f29fa 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -34,6 +34,7 @@ Task("libSkiaSharp") $"target_os='{VARIANT}' " + $"skia_use_icu=false " + $"skia_use_metal={(sdk == "macosx" ? "false" : "true")} " + + $"min_maccatalyst_version=13.1 " + $"skia_use_piex=true " + $"skia_use_sfntly=false " + $"skia_use_system_expat=false " + diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 3ccdd273d3d..189a5cede42 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -13,7 +13,7 @@ variables: MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_24' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' - XCODE_VERSION: 14.0 + XCODE_VERSION: 14.2 VISUAL_STUDIO_VERSION: '' DOTNET_VERSION_PREVIEW: '7.0.202' DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' From 4c4a4dcd19e02f39bed8b1e66a4d012af5e751b5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Mar 2023 03:26:18 +0200 Subject: [PATCH 07/39] quote --- native/ios/build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/ios/build.cake b/native/ios/build.cake index c5a718f29fa..4b2607c99f5 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -34,7 +34,7 @@ Task("libSkiaSharp") $"target_os='{VARIANT}' " + $"skia_use_icu=false " + $"skia_use_metal={(sdk == "macosx" ? "false" : "true")} " + - $"min_maccatalyst_version=13.1 " + + $"min_maccatalyst_version='13.1' " + $"skia_use_piex=true " + $"skia_use_sfntly=false " + $"skia_use_system_expat=false " + From 54ce0658073bb292dca6d071aec3a8cd03bc8002 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 5 Jun 2023 17:03:49 +0200 Subject: [PATCH 08/39] updates --- native/ios/build.cake | 4 ++-- native/maccatalyst/build.cake | 1 + scripts/azure-pipelines-complete.yml | 2 +- scripts/azure-pipelines-tests.yml | 2 +- scripts/azure-pipelines-variables.yml | 2 +- scripts/azure-pipelines.yml | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/native/ios/build.cake b/native/ios/build.cake index 4b2607c99f5..367f2ac3b53 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -34,7 +34,6 @@ Task("libSkiaSharp") $"target_os='{VARIANT}' " + $"skia_use_icu=false " + $"skia_use_metal={(sdk == "macosx" ? "false" : "true")} " + - $"min_maccatalyst_version='13.1' " + $"skia_use_piex=true " + $"skia_use_sfntly=false " + $"skia_use_system_expat=false " + @@ -43,7 +42,8 @@ Task("libSkiaSharp") $"skia_use_system_libwebp=false " + $"skia_use_system_zlib=false " + $"skia_enable_skottie=true " + - $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF' ] "); + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF' ] " + + ADDITIONAL_GN_ARGS); RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch, platform: VARIANT); diff --git a/native/maccatalyst/build.cake b/native/maccatalyst/build.cake index 507f0ca2c72..33e27ccce02 100644 --- a/native/maccatalyst/build.cake +++ b/native/maccatalyst/build.cake @@ -8,6 +8,7 @@ Task("libSkiaSharp") .Does(() => { RunCake("../ios/build.cake", "libSkiaSharp", new Dictionary { + { "gnArgs", $"min_maccatalyst_version='13.1'" }, { "variant", "maccatalyst" }, }); }); diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 3a0e9a57a63..46b6f1c9450 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -30,7 +30,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-12 + vmImage: macos-13 - name: VM_IMAGE_LINUX type: object default: diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml index 3598053960a..1127a2e8cb8 100644 --- a/scripts/azure-pipelines-tests.yml +++ b/scripts/azure-pipelines-tests.yml @@ -20,7 +20,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-12 + vmImage: macos-13 - name: VM_IMAGE_LINUX type: object default: diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 189a5cede42..e05279f5099 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -13,7 +13,7 @@ variables: MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_24' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' - XCODE_VERSION: 14.2 + XCODE_VERSION: 14.3 VISUAL_STUDIO_VERSION: '' DOTNET_VERSION_PREVIEW: '7.0.202' DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 2f34477a628..5f5bb20ad19 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -30,7 +30,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-12 + vmImage: macos-13 - name: VM_IMAGE_LINUX type: object default: From 646da5ffcb4731b4948813d01992eeac023978b8 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 5 Jun 2023 17:40:38 +0200 Subject: [PATCH 09/39] :') --- scripts/azure-pipelines-complete.yml | 2 +- scripts/azure-pipelines-tests.yml | 2 +- scripts/azure-pipelines-variables.yml | 2 +- scripts/azure-pipelines.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 46b6f1c9450..3a0e9a57a63 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -30,7 +30,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-13 + vmImage: macos-12 - name: VM_IMAGE_LINUX type: object default: diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml index 1127a2e8cb8..3598053960a 100644 --- a/scripts/azure-pipelines-tests.yml +++ b/scripts/azure-pipelines-tests.yml @@ -20,7 +20,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-13 + vmImage: macos-12 - name: VM_IMAGE_LINUX type: object default: diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index e05279f5099..189a5cede42 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -13,7 +13,7 @@ variables: MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_24' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' - XCODE_VERSION: 14.3 + XCODE_VERSION: 14.2 VISUAL_STUDIO_VERSION: '' DOTNET_VERSION_PREVIEW: '7.0.202' DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 5f5bb20ad19..2f34477a628 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -30,7 +30,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-13 + vmImage: macos-12 - name: VM_IMAGE_LINUX type: object default: From e76d5510a46c87bf7c7415a1d1ffbc627f080adb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 5 Jun 2023 17:41:27 +0200 Subject: [PATCH 10/39] this --- scripts/azure-pipelines-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 189a5cede42..2eafcf0fefb 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -15,7 +15,7 @@ variables: MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 14.2 VISUAL_STUDIO_VERSION: '' - DOTNET_VERSION_PREVIEW: '7.0.202' + DOTNET_VERSION_PREVIEW: '7.0.203' DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true From 734e62a84f594a1153ab2acb37166cb4b75bcba4 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 5 Jun 2023 17:54:57 +0200 Subject: [PATCH 11/39] archived --- scripts/Docker/debian9/amd64/Dockerfile | 4 +--- scripts/Docker/debian9/clang-cross/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/Docker/debian9/amd64/Dockerfile b/scripts/Docker/debian9/amd64/Dockerfile index d4b899d9822..7e8448ec766 100644 --- a/scripts/Docker/debian9/amd64/Dockerfile +++ b/scripts/Docker/debian9/amd64/Dockerfile @@ -1,4 +1,5 @@ FROM amd64/debian:9 +RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] @@ -16,7 +17,6 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* ARG DOTNET_SDK_VERSION=3.1.412 - RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ && dotnet_sha512='1ed0c1ab48723cef834906a55fb1889b29dd810cd2bc66cbd345a0baf8a2796045b5b7f4beef3c48bd56bef3ffed690b6fae4a5f017ad8687817b25a76fbd9be' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ @@ -24,9 +24,7 @@ RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK && tar -C /usr/share/dotnet -xzf dotnet.tar.gz \ && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ && rm dotnet.tar.gz - ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 - RUN dotnet help ENV CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} diff --git a/scripts/Docker/debian9/clang-cross/Dockerfile b/scripts/Docker/debian9/clang-cross/Dockerfile index ea8d1129985..e47ea081556 100644 --- a/scripts/Docker/debian9/clang-cross/Dockerfile +++ b/scripts/Docker/debian9/clang-cross/Dockerfile @@ -1,4 +1,5 @@ FROM amd64/debian:9 +RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] @@ -24,7 +25,6 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* ARG DOTNET_SDK_VERSION=3.1.412 - RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ && dotnet_sha512='1ed0c1ab48723cef834906a55fb1889b29dd810cd2bc66cbd345a0baf8a2796045b5b7f4beef3c48bd56bef3ffed690b6fae4a5f017ad8687817b25a76fbd9be' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ @@ -32,9 +32,7 @@ RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK && tar -C /usr/share/dotnet -xzf dotnet.tar.gz \ && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ && rm dotnet.tar.gz - ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 - RUN dotnet help # toolchain (gcc/g++) From 4078b51024b0afd3bacecb8b701bc58eb2c13b9d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 5 Jun 2023 23:03:44 +0200 Subject: [PATCH 12/39] Drop missing architecures --- native/ios/build.cake | 4 +--- .../libHarfBuzzSharp.xcodeproj/project.pbxproj | 4 ++-- .../libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj | 4 ++-- .../SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj | 8 ++++---- samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj | 8 ++++---- samples/Gallery/Xamarin.Forms/iOS/iOS.csproj | 8 ++++---- scripts/Docker/debian9/amd64/Dockerfile | 3 ++- scripts/Docker/debian9/clang-cross/Dockerfile | 3 ++- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/native/ios/build.cake b/native/ios/build.cake index 367f2ac3b53..963df45cdd0 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -12,7 +12,6 @@ Task("libSkiaSharp") .Does(() => { if (VARIANT.ToLower() == "ios") { - Build("iphonesimulator", "i386", "x86"); Build("iphonesimulator", "x86_64", "x64"); Build("iphoneos", "armv7", "arm"); Build("iphoneos", "arm64", "arm64"); @@ -32,6 +31,7 @@ Task("libSkiaSharp") GnNinja($"{VARIANT}/{arch}", "skia modules/skottie", $"target_cpu='{skiaArch}' " + $"target_os='{VARIANT}' " + + $"min_ios_version='11.0' " + $"skia_use_icu=false " + $"skia_use_metal={(sdk == "macosx" ? "false" : "true")} " + $"skia_use_piex=true " + @@ -58,9 +58,7 @@ Task("libHarfBuzzSharp") .Does(() => { if (VARIANT.ToLower() == "ios") { - Build("iphonesimulator", "i386"); Build("iphonesimulator", "x86_64"); - Build("iphoneos", "armv7"); Build("iphoneos", "arm64"); CreateFatFramework(OUTPUT_PATH.Combine("ios/libHarfBuzzSharp")); diff --git a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj index d393440c0c9..538b8c76855 100644 --- a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj +++ b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj @@ -493,7 +493,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-all_load"; @@ -553,7 +553,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-all_load"; PLATFORM = ios; diff --git a/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj b/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj index 77da8637822..b0649c28514 100644 --- a/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj @@ -315,7 +315,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-all_load"; @@ -388,7 +388,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-all_load"; SDKROOT = iphoneos; diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 856fc89c7b7..297cca77d14 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -22,7 +22,7 @@ prompt 4 false - i386, x86_64 + x86_64 None true @@ -33,7 +33,7 @@ prompt 4 None - i386, x86_64 + x86_64 false @@ -45,7 +45,7 @@ prompt 4 false - ARMv7, ARM64 + ARM64 iPhone Developer true Entitlements.plist @@ -56,7 +56,7 @@ bin\iPhone\Release prompt 4 - ARMv7, ARM64 + ARM64 false iPhone Developer Entitlements.plist diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj index cd682a8315d..751c9c16574 100644 --- a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -23,7 +23,7 @@ DEBUG prompt 4 - i386, x86_64 + x86_64 None true @@ -34,7 +34,7 @@ prompt 4 None - i386, x86_64 + x86_64 true @@ -44,7 +44,7 @@ DEBUG prompt 4 - ARMv7, ARM64 + ARM64 Entitlements.plist iPhone Developer true @@ -57,7 +57,7 @@ prompt 4 Entitlements.plist - ARMv7, ARM64 + ARM64 iPhone Developer SdkOnly diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index 127703681ac..77d8a098b6a 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -22,7 +22,7 @@ prompt 4 false - i386, x86_64 + x86_64 None True False @@ -42,7 +42,7 @@ prompt 4 Full - i386, x86_64 + x86_64 false False False @@ -65,7 +65,7 @@ prompt 4 false - ARMv7, ARM64 + ARM64 iPhone Developer True Entitlements.plist @@ -87,7 +87,7 @@ bin\iPhone\Release prompt 4 - ARMv7, ARM64 + ARM64 false iPhone Developer Entitlements.plist diff --git a/scripts/Docker/debian9/amd64/Dockerfile b/scripts/Docker/debian9/amd64/Dockerfile index 7e8448ec766..0d7da392c3f 100644 --- a/scripts/Docker/debian9/amd64/Dockerfile +++ b/scripts/Docker/debian9/amd64/Dockerfile @@ -1,5 +1,6 @@ FROM amd64/debian:9 -RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list +RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list \ + && sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] diff --git a/scripts/Docker/debian9/clang-cross/Dockerfile b/scripts/Docker/debian9/clang-cross/Dockerfile index e47ea081556..032c88b7de3 100644 --- a/scripts/Docker/debian9/clang-cross/Dockerfile +++ b/scripts/Docker/debian9/clang-cross/Dockerfile @@ -1,5 +1,6 @@ FROM amd64/debian:9 -RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list +RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list \ + && sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] From 225f11e64c3c94cb2bdc013cb679396929a09362 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 5 Jun 2023 23:44:17 +0200 Subject: [PATCH 13/39] this --- native/ios/build.cake | 1 - samples/Basic/Uno/SkiaSharpSample.iOS/Info.plist | 1 - samples/Basic/iOS/SkiaSharpSample/Info.plist | 2 +- .../Uno.WinUI/SkiaSharpSample.Mobile/iOS/Info.plist | 1 - samples/Gallery/Uno/SkiaSharpSample.iOS/Info.plist | 1 - scripts/Docker/debian9/amd64/Dockerfile | 7 +++++-- scripts/Docker/debian9/clang-cross/Dockerfile | 5 +++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/native/ios/build.cake b/native/ios/build.cake index 963df45cdd0..f889f0b5377 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -13,7 +13,6 @@ Task("libSkiaSharp") { if (VARIANT.ToLower() == "ios") { Build("iphonesimulator", "x86_64", "x64"); - Build("iphoneos", "armv7", "arm"); Build("iphoneos", "arm64", "arm64"); CreateFatFramework(OUTPUT_PATH.Combine("ios/libSkiaSharp")); diff --git a/samples/Basic/Uno/SkiaSharpSample.iOS/Info.plist b/samples/Basic/Uno/SkiaSharpSample.iOS/Info.plist index d014a33c461..4d33252ec7b 100644 --- a/samples/Basic/Uno/SkiaSharpSample.iOS/Info.plist +++ b/samples/Basic/Uno/SkiaSharpSample.iOS/Info.plist @@ -23,7 +23,6 @@ LaunchScreen UIRequiredDeviceCapabilities - armv7 arm64 UISupportedInterfaceOrientations diff --git a/samples/Basic/iOS/SkiaSharpSample/Info.plist b/samples/Basic/iOS/SkiaSharpSample/Info.plist index 6e15faa0d7e..c260c4ebfa5 100644 --- a/samples/Basic/iOS/SkiaSharpSample/Info.plist +++ b/samples/Basic/iOS/SkiaSharpSample/Info.plist @@ -25,7 +25,7 @@ Main UIRequiredDeviceCapabilities - armv7 + arm64 UISupportedInterfaceOrientations diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/iOS/Info.plist b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/iOS/Info.plist index 78b9254b330..c9ffdf08c82 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/iOS/Info.plist +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/iOS/Info.plist @@ -23,7 +23,6 @@ LaunchScreen UIRequiredDeviceCapabilities - armv7 arm64 UISupportedInterfaceOrientations diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/Info.plist b/samples/Gallery/Uno/SkiaSharpSample.iOS/Info.plist index d014a33c461..4d33252ec7b 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.iOS/Info.plist +++ b/samples/Gallery/Uno/SkiaSharpSample.iOS/Info.plist @@ -23,7 +23,6 @@ LaunchScreen UIRequiredDeviceCapabilities - armv7 arm64 UISupportedInterfaceOrientations diff --git a/scripts/Docker/debian9/amd64/Dockerfile b/scripts/Docker/debian9/amd64/Dockerfile index 0d7da392c3f..1ebd2075ca6 100644 --- a/scripts/Docker/debian9/amd64/Dockerfile +++ b/scripts/Docker/debian9/amd64/Dockerfile @@ -1,6 +1,9 @@ FROM amd64/debian:9 -RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list \ - && sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list +RUN echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch main" > /etc/apt/sources.list \ + && echo "deb http://snapshot.debian.org/archive/debian-security/20220622T000000Z stretch/updates main" >> /etc/apt/sources.list \ + && echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch-updates main" >> /etc/apt/sources.list + +RUN cat /etc/apt/sources.list # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] diff --git a/scripts/Docker/debian9/clang-cross/Dockerfile b/scripts/Docker/debian9/clang-cross/Dockerfile index 032c88b7de3..57abd646b15 100644 --- a/scripts/Docker/debian9/clang-cross/Dockerfile +++ b/scripts/Docker/debian9/clang-cross/Dockerfile @@ -1,6 +1,7 @@ FROM amd64/debian:9 -RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list \ - && sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list +RUN echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch main" > /etc/apt/sources.list \ + && echo "deb http://snapshot.debian.org/archive/debian-security/20220622T000000Z stretch/updates main" >> /etc/apt/sources.list \ + && echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch-updates main" >> /etc/apt/sources.list # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] From 9fb5347391fa7890b0013a452f5a3c78c6bea16f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 5 Jun 2023 23:52:18 +0200 Subject: [PATCH 14/39] no https... --- scripts/Docker/debian9/amd64/Dockerfile | 5 ++--- scripts/Docker/debian9/clang-cross/Dockerfile | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/Docker/debian9/amd64/Dockerfile b/scripts/Docker/debian9/amd64/Dockerfile index 1ebd2075ca6..5b756f49969 100644 --- a/scripts/Docker/debian9/amd64/Dockerfile +++ b/scripts/Docker/debian9/amd64/Dockerfile @@ -1,7 +1,6 @@ FROM amd64/debian:9 -RUN echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch main" > /etc/apt/sources.list \ - && echo "deb http://snapshot.debian.org/archive/debian-security/20220622T000000Z stretch/updates main" >> /etc/apt/sources.list \ - && echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch-updates main" >> /etc/apt/sources.list +RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list \ + && echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list RUN cat /etc/apt/sources.list diff --git a/scripts/Docker/debian9/clang-cross/Dockerfile b/scripts/Docker/debian9/clang-cross/Dockerfile index 57abd646b15..22e3a8653e3 100644 --- a/scripts/Docker/debian9/clang-cross/Dockerfile +++ b/scripts/Docker/debian9/clang-cross/Dockerfile @@ -1,7 +1,6 @@ FROM amd64/debian:9 -RUN echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch main" > /etc/apt/sources.list \ - && echo "deb http://snapshot.debian.org/archive/debian-security/20220622T000000Z stretch/updates main" >> /etc/apt/sources.list \ - && echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch-updates main" >> /etc/apt/sources.list +RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list \ + && echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] From 39a7d188fe4cbf1038929f82b0fd14e8bfc78a7e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 6 Jun 2023 19:13:34 +0200 Subject: [PATCH 15/39] archive --- scripts/Docker/debian9/clang-cross/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Docker/debian9/clang-cross/Dockerfile b/scripts/Docker/debian9/clang-cross/Dockerfile index 22e3a8653e3..03320fa8b32 100644 --- a/scripts/Docker/debian9/clang-cross/Dockerfile +++ b/scripts/Docker/debian9/clang-cross/Dockerfile @@ -56,7 +56,7 @@ RUN ln -s /usr/${TOOLCHAIN_ARCH}/include/c++/${TOOLCHAIN_VERSION}.* /usr/${TOOLC ARG FONTCONFIG_VERSION=2.11.0-6.7+b1 RUN (mkdir -p /skia-utils/libfontconfig1-dev \ && cd /skia-utils/libfontconfig1-dev \ - && wget -O libfontconfig1-dev.deb http://ftp.nl.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb \ + && wget -O libfontconfig1-dev.deb http://archive.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb \ && ar vx libfontconfig1-dev.deb \ && tar -xJvf data.tar.xz \ && rm libfontconfig1-dev.deb \ @@ -64,7 +64,7 @@ RUN (mkdir -p /skia-utils/libfontconfig1-dev \ && cp -R usr/include/* /usr/${TOOLCHAIN_ARCH}/include/ ) RUN (mkdir -p /skia-utils/libfontconfig1 \ && cd /skia-utils/libfontconfig1 \ - && wget -O libfontconfig1.deb http://ftp.nl.debian.org/debian/pool/main/f/fontconfig/libfontconfig1_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb \ + && wget -O libfontconfig1.deb http://archive.debian.org/debian/pool/main/f/fontconfig/libfontconfig1_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb \ && ar vx libfontconfig1.deb \ && tar -xJvf data.tar.xz \ && rm libfontconfig1.deb \ From 32874be0b5ca58a68886282d58b46a0152fc6b4d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 6 Jun 2023 22:51:15 +0200 Subject: [PATCH 16/39] just a new min version needed --- native/macos/build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/macos/build.cake b/native/macos/build.cake index d52bb74cac6..a55670066b2 100644 --- a/native/macos/build.cake +++ b/native/macos/build.cake @@ -20,7 +20,7 @@ Task("libSkiaSharp") var minVersion = skiaArch.ToLower() == "arm64" ? "11.0" - : "10.8"; + : "10.9"; GnNinja($"macos/{arch}", "skia modules/skottie", $"target_os='mac' " + From eeaa31e5520258081710012345509775fa6e5e85 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 00:12:59 +0200 Subject: [PATCH 17/39] put the min versions in the cake --- native/tvos/build.cake | 1 + native/watchos/build.cake | 1 + 2 files changed, 2 insertions(+) diff --git a/native/tvos/build.cake b/native/tvos/build.cake index 92beaae768e..bccd84180cf 100644 --- a/native/tvos/build.cake +++ b/native/tvos/build.cake @@ -21,6 +21,7 @@ Task("libSkiaSharp") GnNinja($"tvos/{arch}", "skia modules/skottie", $"target_os='tvos' " + $"target_cpu='{skiaArch}' " + + $"min_ios_version='9.0' " + $"skia_use_icu=false " + $"skia_use_metal=false " + $"skia_use_piex=true " + diff --git a/native/watchos/build.cake b/native/watchos/build.cake index 645bd5f2724..d6714cb48fc 100644 --- a/native/watchos/build.cake +++ b/native/watchos/build.cake @@ -22,6 +22,7 @@ Task("libSkiaSharp") GnNinja($"watchos/{arch}", "skia modules/skottie", $"target_os='watchos' " + $"target_cpu='{skiaArch}' " + + $"min_watchos_version='2.0' " + $"skia_enable_gpu=false " + $"skia_use_icu=false " + $"skia_use_metal=false " + From 10f0f28e6bf7c0c8397c9519df7f8786d72d3ebf Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 00:52:45 +0200 Subject: [PATCH 18/39] certs --- scripts/azure-templates-provisioning-profiles.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/azure-templates-provisioning-profiles.yml b/scripts/azure-templates-provisioning-profiles.yml index d1ad7d898ba..5689a813ebb 100644 --- a/scripts/azure-templates-provisioning-profiles.yml +++ b/scripts/azure-templates-provisioning-profiles.yml @@ -1,16 +1,16 @@ steps: - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'SkiaSharp iOS Certificate.p12' + certSecureFile: 'Components iOS Certificate.p12' - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'SkiaSharp Mac Certificate.p12' + certSecureFile: 'Components Mac Certificate.p12' - task: InstallAppleProvisioningProfile@1 inputs: - provProfileSecureFile: 'SkiaSharp iOS Provisioning.mobileprovision' + provProfileSecureFile: 'Components iOS Provisioning.mobileprovision' - task: InstallAppleProvisioningProfile@1 inputs: - provProfileSecureFile: 'SkiaSharp Mac Provisioning.provisionprofile' + provProfileSecureFile: 'Components Mac Provisioning.provisionprofile' - task: InstallAppleProvisioningProfile@1 inputs: - provProfileSecureFile: 'SkiaSharp tvOS Provisioning.mobileprovision' + provProfileSecureFile: 'Components tvOS Provisioning.mobileprovision' From 09316bf3197d4e315fdab57fc3970807db87a8a7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 00:54:11 +0200 Subject: [PATCH 19/39] ws --- scripts/azure-templates-provisioning-profiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-templates-provisioning-profiles.yml b/scripts/azure-templates-provisioning-profiles.yml index 5689a813ebb..6411ac2fe72 100644 --- a/scripts/azure-templates-provisioning-profiles.yml +++ b/scripts/azure-templates-provisioning-profiles.yml @@ -1,7 +1,7 @@ steps: - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'Components iOS Certificate.p12' + certSecureFile: 'Components iOS Certificate.p12' - task: InstallAppleCertificate@2 inputs: certSecureFile: 'Components Mac Certificate.p12' From 77671a227c3579950aa4737f0e514cd131c6f2f4 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 00:58:38 +0200 Subject: [PATCH 20/39] auth --- scripts/azure-templates-stages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml index 599f2ef44b9..1fd53e0f390 100644 --- a/scripts/azure-templates-stages.yml +++ b/scripts/azure-templates-stages.yml @@ -234,6 +234,8 @@ stages: vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-android additionalArgs: --buildarch=x86 + preBuildSteps: + - template: azure-templates-provisioning-profiles.yml - template: azure-templates-bootstrapper.yml # Build Native Android|x64 (macOS) parameters: name: native_android_x64_macos From 5707516ea3a65f7d14a8480e53ab2c2089f52c62 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 01:18:59 +0200 Subject: [PATCH 21/39] mine --- scripts/azure-templates-provisioning-profiles.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/azure-templates-provisioning-profiles.yml b/scripts/azure-templates-provisioning-profiles.yml index 6411ac2fe72..d1ad7d898ba 100644 --- a/scripts/azure-templates-provisioning-profiles.yml +++ b/scripts/azure-templates-provisioning-profiles.yml @@ -1,16 +1,16 @@ steps: - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'Components iOS Certificate.p12' + certSecureFile: 'SkiaSharp iOS Certificate.p12' - task: InstallAppleCertificate@2 inputs: - certSecureFile: 'Components Mac Certificate.p12' + certSecureFile: 'SkiaSharp Mac Certificate.p12' - task: InstallAppleProvisioningProfile@1 inputs: - provProfileSecureFile: 'Components iOS Provisioning.mobileprovision' + provProfileSecureFile: 'SkiaSharp iOS Provisioning.mobileprovision' - task: InstallAppleProvisioningProfile@1 inputs: - provProfileSecureFile: 'Components Mac Provisioning.provisionprofile' + provProfileSecureFile: 'SkiaSharp Mac Provisioning.provisionprofile' - task: InstallAppleProvisioningProfile@1 inputs: - provProfileSecureFile: 'Components tvOS Provisioning.mobileprovision' + provProfileSecureFile: 'SkiaSharp tvOS Provisioning.mobileprovision' From e0d2a6e9d64612db99cc707f0b010e5277e7f2df Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 01:22:02 +0200 Subject: [PATCH 22/39] =?UTF-8?q?no=20more=C2=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/azure-templates-stages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml index 1fd53e0f390..599f2ef44b9 100644 --- a/scripts/azure-templates-stages.yml +++ b/scripts/azure-templates-stages.yml @@ -234,8 +234,6 @@ stages: vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-android additionalArgs: --buildarch=x86 - preBuildSteps: - - template: azure-templates-provisioning-profiles.yml - template: azure-templates-bootstrapper.yml # Build Native Android|x64 (macOS) parameters: name: native_android_x64_macos From 22cf433316de1479d498e41ee183f0cb7acfcac1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 10:40:30 +0200 Subject: [PATCH 23/39] build --- scripts/azure-pipelines-complete.yml | 2 +- scripts/azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 3a0e9a57a63..ebd5d9d0163 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: '88017' - name: VM_IMAGE_HOST type: object default: diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 2f34477a628..83ef35b3d34 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: string - default: 'latest' + default: '88017' - name: VM_IMAGE_HOST type: object default: From d41f998e50f7dc7dc1876d12ef6062283ca50235 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 10:40:43 +0200 Subject: [PATCH 24/39] nugets --- nuget.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nuget.config b/nuget.config index cf0d53d78d9..4de57ae8006 100644 --- a/nuget.config +++ b/nuget.config @@ -2,11 +2,10 @@ - - + From 7f5e54158f6226b32ac0187c740daf2264a58aaf Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 10:59:30 +0200 Subject: [PATCH 25/39] dotnet --- global.json | 5 +++++ scripts/azure-pipelines-variables.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 00000000000..2d46182cf40 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "7.0.302" + } +} \ No newline at end of file diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 2eafcf0fefb..1c2d1b5aeb9 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -15,8 +15,8 @@ variables: MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 14.2 VISUAL_STUDIO_VERSION: '' - DOTNET_VERSION_PREVIEW: '7.0.203' - DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json' + DOTNET_VERSION_PREVIEW: '7.0.302' + DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true From 2eabd2182c549cb9e2ae8cb2d5f8a8a1c5d16d43 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 17:10:39 +0200 Subject: [PATCH 26/39] update xharness --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d10ef3d8870..b47261b180c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22204.2", + "version": "8.0.0-prerelease.23279.1", "commands": [ "xharness" ] From 9402ec958d8950195176fcd1826a115f27c1b7bb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 17:53:48 +0200 Subject: [PATCH 27/39] Use the new .NET SDK and tools --- .config/dotnet-tools.json | 2 +- global.json | 5 +++++ nuget.config | 3 +-- scripts/azure-pipelines-variables.yml | 6 +++--- scripts/azure-templates-bootstrapper.yml | 4 ++-- scripts/install-dotnet-workloads.ps1 | 21 +++++++++------------ scripts/install-vs.ps1 | 4 +++- 7 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 global.json diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d10ef3d8870..c4ec4ffc7a2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22204.2", + "version": "8.0.0-prerelease.23307.1", "commands": [ "xharness" ] diff --git a/global.json b/global.json new file mode 100644 index 00000000000..2d46182cf40 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "7.0.302" + } +} \ No newline at end of file diff --git a/nuget.config b/nuget.config index cf0d53d78d9..4de57ae8006 100644 --- a/nuget.config +++ b/nuget.config @@ -2,11 +2,10 @@ - - + diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 994b1d6617b..3ace225bb2c 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -14,9 +14,9 @@ variables: MONO_VERSION_MACOS: '6_12_13' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 13.2.1 - VISUAL_STUDIO_VERSION: '17/pre' - DOTNET_VERSION_PREVIEW: '6.0.403' - DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/6.0.547.json' + VISUAL_STUDIO_VERSION: '' + DOTNET_VERSION_PREVIEW: '7.0.302' + DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 786ecb49be8..5ca1da317f6 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -178,9 +178,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: packageType: 'sdk' - version: 6.0.x + version: 7.0.x retryCountOnTaskFailure: 3 - displayName: Install .NET Core 6.0.x + displayName: Install .NET Core 7.0.x - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 diff --git a/scripts/install-dotnet-workloads.ps1 b/scripts/install-dotnet-workloads.ps1 index 8248c7f0349..e18d2c65a2c 100644 --- a/scripts/install-dotnet-workloads.ps1 +++ b/scripts/install-dotnet-workloads.ps1 @@ -6,15 +6,13 @@ Param( $ErrorActionPreference = 'Stop' -$previewFeed = 'https://api.nuget.org/v3/index.json' -$previewNextFeed = 'https://api.nuget.org/v3/index.json' -$previewRuntime = 'https://api.nuget.org/v3/index.json' -$previewEmscripten = 'https://api.nuget.org/v3/index.json' +$feed1 = 'https://api.nuget.org/v3/index.json' +$feed2 = 'https://api.nuget.org/v3/index.json' +$feed3 = 'https://api.nuget.org/v3/index.json' if ($IsPreview) { - $previewFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' - $previewNextFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json' - $previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json' - $previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json' + $feed1 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' + $feed2 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json' + $feed3 = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json' } Write-Host "Installing .NET workloads..." @@ -22,10 +20,9 @@ Write-Host "Installing .NET workloads..." android ios tvos macos maccatalyst wasm-tools maui ` --from-rollback-file $SourceUrl ` --source https://api.nuget.org/v3/index.json ` - --source $previewFeed ` - --source $previewNextFeed ` - --source $previewRuntime ` - --source $previewEmscripten ` + --source $feed1 ` + --source $feed2 ` + --source $feed3 ` --skip-sign-check Write-Host "Installing Tizen workloads..." diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 485a3b26f6a..9a553d9ef0e 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -43,7 +43,6 @@ Write-Host "Installing Visual Studio..." $exitCode = & "$temp\dd_vs_community.exe" --quiet --norestart --wait ` --includeRecommended ` --add Microsoft.VisualStudio.Workload.NetCrossPlat ` - --add Microsoft.VisualStudio.Workload.NetCoreTools ` --add Microsoft.VisualStudio.Workload.ManagedDesktop ` --add Microsoft.VisualStudio.Workload.Universal ` | Out-Null @@ -55,5 +54,8 @@ New-Item -ItemType Directory -Force -Path "$vsLogs" | Out-Null Get-ChildItem "$temp\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" +Get-ChildItem "$env:TEMP\dd_*" | + Where-Object { $_.CreationTime -gt $startTime } | + Copy-Item -Destination "$vsLogs" exit $LASTEXITCODE From 08155b53ecb07f6110ad538656bda31277151592 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 17:57:06 +0200 Subject: [PATCH 28/39] Revert "Use the new .NET SDK and tools" This reverts commit 9402ec958d8950195176fcd1826a115f27c1b7bb. --- scripts/azure-pipelines-variables.yml | 4 ++-- scripts/azure-templates-bootstrapper.yml | 4 ++-- scripts/install-vs.ps1 | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 3ace225bb2c..5f205046b28 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -15,8 +15,8 @@ variables: MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 13.2.1 VISUAL_STUDIO_VERSION: '' - DOTNET_VERSION_PREVIEW: '7.0.302' - DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json' + DOTNET_VERSION_PREVIEW: '6.0.408' + DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/6.0.553.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 5ca1da317f6..786ecb49be8 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -178,9 +178,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: packageType: 'sdk' - version: 7.0.x + version: 6.0.x retryCountOnTaskFailure: 3 - displayName: Install .NET Core 7.0.x + displayName: Install .NET Core 6.0.x - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 9a553d9ef0e..485a3b26f6a 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -43,6 +43,7 @@ Write-Host "Installing Visual Studio..." $exitCode = & "$temp\dd_vs_community.exe" --quiet --norestart --wait ` --includeRecommended ` --add Microsoft.VisualStudio.Workload.NetCrossPlat ` + --add Microsoft.VisualStudio.Workload.NetCoreTools ` --add Microsoft.VisualStudio.Workload.ManagedDesktop ` --add Microsoft.VisualStudio.Workload.Universal ` | Out-Null @@ -54,8 +55,5 @@ New-Item -ItemType Directory -Force -Path "$vsLogs" | Out-Null Get-ChildItem "$temp\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" -Get-ChildItem "$env:TEMP\dd_*" | - Where-Object { $_.CreationTime -gt $startTime } | - Copy-Item -Destination "$vsLogs" exit $LASTEXITCODE From 1a228ed49d043b169b36b11406ce3d7d9afd1246 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 18:06:58 +0200 Subject: [PATCH 29/39] asdf --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 2d46182cf40..dfa39aa9ede 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.302" + "version": "6.0.408" } } \ No newline at end of file From 3e5fc9cbee277b41d0eaed8bab9729cda9761fd1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 18:16:46 +0200 Subject: [PATCH 30/39] and this --- global.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 global.json diff --git a/global.json b/global.json deleted file mode 100644 index 2d46182cf40..00000000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "7.0.302" - } -} \ No newline at end of file From 2ecd46f03d849093e7b91078a43daa70d2c665ed Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 23:02:25 +0200 Subject: [PATCH 31/39] reverts and stuff --- scripts/azure-pipelines-complete.yml | 2 +- scripts/azure-pipelines-variables.yml | 4 ++-- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-bootstrapper.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index ebd5d9d0163..7b0ce471036 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: '88017' + default: '88091' - name: VM_IMAGE_HOST type: object default: diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 1c2d1b5aeb9..c79ef05caee 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -15,8 +15,8 @@ variables: MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 14.2 VISUAL_STUDIO_VERSION: '' - DOTNET_VERSION_PREVIEW: '7.0.302' - DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json' + DOTNET_VERSION_PREVIEW: '6.0.408' + DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/6.0.553.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 83ef35b3d34..5468f909067 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: string - default: '88017' + default: '88091' - name: VM_IMAGE_HOST type: object default: diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 5ca1da317f6..786ecb49be8 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -178,9 +178,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: packageType: 'sdk' - version: 7.0.x + version: 6.0.x retryCountOnTaskFailure: 3 - displayName: Install .NET Core 7.0.x + displayName: Install .NET Core 6.0.x - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 From 5525f2db25c3604893c753c34b580630810d0c36 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 23:17:37 +0200 Subject: [PATCH 32/39] build all --- scripts/azure-pipelines-complete.yml | 2 +- scripts/azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 7b0ce471036..3a0e9a57a63 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: '88091' + default: 'latest' - name: VM_IMAGE_HOST type: object default: diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 5468f909067..2f34477a628 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: string - default: '88091' + default: 'latest' - name: VM_IMAGE_HOST type: object default: From d617ac53d7d8234d290b30a2f779fde8c0adff6e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 23:51:32 +0200 Subject: [PATCH 33/39] this --- scripts/azure-pipelines-complete-internal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-complete-internal.yml b/scripts/azure-pipelines-complete-internal.yml index fb22b753f8c..3ed9f588796 100644 --- a/scripts/azure-pipelines-complete-internal.yml +++ b/scripts/azure-pipelines-complete-internal.yml @@ -24,7 +24,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: macos-11 + vmImage: macos-12 - name: VM_IMAGE_LINUX type: object default: From 0a38269b06883f7879b31a456441cad24dc64ea7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 8 Jun 2023 18:46:35 +0200 Subject: [PATCH 34/39] Update Cake files to override deployment targets --- .config/dotnet-tools.json | 2 +- cake/xcode.cake | 7 ++++- native/ios/build.cake | 41 +++++++++++++++++++-------- native/macos/build.cake | 22 +++++++++----- native/tvos/build.cake | 14 +++++++-- native/watchos/build.cake | 14 +++++++-- scripts/azure-pipelines-variables.yml | 2 +- scripts/install-vs.ps1 | 4 ++- 8 files changed, 79 insertions(+), 27 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index c4ec4ffc7a2..9dd8678ca78 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "dotnet-reportgenerator-globaltool": { - "version": "5.0.4", + "version": "5.1.19", "commands": [ "reportgenerator" ] diff --git a/cake/xcode.cake b/cake/xcode.cake index e037c2b4173..d852b5552b6 100644 --- a/cake/xcode.cake +++ b/cake/xcode.cake @@ -1,6 +1,6 @@ #addin nuget:?package=Cake.XCode&version=5.0.0 -void RunXCodeBuild(FilePath project, string scheme, string sdk, string arch, string platform = null) +void RunXCodeBuild(FilePath project, string scheme, string sdk, string arch, string platform = null, Dictionary properties = null) { var dir = project.GetDirectory(); @@ -21,6 +21,11 @@ void RunXCodeBuild(FilePath project, string scheme, string sdk, string arch, str if (platform != null) { settings.BuildSettings["PLATFORM"] = platform; } + if (properties != null) { + foreach (var prop in properties) { + settings.BuildSettings[prop.Key] = prop.Value; + } + } XCodeBuild(settings); } diff --git a/native/ios/build.cake b/native/ios/build.cake index 8a3f3e51bfc..0402c0c4397 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -4,25 +4,36 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native")); #load "../../cake/native-shared.cake" #load "../../cake/xcode.cake" -string VARIANT = BUILD_VARIANT ?? "ios"; +string VARIANT = (BUILD_VARIANT ?? "ios").ToLower(); +string DEPLOYMENT_SDK = VARIANT == "maccatalyst" ? "[sdk=macosx*]" : ""; + +DirectoryPath OUTPUT_VARIANT_PATH = OUTPUT_PATH.Combine(VARIANT); + +string GetDeploymentTarget(string arch) +{ + switch (VARIANT) { + case "maccatalyst": return "13.0"; + default: return "8.0"; + } +} Task("libSkiaSharp") .IsDependentOn("git-sync-deps") .WithCriteria(IsRunningOnMacOs()) .Does(() => { - if (VARIANT.ToLower() == "ios") { + if (VARIANT == "ios") { Build("iphonesimulator", "i386", "x86"); Build("iphonesimulator", "x86_64", "x64"); Build("iphoneos", "armv7", "arm"); Build("iphoneos", "arm64", "arm64"); - CreateFatFramework(OUTPUT_PATH.Combine("ios/libSkiaSharp")); - } else if (VARIANT.ToLower() == "maccatalyst") { + CreateFatFramework(OUTPUT_VARIANT_PATH.Combine("libSkiaSharp")); + } else if (VARIANT == "maccatalyst") { Build("macosx", "x86_64", "x64"); Build("macosx", "arm64", "arm64"); - CreateFatVersionedFramework(OUTPUT_PATH.Combine("maccatalyst/libSkiaSharp")); + CreateFatVersionedFramework(OUTPUT_VARIANT_PATH.Combine("libSkiaSharp")); } void Build(string sdk, string arch, string skiaArch) @@ -32,6 +43,7 @@ Task("libSkiaSharp") GnNinja($"{VARIANT}/{arch}", "skia modules/skottie", $"target_cpu='{skiaArch}' " + $"target_os='{VARIANT}' " + + $"min_{VARIANT}_version='{GetDeploymentTarget(arch)}' " + $"skia_use_icu=false " + $"skia_use_metal={(sdk == "macosx" ? "false" : "true")} " + $"skia_use_piex=true " + @@ -42,9 +54,12 @@ Task("libSkiaSharp") $"skia_use_system_libwebp=false " + $"skia_use_system_zlib=false " + $"skia_enable_skottie=true " + - $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF' ] "); + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF' ] " + + ADDITIONAL_GN_ARGS); - RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch, platform: VARIANT); + RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch, platform: VARIANT, properties: new Dictionary { + { $"IPHONEOS_DEPLOYMENT_TARGET{DEPLOYMENT_SDK}", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libSkiaSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive", @@ -56,25 +71,27 @@ Task("libHarfBuzzSharp") .WithCriteria(IsRunningOnMacOs()) .Does(() => { - if (VARIANT.ToLower() == "ios") { + if (VARIANT == "ios") { Build("iphonesimulator", "i386"); Build("iphonesimulator", "x86_64"); Build("iphoneos", "armv7"); Build("iphoneos", "arm64"); - CreateFatFramework(OUTPUT_PATH.Combine("ios/libHarfBuzzSharp")); - } else if (VARIANT.ToLower() == "maccatalyst") { + CreateFatFramework(OUTPUT_VARIANT_PATH.Combine("libHarfBuzzSharp")); + } else if (VARIANT == "maccatalyst") { Build("macosx", "x86_64"); Build("macosx", "arm64"); - CreateFatVersionedFramework(OUTPUT_PATH.Combine("maccatalyst/libHarfBuzzSharp")); + CreateFatVersionedFramework(OUTPUT_VARIANT_PATH.Combine("libHarfBuzzSharp")); } void Build(string sdk, string arch) { if (Skip(arch)) return; - RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, arch, platform: VARIANT); + RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, arch, platform: VARIANT, properties: new Dictionary { + { $"IPHONEOS_DEPLOYMENT_TARGET{DEPLOYMENT_SDK}", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libHarfBuzzSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive", diff --git a/native/macos/build.cake b/native/macos/build.cake index d52bb74cac6..ada0e45e5d7 100644 --- a/native/macos/build.cake +++ b/native/macos/build.cake @@ -4,6 +4,14 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native/osx")) #load "../../cake/native-shared.cake" #load "../../cake/xcode.cake" +string GetDeploymentTarget(string arch) +{ + switch (skiaArch.ToLower()) { + case "arm64": return "11.0"; + default: return "10.8"; + } +} + Task("libSkiaSharp") .IsDependentOn("git-sync-deps") .WithCriteria(IsRunningOnMacOs()) @@ -18,14 +26,10 @@ Task("libSkiaSharp") { if (Skip(arch)) return; - var minVersion = skiaArch.ToLower() == "arm64" - ? "11.0" - : "10.8"; - GnNinja($"macos/{arch}", "skia modules/skottie", $"target_os='mac' " + $"target_cpu='{skiaArch}' " + - $"min_macos_version='{minVersion}' " + + $"min_macos_version='{GetDeploymentTarget(arch)}' " + $"skia_use_icu=false " + $"skia_use_metal=true " + $"skia_use_piex=true " + @@ -39,7 +43,9 @@ Task("libSkiaSharp") $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF', '-stdlib=libc++' ] " + $"extra_ldflags=[ '-stdlib=libc++' ]"); - RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", "macosx", arch); + RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", "macosx", arch, properties: new Dictionary { + { "MACOSX_DEPLOYMENT_TARGET", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libSkiaSharp/bin/{CONFIGURATION}/macosx/{arch}.xcarchive", @@ -60,7 +66,9 @@ Task("libHarfBuzzSharp") { if (Skip(arch)) return; - RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", "macosx", arch); + RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", "macosx", arch, properties: new Dictionary { + { "MACOSX_DEPLOYMENT_TARGET", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libHarfBuzzSharp/bin/{CONFIGURATION}/macosx/{arch}.xcarchive", diff --git a/native/tvos/build.cake b/native/tvos/build.cake index 92beaae768e..d53edc17b81 100644 --- a/native/tvos/build.cake +++ b/native/tvos/build.cake @@ -4,6 +4,11 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native/tvos") #load "../../cake/native-shared.cake" #load "../../cake/xcode.cake" +string GetDeploymentTarget(string arch) +{ + return "9.0"; +} + Task("libSkiaSharp") .IsDependentOn("git-sync-deps") .WithCriteria(IsRunningOnMacOs()) @@ -21,6 +26,7 @@ Task("libSkiaSharp") GnNinja($"tvos/{arch}", "skia modules/skottie", $"target_os='tvos' " + $"target_cpu='{skiaArch}' " + + $"min_ios_version='{GetDeploymentTarget(arch)}' " + $"skia_use_icu=false " + $"skia_use_metal=false " + $"skia_use_piex=true " + @@ -33,7 +39,9 @@ Task("libSkiaSharp") $"skia_enable_skottie=true " + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF' ] "); - RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch); + RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch, properties: new Dictionary { + { "TVOS_DEPLOYMENT_TARGET", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libSkiaSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive", @@ -54,7 +62,9 @@ Task("libHarfBuzzSharp") { if (Skip(arch)) return; - RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, arch); + RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, arch, properties: new Dictionary { + { "TVOS_DEPLOYMENT_TARGET", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libHarfBuzzSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive", diff --git a/native/watchos/build.cake b/native/watchos/build.cake index 645bd5f2724..02c65bf01f6 100644 --- a/native/watchos/build.cake +++ b/native/watchos/build.cake @@ -4,6 +4,11 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native/watcho #load "../../cake/native-shared.cake" #load "../../cake/xcode.cake" +string GetDeploymentTarget(string arch) +{ + return "2.0"; +} + Task("libSkiaSharp") .IsDependentOn("git-sync-deps") .WithCriteria(IsRunningOnMacOs()) @@ -22,6 +27,7 @@ Task("libSkiaSharp") GnNinja($"watchos/{arch}", "skia modules/skottie", $"target_os='watchos' " + $"target_cpu='{skiaArch}' " + + $"min_watchos_version='{GetDeploymentTarget(arch)}' " + $"skia_enable_gpu=false " + $"skia_use_icu=false " + $"skia_use_metal=false " + @@ -35,7 +41,9 @@ Task("libSkiaSharp") $"skia_enable_skottie=true " + $"extra_cflags=[ '-DSKIA_C_DLL', '-DHAVE_ARC4RANDOM_BUF' ] "); - RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch); + RunXCodeBuild("libSkiaSharp/libSkiaSharp.xcodeproj", "libSkiaSharp", sdk, arch, properties: new Dictionary { + { "WATCHOS_DEPLOYMENT_TARGET", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libSkiaSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive", @@ -57,7 +65,9 @@ Task("libHarfBuzzSharp") { if (Skip(arch)) return; - RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, arch); + RunXCodeBuild("libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj", "libHarfBuzzSharp", sdk, arch, properties: new Dictionary { + { "WATCHOS_DEPLOYMENT_TARGET", GetDeploymentTarget(arch) }, + }); SafeCopy( $"libHarfBuzzSharp/bin/{CONFIGURATION}/{sdk}/{arch}.xcarchive", diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 5f205046b28..28d444bc952 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -11,7 +11,7 @@ variables: BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build - MONO_VERSION_MACOS: '6_12_13' + MONO_VERSION_MACOS: '6_12_24' MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 13.2.1 VISUAL_STUDIO_VERSION: '' diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 485a3b26f6a..9a553d9ef0e 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -43,7 +43,6 @@ Write-Host "Installing Visual Studio..." $exitCode = & "$temp\dd_vs_community.exe" --quiet --norestart --wait ` --includeRecommended ` --add Microsoft.VisualStudio.Workload.NetCrossPlat ` - --add Microsoft.VisualStudio.Workload.NetCoreTools ` --add Microsoft.VisualStudio.Workload.ManagedDesktop ` --add Microsoft.VisualStudio.Workload.Universal ` | Out-Null @@ -55,5 +54,8 @@ New-Item -ItemType Directory -Force -Path "$vsLogs" | Out-Null Get-ChildItem "$temp\dd_*" | Where-Object { $_.CreationTime -gt $startTime } | Copy-Item -Destination "$vsLogs" +Get-ChildItem "$env:TEMP\dd_*" | + Where-Object { $_.CreationTime -gt $startTime } | + Copy-Item -Destination "$vsLogs" exit $LASTEXITCODE From 9da9da4a57e5bf161ce128e0613d97a13ec8b56b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 8 Jun 2023 19:26:11 +0200 Subject: [PATCH 35/39] this --- native/macos/build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/macos/build.cake b/native/macos/build.cake index ada0e45e5d7..65c37e6732a 100644 --- a/native/macos/build.cake +++ b/native/macos/build.cake @@ -6,7 +6,7 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native/osx")) string GetDeploymentTarget(string arch) { - switch (skiaArch.ToLower()) { + switch (arch.ToLower()) { case "arm64": return "11.0"; default: return "10.8"; } From 1771e336c18b2a428b52fcfec0b8fc567bf22523 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 8 Jun 2023 21:35:03 +0200 Subject: [PATCH 36/39] revert --- .../libHarfBuzzSharp.xcodeproj/project.pbxproj | 4 ++-- .../ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj index 538b8c76855..d393440c0c9 100644 --- a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj +++ b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj @@ -493,7 +493,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-all_load"; @@ -553,7 +553,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-all_load"; PLATFORM = ios; diff --git a/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj b/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj index b0649c28514..77da8637822 100644 --- a/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native/ios/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj @@ -315,7 +315,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-all_load"; @@ -388,7 +388,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-all_load"; SDKROOT = iphoneos; From 075c583da710b6f7df93fe77568e264c2c62456c Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 8 Jun 2023 22:10:57 +0200 Subject: [PATCH 37/39] Try linking --- .../Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 4cc9b216773..12cc43ae468 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -31,6 +31,7 @@ false prompt MinimumRecommendedRules.ruleset + Full From 8663c42474799863e358bd67905465703db131cb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Jun 2023 01:46:14 +0200 Subject: [PATCH 38/39] and this --- .../Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 55ee5ce0374..c505e9508c5 100644 --- a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -31,6 +31,7 @@ false prompt MinimumRecommendedRules.ruleset + Full From cdf23eba09dce180de30d8c7fdce2308753299c7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Jun 2023 01:57:45 +0200 Subject: [PATCH 39/39] not this --- native/maccatalyst/build.cake | 1 - 1 file changed, 1 deletion(-) diff --git a/native/maccatalyst/build.cake b/native/maccatalyst/build.cake index 33e27ccce02..507f0ca2c72 100644 --- a/native/maccatalyst/build.cake +++ b/native/maccatalyst/build.cake @@ -8,7 +8,6 @@ Task("libSkiaSharp") .Does(() => { RunCake("../ios/build.cake", "libSkiaSharp", new Dictionary { - { "gnArgs", $"min_maccatalyst_version='13.1'" }, { "variant", "maccatalyst" }, }); });