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
---
QtVsTest/QtVsTest.csproj | 94 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/QtVsTest/QtVsTest.csproj b/QtVsTest/QtVsTest.csproj
index c1c2aa4..d9a4894 100644
--- a/QtVsTest/QtVsTest.csproj
+++ b/QtVsTest/QtVsTest.csproj
@@ -2,7 +2,7 @@
<!--
/****************************************************************************
**
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt VS Tools.
@@ -69,6 +69,8 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget Condition="'$(VisualStudioVersion)' == '17.0'">x64</PlatformTarget>
+ <PlatformTarget Condition="'$(VisualStudioVersion)' != '17.0'">x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -87,55 +89,36 @@
<Reference Include="System" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
- <Reference Include="Microsoft.VisualStudio.ProjectSystem">
- <HintPath>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\Project\Microsoft.VisualStudio.ProjectSystem.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.Composition">
- <HintPath>$(VsInstallRoot)\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
- </Reference>
</ItemGroup>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////
- // Version specific references
+ // General package references
// -->
<Import Project="$(SolutionDir)\references.props" />
<ItemGroup>
- <PackageReference Include="System.ComponentModel.Composition"
- Version="$(Version_System_ComponentModel_Composition)" />
- <PackageReference Include="Stub.System.Data.SQLite.Core.NetFramework"
- Version="$(Version_Stub_System_Data_SQLite_Core_NetFramework)" />
- <PackageReference Include="Newtonsoft.Json"
- Version="$(Version_Newtonsoft_Json)" />
- <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.VisualStudio.SDK"
- Version="$(Version_Microsoft_VisualStudio_SDK)" ExcludeAssets="runtime" />
- <PackageReference Include="Microsoft.VSSDK.BuildTools"
- Version="$(Version_Microsoft_VSSDK_BuildTools)" />
- <PackageReference Include="Microsoft.VisualStudio.Shell.Framework"
- Version="$(Version_Microsoft_VisualStudio_Shell_Framework)" />
- <PackageReference Include="Microsoft.VisualStudio.Validation"
- Version="$(Version_Microsoft_VisualStudio_Validation)" />
- <PackageReference Include="$(Name_Microsoft_VisualStudio_Threading)"
- Version="$(Version_Microsoft_VisualStudio_Threading)" />
- <PackageReference Include="System.Collections.Immutable"
- Version="$(Version_System_Collections_Immutable)" />
+ <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_VisualStudio_ProjectSystem)" Version="$(Version_Microsoft_VisualStudio_ProjectSystem)" />
</ItemGroup>
- <ItemGroup Condition="'$(VisualStudioVersion)'=='17.0'">
- <PackageReference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)"
- Version="$(Version_Microsoft_VisualStudio_VCProjectEngine)" />
- </ItemGroup>
- <ItemGroup Condition="'$(VisualStudioVersion)'=='16.0'">
- <PackageReference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)"
- Version="$(Version_Microsoft_VisualStudio_VCProjectEngine)" />
- </ItemGroup>
- <ItemGroup Condition="'$(VisualStudioVersion)'=='15.0'">
- <Reference Include="Microsoft.VisualStudio.VCProjectEngine" />
- </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>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////
// Solution project references
@@ -210,6 +193,26 @@
</Content>
</ItemGroup>
<Choose>
+ <When Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.22000.0')">
+ <PropertyGroup>
+ <Win10SDKPath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.22000.0</Win10SDKPath>
+ </PropertyGroup>
+ </When>
+ <When Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.20348.0')">
+ <PropertyGroup>
+ <Win10SDKPath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.20348.0</Win10SDKPath>
+ </PropertyGroup>
+ </When>
+ <When Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.19041.0')">
+ <PropertyGroup>
+ <Win10SDKPath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.19041.0</Win10SDKPath>
+ </PropertyGroup>
+ </When>
+ <When Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.18362.0')">
+ <PropertyGroup>
+ <Win10SDKPath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.18362.0</Win10SDKPath>
+ </PropertyGroup>
+ </When>
<When Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0')">
<PropertyGroup>
<Win10SDKPath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0</Win10SDKPath>
@@ -232,7 +235,7 @@
</When>
</Choose>
<PropertyGroup Condition="'$(Win10SDKPath)' != ''">
- <UIAVerifyPath>$(Win10SDKPath)\x86\UIAVerify</UIAVerifyPath>
+ <UIAVerifyPath>$(Win10SDKPath)\$(PlatformTarget)\UIAVerify</UIAVerifyPath>
</PropertyGroup>
<ItemGroup Condition="'$(UIAVerifyPath)' != ''">
<Reference Include="Interop.UIAutomationClient">
@@ -246,9 +249,6 @@
<Aliases>global</Aliases>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
- </ItemGroup>
- <ItemGroup>
- <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\transform.targets" />
--
Gitblit v1.9.1