Merge remote-tracking branch 'origin/2.0' into dev

Change-Id: Ibf35fe4e76389edb8e2a4cd150de6a5512d38107

12 files changed, 197 insertions, 47 deletions

diff --git a/README b/README
index 67641393..20a23fe1 100644
--- a/README
+++ b/README
@@ -59,27 +59,31 @@ https://wiki.qt.io/Building_Qt_Documentation
 Product name or Publisher name update
 -------------------------------------
 
-Open the file 'source.extension.vsixmanifest' inside the 'src\qtvstools' directory and update the
-'DisplayName' tag's value or the 'Identity' tag's 'Publisher' attribute.
+Open the file 'source.extension.vsixmanifest' inside the 'src\config\$(VisualStudioVersion)'
+directory and update the 'DisplayName' tag's value or the 'Identity' tag's 'Publisher' attribute.
 Important: Updating the information requires also updating the MsBuild 'AfterTargets' information
-at the bottom of the 'QtVsTools.csproj' file in the same directory.
+inside the 'qtvstools.afterbuild.targets' file in the 'src\config' directory.
 
 
 
 Version number update
 ---------------------
 
-Open the file 'source.extension.vsixmanifest' inside the 'src\qtvstools' directory and update the
-'Identity' tag's 'Version' attribute.
+Open the file 'source.extension.vsixmanifest' inside the 'src\config\$(VisualStudioVersion)'
+directory and update the 'Identity' tag's 'Version' attribute.
 Important: Updating the version number there requires also updating the 'VsixVersion' tag at the
-top of the 'QtVsTools.csproj' file in the same directory.
+top of the 'qtvstools.targets' file in the same directory.
 
 
 
 Support for newer Visual Studio Versions
 ----------------------------------------
 
-Add a new file in 'src' named 'VS{NewVersion}.References.targets' by copying one of the existing.
+Add a new directory in 'src\config' matching '$(VisualStudioVersion)' by copying one of the existing
+directories.
+
+Minimum changes to the 'qtvstools.targets' file:
+
 Update the 'Project' tag's 'ToolsVersion' attribute to match the new VS tools version.
 Update the 'DefineConstants' tag's value to match the new VS version.
 Update the 'ItemGroup' tag's 'Condition' attribute to match the new VS version.
@@ -89,9 +93,6 @@ Update the 'Reference' tag's 'Include' attribute to match the new VS version, mo
     - Microsoft.VisualStudio.VCCodeModel
     - Microsoft.VisualStudio.VCProjectEngine
 
-Update the file 'QtVsTools.csproj' inside the 'src\qtvstools' directory to include the newly created
-'VS{NewVersion}.References.targets' file. Search for something along the following line:
-
-<Import Project="..\VS2013.References.targets" Condition=" '$(VisualStudioVersion)' == '12.0' " />
+Minimum changes to the 'source.extension.vsixmanifest' file:
 
-and add a new line using the Visual Studio version and 'VS{NewVersion}.References.targets' file.
+Update the 'Identity' tag's 'Id' attribute with a new GUID.
diff --git a/doc/src/qtvstools.qdoc b/doc/src/qtvstools.qdoc
index 6b44e42b..26a3e541 100644
--- a/doc/src/qtvstools.qdoc
+++ b/doc/src/qtvstools.qdoc
@@ -434,7 +434,8 @@
 
     To use the Qt version set in the \c QTDIR environment variable, create a
     version named \c {$(QTDIR)}. Because the path is not needed, the
-    \uicontrol Path field is disabled.
+    \uicontrol Path field is disabled. You must restart Visual Studio to make
+    it aware of the new environment variable.
 
     To specify the Qt version that the selected project should use, select
     \uicontrol {Qt VS Tools} > \uicontrol {Qt Project Settings} >
