Reference trimmer

Directory.Build.props

@@ -40,12 +40,11 @@
 
   <!-- Versioning -->
   <PropertyGroup>
-    <MSTestEnginePreReleaseVersionLabel>alpha</MSTestEnginePreReleaseVersionLabel>
-
     <!--
       This is a early preview package, keep 1.0.0-alpha or similar suffix even in official builds.
     -->
     <MSTestEngineVersionPrefix>1.0.0</MSTestEngineVersionPrefix>
+    <MSTestEnginePreReleaseVersionLabel>alpha</MSTestEnginePreReleaseVersionLabel>
   </PropertyGroup>
 
   <!-- Pack config -->
@@ -70,6 +69,12 @@
     <PolyGuard>true</PolyGuard>
   </PropertyGroup>
 
+  <!-- Test config -->
+  <PropertyGroup>
+    <!-- Set the test runner here and not in test folder so that arcade doesn't force add xunit to any folder of the repo -->
+    <TestRunnerName>TestingPlatformRunner</TestRunnerName>
+  </PropertyGroup>
+
   <ItemGroup>
     <Using Include="System.Collections" />
     <Using Include="System.Collections.Concurrent" />

Directory.Packages.props

@@ -37,6 +37,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
+    <GlobalPackageReference Include="ReferenceTrimmer" Version="3.3.11" />
   </ItemGroup>
   <ItemGroup Label="Product dependencies">
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.23.0" />

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

samples/Playground/Playground.csproj

@@ -20,7 +20,6 @@
     <ProjectReference Include="$(RepoRoot)src\Analyzers\MSTest.Analyzers.CodeFixes\MSTest.Analyzers.CodeFixes.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
     <ProjectReference Include="$(RepoRoot)src\Analyzers\MSTest.Analyzers\MSTest.Analyzers.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
     <PackageReference Include="StreamJsonRpc" />
-    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.Telemetry\Microsoft.Testing.Extensions.Telemetry.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj

@@ -54,7 +54,8 @@
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Adapter\MSTestAdapter.PlatformServices\MSTestAdapter.PlatformServices.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.VSTestBridge\Microsoft.Testing.Extensions.VSTestBridge.csproj" Condition=" '$(TargetFramework)' != '$(UwpMinimum)' " />
+    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.VSTestBridge\Microsoft.Testing.Extensions.VSTestBridge.csproj"
+                      Condition=" '$(TargetFramework)' != '$(UwpMinimum)' AND '$(TargetFramework)' != '$(ModernUwpMinimum)' " />
     <ProjectReference Include="$(RepoRoot)src\Analyzers\MSTest.Internal.Analyzers\MSTest.Internal.Analyzers.csproj">
       <OutputItemType>Analyzer</OutputItemType>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj

@@ -22,8 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MSTest.Analyzers.CodeFixes\MSTest.Analyzers.CodeFixes.csproj" />
-    <ProjectReference Include="..\MSTest.Analyzers\MSTest.Analyzers.csproj" />
+    <ProjectReference Include="..\MSTest.Analyzers.CodeFixes\MSTest.Analyzers.CodeFixes.csproj" NoWarn="RT0002"  />
+    <ProjectReference Include="..\MSTest.Analyzers\MSTest.Analyzers.csproj" NoWarn="RT0002" />
   </ItemGroup>
 
   <ItemGroup>

src/Package/MSTest/MSTest.csproj

@@ -1,4 +1,4 @@
-<Project>
+<Project>
 
   <!-- SDK top import -->
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
@@ -44,10 +44,15 @@
   </Target>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\Analyzers\MSTest.Analyzers.Package\MSTest.Analyzers.Package.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.TrxReport\Microsoft.Testing.Extensions.TrxReport.csproj" Condition=" '$(TargetFramework)' != '$(UwpMinimum)' " />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj"
+                      NoWarn="RT0002" />
+    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj"
+                      NoWarn="RT0002" />
+    <ProjectReference Include="$(RepoRoot)src\Analyzers\MSTest.Analyzers.Package\MSTest.Analyzers.Package.csproj"
+                      NoWarn="RT0002" />
+    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.TrxReport\Microsoft.Testing.Extensions.TrxReport.csproj"
+                      Condition=" '$(TargetFramework)' != '$(UwpMinimum)' "
+                      NoWarn="RT0002" />
 
     <!-- CodeCoverage 17.14 doesn't support netcoreapp3.1. -->
     <!-- We end up having System.Collections.Immutable 8.0.0 which is not compatible with netcoreapp3.1 -->

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
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Platform\Microsoft.Testing.Platform.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.TrxReport.Abstractions\Microsoft.Testing.Extensions.TrxReport.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Microsoft.Testing.Extensions.VSTestBridge.csproj

