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.Wizards/QtVsTools.Wizards.csproj | 157 +++++++++++++++++++++++-----------------------------
1 files changed, 70 insertions(+), 87 deletions(-)
diff --git a/QtVsTools.Wizards/QtVsTools.Wizards.csproj b/QtVsTools.Wizards/QtVsTools.Wizards.csproj
index 0b333de..34aa9ff 100644
--- a/QtVsTools.Wizards/QtVsTools.Wizards.csproj
+++ b/QtVsTools.Wizards/QtVsTools.Wizards.csproj
@@ -71,42 +71,43 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
<Reference Include="System" />
<Reference Include="System.Drawing" />
- <Reference Include="System.Xml.Linq" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
+ <Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="Microsoft.VisualStudio.VCCodeModel" />
- <Reference Include="Microsoft.VisualStudio.ExtensionsExplorer.UI, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(DevEnvDir)PrivateAssemblies\Microsoft.VisualStudio.ExtensionsExplorer.UI.dll</HintPath>
- </Reference>
</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="Newtonsoft.Json"
- Version="$(Version_Newtonsoft_Json)" />
+ <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>
- <ItemGroup Condition="'$(VisualStudioVersion)'=='17.0'">
- <PackageReference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)"
- Version="$(Version_Microsoft_VisualStudio_VCProjectEngine)" />
- <PackageReference Include="$(Name_Microsoft_VisualStudio_TemplateWizardInterface)"
- Version="$(Version_Microsoft_VisualStudio_TemplateWizardInterface)" />
- </ItemGroup>
- <ItemGroup Condition="'$(VisualStudioVersion)'=='16.0'">
- <Reference Include="Microsoft.VisualStudio.TemplateWizardInterface" />
- </ItemGroup>
- <ItemGroup Condition="'$(VisualStudioVersion)'=='15.0'">
- <Reference Include="Microsoft.VisualStudio.VCProjectEngine" />
- <Reference Include="Microsoft.VisualStudio.TemplateWizardInterface" />
- </ItemGroup>
+ <!--
+ /////////////////////////////////////////////////////////////////////////////////////////////////
+ // Version specific package references
+ // -->
+ <Choose>
+ <When Condition="'$(VisualStudioVersion)'=='17.0'">
+ <ItemGroup>
+ <PackageReference Include="$(Name_Microsoft_VisualStudio_TemplateWizardInterface)" Version="$(Version_Microsoft_VisualStudio_TemplateWizardInterface)" />
+ </ItemGroup>
+ </When>
+ <When Condition="'$(VisualStudioVersion)'=='16.0'">
+ <ItemGroup>
+ <PackageReference Include="$(Name_Microsoft_VisualStudio_TemplateWizardInterface)" Version="$(Version_Microsoft_VisualStudio_TemplateWizardInterface)" />
+ </ItemGroup>
+ </When>
+ <When Condition="'$(VisualStudioVersion)'=='15.0'">
+ <ItemGroup>
+ <Reference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)" />
+ <Reference Include="$(Name_Microsoft_VisualStudio_TemplateWizardInterface)" />
+ </ItemGroup>
+ </When>
+ </Choose>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////
// Solution project references
@@ -123,58 +124,47 @@
// -->
<ItemGroup>
<Content Include="Resources\QtProjectWizard.ico" />
- <Resource Include="Resources\medium.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
<Resource Include="Resources\Qt-logo-small.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
- <Resource Include="Resources\small.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Resource>
</ItemGroup>
<ItemGroup>
- <Compile Include="Wizards\ClassWizard\AddClassPage.xaml.cs">
- <DependentUpon>AddClassPage.xaml</DependentUpon>
+ <Compile Include="ItemWizard\Translation\TranslationPage.xaml.cs">
+ <DependentUpon>TranslationPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ClassWizard\AddClassWizard.cs" />
- <Compile Include="Wizards\ClassWizard\Class.cs" />
- <Compile Include="Wizards\ClassWizard\ClassKind.cs" />
- <Compile Include="Wizards\ProjectWizard\ConfigPage.xaml.cs">
+ <Compile Include="ItemWizard\Translation\TranslationWizard.cs" />
+ <Compile Include="ProjectWizard\ConfigPage.xaml.cs">
<DependentUpon>ConfigPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ProjectWizard\ProjectTemplateWizard.cs" />
- <Compile Include="Wizards\ProjectWizard\Quick\QuickWizard.cs" />
- <Compile Include="Wizards\Util\ClassNameValidationRule.cs" />
- <Compile Include="Wizards\ProjectWizard\Console\ConsoleWizard.cs" />
- <Compile Include="Wizards\ClassWizard\Core\CoreClassPage.xaml.cs">
- <DependentUpon>CoreClassPage.xaml</DependentUpon>
+ <Compile Include="ProjectWizard\ProjectTemplateWizard.cs" />
+ <Compile Include="ProjectWizard\Quick\QuickWizard.cs" />
+ <Compile Include="Util\ClassNameValidationRule.cs" />
+ <Compile Include="ProjectWizard\Console\ConsoleWizard.cs" />
+ <Compile Include="ItemWizard\QtClass\QtClassPage.xaml.cs">
+ <DependentUpon>QtClassPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ClassWizard\Core\CoreClassWizard.cs" />
- <Compile Include="Wizards\ProjectWizard\Designer\DesignerPage.xaml.cs">
+ <Compile Include="ProjectWizard\Designer\DesignerPage.xaml.cs">
<DependentUpon>DesignerPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ProjectWizard\Designer\DesignerWizard.cs" />
- <Compile Include="Wizards\Util\FileExistsInFilterValidationRule.cs" />
- <Compile Include="Wizards\Util\FileNameValidationRule.cs" />
- <Compile Include="Wizards\ClassWizard\Gui\GuiClassPage.xaml.cs">
- <DependentUpon>GuiClassPage.xaml</DependentUpon>
- </Compile>
- <Compile Include="Wizards\ClassWizard\Gui\GuiClassWizard.cs" />
- <Compile Include="Wizards\ProjectWizard\Gui\GuiPage.xaml.cs">
+ <Compile Include="ProjectWizard\Designer\DesignerWizard.cs" />
+ <Compile Include="Util\FileExistsInFilterValidationRule.cs" />
+ <Compile Include="Util\FileNameValidationRule.cs" />
+ <Compile Include="Common\GuiPage.xaml.cs">
<DependentUpon>GuiPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ProjectWizard\Gui\GuiWizard.cs" />
- <Compile Include="Wizards\ProjectWizard\Empty\EmptyWizard.cs" />
- <Compile Include="Wizards\ClassWizard\IClassWizard.cs" />
- <Compile Include="Wizards\WizardIntroPage.xaml.cs">
+ <Compile Include="ProjectWizard\Gui\GuiWizard.cs" />
+ <Compile Include="ProjectWizard\Empty\EmptyWizard.cs" />
+ <Compile Include="Common\WizardIntroPage.xaml.cs">
<DependentUpon>WizardIntroPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ProjectWizard\Library\LibraryClassPage.xaml.cs">
+ <Compile Include="ProjectWizard\Library\LibraryClassPage.xaml.cs">
<DependentUpon>LibraryClassPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ProjectWizard\Library\LibraryWizard.cs" />
- <Compile Include="Wizards\Util\NativeMethods.cs" />
+ <Compile Include="ProjectWizard\Library\LibraryWizard.cs" />
+ <Compile Include="Util\NativeMethods.cs" />
+ <Compile Include="ItemWizard\QtClass\QtClassWizard.cs" />
+ <Compile Include="ItemWizard\WidgetsClass\WidgetsClassWizard.cs" />
+ <Compile Include="Util\VCRulePropertyStorageHelper.cs" />
<T4Template Include="Properties\AssemblyInfo.cs">
<Generator>TextTemplatingFileGenerator</Generator>
<OutputFile>Properties\AssemblyInfo.tt.cs</OutputFile>
@@ -186,65 +176,58 @@
<DesignTime>True</DesignTime>
<DependentUpon>AssemblyInfo.cs</DependentUpon>
</Compile>
- <Compile Include="Wizards\ProjectWizard\Server\ServerPage.xaml.cs">
+ <Compile Include="ProjectWizard\Server\ServerPage.xaml.cs">
<DependentUpon>ServerPage.xaml</DependentUpon>
</Compile>
- <Compile Include="Wizards\ProjectWizard\Server\ServerWizard.cs" />
- <Compile Include="Wizards\Util\SortComboBoxItem.cs" />
- <Compile Include="Wizards\ClassWizard\UiClassInclusion.cs" />
- <Compile Include="Wizards\Util\UnsafeNativeMethods.cs" />
- <Compile Include="Wizards\Util\VCLanguageManagerValidationRule.cs" />
- <Compile Include="Wizards\WizardData.cs" />
- <Compile Include="Wizards\WizardPage.cs" />
- <Compile Include="Wizards\WizardResult.cs" />
- <Compile Include="Wizards\WizardWindow.xaml.cs">
+ <Compile Include="ProjectWizard\Server\ServerWizard.cs" />
+ <Compile Include="Util\UiClassInclusionConverter.cs" />
+ <Compile Include="Common\UiClassInclusion.cs" />
+ <Compile Include="Util\UnsafeNativeMethods.cs" />
+ <Compile Include="Util\VCLanguageManagerValidationRule.cs" />
+ <Compile Include="Common\WizardData.cs" />
+ <Compile Include="Common\WizardPage.cs" />
+ <Compile Include="Common\WizardResult.cs" />
+ <Compile Include="Common\WizardWindow.xaml.cs">
<DependentUpon>WizardWindow.xaml</DependentUpon>
</Compile>
- <Page Include="Wizards\ClassWizard\AddClassPage.xaml">
+ <Page Include="ItemWizard\QtClass\QtClassPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Wizards\ClassWizard\Core\CoreClassPage.xaml">
+ <Page Include="ItemWizard\Translation\TranslationPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Wizards\ProjectWizard\Designer\DesignerPage.xaml">
+ <Page Include="ProjectWizard\Designer\DesignerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Wizards\ClassWizard\Gui\GuiClassPage.xaml">
+ <Page Include="Common\GuiPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Wizards\ProjectWizard\Gui\GuiPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="Wizards\ProjectWizard\ConfigPage.xaml">
+ <Page Include="ProjectWizard\ConfigPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Wizards\WizardIntroPage.xaml">
+ <Page Include="Common\WizardIntroPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Wizards\ProjectWizard\Library\LibraryClassPage.xaml">
+ <Page Include="ProjectWizard\Library\LibraryClassPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Resources\ExpanderStyle.xaml">
+ <Page Include="ProjectWizard\Server\ServerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Wizards\ProjectWizard\Server\ServerPage.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="Wizards\WizardWindow.xaml">
+ <Page Include="Common\WizardWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\transform.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.1