diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2018-11-23 18:07:43 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2018-11-28 09:45:13 +0000 |
| commit | 1ffd6fc620195523dc29173780cc92373454928a (patch) | |
| tree | d2d951b5d44820ab9de9f1cc6fe4f65dcada60f7 | |
| parent | e2445defc5a80667a4afc5f9edf1f52845f25e81 (diff) | |
Automate change of version number
Before this patch, there were 40+ different locations in the source
files where the version number was stored. The version number is now
defined in a single source file as the property $(QtVSToolsVersion).
Other sources that use the version string are then generated from
corresponding templates using the template engine included in Visual
Studio (Text Template Transformation Toolkit, or T4). Projects that
integrate with the Qt VS Tools will also have access to the version
definition property.
Change-Id: Ib3a372c6f0e0c446eef98b4fa26b58e1565bb025
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
48 files changed, 668 insertions, 65 deletions
@@ -267,3 +267,29 @@ ModelManifest.xml # FAKE - F# Make .fake/ + +# Generated Files +vstools.pri +src/config/12.0/source.extension.vsixmanifest +src/config/14.0/source.extension.vsixmanifest +src/config/15.0/source.extension.vsixmanifest +src/qtappwrapper/Properties/AssemblyInfo.tt.cs +src/qtprojectlib/Properties/AssemblyInfo.tt.cs +src/qttemplates/console/Properties/AssemblyInfo.tt.cs +src/qttemplates/designer/Properties/AssemblyInfo.tt.cs +src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.tt.cs +src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.tt.cs +src/qttemplates/gui/Properties/AssemblyInfo.tt.cs +src/qttemplates/lib/Properties/AssemblyInfo.tt.cs +src/qttemplates/mainwindow/Properties/AssemblyInfo.tt.cs +src/qttemplates/resource/Properties/AssemblyInfo.tt.cs +src/qttemplates/server/Properties/AssemblyInfo.tt.cs +src/qttemplates/widget/Properties/AssemblyInfo.tt.cs +src/qtvstools/Version.tt.cs +src/qtvstools/Properties/AssemblyInfo.tt.cs +src/qtwizard/Properties/AssemblyInfo.tt.cs +src/qttemplates/console/console.vstemplate +src/qttemplates/designer/designer.vstemplate +src/qttemplates/gui/gui.vstemplate +src/qttemplates/lib/lib.vstemplate +src/qttemplates/server/server.vstemplate diff --git a/src/QtVsTools.sln b/src/QtVsTools.sln index 0b360df5..32ebe5e8 100644 --- a/src/QtVsTools.sln +++ b/src/QtVsTools.sln @@ -80,6 +80,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "qt", "qt", "{62102FDD-016A- EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsqml", "vsqml\vsqml.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "T4 Templates", "T4 Templates", "{24A01B54-CE41-4559-8418-0723F8DF723F}" + ProjectSection(SolutionItems) = preProject + common.tt = common.tt + version.tt = version.tt + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QtVSTools Version", "QtVSTools Version", "{8307D2C5-3736-4AED-9E65-330DA4C67EA3}" + ProjectSection(SolutionItems) = preProject + version.targets = version.targets + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/common.tt b/src/common.tt new file mode 100644 index 00000000..eb604192 --- /dev/null +++ b/src/common.tt @@ -0,0 +1,41 @@ +<#@template hostspecific="true" language="C#" #> +<#@assembly Name="System.Core" #> +<#@import namespace="System" #> +<#@import namespace="System.IO" #> +<#@assembly name="EnvDTE" #> +<#@import namespace="EnvDTE" #> +<# +/**************************************************************************** +** +** Copyright (C) 2018 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$ +** +****************************************************************************/ + var Dte = ((IServiceProvider)Host).GetService(typeof(DTE)) as DTE; + string SolutionDir = Path.GetDirectoryName(Dte.Solution.FullName); +/***************************************************************************/ + string WARNING_GENERATED_FILE = "This file was generated automatically."; + string XML_COMMENT_BEGIN = "<!--"; + string XML_COMMENT_END = "-->"; +#>
\ No newline at end of file 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> diff --git a/src/qtappwrapper/Properties/AssemblyInfo.cs b/src/qtappwrapper/Properties/AssemblyInfo.cs index 36f6246d..45d75415 100644 --- a/src/qtappwrapper/Properties/AssemblyInfo.cs +++ b/src/qtappwrapper/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qtappwrapper/QtAppWrapper.csproj b/src/qtappwrapper/QtAppWrapper.csproj index ec9a5e87..d2e63d8d 100644 --- a/src/qtappwrapper/QtAppWrapper.csproj +++ b/src/qtappwrapper/QtAppWrapper.csproj @@ -45,11 +45,24 @@ <Compile Include="MessageType.cs" /> <Compile Include="NativeMethods.cs" /> <Compile Include="Program.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <Content Include="QtAppWrapper.ico" /> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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. diff --git a/src/qtmsbuild/qt_globals.targets b/src/qtmsbuild/qt_globals.targets index 11010a33..2b210b75 100644 --- a/src/qtmsbuild/qt_globals.targets +++ b/src/qtmsbuild/qt_globals.targets @@ -49,8 +49,9 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// // Qt/MSBuild global properties // --> + <Import Project="..\version.targets" Condition="Exists('..\version.targets')"/> <PropertyGroup> - <QtMsBuildVersion>2.2.1</QtMsBuildVersion> + <QtMsBuildVersion>$(QtVSToolsVersion)</QtMsBuildVersion> <QtDebug Condition="'$(QtDebug)' == ''">false</QtDebug> <QtLogFilePath Condition="'$(QtLogFilePath)' == ''" >$([System.IO.Path]::Combine($(ProjectDir),$(IntDir)qt_work.log))</QtLogFilePath> diff --git a/src/qtprojectlib/Properties/AssemblyInfo.cs b/src/qtprojectlib/Properties/AssemblyInfo.cs index dfb22281..7d866854 100644 --- a/src/qtprojectlib/Properties/AssemblyInfo.cs +++ b/src/qtprojectlib/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qtprojectlib/QtProjectLib.csproj b/src/qtprojectlib/QtProjectLib.csproj index 44f21a44..ed2c8bd5 100644 --- a/src/qtprojectlib/QtProjectLib.csproj +++ b/src/qtprojectlib/QtProjectLib.csproj @@ -65,7 +65,17 @@ <Compile Include="ProjectExporter.cs" /> <Compile Include="ProjectImporter.cs" /> <Compile Include="ProjectMacros.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> <Compile Include="ProSolution.cs" /> <Compile Include="QMake.cs" /> <Compile Include="QMakeConf.cs" /> @@ -108,6 +118,9 @@ <Reference Include="Microsoft.Build" /> <Reference Include="System.Xml.Linq" /> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="..\config\$(VisualStudioVersion)\qtvstools.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/console/Console.csproj b/src/qttemplates/console/Console.csproj index f56c7747..3ba880d6 100644 --- a/src/qttemplates/console/Console.csproj +++ b/src/qttemplates/console/Console.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <None Include="console.ico" /> @@ -61,11 +71,24 @@ <SubType>Designer</SubType> </None> <None Include="main.cpp" /> + <T4Template Include="console.vstemplate_TT"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>console.vstemplate</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>console.vstemplate</LastGenOutput> + <SubType>Designer</SubType> + </T4Template> <VSTemplate Include="console.vstemplate"> <SubType>Designer</SubType> <OutputSubPath>Qt</OutputSubPath> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>console.vstemplate_TT</DependentUpon> </VSTemplate> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/console/Properties/AssemblyInfo.cs b/src/qttemplates/console/Properties/AssemblyInfo.cs index d75e1b82..30132957 100644 --- a/src/qttemplates/console/Properties/AssemblyInfo.cs +++ b/src/qttemplates/console/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/console/console.vstemplate b/src/qttemplates/console/console.vstemplate_TT index 4c6082cb..6833b2b1 100644 --- a/src/qttemplates/console/console.vstemplate +++ b/src/qttemplates/console/console.vstemplate_TT @@ -27,6 +27,10 @@ ** $QT_END_LICENSE$ ** ***************************************************************************** +<#@output extension="vstemplate" #> +<#@include file="$(SolutionDir)\version.tt" #> + ** <#=WARNING_GENERATED_FILE#> + ***************************************************************************** --> <VSTemplate Version="3.0.0" @@ -56,7 +60,9 @@ </Project> </TemplateContent> <WizardExtension> - <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly> + <!-- BEGIN Generated Text <#=XML_COMMENT_END#> + <Assembly>QtProjectWizard, Version=<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>, Culture=neutral, PublicKeyToken=null</Assembly> + <#=XML_COMMENT_BEGIN#> END Generated Text --> <FullClassName>QtProjectWizard.ConsoleWizard</FullClassName> </WizardExtension> </VSTemplate> diff --git a/src/qttemplates/designer/Designer.csproj b/src/qttemplates/designer/Designer.csproj index e709ef50..ea5e908e 100644 --- a/src/qttemplates/designer/Designer.csproj +++ b/src/qttemplates/designer/Designer.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <None Include="designer.ico" /> @@ -61,9 +71,18 @@ <SubType>Designer</SubType> </None> <None Include="plugin.json" /> + <T4Template Include="designer.vstemplate_TT"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>designer.vstemplate</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>designer.vstemplate</LastGenOutput> + </T4Template> <VSTemplate Include="designer.vstemplate"> <SubType>Designer</SubType> <OutputSubPath>Qt</OutputSubPath> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>designer.vstemplate_TT</DependentUpon> </VSTemplate> </ItemGroup> <ItemGroup> @@ -74,6 +93,9 @@ <Content Include="widget.cpp" /> <Content Include="widget.h" /> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/designer/Properties/AssemblyInfo.cs b/src/qttemplates/designer/Properties/AssemblyInfo.cs index 1c7119ad..673b13b4 100644 --- a/src/qttemplates/designer/Properties/AssemblyInfo.cs +++ b/src/qttemplates/designer/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/designer/designer.vstemplate b/src/qttemplates/designer/designer.vstemplate_TT index 6745cca3..d7aae360 100644 --- a/src/qttemplates/designer/designer.vstemplate +++ b/src/qttemplates/designer/designer.vstemplate_TT @@ -27,6 +27,10 @@ ** $QT_END_LICENSE$ ** ***************************************************************************** +<#@output extension="vstemplate" #> +<#@include file="$(SolutionDir)\version.tt" #> + ** <#=WARNING_GENERATED_FILE#> + ***************************************************************************** --> <VSTemplate Version="3.0.0" @@ -67,7 +71,9 @@ </Project> </TemplateContent> <WizardExtension> - <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly> - <FullClassName>QtProjectWizard.DesignerWizard</FullClassName> + <!-- BEGIN Generated Text <#=XML_COMMENT_END#> + <Assembly>QtProjectWizard, Version=<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>, Culture=neutral, PublicKeyToken=null</Assembly> + <#=XML_COMMENT_BEGIN#> END Generated Text --> + <FullClassName>QtProjectWizard.DesignerWizard</FullClassName> </WizardExtension> </VSTemplate> diff --git a/src/qttemplates/dialogbuttonbottom/DialogButtonBottom.csproj b/src/qttemplates/dialogbuttonbottom/DialogButtonBottom.csproj index 5fd84c86..bfa70d23 100644 --- a/src/qttemplates/dialogbuttonbottom/DialogButtonBottom.csproj +++ b/src/qttemplates/dialogbuttonbottom/DialogButtonBottom.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <Content Include="dialogbuttonbottom.ico" /> @@ -60,6 +70,9 @@ <SubType>Designer</SubType> </VSTemplate> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs b/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs index a158deb2..6ddb675d 100644 --- a/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs +++ b/src/qttemplates/dialogbuttonbottom/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/dialogbuttonright/DialogButtonRight.csproj b/src/qttemplates/dialogbuttonright/DialogButtonRight.csproj index 9a49d5b3..407d114c 100644 --- a/src/qttemplates/dialogbuttonright/DialogButtonRight.csproj +++ b/src/qttemplates/dialogbuttonright/DialogButtonRight.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <Content Include="dialogbuttonright.ico" /> @@ -59,6 +69,9 @@ <OutputSubPath>Qt</OutputSubPath> </VSTemplate> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs b/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs index 257d2e74..5e61247b 100644 --- a/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs +++ b/src/qttemplates/dialogbuttonright/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/gui/Gui.csproj b/src/qttemplates/gui/Gui.csproj index 1898baee..323ecdaa 100644 --- a/src/qttemplates/gui/Gui.csproj +++ b/src/qttemplates/gui/Gui.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <None Include="gui.ico" /> @@ -66,11 +76,23 @@ <None Include="widget.cpp" /> <None Include="widget.h" /> <None Include="widget.ui" /> + <T4Template Include="gui.vstemplate_TT"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>gui.vstemplate</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>gui.vstemplate</LastGenOutput> + </T4Template> <VSTemplate Include="gui.vstemplate"> <SubType>Designer</SubType> <OutputSubPath>Qt</OutputSubPath> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>gui.vstemplate_TT</DependentUpon> </VSTemplate> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/gui/Properties/AssemblyInfo.cs b/src/qttemplates/gui/Properties/AssemblyInfo.cs index 35b031a0..90c26eb8 100644 --- a/src/qttemplates/gui/Properties/AssemblyInfo.cs +++ b/src/qttemplates/gui/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/gui/gui.vstemplate b/src/qttemplates/gui/gui.vstemplate_TT index b62f86c3..9d58402f 100644 --- a/src/qttemplates/gui/gui.vstemplate +++ b/src/qttemplates/gui/gui.vstemplate_TT @@ -27,6 +27,10 @@ ** $QT_END_LICENSE$ ** ***************************************************************************** +<#@output extension="vstemplate" #> +<#@include file="$(SolutionDir)\version.tt" #> + ** <#=WARNING_GENERATED_FILE#> + ***************************************************************************** --> <VSTemplate Version="3.0.0" @@ -65,7 +69,9 @@ </Project> </TemplateContent> <WizardExtension> - <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly> - <FullClassName>QtProjectWizard.GuiWizard</FullClassName> + <!-- BEGIN Generated Text <#=XML_COMMENT_END#> + <Assembly>QtProjectWizard, Version=<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>, Culture=neutral, PublicKeyToken=null</Assembly> + <#=XML_COMMENT_BEGIN#> END Generated Text --> + <FullClassName>QtProjectWizard.GuiWizard</FullClassName> </WizardExtension> </VSTemplate> diff --git a/src/qttemplates/lib/Lib.csproj b/src/qttemplates/lib/Lib.csproj index 78fdf6ab..3770bdb3 100644 --- a/src/qttemplates/lib/Lib.csproj +++ b/src/qttemplates/lib/Lib.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <None Include="lib.ico" /> @@ -60,9 +70,18 @@ <None Include="lib.vcxproj.filters"> <SubType>Designer</SubType> </None> + <T4Template Include="lib.vstemplate_TT"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>lib.vstemplate</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>lib.vstemplate</LastGenOutput> + </T4Template> <VSTemplate Include="lib.vstemplate"> <SubType>Designer</SubType> <OutputSubPath>Qt</OutputSubPath> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>lib.vstemplate_TT</DependentUpon> </VSTemplate> </ItemGroup> <ItemGroup> @@ -72,6 +91,9 @@ <Content Include="stdafx.cpp" /> <Content Include="stdafx.h" /> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/lib/Properties/AssemblyInfo.cs b/src/qttemplates/lib/Properties/AssemblyInfo.cs index 75cb4e0b..74e8b937 100644 --- a/src/qttemplates/lib/Properties/AssemblyInfo.cs +++ b/src/qttemplates/lib/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/lib/lib.vstemplate b/src/qttemplates/lib/lib.vstemplate_TT index 99f3ca06..76193879 100644 --- a/src/qttemplates/lib/lib.vstemplate +++ b/src/qttemplates/lib/lib.vstemplate_TT @@ -27,6 +27,10 @@ ** $QT_END_LICENSE$ ** ***************************************************************************** +<#@output extension="vstemplate" #> +<#@include file="$(SolutionDir)\version.tt" #> + ** <#=WARNING_GENERATED_FILE#> + ***************************************************************************** --> <VSTemplate Version="3.0.0" @@ -63,7 +67,9 @@ </Project> </TemplateContent> <WizardExtension> - <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly> - <FullClassName>QtProjectWizard.LibraryWizard</FullClassName> + <!-- BEGIN Generated Text <#=XML_COMMENT_END#> + <Assembly>QtProjectWizard, Version=<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>, Culture=neutral, PublicKeyToken=null</Assembly> + <#=XML_COMMENT_BEGIN#> END Generated Text --> + <FullClassName>QtProjectWizard.LibraryWizard</FullClassName> </WizardExtension> </VSTemplate> diff --git a/src/qttemplates/mainwindow/MainWindow.csproj b/src/qttemplates/mainwindow/MainWindow.csproj index 8d205bed..9d159309 100644 --- a/src/qttemplates/mainwindow/MainWindow.csproj +++ b/src/qttemplates/mainwindow/MainWindow.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <Content Include="mainwindow.ico" /> @@ -60,6 +70,9 @@ <SubType>Designer</SubType> </VSTemplate> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs b/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs index 72eece55..fa36a495 100644 --- a/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs +++ b/src/qttemplates/mainwindow/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/resource/Properties/AssemblyInfo.cs b/src/qttemplates/resource/Properties/AssemblyInfo.cs index 8ef1b640..f1883d4c 100644 --- a/src/qttemplates/resource/Properties/AssemblyInfo.cs +++ b/src/qttemplates/resource/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/resource/Resource.csproj b/src/qttemplates/resource/Resource.csproj index 2f92f31c..42750cea 100644 --- a/src/qttemplates/resource/Resource.csproj +++ b/src/qttemplates/resource/Resource.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <None Include="resource.qrc" /> @@ -64,6 +74,9 @@ <ItemGroup> <Content Include="resource.ico" /> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/server/Properties/AssemblyInfo.cs b/src/qttemplates/server/Properties/AssemblyInfo.cs index e1465e4c..609f6522 100644 --- a/src/qttemplates/server/Properties/AssemblyInfo.cs +++ b/src/qttemplates/server/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/server/Server.csproj b/src/qttemplates/server/Server.csproj index e60d0eda..0db95147 100644 --- a/src/qttemplates/server/Server.csproj +++ b/src/qttemplates/server/Server.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <None Include="server.ico" /> @@ -60,9 +70,18 @@ <None Include="server.vcxproj.filters"> <SubType>Designer</SubType> </None> + <T4Template Include="server.vstemplate_TT"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>server.vstemplate</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>server.vstemplate</LastGenOutput> + </T4Template> <VSTemplate Include="server.vstemplate"> <SubType>Designer</SubType> <OutputSubPath>Qt</OutputSubPath> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>server.vstemplate_TT</DependentUpon> </VSTemplate> </ItemGroup> <ItemGroup> @@ -74,6 +93,9 @@ <Content Include="stdafx.h" /> <Content Include="widget.ui" /> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qttemplates/server/server.vstemplate b/src/qttemplates/server/server.vstemplate_TT index 1b106e12..32efc59c 100644 --- a/src/qttemplates/server/server.vstemplate +++ b/src/qttemplates/server/server.vstemplate_TT @@ -27,6 +27,10 @@ ** $QT_END_LICENSE$ ** ***************************************************************************** +<#@output extension="vstemplate" #> +<#@include file="$(SolutionDir)\version.tt" #> + ** <#=WARNING_GENERATED_FILE#> + ***************************************************************************** --> <VSTemplate Version="3.0.0" @@ -69,7 +73,9 @@ </Project> </TemplateContent> <WizardExtension> - <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly> - <FullClassName>QtProjectWizard.ServerWizard</FullClassName> + <!-- BEGIN Generated Text <#=XML_COMMENT_END#> + <Assembly>QtProjectWizard, Version=<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>, Culture=neutral, PublicKeyToken=null</Assembly> + <#=XML_COMMENT_BEGIN#> END Generated Text --> + <FullClassName>QtProjectWizard.ServerWizard</FullClassName> </WizardExtension> </VSTemplate> diff --git a/src/qttemplates/widget/Properties/AssemblyInfo.cs b/src/qttemplates/widget/Properties/AssemblyInfo.cs index fde13344..ededfdc3 100644 --- a/src/qttemplates/widget/Properties/AssemblyInfo.cs +++ b/src/qttemplates/widget/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qttemplates/widget/Widget.csproj b/src/qttemplates/widget/Widget.csproj index a96740ea..91cf7755 100644 --- a/src/qttemplates/widget/Widget.csproj +++ b/src/qttemplates/widget/Widget.csproj @@ -50,7 +50,17 @@ <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <Content Include="widget.ico" /> @@ -59,6 +69,9 @@ <OutputSubPath>Qt</OutputSubPath> </VSTemplate> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/qtvstools/Properties/AssemblyInfo.cs b/src/qtvstools/Properties/AssemblyInfo.cs index b248205a..e2b10031 100644 --- a/src/qtvstools/Properties/AssemblyInfo.cs +++ b/src/qtvstools/Properties/AssemblyInfo.cs @@ -24,7 +24,11 @@ ** ** $QT_END_LICENSE$ ** -****************************************************************************/ +**************************************************************************** +<#@output extension="tt.cs" #> +<#@include file="$(SolutionDir)\version.tt" #> +** <#=WARNING_GENERATED_FILE#> +***************************************************************************/ using System.Reflection; using System.Runtime.InteropServices; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qtvstools/QtVsTools.csproj b/src/qtvstools/QtVsTools.csproj index 2771786c..86756cfc 100644 --- a/src/qtvstools/QtVsTools.csproj +++ b/src/qtvstools/QtVsTools.csproj @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="$(VisualStudioVersion)" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="$(VisualStudioVersion)" DefaultTargets="CheckT4Templates;Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(SolutionDir)\version.targets" /> + <PropertyGroup> + <VsixVersion Condition="'$(VsixVersion)' == ''">$(QtVSToolsVersion)</VsixVersion> + </PropertyGroup> <Import Project="..\config\qtvstools.version.targets" /> <PropertyGroup> <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion> @@ -83,7 +87,17 @@ <DependentUpon>FormVSQtSettings.cs</DependentUpon> </Compile> <Compile Include="ProjectQtSettings.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <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="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> <Compile Include="QMakeWrapper.cs" /> <Compile Include="QML\Classification\QmlAsyncClassifier.cs" /> <Compile Include="QML\Classification\QmlClassificationFormat.cs" /> @@ -158,7 +172,61 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> <IncludeInVSIX>true</IncludeInVSIX> </Content> - <None Include="..\config\$(VisualStudioVersion)\source.extension.vsixmanifest" /> + </ItemGroup> + <Choose> + <When Condition="'$(VisualStudioVersion)' == '15.0'"> + <ItemGroup> + <T4Template Include="..\config\15.0\source.extension.vsixmanifest_TT"> + <Link>source.extension.vsixmanifest_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\config\15.0\source.extension.vsixmanifest</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>source.extension.vsixmanifest</LastGenOutput> + </T4Template> + <None Include="..\config\15.0\source.extension.vsixmanifest"> + <Link>source.extension.vsixmanifest</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>source.extension.vsixmanifest_TT</DependentUpon> + </None> + </ItemGroup> + </When> + <When Condition="'$(VisualStudioVersion)' == '14.0'"> + <ItemGroup> + <T4Template Include="..\config\14.0\source.extension.vsixmanifest_TT"> + <Link>source.extension.vsixmanifest_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\config\14.0\source.extension.vsixmanifest</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>source.extension.vsixmanifest</LastGenOutput> + </T4Template> + <None Include="..\config\14.0\source.extension.vsixmanifest"> + <Link>source.extension.vsixmanifest</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>source.extension.vsixmanifest_TT</DependentUpon> + </None> + </ItemGroup> + </When> + <When Condition="'$(VisualStudioVersion)' == '12.0'"> + <ItemGroup> + <T4Template Include="..\config\12.0\source.extension.vsixmanifest_TT"> + <Link>source.extension.vsixmanifest_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\config\12.0\source.extension.vsixmanifest</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>source.extension.vsixmanifest</LastGenOutput> + </T4Template> + <None Include="..\config\12.0\source.extension.vsixmanifest"> + <Link>source.extension.vsixmanifest</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>source.extension.vsixmanifest_TT</DependentUpon> + </None> + </ItemGroup> + </When> + </Choose> + <ItemGroup> <Content Include="..\qtmsbuild\qtmoc.targets"> <Link>QtMsBuild\qtmoc.targets</Link> <CopyToOutputDirectory>Always</CopyToOutputDirectory> @@ -427,6 +495,9 @@ </Page> <Reference Include="System.ComponentModel.Composition" /> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="..\config\$(VisualStudioVersion)\qtvstools.targets" /> <Import Project="..\config\qtvstools.afterbuild.targets" /> @@ -438,4 +509,35 @@ </PropertyGroup> <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net45\System.Data.SQLite.Core.targets'))" /> </Target> -</Project> + <ItemGroup> + <T4Template Include="..\..\vstools.pri_TT"> + <Link>vstools.pri_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <LastGenOutput>vstools.pri</LastGenOutput> + <OutputFile>..\..\vstools.pri</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + </T4Template> + <Content Include="..\..\vstools.pri"> + <Link>vstools.pri</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>vstools.pri_TT</DependentUpon> + </Content> + </ItemGroup> + <ItemGroup> + <T4Template Include="Version.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Version.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>Version.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Version.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Version.cs</DependentUpon> + </Compile> + </ItemGroup> + <Target Name="CheckT4Templates" BeforeTargets="Build" Inputs="%(T4Template.FullPath);%(T4Template.DependsOn)" Outputs="@(T4Template->'%(OutputFile)')"> + <Error Text="T4 templates out-of-date; update by selecting "Build" > "Transform All T4 Templates"" /> + </Target> +</Project>
\ No newline at end of file diff --git a/src/qtvstools/Version.cs b/src/qtvstools/Version.cs new file mode 100644 index 00000000..2b1385c2 --- /dev/null +++ b/src/qtvstools/Version.cs @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** 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$ +** +**************************************************************************** +<#@output extension="tt.cs" #> +<#@include file="$(SolutionDir)\version.tt" #> +** <#=WARNING_GENERATED_FILE#> +**************************************************************************** +*/ + +namespace QtVsTools +{ + internal static class Version + { + public const string PRODUCT_VERSION = "<#=QT_VS_TOOLS_VERSION#>"; + } +} diff --git a/src/qtvstools/Vsix.cs b/src/qtvstools/Vsix.cs index a45799e3..1aecd180 100644 --- a/src/qtvstools/Vsix.cs +++ b/src/qtvstools/Vsix.cs @@ -41,7 +41,7 @@ namespace QtVsTools { [Guid(PackageGuid)] [PackageRegistration(UseManagedResourcesOnly = true)] - [InstalledProductRegistration("#110", "#112", "2.2.1", IconResourceID = 400)] + [InstalledProductRegistration("#110", "#112", Version.PRODUCT_VERSION, IconResourceID = 400)] [ProvideMenuResource("Menus.ctmenu", 1)] [ProvideAutoLoad(Microsoft.VisualStudio.Shell.Interop.UIContextGuids.SolutionExists)] [ProvideAutoLoad(Microsoft.VisualStudio.Shell.Interop.UIContextGuids.NoSolution)] diff --git a/src/qtwizard/Properties/AssemblyInfo.cs b/src/qtwizard/Properties/AssemblyInfo.cs index c3394332..1eb48360 100644 --- a/src/qtwizard/Properties/AssemblyInfo.cs +++ b/src/qtwizard/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; @@ -59,5 +63,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.2.1.0")] -[assembly: AssemblyFileVersion("2.2.1.0")] +[assembly: AssemblyVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY#>")] +[assembly: AssemblyFileVersion("<#=QT_VS_TOOLS_VERSION_ASSEMBLY_FILE#>")] diff --git a/src/qtwizard/QtProjectWizard.csproj b/src/qtwizard/QtProjectWizard.csproj index 0bbd9505..153fc22b 100644 --- a/src/qtwizard/QtProjectWizard.csproj +++ b/src/qtwizard/QtProjectWizard.csproj @@ -89,7 +89,17 @@ <DependentUpon>ModulePage.xaml</DependentUpon> </Compile> <Compile Include="NativeMethods.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <T4Template Include="Properties\AssemblyInfo.cs"> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile> + <DependsOn>$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput> + </T4Template> + <Compile Include="Properties\AssemblyInfo.tt.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>AssemblyInfo.cs</DependentUpon> + </Compile> <Compile Include="ServerPage.xaml.cs"> <DependentUpon>ServerPage.xaml</DependentUpon> </Compile> @@ -164,6 +174,9 @@ <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.ExtensionsExplorer.UI.dll</HintPath> </Reference> </ItemGroup> + <ItemGroup> + <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="..\config\$(VisualStudioVersion)\qtvstools.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/src/version.targets b/src/version.targets new file mode 100644 index 00000000..4f2ab9ff --- /dev/null +++ b/src/version.targets @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(QtVSToolsVersion)' == ''"> + <QtVSToolsVersion>2.2.1</QtVSToolsVersion> + </PropertyGroup> +</Project> diff --git a/src/version.tt b/src/version.tt new file mode 100644 index 00000000..ebb2da84 --- /dev/null +++ b/src/version.tt @@ -0,0 +1,46 @@ +<#@include file="$(SolutionDir)\common.tt" #> +<#@ assembly name="System.Core" #> +<#@ assembly name="System.Xml" #> +<#@ assembly name="System.Xml.Linq" #> +<#@ assembly name="System.Linq" #> +<#@ assembly name="System.Data.Linq" #> +<#@ import namespace="System.Linq" #> +<#@ import namespace="System.Xml" #> +<#@ import namespace="System.Xml.Linq" #> +<# +/**************************************************************************** +** +** Copyright (C) 2018 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$ +** +****************************************************************************/ + string QT_VS_TOOLS_VERSION = (string)XDocument.Load(SolutionDir + @"\version.targets") + .Descendants() + .Where(x => x.Name.LocalName == "QtVSToolsVersion") + .FirstOrDefault(); +/***************************************************************************/ + string QT_VS_TOOLS_VERSION_TAG = QT_VS_TOOLS_VERSION.Replace(".", ""); + string QT_VS_TOOLS_VERSION_ASSEMBLY = QT_VS_TOOLS_VERSION + ".0"; + string QT_VS_TOOLS_VERSION_ASSEMBLY_FILE = QT_VS_TOOLS_VERSION + ".0"; +#>
\ No newline at end of file diff --git a/vstools.pri b/vstools.pri_TT index 5bbceae0..145fe777 100644 --- a/vstools.pri +++ b/vstools.pri_TT @@ -1,9 +1,14 @@ +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +# <#@output extension="pri" #> +# <#@include file="$(SolutionDir)\version.tt" #> +# <#=WARNING_GENERATED_FILE#> +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # !isEmpty(QTVSOOLS_PRI) { error("vstools.pri already included") } QTVSTOOLS_PRI = 1 -QTVSTOOLS_VERSION = 2.2.1 -QTVSTOOLS_VERSION_TAG = 221 +QTVSTOOLS_VERSION = <#=QT_VS_TOOLS_VERSION#> +QTVSTOOLS_VERSION_TAG = <#=QT_VS_TOOLS_VERSION_TAG#> defineTest(minQtVersion) { maj = $$1 |