diff --git a/build_v18.bat b/build_v18.bat new file mode 100644 index 0000000..d47ae0d --- /dev/null +++ b/build_v18.bat @@ -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% \ No newline at end of file diff --git a/lib/18.0/Microsoft.TeamFoundation.Client.dll b/lib/18.0/Microsoft.TeamFoundation.Client.dll new file mode 100644 index 0000000..e3ccd35 Binary files /dev/null and b/lib/18.0/Microsoft.TeamFoundation.Client.dll differ diff --git a/lib/18.0/Microsoft.TeamFoundation.Common.dll b/lib/18.0/Microsoft.TeamFoundation.Common.dll new file mode 100644 index 0000000..d3a0d35 Binary files /dev/null and b/lib/18.0/Microsoft.TeamFoundation.Common.dll differ diff --git a/lib/18.0/Microsoft.TeamFoundation.Controls.dll b/lib/18.0/Microsoft.TeamFoundation.Controls.dll new file mode 100644 index 0000000..feec36b Binary files /dev/null and b/lib/18.0/Microsoft.TeamFoundation.Controls.dll differ diff --git a/lib/18.0/Microsoft.TeamFoundation.VersionControl.Client.dll b/lib/18.0/Microsoft.TeamFoundation.VersionControl.Client.dll new file mode 100644 index 0000000..50793ea Binary files /dev/null and b/lib/18.0/Microsoft.TeamFoundation.VersionControl.Client.dll differ diff --git a/lib/18.0/Microsoft.TeamFoundation.VersionControl.Common.dll b/lib/18.0/Microsoft.TeamFoundation.VersionControl.Common.dll new file mode 100644 index 0000000..b28ef40 Binary files /dev/null and b/lib/18.0/Microsoft.TeamFoundation.VersionControl.Common.dll differ diff --git a/lib/18.0/Microsoft.TeamFoundation.WorkItemTracking.Client.dll b/lib/18.0/Microsoft.TeamFoundation.WorkItemTracking.Client.dll new file mode 100644 index 0000000..1e20c15 Binary files /dev/null and b/lib/18.0/Microsoft.TeamFoundation.WorkItemTracking.Client.dll differ diff --git a/src/AutoMerge.Tests/AutoMerge.Tests.csproj b/src/AutoMerge.Tests/AutoMerge.Tests.csproj index 7bb261d..047206b 100644 --- a/src/AutoMerge.Tests/AutoMerge.Tests.csproj +++ b/src/AutoMerge.Tests/AutoMerge.Tests.csproj @@ -1,6 +1,7 @@ + net48 net48 net472 @@ -11,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/AutoMerge/AutoMerge.csproj b/src/AutoMerge/AutoMerge.csproj index 385825e..2b856e5 100644 --- a/src/AutoMerge/AutoMerge.csproj +++ b/src/AutoMerge/AutoMerge.csproj @@ -3,6 +3,7 @@ $(VisualStudioVersion) 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) Program $(DevEnvDir)\devenv.exe /rootsuffix Exp @@ -21,6 +22,7 @@ AutoMerge True Key.snk + v4.8 v4.8 v4.7.2 @@ -84,8 +86,8 @@ - - + + diff --git a/src/AutoMerge/source.extension.vsixmanifest b/src/AutoMerge/source.extension.vsixmanifest index 3e21269..42639c5 100644 --- a/src/AutoMerge/source.extension.vsixmanifest +++ b/src/AutoMerge/source.extension.vsixmanifest @@ -1,29 +1,32 @@ - + - - - Auto Merge for Visual Studio 2022 - Easy way to merge changeset - LICENSE.txt - https://github.com/CDuke/AutoMerge/blob/master/RELEASE_NOTES.md - Resources/merge.png - Resources/preview.png - merge code, merge, merging, branch, changeset, merge by work item, tfs - - - - amd64 - - - - - - - - - - + + + Auto Merge for Visual Studio 2026 + Easy way to merge changeset + LICENSE.txt + https://github.com/CDuke/AutoMerge/blob/master/RELEASE_NOTES.md + Resources/merge.png + Resources/preview.png + merge code, merge, merging, branch, changeset, merge by work item, tfs + + + + amd64 + + + amd64 + + + + + + + + + + - + diff --git a/src/AutoMerge/source.vs18.0.extension.vsixmanifest b/src/AutoMerge/source.vs18.0.extension.vsixmanifest new file mode 100644 index 0000000..42639c5 --- /dev/null +++ b/src/AutoMerge/source.vs18.0.extension.vsixmanifest @@ -0,0 +1,32 @@ + + + + + Auto Merge for Visual Studio 2026 + Easy way to merge changeset + LICENSE.txt + https://github.com/CDuke/AutoMerge/blob/master/RELEASE_NOTES.md + Resources/merge.png + Resources/preview.png + merge code, merge, merging, branch, changeset, merge by work item, tfs + + + + amd64 + + + amd64 + + + + + + + + + + + + + +