diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2017-01-25 14:01:58 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2017-01-27 12:53:39 +0000 |
commit | 970cb6f27091f6a4710c933b478d18f54da876b8 (patch) | |
tree | 1330a91e9141498f38e0bb45cf4a4ef03a5d6131 | |
parent | 511fec382396b1fbe77485404b00bcf26e8d79aa (diff) |
Update version number, copyright, assembly info, READMEv2.1.0
Change-Id: I6d82544fb98afcba8911cb58ed21cdaad61e7681
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
22 files changed, 43 insertions, 28 deletions
@@ -73,6 +73,21 @@ Open the file 'source.extension.vsixmanifest' inside the 'src\config\$(VisualStu 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.targets' file in the same directory. +There are some other parts that need to be updated: + + - 'vstools.pri' + adapt QTVSTOOLS_VERSION and QTVSTOOLS_VERSION_TAG + - 'src\qtvstools\Vsix.cs' + search for the line containing "InstalledProductRegistration", adapt the third argument) + - 'src\qtvstools\Properties\AssemblyInfo.cs' + adapt [assembly: AssemblyVersion(...)] and [assembly: AssemblyFileVersion(...)] + +Depending on the amount of changes done to other libraries of the projects, adjust their respective +assembly infos as well. + +Note: Some extra caution is required while changing the qtwizard assembly info, because most of + the templates (e.g. console, gui, etc.) depend on that version number and need to be adjusted + as well (see gui.vstemplate 'Assembly' tag for example). diff --git a/src/config/12.0/qtvstools.targets b/src/config/12.0/qtvstools.targets index 08773e0a..dff6a956 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.0.0</VsixVersion> + <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.0</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 58770197..735ba489 100644 --- a/src/config/12.0/source.extension.vsixmanifest +++ b/src/config/12.0/source.extension.vsixmanifest @@ -2,7 +2,7 @@ <!-- ***************************************************************************** ** - ** Copyright (C) 2016 The Qt Company Ltd. + ** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -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.0.0" Language="en-US" + <Identity Id="QtVsTools.15021976-cd02-4fd0-89bd-e36f85abe16a" Version="2.1.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> diff --git a/src/config/14.0/qtvstools.targets b/src/config/14.0/qtvstools.targets index 0a462e2d..6ed4447b 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.0.0</VsixVersion> + <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.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 index dab32cff..aaf771f3 100644 --- a/src/config/14.0/source.extension.vsixmanifest +++ b/src/config/14.0/source.extension.vsixmanifest @@ -2,7 +2,7 @@ <!-- ***************************************************************************** ** - ** Copyright (C) 2016 The Qt Company Ltd. + ** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -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.0.0" Language="en-US" + <Identity Id="QtVsTools.30112013-cd02-4fd0-89bd-e36f85abe16a" Version="2.1.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> diff --git a/src/qtappwrapper/Properties/AssemblyInfo.cs b/src/qtappwrapper/Properties/AssemblyInfo.cs index 19b3e483..1f369e90 100644 --- a/src/qtappwrapper/Properties/AssemblyInfo.cs +++ b/src/qtappwrapper/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qtarchivegen/Properties/AssemblyInfo.cs b/src/qtarchivegen/Properties/AssemblyInfo.cs index ef30c3a9..5c8b103c 100644 --- a/src/qtarchivegen/Properties/AssemblyInfo.cs +++ b/src/qtarchivegen/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qtprojectlib/Properties/AssemblyInfo.cs b/src/qtprojectlib/Properties/AssemblyInfo.cs index c0e1e87a..a571ff42 100644 --- a/src/qtprojectlib/Properties/AssemblyInfo.cs +++ b/src/qtprojectlib/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] @@ -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.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] diff --git a/src/qttemplates/console/Properties/AssemblyInfo.cs b/src/qttemplates/console/Properties/AssemblyInfo.cs index 8c55b394..485ace1f 100644 --- a/src/qttemplates/console/Properties/AssemblyInfo.cs +++ b/src/qttemplates/console/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-17 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/designer/Properties/AssemblyInfo.cs b/src/qttemplates/designer/Properties/AssemblyInfo.cs index 85b93d92..fc4dad30 100644 --- a/src/qttemplates/designer/Properties/AssemblyInfo.cs +++ b/src/qttemplates/designer/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs b/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs index bd6fa273..83e3962d 100644 --- a/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs +++ b/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs b/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs index 55bfab30..b26bc081 100644 --- a/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs +++ b/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/gui/Properties/AssemblyInfo.cs b/src/qttemplates/gui/Properties/AssemblyInfo.cs index ce2f468a..f65c59cd 100644 --- a/src/qttemplates/gui/Properties/AssemblyInfo.cs +++ b/src/qttemplates/gui/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/lib/Properties/AssemblyInfo.cs b/src/qttemplates/lib/Properties/AssemblyInfo.cs index 9e48116f..69d4a199 100644 --- a/src/qttemplates/lib/Properties/AssemblyInfo.cs +++ b/src/qttemplates/lib/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs b/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs index 568bee42..8ac69ff4 100644 --- a/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs +++ b/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/resource/Properties/AssemblyInfo.cs b/src/qttemplates/resource/Properties/AssemblyInfo.cs index 7f36a2fd..8d1c23f3 100644 --- a/src/qttemplates/resource/Properties/AssemblyInfo.cs +++ b/src/qttemplates/resource/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/server/Properties/AssemblyInfo.cs b/src/qttemplates/server/Properties/AssemblyInfo.cs index c1db742a..b5ed5f7e 100644 --- a/src/qttemplates/server/Properties/AssemblyInfo.cs +++ b/src/qttemplates/server/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qttemplates/widget/Properties/AssemblyInfo.cs b/src/qttemplates/widget/Properties/AssemblyInfo.cs index 1944ac8a..2b3a7889 100644 --- a/src/qttemplates/widget/Properties/AssemblyInfo.cs +++ b/src/qttemplates/widget/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/src/qtvstools/Properties/AssemblyInfo.cs b/src/qtvstools/Properties/AssemblyInfo.cs index db203dd2..bcfaaf1a 100644 --- a/src/qtvstools/Properties/AssemblyInfo.cs +++ b/src/qtvstools/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] @@ -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.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] diff --git a/src/qtvstools/Vsix.cs b/src/qtvstools/Vsix.cs index 14124298..5c125640 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.0.0", IconResourceID = 400)] + [InstalledProductRegistration("#110", "#112", "2.1.0", IconResourceID = 400)] [ProvideMenuResource("Menus.ctmenu", 1)] [ProvideAutoLoad(Microsoft.VisualStudio.Shell.Interop.UIContextGuids.SolutionExists)] public sealed class Vsix : Package diff --git a/src/qtwizard/Properties/AssemblyInfo.cs b/src/qtwizard/Properties/AssemblyInfo.cs index 6cdaef4a..7a63a06a 100644 --- a/src/qtwizard/Properties/AssemblyInfo.cs +++ b/src/qtwizard/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Qt Company Ltd.")] [assembly: AssemblyProduct("Qt Visual Studio Tools")] -[assembly: AssemblyCopyright("Copyright (C) 2016 The Qt Company Ltd.")] +[assembly: AssemblyCopyright("Copyright (C) 2016-2017 The Qt Company Ltd.")] [assembly: AssemblyTrademark("The Qt Company Ltd. Qt and their respective logos are trademarks of The Qt Company Ltd. in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.")] [assembly: AssemblyCulture("")] diff --git a/vstools.pri b/vstools.pri index fdbbdba0..7b203feb 100644 --- a/vstools.pri +++ b/vstools.pri @@ -2,8 +2,8 @@ error("vstools.pri already included") } QTVSTOOLS_PRI = 1 -QTVSTOOLS_VERSION = 2.0.0 -QTVSTOOLS_VERSION_TAG = 200 +QTVSTOOLS_VERSION = 2.1.0 +QTVSTOOLS_VERSION_TAG = 210 defineTest(minQtVersion) { maj = $$1 |