From ca47896204482bf4a6979e3838bf7f09f61cebeb Mon Sep 17 00:00:00 2001 From: giy <giy@omp-system.ru> Date: Fri, 02 Sep 2022 14:16:56 +0300 Subject: [PATCH] Обновление до версии 2.9.0 --- Templates/gui/QtTemplate.Project.Gui.csproj | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 16 deletions(-) diff --git a/Templates/gui/QtTemplate.Project.Gui.csproj b/Templates/gui/QtTemplate.Project.Gui.csproj index 1b373ae..09a9d4f 100644 --- a/Templates/gui/QtTemplate.Project.Gui.csproj +++ b/Templates/gui/QtTemplate.Project.Gui.csproj @@ -76,16 +76,45 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Global references + // --> <ItemGroup> - <Reference Include="Microsoft.VisualStudio.CoreUtility"> - <Private>False</Private> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> </ItemGroup> + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// + // General package references + // --> + <Import Project="$(SolutionDir)\references.props" /> + <ItemGroup> + <PackageReference Include="$(Name_Microsoft_VSSDK_BuildTools)" Version="$(Version_Microsoft_VSSDK_BuildTools)" /> + <PackageReference Include="$(Name_Microsoft_VisualStudio_SDK)" Version="$(Version_Microsoft_VisualStudio_SDK)" ExcludeAssets="runtime" /> + </ItemGroup> + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Version specific package references + // --> + <Choose> + <When Condition="'$(VisualStudioVersion)'=='17.0'"> + <ItemGroup> + </ItemGroup> + </When> + <When Condition="'$(VisualStudioVersion)'=='16.0'"> + <ItemGroup> + <PackageReference Include="$(Name_Microsoft_VisualStudio_Validation)" Version="$(Version_Microsoft_VisualStudio_Validation)" /> + </ItemGroup> + </When> + <When Condition="'$(VisualStudioVersion)'=='15.0'"> + <ItemGroup> + </ItemGroup> + </When> + </Choose> + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Project items + // --> <ItemGroup> <T4Template Include="Properties\AssemblyInfo.cs"> <Generator>TextTemplatingFileGenerator</Generator> @@ -108,6 +137,7 @@ <SubType>Designer</SubType> </None> <None Include="main.cpp" /> + <None Include="widget.qrc" /> <None Include="stdafx.cpp" /> <None Include="stdafx.h" /> <None Include="widget.cpp" /> @@ -130,13 +160,6 @@ </VSTemplate> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(SolutionDir)\transform.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. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project> + <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> +</Project> \ No newline at end of file -- Gitblit v1.9.1