Implement conditional configuration includes2.0

Since the VS Gallery expects each VSIX having a different GUID,
we need to have a separate .vsixmanifest file per VS version.
Put the configuration stuff in a dedicated directory, split the
AfterBuild from the actual .csproj and have a .targets file and
.vsixmanifest per Visual Studio version. Update the README file.

Change-Id: I32ffee1c40345812b7f2232987e4e7a5b20c3da6
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

9 files changed, 182 insertions, 31 deletions

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 49856dce..1dd3ed24 100644
--- a/src/qtprojectlib/QtProjectLib.csproj
+++ b/src/qtprojectlib/QtProjectLib.csproj
@@ -84,8 +84,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/QtVsTools.csproj b/src/qtvstools/QtVsTools.csproj
index e3c7eb5f..75bf0273 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>
@@ -113,8 +112,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">
@@ -286,31 +284,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 532df145..baa27dbf 100644
--- a/src/qtwizard/QtProjectWizard.csproj
+++ b/src/qtwizard/QtProjectWizard.csproj
@@ -154,8 +154,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">