Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split extension into PreVS2022 and VS2022 projects #13

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 12 additions & 53 deletions LineSorter.Export/LineSorter.Export.csproj
Original file line number Diff line number Diff line change
@@ -1,58 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7C6268A5-9C8A-4251-B26B-236432D3CD44}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LineSorter.Export</RootNamespace>
<AssemblyName>LineSorter.Export</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<Deterministic>true</Deterministic>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\SharedFiles</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Enums.cs" />
<Compile Include="IUserSort.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Row.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Key.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

</Project>
198 changes: 198 additions & 0 deletions LineSorter.PreVS2022/LineSorter.PreVS2022.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<UseCodebase>true</UseCodebase>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\SharedFiles\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{5C125593-C23E-4ADF-ADAA-8CED87AA89D4}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LineSorter</RootNamespace>
<AssemblyName>LineSorter</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<GeneratePkgDefFile>true</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<StartAction>Program</StartAction>
<StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>2</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\SharedFiles\VSPackage.cs">
<SubType>VSPackage.vs</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="..\SharedFiles\Templates\BuildAll2.log">
<Link>Templates\BuildAll2.log</Link>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>BuildAll.tt</DependentUpon>
</None>
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="..\SharedFiles\Key.snk">
<Link>Key.snk</Link>
</None>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<VSCTCompile Include="..\SharedFiles\CommandTables\VSPackage.en.vsct">
<Link>CommandTables\VSPackage.en.vsct</Link>
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
</VSCTCompile>
</ItemGroup>
<ItemGroup>
<VSCTCompile Include="..\SharedFiles\CommandTables\VSPackage.ru-RU.vsct">
<Link>CommandTables\VSPackage.ru-RU.vsct</Link>
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
</VSCTCompile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\SharedFiles\Resources\VSPackage.ru-RU.resx">
<Link>Resources\VSPackage.ru-RU.resx</Link>
<MergeWithCTO>true</MergeWithCTO>
<LogicalName>VSPackage.ru-RU.Resources</LogicalName>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedFiles\Resources\VSPackage.en.resx">
<Link>Resources\VSPackage.en.resx</Link>
<MergeWithCTO>true</MergeWithCTO>
<LogicalName>VSPackage.en.Resources</LogicalName>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="..\SharedFiles\Images\Donate Button.png">
<Link>Images\Donate Button.png</Link>
</Content>
<Content Include="..\SharedFiles\Images\Pictures.png">
<Link>Images\Pictures.png</Link>
</Content>
<Content Include="..\SharedFiles\Images\VSPackageIcon.ico">
<Link>Images\VSPackageIcon.ico</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\SharedFiles\Images\VSPackageIcon256x256.png">
<Link>Images\VSPackageIcon256x256.png</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\SharedFiles\Images\VSPackageIcon64x64.png">
<Link>Images\VSPackageIcon64x64.png</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\SharedFiles\LineSorter.Export.dll">
<Link>LineSorter.Export.dll</Link>
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\SharedFiles\Templates\CommandTable.tt">
<Link>Templates\CommandTable.tt</Link>
</Content>
<Content Include="..\SharedFiles\Templates\BuildAll.tt">
<Link>Templates\BuildAll.tt</Link>
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>BuildAll2.log</LastGenOutput>
</Content>
<Content Include="..\SharedFiles\Templates\Resource.tt">
<Link>Templates\Resource.tt</Link>
</Content>
<Content Include="..\SharedFiles\Templates\VSPackage.tt">
<Link>Templates\VSPackage.tt</Link>
</Content>
<None Include="..\SharedFiles\Templates\BuildAll.log">
<Link>Templates\BuildAll.log</Link>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>BuildAll.tt</DependentUpon>
</None>
<None Include="..\SharedFiles\Templates\Structures.ttinclude">
<Link>Templates\Structures.ttinclude</Link>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="KE.VSIX.DotNetCompilerPlatform" Version="1.2.0" />
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Threading">
<Version>15.8.209</Version>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LineSorter.Export\LineSorter.Export.csproj">
<Project>{7c6268a5-9c8a-4251-b26b-236432d3cd44}</Project>
<Name>LineSorter.Export</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\LineSorter.Shared\LineSorter.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Resources;
using System.Reflection;
using Microsoft.VisualStudio.Shell;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio.Shell;

[assembly: AssemblyVersion("5.0.0")]
[assembly: AssemblyFileVersion("5.0.0")]
[assembly: AssemblyVersion("5.0.1")]
[assembly: AssemblyFileVersion("5.0.1")]
[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]

[assembly: ProvideCodeBase]
Expand All @@ -17,4 +17,3 @@
[assembly: AssemblyDescription("LineSorter extension")]

[assembly: ComVisible(true)]

15 changes: 15 additions & 0 deletions LineSorter.PreVS2022/app.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="LineSorter.c3caf4db-92f1-4faa-b2c3-fafaddf4420b" Version="5.0" Language="en-US" Publisher="Kir_Antipov" />
<Identity Id="LineSorter.c3caf4db-92f1-4faa-b2c3-fafaddf4420b" Version="5.0.1" Language="en-US" Publisher="Kir_Antipov" />
<DisplayName>LineSorter</DisplayName>
<Description xml:space="preserve">An extension that allows you to sort rows by different criteria</Description>
<Icon>Images\VSPackageIcon256x256.png</Icon>
Expand All @@ -10,16 +10,9 @@
</Metadata>
<Installation>
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[15.0,17.0)" />
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
<Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0,18.0)" />
</Dependencies>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
Expand Down
61 changes: 61 additions & 0 deletions LineSorter.Shared/LineSorter.Shared.projitems
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>5c46ed96-d96c-45f2-911b-c3ab84e9b8df</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>LineSorter.Shared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Commands\CommandAlphSort.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\CommandAlphSortDesc.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\CommandAnchor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\CommandLengthSort.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\CommandLengthSortDesc.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\CommandRandomSort.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\CommandUserSort.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\UserSort\FormCreateFunc.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Commands\UserSort\FormCreateFunc.Designer.cs">
<DependentUpon>FormCreateFunc.cs</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Commands\UserSort\FormTestFunc.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Commands\UserSort\FormTestFunc.Designer.cs">
<DependentUpon>FormTestFunc.cs</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Commands\UserSort\LangBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Helpers\AssemblyLoader.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Helpers\NewlineType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Helpers\ResourceManager.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Helpers\SortsLoader.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Helpers\TextSelection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Options\OptionControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Options\OptionControl.Designer.cs">
<DependentUpon>OptionControl.cs</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Options\OptionPageGrid.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Options\Settings.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Commands\UserSort\FormCreateFunc.resx">
<DependentUpon>FormCreateFunc.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Commands\UserSort\FormTestFunc.resx">
<DependentUpon>FormTestFunc.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Options\OptionControl.resx">
<DependentUpon>OptionControl.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
</Project>
Loading