From c8da899796f7c5c87865ccd8bfb433b7a8dc56be Mon Sep 17 00:00:00 2001 From: stan-sz <37585349+stan-sz@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:37:45 +0100 Subject: [PATCH 1/6] Use ReferenceTrimmer --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 3ac12f24f5..9e303506bc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,6 +36,7 @@ + From 0f3679e4f9b17b54939703d6ee92f00a5076e1ab Mon Sep 17 00:00:00 2001 From: stan-sz <37585349+stan-sz@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:38:33 +0100 Subject: [PATCH 2/6] Update Directory.Packages.props --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9e303506bc..ab9ae827ac 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,7 +36,7 @@ - + From b71d1b047c44c5236c1c6a48d9bd15005549eab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 14 Feb 2025 11:12:17 +0100 Subject: [PATCH 3/6] WIP --- TestFx.sln | 1 + .../MSTest.Analyzers.Package.csproj | 4 ++-- src/Package/MSTest/MSTest.csproj | 13 +++++++++---- .../Microsoft.Testing.Extensions.CrashDump.csproj | 1 - ...Microsoft.Testing.Extensions.VSTestBridge.csproj | 2 +- .../Microsoft.Testing.Platform.MSBuild.csproj | 4 ++-- test/Directory.Build.targets | 1 + .../MSTest.Acceptance.IntegrationTests/Program.cs | 4 +++- .../Program.cs | 5 +++-- .../TestAssets/Directory.Build.props | 9 +++++++++ .../TestAssets/Directory.Build.targets | 1 + .../UnitTests/MSTest.Analyzers.UnitTests/Program.cs | 4 +++- test/UnitTests/MSTest.Engine.UnitTests/Program.cs | 5 +++-- .../MSTest.SourceGeneration.UnitTests/Program.cs | 5 +++-- .../Program.cs | 5 +++-- .../Program.cs | 5 +++-- .../Program.cs | 4 +++- .../Microsoft.Testing.Platform.UnitTests/Program.cs | 4 +++- 18 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 test/IntegrationTests/TestAssets/Directory.Build.props diff --git a/TestFx.sln b/TestFx.sln index d8d48028b3..7806656287 100644 --- a/TestFx.sln +++ b/TestFx.sln @@ -72,6 +72,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTests", "Integra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssets", "TestAssets", "{C9F82701-0E0F-4E61-B05B-AE387E7631F6}" ProjectSection(SolutionItems) = preProject + test\IntegrationTests\TestAssets\Directory.Build.props = test\IntegrationTests\TestAssets\Directory.Build.props test\IntegrationTests\TestAssets\Directory.Build.targets = test\IntegrationTests\TestAssets\Directory.Build.targets EndProjectSection EndProject diff --git a/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj b/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj index 7c18112c41..8458524021 100644 --- a/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj +++ b/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/Package/MSTest/MSTest.csproj b/src/Package/MSTest/MSTest.csproj index 736f4676b0..fe076a4a7d 100644 --- a/src/Package/MSTest/MSTest.csproj +++ b/src/Package/MSTest/MSTest.csproj @@ -45,10 +45,15 @@ - - - - + + + + diff --git a/src/Platform/Microsoft.Testing.Extensions.CrashDump/Microsoft.Testing.Extensions.CrashDump.csproj b/src/Platform/Microsoft.Testing.Extensions.CrashDump/Microsoft.Testing.Extensions.CrashDump.csproj index 6d7d59466d..8689742ba7 100644 --- a/src/Platform/Microsoft.Testing.Extensions.CrashDump/Microsoft.Testing.Extensions.CrashDump.csproj +++ b/src/Platform/Microsoft.Testing.Extensions.CrashDump/Microsoft.Testing.Extensions.CrashDump.csproj @@ -37,7 +37,6 @@ This package extends Microsoft Testing Platform to provide a crash dump function - diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Microsoft.Testing.Extensions.VSTestBridge.csproj b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Microsoft.Testing.Extensions.VSTestBridge.csproj index a3d08254e9..7446a537d6 100644 --- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Microsoft.Testing.Extensions.VSTestBridge.csproj +++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Microsoft.Testing.Extensions.VSTestBridge.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj b/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj index d5aa1e10a8..d1954c2464 100644 --- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj +++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj @@ -12,13 +12,13 @@ - + - + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 5697bbf9cd..f805454898 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -26,6 +26,7 @@ + diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs index 116b5bef8d..77c41fe4fe 100644 --- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs +++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs @@ -18,8 +18,10 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddHangDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); builder.AddCrashDumpProvider(ignoreIfNotSupported: true); +builder.AddHangDumpProvider(); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); // Custom suite tools diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs index 5463488c7f..77c41fe4fe 100644 --- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs +++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs @@ -18,10 +18,11 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddHangDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); builder.AddCrashDumpProvider(ignoreIfNotSupported: true); -builder.AddTrxReportProvider(); +builder.AddHangDumpProvider(); builder.AddRetryProvider(); +builder.AddTrxReportProvider(); // Custom suite tools CompositeExtensionFactory slowestTestCompositeServiceFactory diff --git a/test/IntegrationTests/TestAssets/Directory.Build.props b/test/IntegrationTests/TestAssets/Directory.Build.props new file mode 100644 index 0000000000..354d7268f8 --- /dev/null +++ b/test/IntegrationTests/TestAssets/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + false + + + diff --git a/test/IntegrationTests/TestAssets/Directory.Build.targets b/test/IntegrationTests/TestAssets/Directory.Build.targets index 9046e8b883..80a10f76ba 100644 --- a/test/IntegrationTests/TestAssets/Directory.Build.targets +++ b/test/IntegrationTests/TestAssets/Directory.Build.targets @@ -10,4 +10,5 @@ + diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/Program.cs b/test/UnitTests/MSTest.Analyzers.UnitTests/Program.cs index 6ad08378a2..ceea2da137 100644 --- a/test/UnitTests/MSTest.Analyzers.UnitTests/Program.cs +++ b/test/UnitTests/MSTest.Analyzers.UnitTests/Program.cs @@ -13,8 +13,10 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddCrashDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); +builder.AddCrashDumpProvider(ignoreIfNotSupported: true); builder.AddHangDumpProvider(); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); // Custom suite tools diff --git a/test/UnitTests/MSTest.Engine.UnitTests/Program.cs b/test/UnitTests/MSTest.Engine.UnitTests/Program.cs index 79206b730e..107ad0a5bf 100644 --- a/test/UnitTests/MSTest.Engine.UnitTests/Program.cs +++ b/test/UnitTests/MSTest.Engine.UnitTests/Program.cs @@ -14,10 +14,11 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddHangDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); builder.AddCrashDumpProvider(ignoreIfNotSupported: true); +builder.AddHangDumpProvider(); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); -builder.AddAppInsightsTelemetryProvider(); // Custom suite tools CompositeExtensionFactory slowestTestCompositeServiceFactory diff --git a/test/UnitTests/MSTest.SourceGeneration.UnitTests/Program.cs b/test/UnitTests/MSTest.SourceGeneration.UnitTests/Program.cs index 79206b730e..107ad0a5bf 100644 --- a/test/UnitTests/MSTest.SourceGeneration.UnitTests/Program.cs +++ b/test/UnitTests/MSTest.SourceGeneration.UnitTests/Program.cs @@ -14,10 +14,11 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddHangDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); builder.AddCrashDumpProvider(ignoreIfNotSupported: true); +builder.AddHangDumpProvider(); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); -builder.AddAppInsightsTelemetryProvider(); // Custom suite tools CompositeExtensionFactory slowestTestCompositeServiceFactory diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs index c731857d74..be6fe6e64f 100644 --- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs +++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs @@ -14,10 +14,11 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddHangDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); builder.AddCrashDumpProvider(ignoreIfNotSupported: true); +builder.AddHangDumpProvider(); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); -builder.AddAppInsightsTelemetryProvider(); // Custom suite tools CompositeExtensionFactory slowestTestCompositeServiceFactory diff --git a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs index 5af7b8a583..c28bb0b1c5 100644 --- a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs +++ b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs @@ -20,14 +20,15 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif +Console.WriteLine("NATIVE_AOT disabled"); builder.AddAppInsightsTelemetryProvider(); +builder.AddCrashDumpProvider(ignoreIfNotSupported: true); builder.AddHangDumpProvider(); -Console.WriteLine("NATIVE_AOT disabled"); #else Console.WriteLine("NATIVE_AOT enabled"); #endif -builder.AddCrashDumpProvider(ignoreIfNotSupported: true); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); // Custom suite tools diff --git a/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs index c05ca317bd..7027091a13 100644 --- a/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs +++ b/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs @@ -12,8 +12,10 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddHangDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); builder.AddCrashDumpProvider(ignoreIfNotSupported: true); +builder.AddHangDumpProvider(); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); // Custom suite tools diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs index f8a7bf63f0..0d2e19eb45 100644 --- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs +++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs @@ -19,8 +19,10 @@ #if ENABLE_CODECOVERAGE builder.AddCodeCoverageProvider(); #endif -builder.AddCrashDumpProvider(); +builder.AddAppInsightsTelemetryProvider(); +builder.AddCrashDumpProvider(ignoreIfNotSupported: true); builder.AddHangDumpProvider(); +builder.AddRetryProvider(); builder.AddTrxReportProvider(); // Custom suite tools From de1e04f4ee71a85ff70164ff570fb2b48231bd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 14 Feb 2025 13:25:01 +0100 Subject: [PATCH 4/6] More fixes --- Directory.Build.props | 9 +++++++-- samples/Playground/Playground.csproj | 1 - .../MSTest.TestAdapter/MSTest.TestAdapter.csproj | 6 ++++-- src/Package/MSTest/MSTest.csproj | 10 +++++----- .../Microsoft.Testing.Platform.MSBuild.csproj | 3 ++- test/Directory.Build.props | 3 +-- test/IntegrationTests/TestAssets/Directory.Build.props | 2 +- .../MSTest.Analyzers.UnitTests.csproj | 3 --- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 045a8917ff..c654892102 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -39,12 +39,11 @@ - alpha - 1.0.0 + alpha @@ -63,6 +62,12 @@ true + + + + TestingPlatformRunner + + diff --git a/samples/Playground/Playground.csproj b/samples/Playground/Playground.csproj index a4123f3a05..58895bd353 100644 --- a/samples/Playground/Playground.csproj +++ b/samples/Playground/Playground.csproj @@ -18,7 +18,6 @@ - diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj index 79e7ede4a6..1a3ad695d1 100644 --- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj +++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj @@ -54,7 +54,8 @@ - + Analyzer false @@ -63,7 +64,8 @@ - + diff --git a/src/Package/MSTest/MSTest.csproj b/src/Package/MSTest/MSTest.csproj index fe076a4a7d..3dcba94ce2 100644 --- a/src/Package/MSTest/MSTest.csproj +++ b/src/Package/MSTest/MSTest.csproj @@ -1,4 +1,4 @@ - + @@ -46,14 +46,14 @@ + NoWarn="RT0002" /> + NoWarn="RT0002" /> + NoWarn="RT0002" /> + NoWarn="RT0002" /> diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj b/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj index d1954c2464..cd92b36602 100644 --- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj +++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj @@ -18,7 +18,8 @@ - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index e3a10afd99..6d0625e0f3 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -3,8 +3,7 @@ - - TestingPlatformRunner + true enable diff --git a/test/IntegrationTests/TestAssets/Directory.Build.props b/test/IntegrationTests/TestAssets/Directory.Build.props index 354d7268f8..c23e0a6f57 100644 --- a/test/IntegrationTests/TestAssets/Directory.Build.props +++ b/test/IntegrationTests/TestAssets/Directory.Build.props @@ -1,6 +1,6 @@ - + false diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj b/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj index 860d2e3ce2..e9d11a378e 100644 --- a/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj +++ b/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj @@ -22,9 +22,6 @@ - - - From 0613d86dd9e95e95e2818fe76d518dca62bbb745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 14 Feb 2025 13:34:11 +0100 Subject: [PATCH 5/6] Fix analyzers project --- .../MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj b/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj index 8458524021..0c63b80b90 100644 --- a/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj +++ b/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj @@ -23,8 +23,8 @@ - - + + From 3b02602efb6eebd511125d352e74250b7eb851fd Mon Sep 17 00:00:00 2001 From: stan-sz <37585349+stan-sz@users.noreply.github.com> Date: Wed, 26 Feb 2025 13:57:53 +0100 Subject: [PATCH 6/6] Update Directory.Packages.props --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ab9ae827ac..e8491b3342 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,7 +36,7 @@ - +