From ce339e696c7186f82a03b99d1c96e8ff7c93cde1 Mon Sep 17 00:00:00 2001 From: Asine Tan Date: Thu, 24 Aug 2023 14:44:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AD=89=E4=B8=8D=E5=8F=8A=E5=8E=9F?= =?UTF-8?q?=E4=BD=9C=E8=80=85=E4=BA=86=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=85=88?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=B8=80=E4=B8=AA=E7=94=A8=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GitApi/GitApi.csproj | 4 ++-- GitUI/GitUI.csproj | 4 ++-- GitUI/Properties/Resources.Designer.cs | 26 +++++++++++++------------- GitUI/Properties/Settings.Designer.cs | 10 +++++----- GitUI/app.config | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/GitApi/GitApi.csproj b/GitApi/GitApi.csproj index 0163281..c928aaa 100644 --- a/GitApi/GitApi.csproj +++ b/GitApi/GitApi.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -8,7 +8,7 @@ Properties GitScc GitApi2 - v4.5 + v4.7.2 512 diff --git a/GitUI/GitUI.csproj b/GitUI/GitUI.csproj index 0c5da87..9dffa35 100644 --- a/GitUI/GitUI.csproj +++ b/GitUI/GitUI.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -8,7 +8,7 @@ Properties GitUI GitUI - v4.5 + v4.7.2 512 diff --git a/GitUI/Properties/Resources.Designer.cs b/GitUI/Properties/Resources.Designer.cs index ac83e52..e267dde 100644 --- a/GitUI/Properties/Resources.Designer.cs +++ b/GitUI/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace GitUI.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 一个强类型的资源类，用于查找本地化的字符串等。 /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/GitUI/Properties/Settings.Designer.cs b/GitUI/Properties/Settings.Designer.cs index f75df07..ff8d143 100644 --- a/GitUI/Properties/Settings.Designer.cs +++ b/GitUI/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace GitUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/GitUI/app.config b/GitUI/app.config index 51278a4..312bb3f 100644 --- a/GitUI/app.config +++ b/GitUI/app.config @@ -1,3 +1,3 @@ - + From 655529c7598a35901c011e5eeabbbf5624ff6ccc Mon Sep 17 00:00:00 2001 From: Asine Tan Date: Thu, 24 Aug 2023 15:46:16 +0800 Subject: [PATCH 2/2] add tortoisegit push command --- VSIXProject2022/GitToolCommands.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VSIXProject2022/GitToolCommands.cs b/VSIXProject2022/GitToolCommands.cs index 7345035..1a56df4 100644 --- a/VSIXProject2022/GitToolCommands.cs +++ b/VSIXProject2022/GitToolCommands.cs @@ -2,7 +2,7 @@ namespace VSIXProject2022 { - class GitToolCommand + internal class GitToolCommand { public CommandScope Scope { get; set; } public string Name { get; set; } @@ -21,10 +21,11 @@ public enum CommandScope File, Project } - static class GitToolCommands + internal static class GitToolCommands { internal static List GitTorCommands = new List { new GitToolCommand("TortoiseGit", "/command:log"), + new GitToolCommand("Push", "/command:push"), new GitToolCommand("Branch", "/command:branch"), new GitToolCommand("Commit", "/command:commit"), new GitToolCommand("Export", "/command:export"), @@ -61,6 +62,5 @@ static class GitToolCommands new GitToolCommand("Settings", "settings"), new GitToolCommand("Solve Merge Conflicts", "mergeconflicts"), }; - } -} +} \ No newline at end of file