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.Package/QtVsTools.Package.csproj | 166 +++++++++++++++++++++++++++++-------------------------
1 files changed, 89 insertions(+), 77 deletions(-)
diff --git a/QtVsTools.Package/QtVsTools.Package.csproj b/QtVsTools.Package/QtVsTools.Package.csproj
index 270b6c9..e57b845 100644
--- a/QtVsTools.Package/QtVsTools.Package.csproj
+++ b/QtVsTools.Package/QtVsTools.Package.csproj
@@ -90,59 +90,45 @@
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
+ <Reference Include="System.ComponentModel.Composition" />
+ <Reference Include="System.Xaml" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="WindowsBase" />
- <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)"
- GeneratePathProperty="true" />
- <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)" />
+ <PackageReference Include="$(Name_Newtonsoft_Json)" Version="$(Version_Newtonsoft_Json)" />
+ <PackageReference Include="$(Name_Stub_System_Data_SQLite_Core_NetFramework)" Version="$(Version_Stub_System_Data_SQLite_Core_NetFramework)" GeneratePathProperty="true" />
+ <PackageReference Include="$(Name_Microsoft_VisualStudio_Shell_15)" Version="$(Version_Microsoft_VisualStudio_Shell_15)" />
</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>
+ </ItemGroup>
+ </When>
+ <When Condition="'$(VisualStudioVersion)'=='15.0'">
+ <ItemGroup>
+ <Reference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)" />
+ <PackageReference Include="$(Name_Microsoft_VisualStudio_Shell_Framework)" Version="$(Version_Microsoft_VisualStudio_Shell_Framework)" />
+ </ItemGroup>
+ </When>
+ </Choose>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////
// Solution project references
@@ -173,6 +159,27 @@
<Project>{4cee73c9-fcfa-3a72-a0a3-036bdbb3240f}</Project>
<Name>qrceditor</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\Templates\qtclass\QtTemplate.Item.QtClass.csproj">
+ <Project>{4981AAE8-9AC7-4758-87EA-FB2397D6C404}</Project>
+ <Name>QtTemplate.Item.QtClass</Name>
+ <VSIXSubPath>ItemTemplates</VSIXSubPath>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+ </ProjectReference>
+ <ProjectReference Include="..\Templates\translation\QtTemplate.Item.Translation.csproj">
+ <Project>{202F4A6D-77CD-4992-AA53-01B585463287}</Project>
+ <Name>QtTemplate.Item.Translation</Name>
+ <VSIXSubPath>ItemTemplates</VSIXSubPath>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+ </ProjectReference>
+ <ProjectReference Include="..\Templates\widgetsclass\QtTemplate.Item.WidgetsClass.csproj">
+ <Project>{020422DA-33AB-4495-A439-7DAC2690795C}</Project>
+ <Name>QtTemplate.Item.WidgetsClass</Name>
+ <VSIXSubPath>ItemTemplates</VSIXSubPath>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
</ProjectReference>
<ProjectReference Include="..\vsqml\vsqml.vcxproj">
<Project>{b12702ad-abfb-343a-a199-8e24837244a3}</Project>
@@ -303,6 +310,12 @@
<DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn>
<LastGenOutput>AssemblyInfo.tt.cs</LastGenOutput>
</T4Template>
+ <Compile Include="Legacy\ProjectQtSettings.cs" />
+ <Compile Include="Legacy\QtMenu.cs" />
+ <Compile Include="Legacy\QtOptionsPage.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="Legacy\Translation.cs" />
<Compile Include="Properties\AssemblyInfo.tt.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -321,15 +334,11 @@
<DesignTime>True</DesignTime>
<DependentUpon>QtMenus.vsct_TT</DependentUpon>
</VSCTCompile>
- <Content Include="Resources\Vsix.ico" />
<EmbeddedResource Include="VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
- <Compile Include="Package\AddTranslationDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Package\ChangeFor.cs" />
+ <Compile Include="Legacy\ChangeFor.cs" />
<Compile Include="Common\Concurrent.cs" />
<Compile Include="Common\ConcurrentStopwatch.cs" />
<Compile Include="Common\Disposable.cs" />
@@ -348,20 +357,17 @@
<Compile Include="Editors\Editor.QtLinguist.cs" />
<Compile Include="Editors\Editor.QtResourceEditor.cs" />
<Compile Include="Package\ExtLoader.cs" />
- <Compile Include="Package\FormChangeQtVersion.cs">
+ <Compile Include="Legacy\FormChangeQtVersion.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Package\FormChangeQtVersion.Designer.cs">
+ <Compile Include="Legacy\FormChangeQtVersion.Designer.cs">
<DependentUpon>FormChangeQtVersion.cs</DependentUpon>
</Compile>
- <Compile Include="Package\FormProjectQtSettings.cs">
+ <Compile Include="Legacy\FormProjectQtSettings.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Package\FormProjectQtSettings.Designer.cs">
+ <Compile Include="Legacy\FormProjectQtSettings.Designer.cs">
<DependentUpon>FormProjectQtSettings.cs</DependentUpon>
- </Compile>
- <Compile Include="Options\QtLegacyOptionsPage.cs">
- <SubType>Component</SubType>
</Compile>
<Compile Include="Options\QtOptionsPage.cs">
<SubType>Component</SubType>
@@ -372,7 +378,6 @@
<Compile Include="Options\QtVersionsPage.cs">
<SubType>Component</SubType>
</Compile>
- <Compile Include="Package\ProjectQtSettings.cs" />
<Compile Include="Package\QMakeWrapper.cs" />
<Compile Include="QML\Classification\QmlAsyncClassifier.cs" />
<Compile Include="QML\Classification\QmlClassificationFormat.cs" />
@@ -437,9 +442,7 @@
<Compile Include="Package\QtSolutionContextMenu.cs" />
<Compile Include="Package\SR.cs" />
<Compile Include="Package\Translation.cs" />
- <Compile Include="Package\TranslationItem.cs" />
- <Compile Include="VisualStudio\VsShell.cs" />
- <Compile Include="Common\VsToolsDialogWindow.cs" />
+ <Compile Include="Package\Notifications.cs" />
<Content Include="..\Changelog">
<Link>Changelog</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -456,6 +459,9 @@
<DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn>
<LastGenOutput>source.extension.vsixmanifest</LastGenOutput>
</T4Template>
+ <Content Include="Icons\Monikers.imagemanifest">
+ <IncludeInVSIX>true</IncludeInVSIX>
+ </Content>
<None Include="source.extension.vsixmanifest">
<DependentUpon>source.extension.vsixmanifest_TT</DependentUpon>
<SubType>Designer</SubType>
@@ -473,6 +479,16 @@
<DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn>
<LastGenOutput>Overview.html</LastGenOutput>
</T4Template>
+ <Content Include="QtVsTools.Icons.pkgdef">
+ <IncludeInVSIX>true</IncludeInVSIX>
+ </Content>
+ <Resource Include="Icons\prf32.png" />
+ <Resource Include="Icons\pri32.png" />
+ <Resource Include="Icons\pro32.png" />
+ <Resource Include="Icons\qml32.png" />
+ <Resource Include="Icons\qrc32.png" />
+ <Resource Include="Icons\ts32.png" />
+ <Resource Include="Icons\ui32.png" />
<Content Include="Marketplace\Overview.html">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -499,6 +515,10 @@
<IncludeInVSIX>true</IncludeInVSIX>
<SubType>Designer</SubType>
</Content>
+ <Content Include="qt6modules.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <IncludeInVSIX>true</IncludeInVSIX>
+ </Content>
<Content Include="QtVsTools.ico" />
<Content Include="QtVsTools.Qml.Debug.pkgdef">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -509,14 +529,12 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
- <EmbeddedResource Include="Package\AddTranslationDialog.resx">
- <DependentUpon>AddTranslationDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Package\FormChangeQtVersion.resx">
+ <EmbeddedResource Include="Legacy\FormChangeQtVersion.resx">
<DependentUpon>FormChangeQtVersion.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Package\FormProjectQtSettings.resx">
+ <EmbeddedResource Include="Legacy\FormProjectQtSettings.resx">
<DependentUpon>FormProjectQtSettings.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources.resx">
<SubType>Designer</SubType>
@@ -546,8 +564,8 @@
</Page>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(SolutionDir)\transform.targets" />
+ <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<Target Name="QtVsTools_PostBuild" AfterTargets="Build">
<Error Condition="!Exists('$(TargetPath)')" Text="Build failed." />
<PropertyGroup>
@@ -602,19 +620,13 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
// NuGet native libs
// -->
- <PropertyGroup
- Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' != ''">
- <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''"
- >$(PkgStub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
+ <PropertyGroup Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' != ''">
+ <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''">$(PkgStub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
</PropertyGroup>
- <PropertyGroup
- Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' == ''">
- <NuGetGlobalPkgDir Condition="'$(NuGetGlobalPkgDir)' == ''"
- >$(USERPROFILE)\.nuget\packages</NuGetGlobalPkgDir>
- <SQLitePkgRoot
- >$(NuGetGlobalPkgDir)\Stub.System.Data.SQLite.Core.NetFramework</SQLitePkgRoot>
- <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''"
- >$(SQLitePkgRoot)\$(Version_Stub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
+ <PropertyGroup Condition="'$(PkgStub_System_Data_SQLite_Core_NetFramework)' == ''">
+ <NuGetGlobalPkgDir Condition="'$(NuGetGlobalPkgDir)' == ''">$(USERPROFILE)\.nuget\packages</NuGetGlobalPkgDir>
+ <SQLitePkgRoot>$(NuGetGlobalPkgDir)\Stub.System.Data.SQLite.Core.NetFramework</SQLitePkgRoot>
+ <SQLitePkgDir Condition="'$(SQLitePkgDir)' == ''">$(SQLitePkgRoot)\$(Version_Stub_System_Data_SQLite_Core_NetFramework)</SQLitePkgDir>
</PropertyGroup>
<ItemGroup>
<Content Include="$(SQLitePkgDir)\build\net46\x64\SQLite.Interop.dll">
--
Gitblit v1.9.1