From 4d04164c56b0199b1747fbab594fede1e929eb56 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Mon, 6 Aug 2018 19:06:46 +0100 Subject: [PATCH 1/2] Install GitHub.TeamFoundation.15 for all versions Install the GitHub.TeamFoundation.15 MEF component in all Visual Studio versions. This is a workaround for #1810. --- .../source.extension.vsixmanifest | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest index 40cb993668..8ee67ad2e1 100644 --- a/src/GitHub.VisualStudio/source.extension.vsixmanifest +++ b/src/GitHub.VisualStudio/source.extension.vsixmanifest @@ -1,42 +1,42 @@  - - - GitHub Extension for Visual Studio - A Visual Studio Extension that brings the GitHub Flow into Visual Studio. - GitHub.VisualStudio - https://visualstudio.github.com - LICENSE.txt - https://visualstudio.github.com/release-notes.html - Resources\logo_32x32@2x.png - Resources\preview_200x200.png - GitHub;git;open source;source control;branch;pull request;team explorer;commit;publish - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + GitHub Extension for Visual Studio + A Visual Studio Extension that brings the GitHub Flow into Visual Studio. + GitHub.VisualStudio + https://visualstudio.github.com + LICENSE.txt + https://visualstudio.github.com/release-notes.html + Resources\logo_32x32@2x.png + Resources\preview_200x200.png + GitHub;git;open source;source control;branch;pull request;team explorer;commit;publish + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 68f97613eb299b9839fb59d2d746f64b996c5c4e Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 7 Aug 2018 15:19:29 +0100 Subject: [PATCH 2/2] Use VS 15.0 version of MS.VS.Threading Visual Studio 2017 shipped with Microsoft.VisualStudio.Threading 15.0. Reference a version that is compatible. --- .../GitHub.TeamFoundation.15.csproj | 8 +++----- src/GitHub.TeamFoundation.15/packages.config | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj b/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj index c617485a70..9306a1e81b 100644 --- a/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj +++ b/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj @@ -89,8 +89,7 @@ True - ..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.4.27004\lib\Microsoft.VisualStudio.Shell.15.0.dll - True + ..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.26228\lib\Microsoft.VisualStudio.Shell.15.0.dll ..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.4.27004\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll @@ -130,9 +129,8 @@ ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll True - - ..\..\packages\Microsoft.VisualStudio.Threading.15.4.4\lib\net45\Microsoft.VisualStudio.Threading.dll - True + + ..\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll ..\..\packages\Microsoft.VisualStudio.Utilities.15.4.27004\lib\net46\Microsoft.VisualStudio.Utilities.dll diff --git a/src/GitHub.TeamFoundation.15/packages.config b/src/GitHub.TeamFoundation.15/packages.config index ca6ba30df0..e6dc9b355a 100644 --- a/src/GitHub.TeamFoundation.15/packages.config +++ b/src/GitHub.TeamFoundation.15/packages.config @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@ - +