Update version number to 2.1.2

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

11 files changed, 21 insertions, 13 deletions

diff --git a/Changelog b/Changelog
index eaba4bae..715ceb60 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,11 @@
+The Qt Visual Studio Tools version 2.1.2 contains support for VS 2017 and several bug fixes.
+
+QTVSADDINBUG-459: Fix reported issues against the VS2017 beta release
+QTVSADDINBUG-396: Fix new item with VS not generating the moc
+QTVSADDINBUG-472: Fix opening pro file with Qt 5.9
+QTVSADDINBUG-460: Fix package containing corrupted data
+
+
 The Qt Visual Studio Tools version 2.1.1 contains a bug fix for QTVSADDINBUG-453
 
 The Qt Visual Studio Tools version 2.1.0 contains improvements for QML syntax highlighting and
diff --git a/src/config/12.0/qtvstools.targets b/src/config/12.0/qtvstools.targets
index e5ac1b5a..8b214680 100644
--- a/src/config/12.0/qtvstools.targets
+++ b/src/config/12.0/qtvstools.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2013</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.1</VsixVersion>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.2</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
index fdf569c0..739bc19f 100644
--- a/src/config/12.0/source.extension.vsixmanifest
+++ b/src/config/12.0/source.extension.vsixmanifest
@@ -32,7 +32,7 @@
 <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.1.1" Language="en-US"
+        <Identity Id="QtVsTools.15021976-cd02-4fd0-89bd-e36f85abe16a" Version="2.1.2" 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>
diff --git a/src/config/14.0/qtvstools.targets b/src/config/14.0/qtvstools.targets
index 180b5092..d0e30ebd 100644
--- a/src/config/14.0/qtvstools.targets
+++ b/src/config/14.0/qtvstools.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2015</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.1</VsixVersion>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.2</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
index 141f2a33..7b5f743f 100644
--- a/src/config/14.0/source.extension.vsixmanifest
+++ b/src/config/14.0/source.extension.vsixmanifest
@@ -32,7 +32,7 @@
 <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.1.1" Language="en-US"
+        <Identity Id="QtVsTools.30112013-cd02-4fd0-89bd-e36f85abe16a" Version="2.1.2" 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>
diff --git a/src/config/15.0/qtvstools.targets b/src/config/15.0/qtvstools.targets
index 45933b90..0f8c3049 100644
--- a/src/config/15.0/qtvstools.targets
+++ b/src/config/15.0/qtvstools.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2017</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.1</VsixVersion>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.2</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
index b47fa777..b37c28f4 100644
--- a/src/config/15.0/source.extension.vsixmanifest
+++ b/src/config/15.0/source.extension.vsixmanifest
@@ -32,7 +32,7 @@
 <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.1.1" Language="en-US"
+        <Identity Id="QtVsTools.13121978-cd02-4fd0-89bd-e36f85abe16a" Version="2.1.2" 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>
diff --git a/src/qtprojectlib/Properties/AssemblyInfo.cs b/src/qtprojectlib/Properties/AssemblyInfo.cs
index 5badcdc6..5678e2f2 100644
--- a/src/qtprojectlib/Properties/AssemblyInfo.cs
+++ b/src/qtprojectlib/Properties/AssemblyInfo.cs
@@ -59,5 +59,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("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/src/qtvstools/Properties/AssemblyInfo.cs b/src/qtvstools/Properties/AssemblyInfo.cs
index 5159e844..3f89f604 100644
--- a/src/qtvstools/Properties/AssemblyInfo.cs
+++ b/src/qtvstools/Properties/AssemblyInfo.cs
@@ -59,5 +59,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("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/src/qtvstools/Vsix.cs b/src/qtvstools/Vsix.cs
index 2813d07e..f96bf7e1 100644
--- a/src/qtvstools/Vsix.cs
+++ b/src/qtvstools/Vsix.cs
@@ -40,7 +40,7 @@ namespace QtVsTools
 {
     [Guid(PackageGuid)]
     [PackageRegistration(UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "2.1.1", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", "2.1.2", IconResourceID = 400)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideAutoLoad(Microsoft.VisualStudio.Shell.Interop.UIContextGuids.SolutionExists)]
     public sealed class Vsix : Package
diff --git a/vstools.pri b/vstools.pri
index 6cabab4c..486020c2 100644
--- a/vstools.pri
+++ b/vstools.pri
@@ -2,8 +2,8 @@
     error("vstools.pri already included")
 }
 QTVSTOOLS_PRI = 1
-QTVSTOOLS_VERSION = 2.1.1
-QTVSTOOLS_VERSION_TAG = 211
+QTVSTOOLS_VERSION = 2.1.2
+QTVSTOOLS_VERSION_TAG = 212
 
 defineTest(minQtVersion) {
     maj = $$1