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

---
 QtVsTools.Core/QtVsTools.Core.csproj |   57 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/QtVsTools.Core/QtVsTools.Core.csproj b/QtVsTools.Core/QtVsTools.Core.csproj
index c436e03..19e3727 100644
--- a/QtVsTools.Core/QtVsTools.Core.csproj
+++ b/QtVsTools.Core/QtVsTools.Core.csproj
@@ -69,36 +69,45 @@
   // -->
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <!--
   /////////////////////////////////////////////////////////////////////////////////////////////////
-  // Version specific references
+  // General package references
   // -->
   <Import Project="$(SolutionDir)\references.props" />
   <ItemGroup>
-    <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.Build"
-      Version="$(Version_Microsoft_Build)" />
+    <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)" />
   </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)" />
+        <PackageReference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)" Version="$(Version_Microsoft_VisualStudio_VCProjectEngine)" />
+      </ItemGroup>
+    </When>
+    <When Condition="'$(VisualStudioVersion)'=='15.0'">
+      <ItemGroup>
+        <Reference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)" />
+      </ItemGroup>
+    </When>
+  </Choose>
   <!--
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Solution project references
@@ -117,6 +126,8 @@
     <Compile Include="BuildConfig.cs" />
     <Compile Include="CommandLineParser.cs" />
     <Compile Include="Common\EnumExt.cs" />
+    <Compile Include="Common\LazyFactory.cs" />
+    <Compile Include="Common\QtVSIPSettingsShared.cs" />
     <Compile Include="CompilerToolWrapper.cs" />
     <Compile Include="CxxStreamReader.cs" />
     <Compile Include="ExportProjectDialog.cs">
@@ -130,12 +141,16 @@
     <Compile Include="ImageButton.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Legacy\QtProject.cs" />
+    <Compile Include="Legacy\QtVersionManager.cs" />
+    <Compile Include="Legacy\QtVSIPSettings.cs" />
     <Compile Include="LinkerToolWrapper.cs" />
     <Compile Include="MainWinWrapper.cs" />
     <Compile Include="Messages.cs" />
     <Compile Include="MocCmdChecker.cs" />
     <Compile Include="MsBuildProject.cs" />
     <Compile Include="Observable.cs" />
+    <Compile Include="OutputWindowPane.cs" />
     <Compile Include="ProFileContent.cs" />
     <Compile Include="ProFileOption.cs" />
     <Compile Include="ProjectExporter.cs" />
@@ -170,10 +185,12 @@
     <Compile Include="RccOptions.cs" />
     <Compile Include="Resources.cs" />
     <Compile Include="SR.cs" />
-    <Compile Include="TemplateType.cs" />
     <Compile Include="VersionInformation.cs" />
+    <Compile Include="VisualStudio\InfoBarMessage.cs" />
     <Compile Include="VisualStudio\IProjectTracker.cs" />
+    <Compile Include="VisualStudio\VsSearch.cs" />
     <Compile Include="VisualStudio\VsServiceProvider.cs" />
+    <Compile Include="VisualStudio\VsShell.cs" />
     <Compile Include="WaitDialog.cs" />
     <EmbeddedResource Include="ExportProjectDialog.resx">
       <DependentUpon>ExportProjectDialog.cs</DependentUpon>
@@ -188,4 +205,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\transform.targets" />
-</Project>
+</Project>
\ No newline at end of file

--
Gitblit v1.9.1