Synchronize QtVsTest version with VS Tools

The version of the Qt VS Tools and QtVsTest are now in sync. This will
make it easier to detect/prevent a mismatch between the two extensions.

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

7 files changed, 122 insertions, 228 deletions

diff --git a/src/qtvstest/Properties/AssemblyInfo.cs b/src/qtvstest/Properties/AssemblyInfo.cs
index 83916fd6..baf09868 100644
--- a/src/qtvstest/Properties/AssemblyInfo.cs
+++ b/src/qtvstest/Properties/AssemblyInfo.cs
@@ -24,6 +24,10 @@
 **
 ** $QT_END_LICENSE$
 **
+****************************************************************************
+<#@output extension="tt.cs" #>
+<#@include file="$(SolutionDir)\version.tt" #>
+**              <#=WARNING_GENERATED_FILE#>
 ****************************************************************************/
 
 using System.Reflection;
@@ -57,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")]
+[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")]
diff --git a/src/qtvstest/QtVsTest.csproj b/src/qtvstest/QtVsTest.csproj
index b37c5e1e..665a714c 100644
--- a/src/qtvstest/QtVsTest.csproj
+++ b/src/qtvstest/QtVsTest.csproj
@@ -81,11 +81,29 @@
     <Compile Include="Macro.cs" />
     <Compile Include="MacroParser.cs" />
     <Compile Include="MacroServer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.tt.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>AssemblyInfo.cs</DependentUpon>
+    </Compile>
+    <T4Template Include="Properties\AssemblyInfo.cs">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile>
+      <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn>
+      <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput>
+    </T4Template>
     <Compile Include="QtVsTest.cs" />
-    <None Include="config\$(VisualStudioVersion)\source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
+    <None Include="source.extension.vsixmanifest">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>source.extension.vsixmanifest_TT</DependentUpon>
     </None>
+    <T4Template Include="source.extension.vsixmanifest_TT">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <OutputFile>source.extension.vsixmanifest</OutputFile>
+      <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn>
+      <LastGenOutput>source.extension.vsixmanifest</LastGenOutput>
+    </T4Template>
     <Content Include="MacroClient.h">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
diff --git a/src/qtvstest/config/12.0/source.extension.vsixmanifest b/src/qtvstest/config/12.0/source.extension.vsixmanifest
deleted file mode 100644
index e172f974..00000000
--- a/src/qtvstest/config/12.0/source.extension.vsixmanifest
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-<!--
-    *****************************************************************************
-    **
-    ** Copyright (C) 2019 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$
-    **
-    *****************************************************************************
--->
-
-    <Metadata>
-        <Identity Id="QtVsTest.7026c025-6dd2-44bf-9913-0b058e239616" Version="1.0" Language="en-US" Publisher="The Qt Company Ltd." />
-        <DisplayName>Qt Visual Studio Test</DisplayName>
-        <Description xml:space="preserve">Auto-test framework for Qt Visual Studio Tools.</Description>
-    </Metadata>
-    <Installation InstalledByMsi="false">
-      <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[12.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Premium" Version="[12.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[12.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[12.0]" />
-    </Installation>
-    <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|" />
-    </Assets>
-</PackageManifest>
diff --git a/src/qtvstest/config/14.0/source.extension.vsixmanifest b/src/qtvstest/config/14.0/source.extension.vsixmanifest
deleted file mode 100644
index dfe69447..00000000
--- a/src/qtvstest/config/14.0/source.extension.vsixmanifest
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-<!--
-    *****************************************************************************
-    **
-    ** Copyright (C) 2019 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$
-    **
-    *****************************************************************************
--->
-
-    <Metadata>
-        <Identity Id="QtVsTest.7026c025-6dd2-44bf-9913-0b058e239616" Version="1.0" Language="en-US" Publisher="The Qt Company Ltd." />
-        <DisplayName>Qt Visual Studio Test</DisplayName>
-        <Description xml:space="preserve">Auto-test framework for Qt Visual Studio Tools.</Description>
-    </Metadata>
-    <Installation InstalledByMsi="false">
-      <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Premium" Version="[14.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[14.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
-    </Installation>
-    <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|" />
-    </Assets>
-</PackageManifest>
diff --git a/src/qtvstest/config/15.0/source.extension.vsixmanifest b/src/qtvstest/config/15.0/source.extension.vsixmanifest
deleted file mode 100644
index ce705b69..00000000
--- a/src/qtvstest/config/15.0/source.extension.vsixmanifest
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-<!--
-    *****************************************************************************
-    **
-    ** Copyright (C) 2019 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$
-    **
-    *****************************************************************************
--->
-
-    <Metadata>
-        <Identity Id="QtVsTest.7026c025-6dd2-44bf-9913-0b058e239616" Version="1.0" Language="en-US" Publisher="The Qt Company Ltd." />
-        <DisplayName>Qt Visual Studio Test</DisplayName>
-        <Description xml:space="preserve">Auto-test framework for Qt Visual Studio Tools.</Description>
-    </Metadata>
-    <Installation InstalledByMsi="false">
-      <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Premium" Version="[15.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[15.0]" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
-    </Installation>
-    <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|" />
-    </Assets>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor"
-                      Version="[15.0.26208.0,16.0)"
-                      DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde"
-                      Version="[15.0.26208.0,16.0)"
-                      DisplayName="Visual Studio C++ core features" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
-                      Version="[15.0.26208.0,16.0)"
-                      DisplayName="VC++ 2017 v141 toolset (x86,x64)" />
-    </Prerequisites>
-</PackageManifest>
diff --git a/src/qtvstest/config/16.0/source.extension.vsixmanifest b/src/qtvstest/config/16.0/source.extension.vsixmanifest
deleted file mode 100644
index a259d1c6..00000000
--- a/src/qtvstest/config/16.0/source.extension.vsixmanifest
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-<!--
-    *****************************************************************************
-    **
-    ** Copyright (C) 2019 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$
-    **
-    *****************************************************************************
--->
-
-    <Metadata>
-        <Identity Id="QtVsTest.7026c025-6dd2-44bf-9913-0b058e239616" Version="1.0" Language="en-US" Publisher="The Qt Company Ltd." />
-        <DisplayName>Qt Visual Studio Test</DisplayName>
-        <Description xml:space="preserve">Auto-test framework for Qt Visual Studio Tools.</Description>
-    </Metadata>
-    <Installation InstalledByMsi="false">
-      <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0,17.0)" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Premium" Version="[16.0,17.0)" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[16.0,17.0)" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
-      <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[16.0,17.0)" />
-    </Installation>
-    <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|" />
-    </Assets>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor"
-                      Version="[16.0,17.0)"
-                      DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde"
-                      Version="[16.0,17.0)"
-                      DisplayName="Visual Studio C++ core features" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
-                      Version="[16.0,17.0)"
-                      DisplayName="VC++ 2017 v141 toolset (x86,x64)" />
-    </Prerequisites>
-</PackageManifest>
diff --git a/src/qtvstest/source.extension.vsixmanifest_TT b/src/qtvstest/source.extension.vsixmanifest_TT
new file mode 100644
index 00000000..57d1f693
--- /dev/null
+++ b/src/qtvstest/source.extension.vsixmanifest_TT
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+  <!--
+  *****************************************************************************
+  **
+  ** Copyright (C) 2021 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$
+  **
+  *****************************************************************************
+<#@output extension="vsixmanifest" #>
+<#@include file="$(SolutionDir)\version.tt" #>
+  **          <#=WARNING_GENERATED_FILE#>
+  *****************************************************************************
+  -->
+  <Metadata>
+    <!--<#/*#>--><Identity/><!--<#*/#>-->
+    <!--<#=XML_COMMENT_END#>
+    <Identity Id="QtVsTest.7026c025-6dd2-44bf-9913-0b058e239616"
+              Version="<#=QT_VS_TOOLS_VERSION_MANIFEST#>"
+              Language="en-US"
+              Publisher="The Qt Company Ltd." />
+    <#=XML_COMMENT_BEGIN#>-->
+    <DisplayName>Qt Visual Studio Test</DisplayName>
+    <Description xml:space="preserve">Auto-test framework for Qt Visual Studio Tools.</Description>
+  </Metadata>
+  <Installation InstalledByMsi="false">
+    <!--<# if (VS_NAME == "2015") { #>-->
+    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Premium" Version="[14.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[14.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
+    <!--<# } else if (VS_NAME == "2017") { #>-->
+    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Premium" Version="[15.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[15.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
+    <!--<# } else if (VS_NAME == "2019") { #>-->
+    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0,17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Premium" Version="[16.0,17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Ultimate" Version="[16.0,17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[16.0,17.0)" />
+    <!--<# } #>-->
+  </Installation>
+  <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|" />
+  </Assets>
+  <Prerequisites>
+    <!--<# if (VS_NAME == "2017") { #>-->
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor"
+                  Version="[15.0.26208.0,16.0)"
+                  DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde"
+                  Version="[15.0.26208.0,16.0)"
+                  DisplayName="Visual Studio C++ core features" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+                  Version="[15.0.26208.0,16.0)"
+                  DisplayName="VC++ 2017 v141 toolset (x86,x64)" />
+    <!--<# } else if (VS_NAME == "2019") { #>-->
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor"
+                  Version="[16.0,17.0)"
+                  DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde"
+                  Version="[16.0,17.0)"
+                  DisplayName="Visual Studio C++ core features" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+                  Version="[16.0,17.0)"
+                  DisplayName="VC++ 2017 v141 toolset (x86,x64)" />
+    <!--<# } #>-->
+  </Prerequisites>
+</PackageManifest>