diff --git a/src/VS2013.References.targets b/src/config/12.0/qtvstools.targets
index aaab9b3c..08773e0a 100644
--- a/src/VS2013.References.targets
+++ b/src/config/12.0/qtvstools.targets
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2013</DefineConstants>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.0.0</VsixVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(VisualStudioVersion)' == '12.0' ">
diff --git a/src/qtvstools/source.extension.vsixmanifest b/src/config/12.0/source.extension.vsixmanifest
index 58770197..58770197 100644
--- a/src/qtvstools/source.extension.vsixmanifest
+++ b/src/config/12.0/source.extension.vsixmanifest
diff --git a/src/VS2015.References.targets b/src/config/14.0/qtvstools.targets
index 28caae0a..0a462e2d 100644
--- a/src/VS2015.References.targets
+++ b/src/config/14.0/qtvstools.targets
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2015</DefineConstants>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.0.0</VsixVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(VisualStudioVersion)' == '14.0' ">
diff --git a/src/config/14.0/source.extension.vsixmanifest b/src/config/14.0/source.extension.vsixmanifest
new file mode 100644
index 00000000..dab32cff
--- /dev/null
+++ b/src/config/14.0/source.extension.vsixmanifest
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    *****************************************************************************
+    **
+    ** Copyright (C) 2016 The Qt Company Ltd.
+    ** Contact: https://www.qt.io/licensing/
+    **
+    ** This file is part of the Qt VS Tools.
+    **
+    ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+    ** Commercial License Usage
+    ** Licensees holding valid commercial Qt licenses may use this file in
+    ** accordance with the commercial license agreement provided with the
+    ** Software or, alternatively, in accordance with the terms contained in
+    ** a written agreement between you and The Qt Company. For licensing terms
+    ** and conditions see https://www.qt.io/terms-conditions. For further
+    ** information use the contact form at https://www.qt.io/contact-us.
+    **
+    ** GNU General Public License Usage
+    ** Alternatively, this file may be used under the terms of the GNU
+    ** General Public License version 3 as published by the Free Software
+    ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+    ** included in the packaging of this file. Please review the following
+    ** information to ensure the GNU General Public License requirements will
+    ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+    **
+    ** $QT_END_LICENSE$
+    **
+    *****************************************************************************
+-->
+
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
+    xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+    <Metadata>
+        <Identity Id="QtVsTools.30112013-cd02-4fd0-89bd-e36f85abe16a" Version="2.0.0" Language="en-US"
+            Publisher="The Qt Company Ltd." />
+        <DisplayName>Qt Visual Studio Tools</DisplayName>
+        <Description xml:space="preserve">The Qt Visual Studio Tools allow developers to use the standard development environment without having to worry about any Qt-related build steps or tools.</Description>
+        <MoreInfo>http://www.qt.io</MoreInfo>
+        <License>LICENSE.GPL3-EXCEPT</License>
+        <ReleaseNotes>Changelog</ReleaseNotes>
+        <Icon>qt.ico</Icon>
+        <PreviewImage>preview.png</PreviewImage>
+    </Metadata>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%"
+            Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%"
+            Path="|%CurrentProject%|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="QtAppWrapper" Path="|QtAppWrapper|" AssemblyName="|QtAppWrapper;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="QtProjectWizard" Path="|QtProjectWizard|" AssemblyName="|QtProjectWizard;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Console" d:TargetPath="|Console;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Gui" d:TargetPath="|Gui;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Lib" d:TargetPath="|Lib;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Server" d:TargetPath="|Server;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Designer" d:TargetPath="|Designer;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="Resource" d:TargetPath="|Resource;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="DialogButtonBottom" d:TargetPath="|DialogButtonBottom;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="DialogButtonRight" d:TargetPath="|DialogButtonRight;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="MainWindow" d:TargetPath="|MainWindow;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="Widget" d:TargetPath="|Widget;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizer\qt5.natvis" />
+    <Asset Type="File"
+           d:Source="File"
+           Path="x64\SQLite.Interop.dll"
+           d:VsixSubPath="x64" />
+    <Asset Type="file"
+           d:Source="File"
+           Path="x86\SQLite.Interop.dll"
+           d:VsixSubPath="x86" />
+  </Assets>
+</PackageManifest>
diff --git a/src/config/qtvstools.afterbuild.targets b/src/config/qtvstools.afterbuild.targets
new file mode 100644
index 00000000..45c77a16
--- /dev/null
+++ b/src/config/qtvstools.afterbuild.targets
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="AfterBuild">
+    <PropertyGroup>
+      <QrcEditor>$(SolutionDir)\qrceditor\bin\QrcEditor.exe</QrcEditor>
+      <QtArchiveGen>$(SolutionDir)\qtarchivegen\$(OutDir)\QtArchiveGen.exe</QtArchiveGen>
+      <QMakeFileReader>$(SolutionDir)\qmakefilereader\bin\QMakeFileReader.exe</QMakeFileReader>
+      <DestFolder>$(LOCALAPPDATA)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\The Qt Company Ltd\Qt Visual Studio Tools\$(VsixVersion)\</DestFolder>
+    </PropertyGroup>
+    <Message Text="Running post build target for $(ProjectName)." Importance="high" />
+    <Message Text="Set $(ProjectName) installation target to [$(VisualStudioVersion)]." Importance="high" />
+    <Exec Command="$(QtArchiveGen) target=$(TargetDir)\$(TargetName).vsix version=[$(VisualStudioVersion)]" />
+    <Message Text="Copy '$(QrcEditor)' to '$(DestFolder)'." Importance="high" />
+    <Copy SourceFiles="$(QrcEditor)" DestinationFolder="$(DestFolder)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />
+    <Message Text="Copy '$(QMakeFileReader)' to '$(DestFolder)'." Importance="high" />
+    <Copy SourceFiles="$(QMakeFileReader)" DestinationFolder="$(DestFolder)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />
+    <Message Text="Copy '$(QrcEditor)' into '$(TargetDir)\$(TargetName).vsix'." Importance="high" />
+    <Exec Command="$(QtArchiveGen) source=$(QrcEditor) target=$(TargetDir)\$(TargetName).vsix" />
+    <Message Text="Copy '$(QMakeFileReader)' into '$(TargetDir)\$(TargetName).vsix'." Importance="high" />
+    <Exec Command="$(QtArchiveGen) source=$(QMakeFileReader) target=$(TargetDir)\$(TargetName).vsix" />
+    <Message Text="Completed post build target for $(ProjectName)." Importance="high" />
+  </Target>
+
+</Project>
diff --git a/src/qtprojectlib/QtProjectLib.csproj b/src/qtprojectlib/QtProjectLib.csproj
index 749aba1e..53de2fa7 100644
--- a/src/qtprojectlib/QtProjectLib.csproj
+++ b/src/qtprojectlib/QtProjectLib.csproj
@@ -100,8 +100,7 @@
     <EmbeddedResource Include="Resources\newitem_d.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\VS2013.References.targets" Condition=" '$(VisualStudioVersion)' == '12.0' " />
