Skip to content

Add support vor VS 2026 #62

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.

Sign up for GitHub

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

Open
jannikbecker wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support vor VS 2026 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87680eb
Add VS2026 support
jannikbecker Jan 13, 2026
6db8b54
Update version number
jannikbecker Jan 13, 2026
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
9 changes: 9 additions & 0 deletions build_v18.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@echo off
cls
IF NOT EXIST "tools/FAKE" (
"tools/nuget/nuget.exe" "install" "FAKE" "-OutputDirectory" "tools" "-ExcludeVersion"
)

"tools/FAKE/tools/Fake.exe" "build/build.fsx" "VisualStudioVersion=18.0"
pause
exit /b %errorlevel%
Binary file added lib/18.0/Microsoft.TeamFoundation.Client.dll
View file
Open in desktop
Binary file not shown.
Binary file added lib/18.0/Microsoft.TeamFoundation.Common.dll
View file
Open in desktop
Binary file not shown.
Binary file added lib/18.0/Microsoft.TeamFoundation.Controls.dll
View file
Open in desktop
Binary file not shown.
Binary file added lib/18.0/Microsoft.TeamFoundation.VersionControl.Client.dll
View file
Open in desktop
Binary file not shown.
Binary file added lib/18.0/Microsoft.TeamFoundation.VersionControl.Common.dll
View file
Open in desktop
Binary file not shown.
Binary file added lib/18.0/Microsoft.TeamFoundation.WorkItemTracking.Client.dll
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion src/AutoMerge.Tests/AutoMerge.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework Condition="'$(VisualStudioVersion)' == '18.0'">net48</TargetFramework>
<TargetFramework Condition="'$(VisualStudioVersion)' == '17.0'">net48</TargetFramework>
<TargetFramework Condition="'$(VisualStudioVersion)' == '16.0'">net472</TargetFramework>
</PropertyGroup>
Expand All @@ -11,4 +12,4 @@
<ItemGroup>
<ProjectReference Include="..\AutoMerge\AutoMerge.csproj" />
</ItemGroup>
</Project>
</Project>
6 changes: 4 additions & 2 deletions src/AutoMerge/AutoMerge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<StartAction>Program</StartAction>
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
Expand All @@ -21,6 +22,7 @@
<AssemblyName>AutoMerge</AssemblyName>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '18.0'">v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '17.0'">v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '16.0'">v4.7.2</TargetFrameworkVersion>
</PropertyGroup>
Expand Down Expand Up @@ -84,8 +86,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(VisualStudioVersion).*" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="$(VisualStudioVersion).*" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.*" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.*" ExcludeAssets="runtime" />
</ItemGroup>
<ItemGroup>
<Compile Include="AutoMergeNavigationItem.cs" />
Expand Down
53 changes: 28 additions & 25 deletions src/AutoMerge/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<?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="AutoMerge.VS2019.F05BAC3E-6794-4A9E-9EE7-1B8A200778EE" Version="0.2.6.10" Language="en-US" Publisher="Kulikov Denis" />
<DisplayName>Auto Merge for Visual Studio 2022</DisplayName>
<Description>Easy way to merge changeset</Description>
<License>LICENSE.txt</License>
<ReleaseNotes>https://github.com/CDuke/AutoMerge/blob/master/RELEASE_NOTES.md</ReleaseNotes>
<Icon>Resources/merge.png</Icon>
<PreviewImage>Resources/preview.png</PreviewImage>
<Tags>merge code, merge, merging, branch, changeset, merge by work item, tfs</Tags>
</Metadata>
<Installation InstalledByMsi="false">
<InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
<Dependency d:Source="Installed" Version="[17.0,18.0)" Id="Microsoft.VisualStudio.MPF.17.0" DisplayName="Visual Studio MPF 17.0" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
</Assets>
<Metadata>
<Identity Id="AutoMerge.VS2026.F05BAC3E-6794-4A9E-9EE7-1B8A200778EE" Version="0.2.6.11" Language="en-US" Publisher="Kulikov Denis" />
<DisplayName>Auto Merge for Visual Studio 2026</DisplayName>
<Description xml:space="preserve">Easy way to merge changeset</Description>
<License>LICENSE.txt</License>
<ReleaseNotes>https://github.com/CDuke/AutoMerge/blob/master/RELEASE_NOTES.md</ReleaseNotes>
<Icon>Resources/merge.png</Icon>
<PreviewImage>Resources/preview.png</PreviewImage>
<Tags>merge code, merge, merging, branch, changeset, merge by work item, tfs</Tags>
</Metadata>
<Installation InstalledByMsi="false">
<InstallationTarget Version="[18.0, 19.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[18.0, 19.0)" Id="Microsoft.VisualStudio.Enterprise">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
<Dependency d:Source="Installed" Version="[17.0,18.0)" Id="Microsoft.VisualStudio.MPF.17.0" DisplayName="Visual Studio MPF 17.0" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[18.0,19.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
32 changes: 32 additions & 0 deletions src/AutoMerge/source.vs18.0.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?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="AutoMerge.VS2026.F05BAC3E-6794-4A9E-9EE7-1B8A200778EE" Version="0.2.6.11" Language="en-US" Publisher="Kulikov Denis" />
<DisplayName>Auto Merge for Visual Studio 2026</DisplayName>
<Description xml:space="preserve">Easy way to merge changeset</Description>
<License>LICENSE.txt</License>
<ReleaseNotes>https://github.com/CDuke/AutoMerge/blob/master/RELEASE_NOTES.md</ReleaseNotes>
<Icon>Resources/merge.png</Icon>
<PreviewImage>Resources/preview.png</PreviewImage>
<Tags>merge code, merge, merging, branch, changeset, merge by work item, tfs</Tags>
</Metadata>
<Installation InstalledByMsi="false">
<InstallationTarget Version="[18.0, 19.0)" Id="Microsoft.VisualStudio.Pro">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Version="[18.0, 19.0)" Id="Microsoft.VisualStudio.Enterprise">
<ProductArchitecture>amd64</ProductArchitecture>
</InstallationTarget>
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
<Dependency d:Source="Installed" Version="[17.0,18.0)" Id="Microsoft.VisualStudio.MPF.17.0" DisplayName="Visual Studio MPF 17.0" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[18.0,19.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>