From b2412801a7033364a6cb75a361df0b220cc559a9 Mon Sep 17 00:00:00 2001
From: Spencer Bloom <spebl@microsoft.com>
Date: Thu, 29 Apr 2021 13:03:31 -0700
Subject: [PATCH 1/2] attempt to drop vstdir on install

---
 .../Packaging.TAfGT/ItemTemplates/VC/Test/Test.VSTDIR         | 4 ++++
 GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj      | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 GoogleTestAdapter/Packaging.TAfGT/ItemTemplates/VC/Test/Test.VSTDIR

diff --git a/GoogleTestAdapter/Packaging.TAfGT/ItemTemplates/VC/Test/Test.VSTDIR b/GoogleTestAdapter/Packaging.TAfGT/ItemTemplates/VC/Test/Test.VSTDIR
new file mode 100644
index 000000000..943f78049
--- /dev/null
+++ b/GoogleTestAdapter/Packaging.TAfGT/ItemTemplates/VC/Test/Test.VSTDIR
@@ -0,0 +1,4 @@
+<TemplateDir Version="1.0.0">
+    <LocalizedName Package="{976CF7D5-2A72-47A3-9E46-5B7C3DB95F17}" ID="2309"/>
+    <SortOrder>80</SortOrder>
+</TemplateDir>
diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
index fb24efc11..edc50b49e 100644
--- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
+++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
@@ -61,6 +61,7 @@
       <CopyToOutputDirectory>CopyIfNewer</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <None Include="ItemTemplates\VC\Test\Test.VSTDIR" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>

From 06f03bfa3cfb012339bf07034740be1da4ec9b3d Mon Sep 17 00:00:00 2001
From: Spencer Bloom <spebl@microsoft.com>
Date: Fri, 30 Apr 2021 12:20:04 -0700
Subject: [PATCH 2/2] include vstdir in vsix

---
 GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
index edc50b49e..4bea0b065 100644
--- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
+++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
@@ -61,7 +61,10 @@
       <CopyToOutputDirectory>CopyIfNewer</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <None Include="ItemTemplates\VC\Test\Test.VSTDIR" />
+    <Content Include="ItemTemplates\VC\Test\Test.VSTDIR">
+      <CopyToOutputDirectory>CopyIfNewer</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>