Merge pull request #1003 from basoundr/RemoveProjSelector

Livar · web-flow · commit 16f318c66450 · 2017-04-10T22:25:53.000-07:00
Move Project Selector reg to Project System Vsix
diff --git a/src/Templates/CSharpNetStandardTemplatesSetup/CSharpNetStandardTemplatesSetup.csproj b/src/Templates/CSharpNetStandardTemplatesSetup/CSharpNetStandardTemplatesSetup.csproj
@@ -47,12 +47,6 @@
     <None Include="project.json" />
     <None Include="source.extension.vsixmanifest" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ProjectSelector.pkgdef">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ProjectTemplates\CSharp\.NETStandard\CSharpNetStandardClassLibrary\CSharpNetStandardClassLibrary.csproj">
       <Project>{440F1724-1830-4C7A-9500-8D9323A7FE71}</Project>
diff --git a/src/Templates/CSharpNetStandardTemplatesSetup/ProjectSelector.pkgdef b/src/Templates/CSharpNetStandardTemplatesSetup/ProjectSelector.pkgdef
diff --git a/src/Templates/CSharpNetStandardTemplatesSetup/source.extension.vsixmanifest b/src/Templates/CSharpNetStandardTemplatesSetup/source.extension.vsixmanifest
@@ -20,7 +20,6 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="ProjectSelector.pkgdef" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CSharpNetStandardClassLibrary" d:TargetPath="|CSharpNetStandardClassLibrary;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
   </Assets>
 </PackageManifest>
diff --git a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj
@@ -77,12 +77,6 @@
     <None Include="project.json" />
     <None Include="source.extension.vsixmanifest" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ProjectSelector.pkgdef">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(ProjectRootDir)build\Targets\Templates.Imports.targets" />
 </Project>
diff --git a/src/Templates/CSharpTemplatesSetup/ProjectSelector.pkgdef b/src/Templates/CSharpTemplatesSetup/ProjectSelector.pkgdef
diff --git a/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest b/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest
@@ -20,7 +20,6 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="ProjectSelector.pkgdef" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CSharpConsoleApplication" d:TargetPath="|CSharpConsoleApplication;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CSharpClassLibrary" d:TargetPath="|CSharpClassLibrary;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CSharpUnitTest" d:TargetPath="|CSharpUnitTest;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
diff --git a/src/Templates/VisualBasicNetStandardTemplatesSetup/ProjectSelector.pkgdef b/src/Templates/VisualBasicNetStandardTemplatesSetup/ProjectSelector.pkgdef
diff --git a/src/Templates/VisualBasicNetStandardTemplatesSetup/VisualBasicNetStandardTemplatesSetup.csproj b/src/Templates/VisualBasicNetStandardTemplatesSetup/VisualBasicNetStandardTemplatesSetup.csproj
@@ -47,12 +47,6 @@
     <None Include="project.json" />
     <None Include="source.extension.vsixmanifest" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ProjectSelector.pkgdef">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ProjectTemplates\VisualBasic\.NETStandard\VisualBasicNetStandardClassLibrary\VisualBasicNetStandardClassLibrary.csproj">
       <Project>{76B09ABB-8D19-41BD-99AE-C3A067C7583C}</Project>
diff --git a/src/Templates/VisualBasicNetStandardTemplatesSetup/source.extension.vsixmanifest b/src/Templates/VisualBasicNetStandardTemplatesSetup/source.extension.vsixmanifest
@@ -20,7 +20,6 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="ProjectSelector.pkgdef" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="VisualBasicNetStandardClassLibrary" d:TargetPath="|VisualBasicNetStandardClassLibrary;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
   </Assets>
 </PackageManifest>
diff --git a/src/Templates/VisualBasicTemplatesSetup/ProjectSelector.pkgdef b/src/Templates/VisualBasicTemplatesSetup/ProjectSelector.pkgdef
diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj
@@ -63,12 +63,6 @@
     <None Include="project.json" />
     <None Include="source.extension.vsixmanifest" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ProjectSelector.pkgdef">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(ProjectRootDir)build\Targets\Templates.Imports.targets" />
 </Project>
diff --git a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest
@@ -20,7 +20,6 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="ProjectSelector.pkgdef" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="VisualBasicConsoleApplication" d:TargetPath="|VisualBasicConsoleApplication;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="VisualBasicClassLibrary" d:TargetPath="|VisualBasicClassLibrary;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
   </Assets>
