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
---
QtMSBuild/QtMSBuild.csproj | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/QtMSBuild/QtMSBuild.csproj b/QtMSBuild/QtMSBuild.csproj
index 5898f7f..6f5d35c 100644
--- a/QtMSBuild/QtMSBuild.csproj
+++ b/QtMSBuild/QtMSBuild.csproj
@@ -67,24 +67,42 @@
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
<Reference Include="System" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Runtime" />
<Reference Include="$(VCTargetsPath)\Application Type\Linux\1.0\Microsoft.Build.Linux.Tasks.dll" />
<Reference Include="$(VCTargetsPath)\Application Type\Linux\1.0\liblinux.dll" />
</ItemGroup>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////
- // Version specific references
+ // General package references
// -->
<Import Project="$(SolutionDir)\references.props" />
<ItemGroup>
- <PackageReference Include="Microsoft.Build"
- Version="$(Version_Microsoft_Build)" />
- <PackageReference Include="Microsoft.Build.Framework"
- Version="$(Version_Microsoft_Build_Framework)" />
- <PackageReference Include="Microsoft.Build.Tasks.Core"
- Version="$(Version_Microsoft_Build_Tasks_Core)" />
- <PackageReference Include="Microsoft.Bcl.AsyncInterfaces"
- Version="$(Version_Microsoft_Bcl_AsyncInterfaces)" />
+ <PackageReference Include="$(Name_Microsoft_VSSDK_BuildTools)" Version="$(Version_Microsoft_VSSDK_BuildTools)" />
+ <PackageReference Include="$(Name_Microsoft_VisualStudio_SDK)" Version="$(Version_Microsoft_VisualStudio_SDK)" ExcludeAssets="runtime" />
+ <PackageReference Include="$(Name_Microsoft_Build)" Version="$(Version_Microsoft_Build)" />
+ <PackageReference Include="$(Name_Microsoft_Build_Tasks_Core)" Version="$(Version_Microsoft_Build_Tasks_Core)" />
</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)" />
+ <PackageReference Include="$(Name_Microsoft_VisualStudio_RpcContracts)" Version="$(Version_Microsoft_VisualStudio_RpcContracts)" />
+ </ItemGroup>
+ </When>
+ <When Condition="'$(VisualStudioVersion)'=='15.0'">
+ <ItemGroup>
+ </ItemGroup>
+ </When>
+ </Choose>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////
// Solution project references
@@ -112,6 +130,12 @@
<DesignTime>True</DesignTime>
<DependentUpon>AssemblyInfo.cs</DependentUpon>
</Compile>
+ <Content Include="QtMSBuild\qt5.natvis.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="QtMSBuild\qt6.natvis.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<!--
///////////////////////////////////////////////////////////////////////////////////////////////
// Qt/MSBuild common property pages and targets
@@ -145,6 +169,10 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="QtMSBuild\qt_vars.targets">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="QtMSBuild\qt_inner.targets">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -380,6 +408,7 @@
// Inline tasks
// -->
<Compile Include="Tasks\CriticalSection.cs" />
+ <Compile Include="Tasks\QtRunTask.cs" />
<Compile Include="Tasks\GetVarsFromMSBuild.cs" />
<Compile Include="Tasks\HostExec_LinuxWSL_Error.cs" />
<Compile Include="Tasks\HostTranslatePaths_LinuxWSL_Error.cs" />
--
Gitblit v1.9.1