From 35a6176e5031ee7ecf7490b5a2c346ec51bfffe6 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 18 Dec 2024 08:03:58 +0100
Subject: [PATCH] Fix main (#4373)

---
 test/Directory.Build.targets                               | 2 ++
 .../MSTest.Analyzers.UnitTests.csproj                      | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index be7e8c4711..463df410cc 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -28,7 +28,9 @@
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.TrxReport\Microsoft.Testing.Extensions.TrxReport.csproj" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" GeneratePathProperty="True" />
     <PackageReference Include="MSTest.Analyzers" />
+
     <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Update="MSTest.TestFramework" Condition=" '$(UseMSTestFromSource)' == 'true' " ExcludeAssets="runtime;compile" />
     <PackageReference Include="MSTest.TestAdapter" />
   </ItemGroup>
 
diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj b/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj
index 48717386f5..40ef00ed4b 100644
--- a/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj
+++ b/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,6 +6,11 @@
     <EnableMSTestRunner>true</EnableMSTestRunner>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    
+    <!-- Analyzers project need to explicitly exclude compile and runtime assets from MSTest.TestFramework NuGet package -->
+    <!-- This is to ensure that the assembly built from source is what is being used in tests -->
+    <!-- This will exclude compile and runtime assets from NuGet so that they flow via ProjectReference -->
+    <UseMSTestFromSource>true</UseMSTestFromSource>
   </PropertyGroup>
 
   <ItemGroup>