6 files changed, 30 insertions, 6 deletions
diff --git a/src/config/12.0/qtvstools.targets b/src/config/12.0/qtvstools.targets
index 56c4a020..9012df1c 100644
--- a/src/config/12.0/qtvstools.targets
+++ b/src/config/12.0/qtvstools.targets
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2013</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.1</VsixVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(VisualStudioVersion)' == '12.0' ">
diff --git a/src/config/12.0/source.extension.vsixmanifest b/src/config/12.0/source.extension.vsixmanifest_TT
index 9e530fae..ca17f5fa 100644
--- a/src/config/12.0/source.extension.vsixmanifest
+++ b/src/config/12.0/source.extension.vsixmanifest_TT
@@ -27,13 +27,22 @@
     ** $QT_END_LICENSE$
     **
     *****************************************************************************
+<#@output extension="vsixmanifest" #>
+<#@include file="$(SolutionDir)\version.tt" #>
+    **          <#=WARNING_GENERATED_FILE#>
+    *****************************************************************************
 -->
 
 <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.2.1" Language="en-US"
+        <!-- BEGIN Generated Text <#=XML_COMMENT_END#>
+        <Identity
+            Id="QtVsTools.15021976-cd02-4fd0-89bd-e36f85abe16a"
+            Version="<#=QT_VS_TOOLS_VERSION#>"
+            Language="en-US"
             Publisher="The Qt Company Ltd." />
+        <#=XML_COMMENT_BEGIN#> END Generated Text -->
         <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>
diff --git a/src/config/14.0/qtvstools.targets b/src/config/14.0/qtvstools.targets
index 30084841..1a4db24a 100644
--- a/src/config/14.0/qtvstools.targets
+++ b/src/config/14.0/qtvstools.targets
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2015</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.1</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_TT
index 71c98d2b..f3e340cc 100644
--- a/src/config/14.0/source.extension.vsixmanifest
+++ b/src/config/14.0/source.extension.vsixmanifest_TT
@@ -27,13 +27,22 @@
     ** $QT_END_LICENSE$
     **
     *****************************************************************************
+<#@output extension="vsixmanifest" #>
+<#@include file="$(SolutionDir)\version.tt" #>
+    **          <#=WARNING_GENERATED_FILE#>
+    *****************************************************************************
 -->
 
 <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.2.1" Language="en-US"
+        <!-- BEGIN Generated Text <#=XML_COMMENT_END#>
+        <Identity
+            Id="QtVsTools.30112013-cd02-4fd0-89bd-e36f85abe16a"
+            Version="<#=QT_VS_TOOLS_VERSION#>"
+            Language="en-US"
             Publisher="The Qt Company Ltd." />
+        <#=XML_COMMENT_BEGIN#> END Generated Text -->
         <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>
diff --git a/src/config/15.0/qtvstools.targets b/src/config/15.0/qtvstools.targets
index ce650dce..638f50a8 100644
--- a/src/config/15.0/qtvstools.targets
+++ b/src/config/15.0/qtvstools.targets
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2017</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.1</VsixVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(VisualStudioVersion)' == '15.0' ">
diff --git a/src/config/15.0/source.extension.vsixmanifest b/src/config/15.0/source.extension.vsixmanifest_TT
index 6c16ed9c..2460b7e6 100644
--- a/src/config/15.0/source.extension.vsixmanifest
+++ b/src/config/15.0/source.extension.vsixmanifest_TT
@@ -27,13 +27,22 @@
     ** $QT_END_LICENSE$
     **
     *****************************************************************************
+<#@output extension="vsixmanifest" #>
+<#@include file="$(SolutionDir)\version.tt" #>
+    **          <#=WARNING_GENERATED_FILE#>
+    *****************************************************************************
 -->
 
 <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.13121978-cd02-4fd0-89bd-e36f85abe16a" Version="2.2.1" Language="en-US"
+        <!-- BEGIN Generated Text <#=XML_COMMENT_END#>
+        <Identity
+            Id="QtVsTools.13121978-cd02-4fd0-89bd-e36f85abe16a"
+            Version="<#=QT_VS_TOOLS_VERSION#>"
+            Language="en-US"
             Publisher="The Qt Company Ltd." />
+        <#=XML_COMMENT_BEGIN#> END Generated Text -->
         <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>