Skip to content

Commit

Permalink
Add VS2022 support
Browse files Browse the repository at this point in the history
  • Loading branch information
heku committed Nov 4, 2021
1 parent 8395b73 commit 1558972
Show file tree
Hide file tree
Showing 55 changed files with 463 additions and 173 deletions.
Binary file removed Images/CompareActiveDocumentWithClipboard.png
Binary file not shown.
Binary file removed Images/CompareSelectedFileWithClipboard.png
Binary file not shown.
Binary file removed Images/CompareSelectedFiles.png
Binary file not shown.
Binary file removed Images/CompareSelectionCodeWithClipboard.png
Binary file not shown.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
<PropertyGroup>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<UICulture>en</UICulture>
<UseCodebase>true</UseCodebase>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\Key.snk</AssemblyOriginatorKeyFile>
<NoWarn>VSTHRD010</NoWarn>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Expand All @@ -15,7 +14,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{E2FA084F-E3B3-4860-BA2B-BC0E2627895C}</ProjectGuid>
<ProjectGuid>{4EFF824C-8920-4BB0-AF4A-03D99BFEA854}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Kool.VsDiff</RootNamespace>
Expand Down Expand Up @@ -49,44 +48,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Commands\BaseCommand.cs" />
<Compile Include="Commands\DiffClipboardWithCodeCommand.cs" />
<Compile Include="Commands\DiffClipboardWithDocumentCommand.cs" />
<Compile Include="Commands\DiffSelectedFilesCommand.cs" />
<Compile Include="Commands\DiffClipboardWithFileCommand.cs" />
<Compile Include="Models\ClipboardHelper.cs" />
<Compile Include="Models\CustomDiffTool.cs" />
<Compile Include="Models\DiffToolFactory.cs" />
<Compile Include="Models\IDiffTool.cs" />
<Compile Include="Models\TempFileHelper.cs" />
<Compile Include="Models\VS.cs" />
<Compile Include="Models\VsDiffTool.cs" />
<Compile Include="Ids.cs" />
<Compile Include="Pages\VsDiffOptions.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Pages\VsDiffOptionsPage.xaml.cs">
<DependentUpon>VsDiffOptionsPage.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="VsDiffPackage.cs" />
<Compile Include="Vsix.cs" />
<Compile Include="VSPackage.Designer.cs">
<Compile Include="..\Kool.VsDiff.Linked\VSPackage.Designer.cs" Link="VSPackage.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>VSPackage.tt</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Key.snk" />
<None Include="source.extension.vsixmanifest" />
<None Include="VsDiffPackage.vsct">
<SubType>Designer</SubType>
</None>
<None Include="VSPackage.tt">
<None Include="..\Kool.VsDiff.Linked\VSPackage.tt" Link="VSPackage.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>VSPackage.Designer.cs</LastGenOutput>
<CustomToolNamespace>Kool.VsDiff</CustomToolNamespace>
</None>
</ItemGroup>
<ItemGroup>
Expand All @@ -99,54 +71,39 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Content Include="Resources\Logo.ico">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="zh-Hans\extension.vsixlangpack">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<VSCTCompile Include="VsDiffPackage.en.vsct">
<VSCTCompile Include="..\Kool.VsDiff.Linked\VsDiffPackage.en.vsct" Link="VsDiffPackage.en.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
</VSCTCompile>
<VSCTCompile Include="VsDiffPackage.zh-Hans.vsct">
<VSCTCompile Include="..\Kool.VsDiff.Linked\VsDiffPackage.zh-Hans.vsct" Link="VsDiffPackage.zh-Hans.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
</VSCTCompile>
<VSCTCompile Include="..\Kool.VsDiff.Linked\VsDiffPackage.vsct" Link="VsDiffPackage.vsct" />
<Content Include="..\Kool.VsDiff.Linked\Resources\Logo.ico" Link="Resources\Logo.ico">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="VSPackage.en.resx">
<EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.en.resx" Link="VSPackage.en.resx">
<MergeWithCTO>true</MergeWithCTO>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="VSPackage.zh-Hans.resx">
<EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.zh-Hans.resx" Link="VSPackage.zh-Hans.resx">
<MergeWithCTO>true</MergeWithCTO>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Page Include="Pages\VsDiffOptionsPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.0.81-pre" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.VSSDK.BuildTools">
<Version>16.8.3038</Version>
<Version>16.11.35</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<Import Project="..\Kool.VsDiff.Shared\Kool.VsDiff.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>
20 changes: 20 additions & 0 deletions Kool.VsDiff.2019/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?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="Kool.VsDiff.45821f83-c54b-469f-b733-0a65cfc32fe6" Version="0.0.0" Language="en-US" Publisher="Heku" />
<DisplayName>VS Diff</DisplayName>
<Description xml:space="preserve">Another open source Visual Studio extension that makes file/code comparison more easily.</Description>
<MoreInfo>https://github.com/heku/kool.vsdiff</MoreInfo>
<Icon>Resources\Logo.ico</Icon>
<Tags>heku;kool;diff;compare</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, 17.0)" />
</Installation>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
</Prerequisites>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
</PackageManifest>
116 changes: 116 additions & 0 deletions Kool.VsDiff.2022/Kool.VsDiff.2022.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?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>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Key.snk</AssemblyOriginatorKeyFile>
<NoWarn>VSTHRD010</NoWarn>
</PropertyGroup>
<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>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{E2FA084F-E3B3-4860-BA2B-BC0E2627895C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Kool.VsDiff</RootNamespace>
<AssemblyName>Kool.VsDiff</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>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Kool.VsDiff.Linked\VSPackage.Designer.cs" Link="VSPackage.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>VSPackage.tt</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="source.extension.vsixmanifest" />
<None Include="..\Kool.VsDiff.Linked\VSPackage.tt" Link="VSPackage.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>VSPackage.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Design" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<VSCTCompile Include="..\Kool.VsDiff.Linked\VsDiffPackage.en.vsct" Link="VsDiffPackage.en.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
</VSCTCompile>
<VSCTCompile Include="..\Kool.VsDiff.Linked\VsDiffPackage.zh-Hans.vsct" Link="VsDiffPackage.zh-Hans.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
</VSCTCompile>
<VSCTCompile Include="..\Kool.VsDiff.Linked\VsDiffPackage.vsct" Link="VsDiffPackage.vsct" />
<Content Include="..\Kool.VsDiff.Linked\Resources\Logo.ico" Link="Resources\Logo.ico">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.en.resx" Link="VSPackage.en.resx">
<MergeWithCTO>true</MergeWithCTO>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.zh-Hans.resx" Link="VSPackage.zh-Hans.resx">
<MergeWithCTO>true</MergeWithCTO>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup Label="Suppressed items">
<SuppressFromVsix Include="Microsoft.VisualStudio.TextTemplating.dll" Visible="false" />
<SuppressFromVsix Include="Microsoft.VisualStudio.TextTemplating.Interfaces.dll" Visible="false" />
<SuppressFromVsix Include="Microsoft.VisualStudio.TextTemplating.VSHost.dll" Visible="false" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.SDK">
<Version>17.0.0-previews-4-31709-430</Version>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools">
<Version>17.0.5322-preview5-g2cf1b9c5</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<Import Project="..\Kool.VsDiff.Shared\Kool.VsDiff.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
File renamed without changes.
22 changes: 22 additions & 0 deletions Kool.VsDiff.2022/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?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="Kool.VsDiff.0ac8776c-89a4-42fa-8194-3feb4f4d7ab8" Version="0.0.0" Language="en-US" Publisher="Heku" />
<DisplayName>VS Diff</DisplayName>
<Description xml:space="preserve">Another open source Visual Studio extension that makes file/code comparison more easily.</Description>
<MoreInfo>https://github.com/heku/kool.vsdiff</MoreInfo>
<Icon>Resources\Logo.ico</Icon>
<Tags>heku;kool;diff;compare</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
</Prerequisites>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
</PackageManifest>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
47 changes: 47 additions & 0 deletions Kool.VsDiff.Shared/Kool.VsDiff.Shared.projitems
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?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>227d4ed5-11a3-4073-b226-50fcca68846a</SharedGUID>
<UICulture>en</UICulture>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>Kool.VsDiff</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Commands\BaseCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\DiffClipboardWithCodeCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\DiffClipboardWithDocumentCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\DiffClipboardWithFileCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\DiffSelectedFilesCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Ids.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\ClipboardHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\CustomDiffTool.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\DiffToolFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\IDiffTool.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\TempFileHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\VS.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\VsDiffTool.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Pages\VsDiffOptions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Pages\VsDiffOptionsPage.xaml.cs">
<DependentUpon>VsDiffOptionsPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)VsDiffPackage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Vsix.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)zh-Hans\extension.vsixlangpack">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)Pages\VsDiffOptionsPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
</Project>
12 changes: 12 additions & 0 deletions Kool.VsDiff.Shared/Kool.VsDiff.Shared.shproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>227d4ed5-11a3-4073-b226-50fcca68846a</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<Import Project="Kool.VsDiff.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 1558972

Please sign in to comment.