From a4f32b4e7e50e4f713a7b360e697ffa39b150f8f Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Thu, 6 Feb 2025 08:06:44 -0700
Subject: [PATCH] Adapt to avoid netstandard2.0 build of VS SDK

---
 ...ualStudio.Threading.Analyzers.Tests.csproj | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj b/test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj
index 31c25111..8174b4bc 100644
--- a/test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj
+++ b/test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj
@@ -15,16 +15,11 @@
     <TargetFrameworks>$(TargetFrameworks);net8.0-windows;net472</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference
-      Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.csproj" />
-    <ProjectReference
-      Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.CSharp\Microsoft.VisualStudio.Threading.Analyzers.CSharp.csproj" />
-    <ProjectReference
-      Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.csproj" />
-    <ProjectReference
-      Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers\Microsoft.VisualStudio.Threading.Analyzers.csproj" />
-    <ProjectReference
-      Include="..\..\src\Microsoft.VisualStudio.Threading\Microsoft.VisualStudio.Threading.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.CSharp\Microsoft.VisualStudio.Threading.Analyzers.CSharp.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers\Microsoft.VisualStudio.Threading.Analyzers.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Threading\Microsoft.VisualStudio.Threading.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
@@ -32,15 +27,14 @@
     <PackageReference Include="Microsoft.CodeAnalysis" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.VisualStudio.Interop" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" IncludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Framework" IncludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" IncludeAssets="None" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Framework" IncludeAssets="None" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Xunit.SkippableFact" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource
-      Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\build\AdditionalFiles\**"
+    <EmbeddedResource Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\build\AdditionalFiles\**"
       LinkBase="BuiltIn.AdditionalFiles">
       <LogicalName>AdditionalFiles.%(FileName)%(Extension)</LogicalName>
     </EmbeddedResource>
@@ -50,13 +44,14 @@
   </ItemGroup>
   <ItemGroup>
     <None Remove="AdditionalFiles\**" />
+    <None Include="$(PkgMicrosoft_VisualStudio_Shell_15_0)\lib\net472\Microsoft.VisualStudio.Shell.15.0.dll" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="$(PkgMicrosoft_VisualStudio_Shell_Framework)\lib\net472\Microsoft.VisualStudio.Shell.Framework.dll" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource
-      Update="..\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\build\AdditionalFiles\VSTHRD010.MainThreadSwitchingMethods.txt">
+    <EmbeddedResource Update="..\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\build\AdditionalFiles\VSTHRD010.MainThreadSwitchingMethods.txt">
       <CustomToolNamespace>AdditionalFiles</CustomToolNamespace>
     </EmbeddedResource>
   </ItemGroup>