Minor directory structure cleanup.

Author: SeanCline

.gitignore

@@ -48,7 +48,6 @@ build/
 *.pidb
 *.log
 *.scc
-*.pkgdef
 
 # Visual C++ cache files
 ipch/

CatchVsTestAdapter/CatchVsTestAdapter.csproj

@@ -87,16 +87,11 @@
   <ItemGroup>
     <Compile Include="CatchTestDiscoverer.cs" />
     <Compile Include="CatchTestExecutor.cs" />
-    <None Include="CatchVsTestAdaptorPackage.cs" />
     <Compile Include="FailureExpression.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utility.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CatchVsTestAdapter.pkgdef">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <Content Include="ItemTemplates\Test\CatchVsItemTemplate\catch.ico">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -122,6 +117,10 @@
     <Content Include="Snippets\Catch.snippet">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="Snippets\snippets.pkgdef">
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>

CatchVsTestAdapter/CatchVsTestAdaptorPackage.cs

@@ -1,13 +1,13 @@
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
-    <TemplateData>
-        <Name>Catch Unit Test File</Name>
-        <Description>And empty file for Catch unit tests.</Description>
-        <Icon>catch.ico</Icon>
-        <ProjectType>VC</ProjectType>
-        <ProjectSubType></ProjectSubType>
-        <DefaultName>Test.cpp</DefaultName>
-    </TemplateData>
-    <TemplateContent>
-        <ProjectItem ReplaceParameters="true">Test.cpp</ProjectItem>
-    </TemplateContent>
+  <TemplateData>
+    <Name>Catch Unit Test File</Name>
+    <Description>And empty file for Catch unit tests.</Description>
+    <ProjectType>VC</ProjectType>
+    <ProjectSubType></ProjectSubType>
+    <DefaultName>Test.cpp</DefaultName>
+    <Icon>catch.ico</Icon>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem ReplaceParameters="true">Test.cpp</ProjectItem>
+  </TemplateContent>
 </VSTemplate>

CatchVsTestAdapter/ItemTemplates/Test/CatchVsItemTemplate/CatchVsItemTemplate.vstemplate

@@ -23,6 +23,6 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="CatchVsTestAdapter" Path="|CatchVsTestAdapter|" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates\Test\CatchVsProjectTemplate" d:TargetPath="ProjectTemplates\CatchVsProjectTemplate\CatchVsProjectTemplate.vstemplate" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="File" Path="ItemTemplates" d:VsixSubPath="ItemTemplates\Test\CatchVsItemTemplate" d:TargetPath="ItemTemplates\CatchVsItemTemplate\CatchVsItemTemplate.vstemplate" />
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="CatchVsTestAdapter.pkgdef" />
+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Snippets\snippets.pkgdef" />
   </Assets>
 </PackageManifest>