This repository was archived by the owner on Jun 21, 2023. It is now read-only.
Merging changes made to support VS2017 in the 2.1 release branch to master #696
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To load things async, nothing in the loading path can call GetService or GetGlobalService, since these will deadlock. This requires moving a bunch of initialization code out of constructors, so things can be initialized on request and after the package load codepath is done.
We need to build against versions of VS assemblies that match the earliest VS version we support, and build machines might not have all VS versions installed, so we switch to nuget to guarantee that we always compile against the same set of assemblies.
And use `System.Windows.Interactivity` from there as previously we were assuming that Blend was installed.
I couldn't work out which ones we *actually* need (we don't need anything beyond Team Explorer, right? That doesn't seem to be one of the choices) but you have to put at least one in there so I chose the core editor.
To this had to fix `GetServiceAsync` call in `IUIProvider` which was trying to cast a `Task` to an `IComponentModel`.
`IUIProvider` is now a global service and not a MEF component, so we now use a separate class as a MEF wrapper that dispatches calls to the service, to connect the two worlds.
Added dependency on GitHub.StartPage.Preview5 from GitHub.VisualStudio
Needed an MEF-visible `IMenuProvider` (`MenuProviderDispatcher`) and the `ExportMenu` attribute to be re-applied to `OpenPullRequests` in order to find the menu.
Visual Studio picks them up automatically.
…Start Page The Start Page re-acquisition code path needs to clone repositories, but it already knows which repo to clone, so we need a variant of the clone dialog for this purpose.
To improve the startup time of the extension.
Required changing most of the UsageTracker methods to be async.
Lazy load the services needed by UsageTracker.
Some services are not mocked by default, so getting the default service provider was returning a real instance, and setting a Returns on it does not make NSubstitute happy.
Might as well use the VisualStudio Threading library, since we're already bound to it because of the main thread switcher.
Bump start page module to pick up fix for container id
Conflicts: src/GitHub.App/SampleData/SampleViewModels.cs src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs src/GitHub.Exports.Reactive/ViewModels/IRepositoryCloneViewModel.cs src/GitHub.VisualStudio.UI/Resources.resx src/GitHub.VisualStudio/GitHubPackage.cs src/GitHub.VisualStudio/source.extension.vsixmanifest src/MsiInstaller/Version.wxi src/common/SolutionInfo.cs Also had to downgrade Microsoft.VSSDK.BuildTools to version 14.
Fix unit tests on the 2.1 tree
To remove Microsoft.VSSDK.BuildTools package.
To manually remove Microsoft.VSSDK.BuildTools remnants from .csproj.
|
LGTM! 👍 |
As we can now build them directly from the GitHubVS solution.
grokys
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges the
releases/2.1.0branch to master,