From 8d0a0eb454d6d8087f3ebe4cf7c6a2eaf5e8b41d Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 25 May 2021 17:25:27 -0400 Subject: [PATCH 01/13] [libraries] Remove UseSystemResourceKeys true default --- eng/testing/tests.mobile.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 3e5321d57ebdb..39c3e239df19f 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -17,7 +17,6 @@ false false false - true false false true From ab46fbf3a420d7eb79df200561f7ac8214e00405 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 26 May 2021 11:10:26 -0400 Subject: [PATCH 02/13] [libraries] Remove UseSystemResourceKeys for iOS --- eng/testing/tests.mobile.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 39c3e239df19f..04f8b414fb87f 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -28,7 +28,6 @@ false false false - true true From 309b41f89ea3b3d366e2da2174ae88729bd1814a Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 26 May 2021 11:23:55 -0400 Subject: [PATCH 03/13] [libraries] Resolve WebSockets System resource keys activeissue --- .../System.Net.WebSockets/tests/WebSocketDeflateTests.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/libraries/System.Net.WebSockets/tests/WebSocketDeflateTests.cs b/src/libraries/System.Net.WebSockets/tests/WebSocketDeflateTests.cs index 9a068e3de46a4..184c7e9089e2a 100644 --- a/src/libraries/System.Net.WebSockets/tests/WebSocketDeflateTests.cs +++ b/src/libraries/System.Net.WebSockets/tests/WebSocketDeflateTests.cs @@ -349,7 +349,6 @@ public async Task LargeMessageSplitInMultipleFrames(int windowBits) } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52645", TestPlatforms.Android)] public async Task WebSocketWithoutDeflateShouldThrowOnCompressedMessage() { WebSocketTestStream stream = new(); @@ -364,7 +363,6 @@ public async Task WebSocketWithoutDeflateShouldThrowOnCompressedMessage() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52645", TestPlatforms.Android)] public async Task ReceiveUncompressedMessageWhenCompressionEnabled() { // We should be able to handle the situation where even if we have @@ -401,7 +399,6 @@ public async Task ReceiveUncompressedMessageWhenCompressionEnabled() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52645", TestPlatforms.Android)] public async Task ReceiveInvalidCompressedData() { WebSocketTestStream stream = new(); From f01c3b1c25ca2edbf03daf74f123745c8e201d45 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 26 May 2021 12:43:34 -0400 Subject: [PATCH 04/13] [tests] Move default feature switches from libraries to functional tests --- eng/testing/tests.mobile.targets | 19 ----------------- .../FunctionalTests/Directory.Build.props | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 04f8b414fb87f..04d6dee19241f 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -12,25 +12,6 @@ BundleTestAppleApp;BundleTestAndroidApp - - false - false - false - false - false - false - true - - - - false - false - false - false - false - true - - true diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index b55014abfd0ce..1a73c02dc0a00 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -7,5 +7,26 @@ true + + false + false + false + false + false + false + true + true + + + + false + false + false + false + false + true + true + + From fa74fe9ae660ef5001e85f90362afa81b8e55e2e Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 26 May 2021 15:17:58 -0400 Subject: [PATCH 05/13] [tests] Move Browser wasm default switches into FuntionalTests scope --- eng/testing/tests.wasm.targets | 10 ---------- src/tests/FunctionalTests/Directory.Build.props | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 5d6c2e626eab7..ce10194388d55 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -47,16 +47,6 @@ $(_AOTBuildCommand) && $(RunScriptCommand) - - false - false - false - false - - - false - - diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 1a73c02dc0a00..5fb0f35661092 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -28,5 +28,15 @@ true + + false + false + false + false + + + false + + From d9f5dceca2c179c2d559a43cefed4ad97a4133be Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 26 May 2021 15:19:10 -0400 Subject: [PATCH 06/13] Add Browser OS condition --- src/tests/FunctionalTests/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 5fb0f35661092..064879b10bc6f 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -28,7 +28,7 @@ true - + false false false From ee0dc9dfb9252436d88cc6f1d0d2181b4e837fdf Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Wed, 26 May 2021 15:42:21 -0400 Subject: [PATCH 07/13] Move DefaultFeatureSwitches initialization to FunctionalTests project --- eng/testing/tests.mobile.targets | 3 --- src/tests/FunctionalTests/Directory.Build.props | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 04d6dee19241f..4fa74603c8873 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -6,9 +6,6 @@ true true - true - true - true BundleTestAppleApp;BundleTestAndroidApp diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 064879b10bc6f..c13ce7d2c8bcb 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -5,6 +5,9 @@ true true true + true + true + true From f84657a3eaf24fef6a7b18eab1b0abecfb76bcb9 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Thu, 27 May 2021 16:28:03 -0400 Subject: [PATCH 08/13] Consolidate trimming framework library features and condition for libraries with EnableAggressiveTrimming --- .../linker/SupportFiles/Directory.Build.props | 3 -- eng/testing/tests.mobile.targets | 10 ++++++ .../FunctionalTests/Directory.Build.props | 34 ------------------- 3 files changed, 10 insertions(+), 37 deletions(-) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index 46e0d3bcc0aad..c1220c719b9af 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -1,9 +1,6 @@ true - false - false - false true true true diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 4fa74603c8873..f0a0412a8453b 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -13,6 +13,16 @@ true true + + + false + false + false + false + false + false + true + true diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index c13ce7d2c8bcb..b55014abfd0ce 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -5,40 +5,6 @@ true true true - true - true - true - - - - false - false - false - false - false - false - true - true - - - - false - false - false - false - false - true - true - - - - false - false - false - false - - - false From a66f971a8241c65d22a1d690fb1e597e1d59fd5e Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Fri, 28 May 2021 15:39:03 -0400 Subject: [PATCH 09/13] [testing][EAT] Revert trimming framework library features to browser defaults for enable aggressive trimming --- eng/testing/tests.mobile.targets | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index f0a0412a8453b..61d7421402d89 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -15,14 +15,11 @@ true - false - false + false false - false - false - false - true - true + false + false + false From 794e2732b122727664486e16f98fb8c6708dd094 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Fri, 28 May 2021 15:40:23 -0400 Subject: [PATCH 10/13] [tests] Add Xamarin Android, Xamarin Mac/iOS, and Wasm feature defaults to Functional tests --- .../FunctionalTests/Directory.Build.props | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index b55014abfd0ce..8d149ebb1a081 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -7,5 +7,44 @@ true + + + false + false + false + false + false + false + true + + + + + false + false + false + false + false + true + + + + + <_BundlerDebug Condition="'$(_BundlerDebug)' == '' And '$(Configuration)' == 'Debug'">true + <_BundlerDebug Condition="'$(_BundlerDebug)' == ''">false + + $(_BundlerDebug) + false + false + false + false + false + false + true + false + true + true + + From 6a05abcffd4492d4b481d2e79dd0916b580552cf Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Fri, 28 May 2021 15:57:49 -0400 Subject: [PATCH 11/13] Fixup tabs to spaces --- .../FunctionalTests/Directory.Build.props | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 8d149ebb1a081..56b065f52c71f 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -30,20 +30,20 @@ - <_BundlerDebug Condition="'$(_BundlerDebug)' == '' And '$(Configuration)' == 'Debug'">true - <_BundlerDebug Condition="'$(_BundlerDebug)' == ''">false + <_BundlerDebug Condition="'$(_BundlerDebug)' == '' And '$(Configuration)' == 'Debug'">true + <_BundlerDebug Condition="'$(_BundlerDebug)' == ''">false $(_BundlerDebug) - false - false - false - false - false - false - true - false - true - true + false + false + false + false + false + false + true + false + true + true From 24add4d989099ec8e7458c683d72e80e3c213639 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Fri, 28 May 2021 16:14:12 -0400 Subject: [PATCH 12/13] Add common feature switches, links, and cleanup --- .../FunctionalTests/Directory.Build.props | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 56b065f52c71f..8f03042517564 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -7,42 +7,38 @@ true - - - false + + false - false false false - false true - + + + false + false + + false + true + + + false - false - false - false false - true - + - <_BundlerDebug Condition="'$(_BundlerDebug)' == '' And '$(Configuration)' == 'Debug'">true - <_BundlerDebug Condition="'$(_BundlerDebug)' == ''">false - - $(_BundlerDebug) false + true + false false false - false - false - false - true + true false - true true From f0a2a18cf17c08d16670e7eb4652d27461876004 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Fri, 28 May 2021 16:17:03 -0400 Subject: [PATCH 13/13] Cleanup Xamarin Android link --- src/tests/FunctionalTests/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 8f03042517564..5dea1a35e0ccc 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -15,7 +15,7 @@ true - + false false