-  <Import Project="..\VS2015.References.targets" Condition=" '$(VisualStudioVersion)' == '14.0' " />
+  <Import Project="..\config\$(VisualStudioVersion)\qtvstools.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/qtvstools/QtMenus.vsct b/src/qtvstools/QtMenus.vsct
index 80f874d4..55cb9b1f 100644
--- a/src/qtvstools/QtMenus.vsct
+++ b/src/qtvstools/QtMenus.vsct
@@ -55,9 +55,6 @@
     <!-- This header contains the command ids for the menus provided by the shell. -->
     <Extern href="vsshlids.h"/>
 
-    <!--  Include the definitions for images included in the VS image catalog -->
-    <Include href="KnownImageIds.vsct"/>
-
     <!--
         The Commands section is where commands, menus, and menu groups are defined.
         This section uses a Guid to identify the package that provides the command defined inside it.
diff --git a/src/qtvstools/QtVsTools.csproj b/src/qtvstools/QtVsTools.csproj
index 881be521..5e3b4391 100644
--- a/src/qtvstools/QtVsTools.csproj
+++ b/src/qtvstools/QtVsTools.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="$(VisualStudioVersion)" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.0.0</VsixVersion>
     <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <UseCodebase>true</UseCodebase>
@@ -125,8 +124,7 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="packages.config" />
-    <None Include="source.extension.vsixmanifest">
-    </None>
+    <None Include="..\config\$(VisualStudioVersion)\source.extension.vsixmanifest" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\x64\SQLite.Interop.dll">
@@ -295,31 +293,9 @@
     <Reference Include="System.ComponentModel.Composition" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\VS2013.References.targets" Condition=" '$(VisualStudioVersion)' == '12.0' " />
