diff --git a/.gitignore b/.gitignore index 8e7e285c46341fb60b6cb6baf143a8ff261a6408..9328dd19463ab3d0a72063661ee9fd9f8e55eb86 100644 --- a/.gitignore +++ b/.gitignore @@ -242,3 +242,4 @@ GitHubVS.sln.DotSettings **/generated/*.cs /src/Gitee.Api/SDKConfig.cs /src/common/SDKConfig.cs +/src/Gitee.API.Sandbox/json1.json diff --git a/src/Gitee.API.Sandbox/Gitee.Api.Sandbox.csproj b/src/Gitee.API.Sandbox/Gitee.Api.Sandbox.csproj index 71f6710e0bc789a1ec97b98c0c50e4d010b1c4a3..f7b4c3efde1b50ba66107aa4c5b6b3c5821179a3 100644 --- a/src/Gitee.API.Sandbox/Gitee.Api.Sandbox.csproj +++ b/src/Gitee.API.Sandbox/Gitee.Api.Sandbox.csproj @@ -5,6 +5,10 @@ netcoreapp2.2 + + + + diff --git a/src/Gitee.API.Sandbox/Program.cs b/src/Gitee.API.Sandbox/Program.cs index 7c0d114ed7ba71744dcb2979246c861b4f996e02..1aaa822b1379a259efa6020f1646e75284a31417 100644 --- a/src/Gitee.API.Sandbox/Program.cs +++ b/src/Gitee.API.Sandbox/Program.cs @@ -1,13 +1,24 @@ using Gitee.Api; +using Gitee.Api.Dto; using System; +using System.Collections.Generic; using System.Threading.Tasks; namespace Gitee.API.Sandbox { - class Program + internal class Program { - static void Main(string[] args) + private static void Main(string[] args) { + //try + //{ + // var jtk = Newtonsoft.Json.Linq.JToken.Parse(System.IO.File.ReadAllText("json1.json")); + // var result = jtk.ToObject>(); + //} + //catch (Exception ex) + //{ + //} + Console.WriteLine("Hello World!"); Task.Run(async () => { @@ -15,23 +26,21 @@ namespace Gitee.API.Sandbox { SDK.client_id = SdkConfig.client_id; SDK.client_secret = SdkConfig.client_secret; - var client = await SDK.LoginAsync(SdkConfig.username,SdkConfig.password); + var client = await SDK.LoginAsync(SdkConfig.username, SdkConfig.password); var user = await client.GetUserAsync(); - var poject = await client.GetReposAsync(1,20); + var poject = await client.GetReposAsync(1, 20); var ooox = await SDK.RefreshToken(client.Token.refresh_token); var oooxxx = await ooox.GetUserAsync(); var o = SDK.ContinueByToken(ooox.Token.refresh_token, ooox.Token.access_token, ooox.Token.Expires); var oxx = await o.GetUserAsync(); - // await client.CreateRepoAsync("test" + DateTime.Now.ToString("yyyyMMddHHmmss"), DateTime.Now.ToString(), true); - await client.CreateRepoAsync("testpublic1122211" , "", false); + // await client.CreateRepoAsync("test" + DateTime.Now.ToString("yyyyMMddHHmmss"), DateTime.Now.ToString(), true); + await client.CreateRepoAsync("testpublic1122211", "", false); } catch (Exception ex) { Console.WriteLine(ex.Message); } }).Wait(); - - } } -} +} \ No newline at end of file diff --git a/src/Gitee.Api/Dto/Repo.cs b/src/Gitee.Api/Dto/Repo.cs index 11495b998d56ebb0c8aac0e66628266600b46fbb..9fb7e08b071557b84dc117ce1c93ff3cf5d412b5 100644 --- a/src/Gitee.Api/Dto/Repo.cs +++ b/src/Gitee.Api/Dto/Repo.cs @@ -6,301 +6,371 @@ using System.Threading.Tasks; namespace Gitee.Api.Dto { - public class Owner { /// - /// + /// /// public int id { get; set; } + /// - /// + /// /// public string login { get; set; } + [Newtonsoft.Json.JsonProperty("name")] public string Name { get; set; } + [Newtonsoft.Json.JsonProperty("avatar_url")] public string AvatarUrl { get; set; } + [Newtonsoft.Json.JsonProperty("url")] public string Url { get; set; } + /// - /// + /// /// public string html_url { get; set; } + /// - /// + /// /// public string followers_url { get; set; } + /// - /// + /// /// public string following_url { get; set; } + /// - /// + /// /// public string gists_url { get; set; } + /// - /// + /// /// public string starred_url { get; set; } + /// - /// + /// /// public string subscriptions_url { get; set; } + /// - /// + /// /// public string organizations_url { get; set; } + /// - /// + /// /// public string repos_url { get; set; } + /// - /// + /// /// public string events_url { get; set; } + /// - /// + /// /// public string received_events_url { get; set; } + /// - /// + /// /// public string type { get; set; } + /// - /// + /// /// public string site_admin { get; set; } } + public class RepoPermission { /// - /// + /// /// public string pull { get; set; } + /// - /// + /// /// public string push { get; set; } + /// - /// + /// /// public string admin { get; set; } } - public class Repo { /// - /// + /// /// public int id { get; set; } + /// - /// + /// /// public string full_name { get; set; } + /// - /// + /// /// public string human_name { get; set; } + [Newtonsoft.Json.JsonProperty("url")] public string Url { get; set; } + [Newtonsoft.Json.JsonProperty("namespace")] public Namespace Namespace { get; set; } + /// - /// + /// /// public string path { get; set; } + [Newtonsoft.Json.JsonProperty("name")] public string Name { get; set; } + [Newtonsoft.Json.JsonProperty("owner")] public Owner Owner { get; set; } + [Newtonsoft.Json.JsonProperty("description")] public string Description { get; set; } + [Newtonsoft.Json.JsonProperty("private")] public bool IsPrivate { get; set; } + [Newtonsoft.Json.JsonProperty("public")] public bool IsPublic { get; set; } + [Newtonsoft.Json.JsonProperty("internal")] public bool IsInternal { get; set; } public bool fork { get; set; } + /// - /// + /// /// public string html_url { get; set; } + /// - /// + /// /// public string forks_url { get; set; } + /// - /// + /// /// public string keys_url { get; set; } + /// - /// + /// /// public string collaborators_url { get; set; } + /// - /// + /// /// public string hooks_url { get; set; } + /// - /// + /// /// public string branches_url { get; set; } + /// - /// + /// /// public string tags_url { get; set; } + /// - /// + /// /// public string blobs_url { get; set; } + /// - /// + /// /// public string stargazers_url { get; set; } + /// - /// + /// /// public string contributors_url { get; set; } + /// - /// + /// /// public string commits_url { get; set; } + /// - /// + /// /// public string comments_url { get; set; } + /// - /// + /// /// public string issue_comment_url { get; set; } + /// - /// + /// /// public string issues_url { get; set; } + /// - /// + /// /// public string pulls_url { get; set; } + /// - /// + /// /// public string milestones_url { get; set; } + /// - /// + /// /// public string notifications_url { get; set; } + /// - /// + /// /// public string labels_url { get; set; } + /// - /// + /// /// public string releases_url { get; set; } + /// - /// + /// /// public string recommend { get; set; } + /// - /// + /// /// public string homepage { get; set; } + /// - /// + /// /// public string language { get; set; } + /// - /// + /// /// public int forks_count { get; set; } + /// - /// + /// /// public int stargazers_count { get; set; } + /// - /// + /// /// public int watchers_count { get; set; } + /// - /// + /// /// public string default_branch { get; set; } + /// - /// + /// /// public int open_issues_count { get; set; } + /// - /// + /// /// public bool has_issues { get; set; } + /// - /// + /// /// public bool has_wiki { get; set; } + /// - /// + /// /// public bool pull_requests_enabled { get; set; } + /// - /// + /// /// public bool has_page { get; set; } + /// - /// + /// /// public string license { get; set; } + /// - /// + /// /// public string outsourced { get; set; } + /// - /// + /// /// public string project_creator { get; set; } + /// - /// + /// /// public List members { get; set; } + /// - /// + /// /// public string pushed_at { get; set; } + /// - /// + /// /// public string created_at { get; set; } + /// - /// + /// /// public string updated_at { get; set; } + /// - /// + /// 暂时不使用不解析 /// - public string parent { get; set; } + // public string parent { get; set; } /// - /// + /// /// public string paas { get; set; } + /// - /// + /// /// public string stared { get; set; } + /// - /// + /// /// public string watched { get; set; } + /// - /// + /// /// public RepoPermission permission { get; set; } + /// - /// + /// /// public string relation { get; set; } } - -} +} \ No newline at end of file diff --git a/src/Gitee.TeamFoundation.14/Connect/GiteeConnectSection.cs b/src/Gitee.TeamFoundation.14/Connect/GiteeConnectSection.cs index 6f3875fa2d42738b5aec0f9115c38e30535097c0..912674f0f70565216e90a7d0378ee01a29ca692b 100644 --- a/src/Gitee.TeamFoundation.14/Connect/GiteeConnectSection.cs +++ b/src/Gitee.TeamFoundation.14/Connect/GiteeConnectSection.cs @@ -5,12 +5,15 @@ using Gitee.VisualStudio.Shared.Helpers; using Microsoft.TeamFoundation.Controls; using Microsoft.TeamFoundation.Controls.WPF.TeamExplorer; using Microsoft.TeamFoundation.Git.Controls.Extensibility; +using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; +using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility; +using Microsoft.VisualStudio.Threading; using System; using System.ComponentModel.Composition; using System.Threading.Tasks; using System.Windows; - +using GlobalServiceProvider = Microsoft.VisualStudio.Shell.ServiceProvider; namespace Gitee.TeamFoundation.Connect { [TeamExplorerSection(Settings.ConnectSectionId, TeamExplorerPageIds.Connect, Settings.ConnectSectionPriority)] @@ -34,10 +37,29 @@ namespace Gitee.TeamFoundation.Connect _viewFactory = viewFactory; _web = web; - messenger.Register("OnLogined", OnLoggedIn); - messenger.Register("OnSignOuted", InLoggedOut); + messenger.Register("OnLogined", OnLogined); + messenger.Register("OnSignOuted", OnSignOuted); messenger.Register("OnClone", OnClone); messenger.Register("OnOpenSolution", OnOpenSolution); + IGitExt gitExt = GlobalServiceProvider.GlobalProvider.GetService(); + gitExt.PropertyChanged += GitExt_PropertyChanged; + } + private void GitExt_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + { + if (e.PropertyName == "ActiveRepositories") + { + System.Threading.Tasks.Task.Run(async () => + { + await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); + Refresh(); + }).Forget(); + } + } + public override void Refresh() + { + + ((View as ConnectSectionView).DataContext as ConnectSectionViewModel).Refresh(); + base.Refresh(); } protected override ITeamExplorerSection CreateViewModel(SectionInitializeEventArgs e) @@ -54,20 +76,7 @@ namespace Gitee.TeamFoundation.Connect { base.Initialize(sender, e); - var gitExt = ServiceProvider.GetService(); - gitExt.PropertyChanged += GitExt_PropertyChanged; - } - - private void GitExt_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) - { - if (e.PropertyName == "ActiveRepositories") - { - Task.Run(async () => - { - await ThreadingHelper.SwitchToMainThreadAsync(); - Refresh(); - }); - } + IsVisible = _storage.IsLogined; } protected override object CreateView(SectionInitializeEventArgs e) @@ -81,18 +90,16 @@ namespace Gitee.TeamFoundation.Connect if (view != null) { view.DataContext = new ConnectSectionViewModel(_messenger, _shell, _storage, _teamexplorer, _viewFactory, _web); - } + } } - public void OnLoggedIn() + public void OnLogined() { - // Added Connect and Sign Up buttons in case user closes the invitation. IsVisible = true; } - public void InLoggedOut() + public void OnSignOuted() { - // Added Connect and Sign Up buttons in case user closes the invitation. IsVisible = false; } @@ -111,12 +118,6 @@ namespace Gitee.TeamFoundation.Connect } } - public override void Refresh() - { - ((View as ConnectSectionView).DataContext as ConnectSectionViewModel).Refresh(); - base.Refresh(); - } - public override void Dispose() { _messenger.UnRegister(this); diff --git a/src/Gitee.TeamFoundation.14/Gitee.TeamFoundation.14.csproj b/src/Gitee.TeamFoundation.14/Gitee.TeamFoundation.14.csproj index d340b8cc772989df6e56d32eeb2ed98a4cdf27c5..94da4b3120fec7422ec0e3b1076da98a3a3bf356 100644 --- a/src/Gitee.TeamFoundation.14/Gitee.TeamFoundation.14.csproj +++ b/src/Gitee.TeamFoundation.14/Gitee.TeamFoundation.14.csproj @@ -70,6 +70,9 @@ ..\..\lib\14.0\Microsoft.TeamFoundation.Git.Provider.dll False + + ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll + ..\..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll True @@ -78,8 +81,7 @@ ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True + ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.2.25123\lib\Microsoft.VisualStudio.Shell.14.0.dll ..\..\packages\Microsoft.VisualStudio.Shell.Embeddable.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Embeddable.dll @@ -95,6 +97,9 @@ ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll True + + ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll diff --git a/src/Gitee.TeamFoundation.14/Home/GiteeHomeSection.cs b/src/Gitee.TeamFoundation.14/Home/GiteeHomeSection.cs index 3311456e1a684170f8d7f3e0a0167be1cb78df94..6c72f5ee768fd5a5aee10f8423eff5a23f83075d 100644 --- a/src/Gitee.TeamFoundation.14/Home/GiteeHomeSection.cs +++ b/src/Gitee.TeamFoundation.14/Home/GiteeHomeSection.cs @@ -3,6 +3,7 @@ using Gitee.VisualStudio.Shared; using Gitee.VisualStudio.Shared.Helpers; using Microsoft.TeamFoundation.Controls; using Microsoft.TeamFoundation.Controls.WPF.TeamExplorer; +using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility; using System.ComponentModel.Composition; using System.Threading.Tasks; using System.Windows; @@ -25,7 +26,7 @@ namespace Gitee.TeamFoundation.Home public override void Initialize(object sender, SectionInitializeEventArgs e) { base.Initialize(sender, e); - var gitExt = ServiceProvider.GetService(); + var gitExt = ServiceProvider.GetService(); gitExt.PropertyChanged += GitExt_PropertyChanged; } diff --git a/src/Gitee.TeamFoundation.14/Home/GiteeNavigationItem.cs b/src/Gitee.TeamFoundation.14/Home/GiteeNavigationItem.cs index 5015811c3a159732716a15913e0fd92196599930..1b74ee6fbea4294f462644b9330b6124b56a2562 100644 --- a/src/Gitee.TeamFoundation.14/Home/GiteeNavigationItem.cs +++ b/src/Gitee.TeamFoundation.14/Home/GiteeNavigationItem.cs @@ -8,6 +8,8 @@ using System; using System.Threading.Tasks; using System.Windows.Media; using Task = System.Threading.Tasks.Task; +using GlobalServiceProvider = Microsoft.VisualStudio.Shell.ServiceProvider; +using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility; namespace Gitee.TeamFoundation.Home { @@ -37,7 +39,7 @@ namespace Gitee.TeamFoundation.Home OnThemeChanged(); Invalidate(); }; - var gitExt = Microsoft.VisualStudio.Shell.ServiceProvider.GlobalProvider.GetService(); + var gitExt = GlobalServiceProvider.GlobalProvider.GetService(); gitExt.PropertyChanged += GitExt_PropertyChanged; } diff --git a/src/Gitee.TeamFoundation.14/Settings.cs b/src/Gitee.TeamFoundation.14/Settings.cs index 6b407290d9c3c3413be6af8e6a7fba22c6c6da76..deef1593f9f5ca4d9c36cbd73df11fb9051ec972 100644 --- a/src/Gitee.TeamFoundation.14/Settings.cs +++ b/src/Gitee.TeamFoundation.14/Settings.cs @@ -4,7 +4,7 @@ namespace Gitee.TeamFoundation { internal static class Settings { - public const string InvitationSectionId = "44A4CF18-EDAC-4967-A332-8521A5CC0862"; + public const string InvitationSectionId = "F18337CD-024C-4327-B600-D30F935D720C"; public const int InvitationSectionPriority = 100; public const string ConnectSectionId = "80F53301-4049-42D1-BC9C-A3121A3F73E9"; diff --git a/src/Gitee.TeamFoundation.14/Sync/GiteePublishSection.cs b/src/Gitee.TeamFoundation.14/Sync/GiteePublishSection.cs index 90c2c2eb31902e5dcfe64a7cfa6e21fada226fad..cebc05f4eb205e2624a1d103affc118dca9f240e 100644 --- a/src/Gitee.TeamFoundation.14/Sync/GiteePublishSection.cs +++ b/src/Gitee.TeamFoundation.14/Sync/GiteePublishSection.cs @@ -50,6 +50,7 @@ namespace Gitee.TeamFoundation.Sync base.Initialize(sender, e); var gitExt = ServiceProvider.GetService(); gitExt.PropertyChanged += GitExt_PropertyChanged; + Refresh(); } private void GitExt_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) @@ -58,16 +59,18 @@ namespace Gitee.TeamFoundation.Sync { Refresh(); } - } + } + public override void Refresh() - { - base.Refresh(); + { Task.Run(async () => { - var result = _tes.IsGiteeRepo(); + var result = !_tes.IsGiteeRepo(); await ThreadingHelper.SwitchToMainThreadAsync(); IsVisible = result; + ((SectionContent as FrameworkElement)?.DataContext as PublishSectionViewModel)?.Refresh(); }); + base.Refresh(); } protected override object CreateView(SectionInitializeEventArgs e) diff --git a/src/Gitee.TeamFoundation.14/ViewModels/ConnectSectionViewModel.cs b/src/Gitee.TeamFoundation.14/ViewModels/ConnectSectionViewModel.cs index ec0921dc508f1b0828ae03712a6eb820b2d2c0ec..4a98960c63ce9d3e00b87485eb20dc136e23d5ba 100644 --- a/src/Gitee.TeamFoundation.14/ViewModels/ConnectSectionViewModel.cs +++ b/src/Gitee.TeamFoundation.14/ViewModels/ConnectSectionViewModel.cs @@ -1,7 +1,9 @@ using Gitee.TeamFoundation.Services; using Gitee.VisualStudio.Shared; -using Gitee.VisualStudio.Shared.Helpers; using Gitee.VisualStudio.Shared.Helpers.Commands; +using Gitee.VisualStudio.Shared.Helpers; +using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.Threading; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -9,6 +11,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; using System.Windows.Input; +using Task = System.Threading.Tasks.Task; namespace Gitee.TeamFoundation.ViewModels { @@ -48,7 +51,7 @@ namespace Gitee.TeamFoundation.ViewModels LoadRepositoriesAsync(); } } - + public Visibility Visibility { get; set; } public void OnLogined() { LoadRepositoriesAsync(); @@ -146,60 +149,58 @@ namespace Gitee.TeamFoundation.ViewModels IReadOnlyList remotes = null; Exception ex = null; - Task.Run(async () => - { - try - { - remotes = await _web.GetProjectsAsync(); - known = Registry.GetKnownRepositories(); - } - catch (Exception e) - { - ex = e; - } - }).ContinueWith(task => - { - if (ex == null) - { - Repositories.Clear(); - - var activeRepository = _teamexplorer.GetActiveRepository(); - - var valid = new List(); - - if (known != null) - { - foreach (var k in known) - { - var r = remotes.FirstOrDefault(o => o.Name == k.Name); - if (r != null) - { - k.Icon = r.Icon; - - valid.Add(k); - } - } - } - - if (activeRepository != null) - { - var matched = valid.FirstOrDefault(o => string.Equals(o.Path, activeRepository.Path, StringComparison.OrdinalIgnoreCase)); - if (matched != null) - { - matched.IsActived = true; - } - } - valid.Each(o => Repositories.Add(o)); - } - else if (!(ex is UnauthorizedAccessException)) - { - _teamexplorer.ShowMessage(ex.Message); - } - else - { - _teamexplorer.ShowMessage(ex.Message); - } - }, TaskScheduler.FromCurrentSynchronizationContext()); + Task.Run( async () => + { + try + { + remotes = await _web.GetProjectsAsync(); + known = Registry.GetKnownRepositories(); + } + catch (Exception e) + { + ex = e; + } + }).ContinueWith(async tsk => + { + await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); + if (ex == null) + { + Repositories.Clear(); + + var activeRepository = _teamexplorer.GetActiveRepository(); + + var valid = new List(); + + if (known != null) + { + foreach (var k in known) + { + var r = remotes.FirstOrDefault(o => o.Name == k.Name); + if (r != null) + { + k.Icon = r.Icon; + + valid.Add(k); + } + } + } + + if (activeRepository != null) + { + var matched = valid.FirstOrDefault(o => string.Equals(o.Path, activeRepository.Path, StringComparison.OrdinalIgnoreCase)); + if (matched != null) + { + matched.IsActived = true; + } + } + + valid.Each(o => Repositories.Add(o)); + } + else if (!(ex is UnauthorizedAccessException)) + { + _teamexplorer.ShowMessage(ex.Message); + } + },TaskScheduler.Default).Forget(); } public void OnRepositoryCloned(string url, Repository repository) diff --git a/src/Gitee.TeamFoundation.14/ViewModels/PublishSectionViewModel.cs b/src/Gitee.TeamFoundation.14/ViewModels/PublishSectionViewModel.cs index 4f373b2260d15ca63faa782c67b28f2d1e50e7f5..b3c67b3d1af421dae8b8007c9b1e2c3a7a7b7001 100644 --- a/src/Gitee.TeamFoundation.14/ViewModels/PublishSectionViewModel.cs +++ b/src/Gitee.TeamFoundation.14/ViewModels/PublishSectionViewModel.cs @@ -48,12 +48,22 @@ namespace Gitee.TeamFoundation.ViewModels _getStartedCommand = new DelegateCommand(OnGetStarted); _publishCommand = new DelegateCommand(OnPublish, CanPublish); - ShowGetStarted = storage.IsLogined; - - //IsStarted = true; LoadResources(); - } - + } + + public void Refresh() + { + if (!string.IsNullOrEmpty(_tes.GetSolutionPath())) + { + var url = _git?.GetRemote(_tes.GetSolutionPath()); + ShowGetStarted = string.IsNullOrEmpty(url) || !url.ToLower().StartsWith("https://gitee.com"); + } + else + { + ShowGetStarted = false; + } + } + private void LoadResources() { Licenses.Clear(); diff --git a/src/Gitee.TeamFoundation.14/packages.config b/src/Gitee.TeamFoundation.14/packages.config index 7f0e10688729250c5580169a2b2e7292a7ead324..281500e081ffca6e477da1ab6f4c8532503ba03a 100644 --- a/src/Gitee.TeamFoundation.14/packages.config +++ b/src/Gitee.TeamFoundation.14/packages.config @@ -2,9 +2,10 @@ + - + diff --git a/src/Gitee.TeamFoundation.15/Gitee.TeamFoundation.15.csproj b/src/Gitee.TeamFoundation.15/Gitee.TeamFoundation.15.csproj index 866f1cd0a3e7c62f89c026d49c04e971f951474e..2007072ef586beca811bc21d94256bedfdc55e20 100644 --- a/src/Gitee.TeamFoundation.15/Gitee.TeamFoundation.15.csproj +++ b/src/Gitee.TeamFoundation.15/Gitee.TeamFoundation.15.csproj @@ -69,7 +69,9 @@ ..\..\lib\15.0\Microsoft.TeamFoundation.Git.Provider.dll False - + + ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll + ..\..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll @@ -77,7 +79,7 @@ ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.2.25123\lib\Microsoft.VisualStudio.Shell.14.0.dll ..\..\packages\Microsoft.VisualStudio.Shell.Embeddable.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Embeddable.dll @@ -90,6 +92,9 @@ ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll + + ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll diff --git a/src/Gitee.TeamFoundation.15/packages.config b/src/Gitee.TeamFoundation.15/packages.config index 7f0e10688729250c5580169a2b2e7292a7ead324..281500e081ffca6e477da1ab6f4c8532503ba03a 100644 --- a/src/Gitee.TeamFoundation.15/packages.config +++ b/src/Gitee.TeamFoundation.15/packages.config @@ -2,9 +2,10 @@ + - + diff --git a/src/Gitee.TeamFoundation.16/Gitee.TeamFoundation.16.csproj b/src/Gitee.TeamFoundation.16/Gitee.TeamFoundation.16.csproj index 04eb76c6ca10c5c4fe2a8a8f095022ea1db2c97c..9959547fef958c0486c570827414836d01457386 100644 --- a/src/Gitee.TeamFoundation.16/Gitee.TeamFoundation.16.csproj +++ b/src/Gitee.TeamFoundation.16/Gitee.TeamFoundation.16.csproj @@ -70,7 +70,9 @@ ..\..\lib\16.0\Microsoft.TeamFoundation.Git.Provider.dll False - + + ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll + ..\..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll @@ -78,7 +80,7 @@ ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.2.25123\lib\Microsoft.VisualStudio.Shell.14.0.dll ..\..\packages\Microsoft.VisualStudio.Shell.Embeddable.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Embeddable.dll @@ -91,6 +93,9 @@ ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll + + ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll diff --git a/src/Gitee.TeamFoundation.16/packages.config b/src/Gitee.TeamFoundation.16/packages.config index b0a2ea680d1f67a15b0e0013b1854aece66dbdfb..090be87028d6aaab2bd5cdf0d42829dbcb29c3ad 100644 --- a/src/Gitee.TeamFoundation.16/packages.config +++ b/src/Gitee.TeamFoundation.16/packages.config @@ -2,14 +2,15 @@ + - + - + diff --git a/src/Gitee.VisualStudio.Shared/Gitee.VisualStudio.Shared.csproj b/src/Gitee.VisualStudio.Shared/Gitee.VisualStudio.Shared.csproj index c75fa38a818911cf9ebf6b2425599e9f4ffa6a70..cfbadb3a8ad6da8bf355e302819c749beb4126e0 100644 --- a/src/Gitee.VisualStudio.Shared/Gitee.VisualStudio.Shared.csproj +++ b/src/Gitee.VisualStudio.Shared/Gitee.VisualStudio.Shared.csproj @@ -50,7 +50,7 @@ ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.2.25123\lib\Microsoft.VisualStudio.Shell.14.0.dll ..\..\packages\Microsoft.VisualStudio.Shell.Embeddable.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Embeddable.dll @@ -68,7 +68,6 @@ ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll diff --git a/src/Gitee.VisualStudio.Shared/packages.config b/src/Gitee.VisualStudio.Shared/packages.config index c13d569f331b6d585bebfafdbb782cdd7373d325..594b4f197c39cbf4c7996cbc53cad91cb0b93a5c 100644 --- a/src/Gitee.VisualStudio.Shared/packages.config +++ b/src/Gitee.VisualStudio.Shared/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Gitee.VisualStudio.UI/Gitee.VisualStudio.UI.csproj b/src/Gitee.VisualStudio.UI/Gitee.VisualStudio.UI.csproj index c8df08529b38d11de441172171998ca3e92442fc..1eee4569ce54007659e8f3c467c543a7dfc3ad3f 100644 --- a/src/Gitee.VisualStudio.UI/Gitee.VisualStudio.UI.csproj +++ b/src/Gitee.VisualStudio.UI/Gitee.VisualStudio.UI.csproj @@ -54,7 +54,7 @@ ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.2.25123\lib\Microsoft.VisualStudio.Shell.14.0.dll ..\..\packages\Microsoft.VisualStudio.Shell.Embeddable.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Embeddable.dll @@ -72,7 +72,6 @@ ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll @@ -204,6 +203,9 @@ + + + diff --git a/src/Gitee.VisualStudio.UI/Resources/images/logo_gitee_light_cn_with_domain_name.png b/src/Gitee.VisualStudio.UI/Resources/images/logo_gitee_light_cn_with_domain_name.png new file mode 100644 index 0000000000000000000000000000000000000000..0117388c606b075f2528902592a41b7b67e13fc0 Binary files /dev/null and b/src/Gitee.VisualStudio.UI/Resources/images/logo_gitee_light_cn_with_domain_name.png differ diff --git a/src/Gitee.VisualStudio.UI/Views/CreateView.xaml b/src/Gitee.VisualStudio.UI/Views/CreateView.xaml index d8f1f3bc11f611827cb67146f0938d51b81a4818..de300647d9af15c5b96510d22b1da0999f713121 100644 --- a/src/Gitee.VisualStudio.UI/Views/CreateView.xaml +++ b/src/Gitee.VisualStudio.UI/Views/CreateView.xaml @@ -20,8 +20,8 @@ - - + + @@ -35,15 +35,15 @@