Merge pull request #3079 from nosami/dev/nosami/vstoolspath-workaround

$(VSToolsPath) no longer resolves
VsVim · Nov 16, 2023 · d4afbd9 · d4afbd9
2 parents c09517b + 86a2d54
commit d4afbd9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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>
diff --git 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;