From 153a541e3f18363301deba4ab91ffe0e17805055 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 7 Aug 2020 09:36:08 -0400 Subject: [PATCH 1/4] Re-enable testing on OSX 10.15, add 11.0 The 10.15 disable was due to OpenSSL, which we no longer run on Mac anyway --- eng/pipelines/libraries/helix-queues-setup.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 33d0ea5aa9dbdd..edcdd34cad6c99 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -78,9 +78,8 @@ jobs: - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - OSX.1013.Amd64.Open - OSX.1014.Amd64.Open - # The 10.15 machines aren't in the same configuration, see - # https://github.com/dotnet/runtime/issues/24736 - #- OSX.1015.Amd64.Open + - OSX.1015.Amd64.Open + - OSX.1100.Amd64.Open - ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}: - OSX.1013.Amd64.Open - OSX.1014.Amd64.Open From a6c12044ac77abc1a148570f23b2774e47c350be Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 7 Aug 2020 09:56:34 -0400 Subject: [PATCH 2/4] whoops --- eng/pipelines/libraries/helix-queues-setup.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index edcdd34cad6c99..db4c9c7ec5ab31 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -79,7 +79,6 @@ jobs: - OSX.1013.Amd64.Open - OSX.1014.Amd64.Open - OSX.1015.Amd64.Open - - OSX.1100.Amd64.Open - ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}: - OSX.1013.Amd64.Open - OSX.1014.Amd64.Open From 613f651839e41ae183255b471115fd5125703e13 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 10 Aug 2020 09:30:42 -0400 Subject: [PATCH 3/4] Actually, test on 2 latest for PRs (all supported in fullmatrix) --- eng/pipelines/libraries/helix-queues-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index db4c9c7ec5ab31..bb025f3ae7958b 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -80,8 +80,8 @@ jobs: - OSX.1014.Amd64.Open - OSX.1015.Amd64.Open - ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}: - - OSX.1013.Amd64.Open - OSX.1014.Amd64.Open + - OSX.1015.Amd64.Open # Windows_NT x64 - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}: From 63836ee9d022359ad1cda1100e3b13fbdf836d9d Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 19 Aug 2020 15:10:34 -0400 Subject: [PATCH 4/4] ActiveIssue for failing font issue --- src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs b/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs index 5e801458355529..a87895ba21303f 100644 --- a/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs +++ b/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs @@ -100,6 +100,10 @@ public void Equals_Object_ReturnsExpected(FontFamily fontFamily, object other, b } } + // This will fail on any platform we use libgdiplus, with any + // installed system fonts whose name is longer than 31 chars. + // macOS 10.15+ ships out of the box with a problem font + [ActiveIssue("https://github.com/dotnet/runtime/issues/40937", TestPlatforms.AnyUnix)] [ConditionalFact(Helpers.IsDrawingSupported)] public void Families_Get_ReturnsExpected() {