Merge branch 'main' into improve-skcolor-parse

mono · Jun 7, 2023 · eaacd9c · eaacd9c
2 parents 000c5ee + d05e194
commit eaacd9c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 29 deletions.
diff --git 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
@@ -2,11 +2,10 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
+    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git 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,17 +20,14 @@ 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 - \
     && mkdir -p /usr/share/dotnet \
     && 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
@@ -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,17 +26,14 @@ 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 - \
     && mkdir -p /usr/share/dotnet \
     && 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,15 +56,15 @@ 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 \
     && cp -R usr/lib/*/* /usr/${TOOLCHAIN_ARCH}/lib/ \
     && 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 \

diff --git 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
@@ -6,26 +6,23 @@ 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..."
 & dotnet workload install `
   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/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();