@@ -18,7 +18,7 @@
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Platform\Microsoft.Testing.Platform.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.TrxReport.Abstractions\Microsoft.Testing.Extensions.TrxReport.Abstractions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.Telemetry\Microsoft.Testing.Extensions.Telemetry.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.Telemetry\Microsoft.Testing.Extensions.Telemetry.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <!-- NuGet properties -->

src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj

@@ -18,7 +18,8 @@
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\Platform\Microsoft.Testing.Platform\Microsoft.Testing.Platform.csproj" CopyToBuildOutput="true" />
     <!-- Deps only so we can include it in the lib of the NuGet package -->
-    <ProjectReference Include="$(RepoRoot)\src\Platform\Microsoft.Testing.Extensions.MSBuild\Microsoft.Testing.Extensions.MSBuild.csproj" PrivateAssets="All" />
+    <ProjectReference Include="$(RepoRoot)\src\Platform\Microsoft.Testing.Extensions.MSBuild\Microsoft.Testing.Extensions.MSBuild.csproj" PrivateAssets="All"
+                      NoWarn="RT0002" />
   </ItemGroup>
 
   <!-- NuGet properties -->

test/Directory.Build.targets

@@ -36,6 +36,7 @@
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.CrashDump\Microsoft.Testing.Extensions.CrashDump.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.HangDump\Microsoft.Testing.Extensions.HangDump.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.Retry\Microsoft.Testing.Extensions.Retry.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.Telemetry\Microsoft.Testing.Extensions.Telemetry.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.TrxReport\Microsoft.Testing.Extensions.TrxReport.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.AzureDevOpsReport\Microsoft.Testing.Extensions.AzureDevOpsReport.csproj" />
     <PackageReference Include="Microsoft.Testing.Platform.MSBuild" Condition="'$(UseMSTestFromSource)' == 'true'" />

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();
 builder.AddAzureDevOpsProvider();
 

test/IntegrationTests/Microsoft.Testing.Platform.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();
 builder.AddRetryProvider();
 builder.AddAzureDevOpsProvider();

test/IntegrationTests/TestAssets/Directory.Build.props

@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../../'))" />
+
+  <PropertyGroup>
+    <EnableReferenceTrimmer>false</EnableReferenceTrimmer>
+  </PropertyGroup>
+
+</Project>

test/IntegrationTests/TestAssets/Directory.Build.targets

@@ -11,4 +11,5 @@
     <ProjectCapability Remove="TestContainer" />
     <ProjectCapability Remove="TestingPlatformServer" />
   </ItemGroup>
+
 </Project>

test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj

@@ -22,9 +22,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" />
-
-    <!-- Deps of MSTest.TestAdapter -->
-    <PackageReference Include="Microsoft.TestPlatform.AdapterUtilities" />
   </ItemGroup>
 
   <ItemGroup>

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();
 builder.AddAzureDevOpsProvider();
 

test/UnitTests/MSTest.Engine.UnitTests/Program.cs

@@ -14,8 +14,9 @@
 #if ENABLE_CODECOVERAGE
 builder.AddCodeCoverageProvider();
 #endif
-builder.AddHangDumpProvider();
 builder.AddCrashDumpProvider(ignoreIfNotSupported: true);
+builder.AddHangDumpProvider();
+builder.AddRetryProvider();
 builder.AddTrxReportProvider();
 builder.AddAppInsightsTelemetryProvider();
 builder.AddAzureDevOpsProvider();

test/UnitTests/MSTest.SourceGeneration.UnitTests/Program.cs

@@ -14,8 +14,9 @@
 #if ENABLE_CODECOVERAGE
 builder.AddCodeCoverageProvider();
 #endif
-builder.AddHangDumpProvider();
 builder.AddCrashDumpProvider(ignoreIfNotSupported: true);
+builder.AddHangDumpProvider();
+builder.AddRetryProvider();
 builder.AddTrxReportProvider();
 builder.AddAppInsightsTelemetryProvider();
 builder.AddAzureDevOpsProvider();

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();
 builder.AddAzureDevOpsProvider();
 
 // Custom suite tools

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();
 builder.AddAzureDevOpsProvider();
 

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();
 builder.AddAzureDevOpsProvider();
 

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();
 builder.AddAzureDevOpsProvider();