From 7653ed6c2844e1767582dc159c19d97102d7492e Mon Sep 17 00:00:00 2001
From: nosami <jasonimison@gmail.com>
Date: Wed, 8 Nov 2023 22:03:06 +0000
Subject: [PATCH 1/2] $(VSToolsPath) no longer resolves

This seems to be an ok workaround for now.
---
 References/Vs2019/Vs2019.Build.targets | 2 +-
 References/Vs2022/Vs2022.Build.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/References/Vs2019/Vs2019.Build.targets b/References/Vs2019/Vs2019.Build.targets
index 57aca740d..47e62d9c2 100644
--- a/References/Vs2019/Vs2019.Build.targets
+++ b/References/Vs2019/Vs2019.Build.targets
@@ -32,5 +32,5 @@
     </None>
   </ItemGroup>
 
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
 </Project>
diff --git a/References/Vs2022/Vs2022.Build.targets b/References/Vs2022/Vs2022.Build.targets
index 09e1d73ed..fc8131233 100644
--- a/References/Vs2022/Vs2022.Build.targets
+++ b/References/Vs2022/Vs2022.Build.targets
@@ -29,5 +29,5 @@
     </None>
   </ItemGroup>
 
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VsVimProjectType)' == 'Vsix' AND '$(VSToolsPath)' != ''" />
 </Project>

From 86a2d5473273be3aa1dae990cb540f430f891798 Mon Sep 17 00:00:00 2001
From: nosami <jasonimison@gmail.com>
Date: Wed, 8 Nov 2023 22:19:11 +0000
Subject: [PATCH 2/2] Fix code hygiene unit test

---
 Test/VimCoreTest/CodeHygieneTest.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Test/VimCoreTest/CodeHygieneTest.cs b/Test/VimCoreTest/CodeHygieneTest.cs
index 8517cb0b6..c27daea8d 100644
--- a/Test/VimCoreTest/CodeHygieneTest.cs
+++ b/Test/VimCoreTest/CodeHygieneTest.cs
@@ -65,6 +65,7 @@ public void CodeNamespace()
                     if (type.FullName.StartsWith("<Startup", StringComparison.Ordinal) ||
                         type.FullName.StartsWith("Microsoft.FSharp", StringComparison.Ordinal) ||
                         type.FullName.StartsWith("Microsoft.BuildSettings", StringComparison.Ordinal) ||
+                        type.FullName.StartsWith("System.Diagnostics.CodeAnalysis", StringComparison.Ordinal) ||
                         type.FullName.StartsWith("FSharp.BuildProperties", StringComparison.Ordinal))
                     {
                         continue;