From 53f3388581ec90398cb71e8d6960eb6ada71eff6 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 14:01:30 +0200 Subject: [PATCH 1/3] Use the correct method for setting Opaque on macOS (#2477) #2398 had an issue but was merged in the hopes CI would work. I am now working on CI and this is blocking. Fix for a2cfbb271568e5cedf22e07993dc9c0a04767c4f --- .../SkiaSharp.Views.Uno.Mac/SKXamlCanvas.macOS.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SKXamlCanvas.macOS.cs b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SKXamlCanvas.macOS.cs index 34f4897335e..f743bcf7bb4 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SKXamlCanvas.macOS.cs +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SKXamlCanvas.macOS.cs @@ -20,11 +20,10 @@ public partial class SKXamlCanvas public SKXamlCanvas() { Initialize(); -#if MACOS - Opaque = false; -#endif } + public override bool IsOpaque => false; + partial void DoLoaded() => drawable = new SKCGSurfaceFactory(); From 10555a9a753090a8d7d660f886bbed28529d67a1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 14:04:12 +0200 Subject: [PATCH 2/3] Switch to Debian archives (#2476) --- scripts/Docker/debian9/amd64/Dockerfile | 7 ++++--- scripts/Docker/debian9/clang-cross/Dockerfile | 9 ++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/Docker/debian9/amd64/Dockerfile b/scripts/Docker/debian9/amd64/Dockerfile index d4b899d9822..5b756f49969 100644 --- a/scripts/Docker/debian9/amd64/Dockerfile +++ b/scripts/Docker/debian9/amd64/Dockerfile @@ -1,4 +1,8 @@ FROM amd64/debian:9 +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 # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 3.1.412 | * ] @@ -16,7 +20,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 +27,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..03320fa8b32 100644 --- a/scripts/Docker/debian9/clang-cross/Dockerfile +++ b/scripts/Docker/debian9/clang-cross/Dockerfile @@ -1,4 +1,6 @@ FROM amd64/debian:9 +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 | * ] @@ -24,7 +26,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 +33,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++) @@ -57,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 \ @@ -65,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 d05e194a8cb0a1df6d9826c89e9a556bb0cf8e01 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 7 Jun 2023 22:42:37 +0200 Subject: [PATCH 3/3] Use the new XHarness .NET tool and latest .NET 6 MAUI (#2478) --- .config/dotnet-tools.json | 2 +- nuget.config | 3 +-- scripts/azure-pipelines-variables.yml | 6 +++--- scripts/install-dotnet-workloads.ps1 | 21 +++++++++------------ 4 files changed, 14 insertions(+), 18 deletions(-) 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/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..5f205046b28 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: '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/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..."