-  <Import Project="..\VS2015.References.targets" Condition=" '$(VisualStudioVersion)' == '14.0' " />
+  <Import Project="..\config\$(VisualStudioVersion)\qtvstools.targets"/>
+  <Import Project="..\config\qtvstools.afterbuild.targets"/>
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Target Name="AfterBuild">
-    <PropertyGroup>
-      <QrcEditor>$(SolutionDir)\qrceditor\bin\QrcEditor.exe</QrcEditor>
-      <QtArchiveGen>$(SolutionDir)\qtarchivegen\$(OutDir)\QtArchiveGen.exe</QtArchiveGen>
-      <QMakeFileReader>$(SolutionDir)\qmakefilereader\bin\QMakeFileReader.exe</QMakeFileReader>
-      <DestFolder>$(LOCALAPPDATA)\Microsoft\VisualStudio\$(VisualStudioVersion)Exp\Extensions\The Qt Company Ltd\Qt Visual Studio Tools\$(VsixVersion)\</DestFolder>
-    </PropertyGroup>
-    <Message Text="Running post build target for $(ProjectName)." Importance="high" />
-    <Message Text="Set $(ProjectName) installation target to [$(VisualStudioVersion)]." Importance="high" />
-    <Exec Command="$(QtArchiveGen) target=$(TargetDir)\$(TargetName).vsix version=[$(VisualStudioVersion)]" />
-    <Message Text="Copy '$(QrcEditor)' to '$(DestFolder)'." Importance="high" />
-    <Copy SourceFiles="$(QrcEditor)" DestinationFolder="$(DestFolder)" OverwriteReadOnlyFiles="true"
-          SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />
-    <Message Text="Copy '$(QMakeFileReader)' to '$(DestFolder)'." Importance="high" />
-    <Copy SourceFiles="$(QMakeFileReader)" DestinationFolder="$(DestFolder)" OverwriteReadOnlyFiles="true"
-          SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />
-    <Message Text="Copy '$(QrcEditor)' into '$(TargetDir)\$(TargetName).vsix'." Importance="high" />
-    <Exec Command="$(QtArchiveGen) source=$(QrcEditor) target=$(TargetDir)\$(TargetName).vsix" />
-    <Message Text="Copy '$(QMakeFileReader)' into '$(TargetDir)\$(TargetName).vsix'." Importance="high" />
-    <Exec Command="$(QtArchiveGen) source=$(QMakeFileReader) target=$(TargetDir)\$(TargetName).vsix" />
-    <Message Text="Completed post build target for $(ProjectName)." Importance="high" />
-  </Target>
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/qtvstools/VS2015.source.extension.vsixmanifest b/src/qtvstools/VS2015.source.extension.vsixmanifest
new file mode 100644
index 00000000..58770197
--- /dev/null
+++ b/src/qtvstools/VS2015.source.extension.vsixmanifest
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    *****************************************************************************
+    **
+    ** Copyright (C) 2016 The Qt Company Ltd.
+    ** Contact: https://www.qt.io/licensing/
+    **
+    ** This file is part of the Qt VS Tools.
+    **
+    ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+    ** Commercial License Usage
+    ** Licensees holding valid commercial Qt licenses may use this file in
+    ** accordance with the commercial license agreement provided with the
+    ** Software or, alternatively, in accordance with the terms contained in
+    ** a written agreement between you and The Qt Company. For licensing terms
+    ** and conditions see https://www.qt.io/terms-conditions. For further
+    ** information use the contact form at https://www.qt.io/contact-us.
+    **
+    ** GNU General Public License Usage
+    ** Alternatively, this file may be used under the terms of the GNU
+    ** General Public License version 3 as published by the Free Software
+    ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+    ** included in the packaging of this file. Please review the following
+    ** information to ensure the GNU General Public License requirements will
+    ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+    **
+    ** $QT_END_LICENSE$
+    **
+    *****************************************************************************
+-->
+
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
+    xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+    <Metadata>
+        <Identity Id="QtVsTools.15021976-cd02-4fd0-89bd-e36f85abe16a" Version="2.0.0" Language="en-US"
+            Publisher="The Qt Company Ltd." />
+        <DisplayName>Qt Visual Studio Tools</DisplayName>
+        <Description xml:space="preserve">The Qt Visual Studio Tools allow developers to use the standard development environment without having to worry about any Qt-related build steps or tools.</Description>
+        <MoreInfo>http://www.qt.io</MoreInfo>
+        <License>LICENSE.GPL3-EXCEPT</License>
+        <ReleaseNotes>Changelog</ReleaseNotes>
+        <Icon>qt.ico</Icon>
+        <PreviewImage>preview.png</PreviewImage>
+    </Metadata>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%"
+            Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%"
+            Path="|%CurrentProject%|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="QtAppWrapper" Path="|QtAppWrapper|" AssemblyName="|QtAppWrapper;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="QtProjectWizard" Path="|QtProjectWizard|" AssemblyName="|QtProjectWizard;AssemblyName|" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Console" d:TargetPath="|Console;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Gui" d:TargetPath="|Gui;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Lib" d:TargetPath="|Lib;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Server" d:TargetPath="|Server;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="Designer" d:TargetPath="|Designer;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="Resource" d:TargetPath="|Resource;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="DialogButtonBottom" d:TargetPath="|DialogButtonBottom;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="DialogButtonRight" d:TargetPath="|DialogButtonRight;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="MainWindow" d:TargetPath="|MainWindow;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="Widget" d:TargetPath="|Widget;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
+        <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizer\qt5.natvis" />
+    <Asset Type="File"
+           d:Source="File"
+           Path="x64\SQLite.Interop.dll"
+           d:VsixSubPath="x64" />
+    <Asset Type="file"
+           d:Source="File"
+           Path="x86\SQLite.Interop.dll"
+           d:VsixSubPath="x86" />
+  </Assets>
+</PackageManifest>
diff --git a/src/qtwizard/QtProjectWizard.csproj b/src/qtwizard/QtProjectWizard.csproj
index 27227af8..0f354d89 100644
--- a/src/qtwizard/QtProjectWizard.csproj
+++ b/src/qtwizard/QtProjectWizard.csproj
@@ -159,8 +159,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\VS2013.References.targets" Condition=" '$(VisualStudioVersion)' == '12.0' " />
-  <Import Project="..\VS2015.References.targets" Condition=" '$(VisualStudioVersion)' == '14.0' " />
+  <Import Project="..\config\$(VisualStudioVersion)\qtvstools.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">