Mirror
/
GitExtensions
mirror of https://github.com/gitextensions/gitextensions.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

VSIX extension updated (some code auto generated using ExtensibilityTools for VS2015)

pull/3331/head
Arkadiy Shapkin 9 years ago
parent
eeacb92ba5
commit
fea2840aa3
10 changed files with 637 additions and 524 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      GitExtensionsVSIX/GitExtCommandTable.cs
  2. 416
      GitExtensionsVSIX/GitExtCommandTable.vsct
  3. 55
      GitExtensionsVSIX/GitExtCommands.cs
  4. 7
      GitExtensionsVSIX/GitExtensionsPackage.cs
  5. 416
      GitExtensionsVSIX/GitExtensionsPackage.vsct
  6. 37
      GitExtensionsVSIX/GitExtensionsVSIX.csproj
  7. 18
      GitExtensionsVSIX/source.extension.cs
  8. BIN
      GitExtensionsVSIX/source.extension.ico
  9. 21
      GitExtensionsVSIX/source.extension.resx
  10. 50
      GitExtensionsVSIX/source.extension.vsixmanifest

87
GitExtensionsVSIX/GitExtCommandTable.cs
View File

@ -0,0 +1,87 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// This file was generated by Extensibility Tools v1.10.184
// </auto-generated>
// ------------------------------------------------------------------------------
namespace GitExtensionsVSIX
{
using System;
/// <summary>
/// Helper class that exposes all GUIDs used across VS Package.
/// </summary>
internal sealed partial class PackageGuids
{
public const string guidGitExtensionsPackageString = "14f45fb8-a093-48af-a2a2-a7bb404cb357";
public const string guidGitExtensionsPackageCmdSetString = "8bd71b0f-f446-442d-a92a-bbefd8e60202";
public const string guidImagesString = "8bcce2c8-daec-4814-878e-e9c346d42f24";
public static Guid guidGitExtensionsPackage = new Guid(guidGitExtensionsPackageString);
public static Guid guidGitExtensionsPackageCmdSet = new Guid(guidGitExtensionsPackageCmdSetString);
public static Guid guidImages = new Guid(guidImagesString);
}
/// <summary>
/// Helper class that encapsulates all CommandIDs uses across VS Package.
/// </summary>
internal sealed partial class PackageIds
{
public const int gitExtMenu = 0x1000;
public const int gitExtMenuGlobalGroup = 0x1010;
public const int gitExtMenuChangesGroup = 0x1011;
public const int gitExtMenuPatchGroup = 0x1012;
public const int gitExtMenuFindGroup = 0x1013;
public const int gitExtMenuBranchGroup = 0x1014;
public const int gitExtMenuOtherGroup = 0x1015;
public const int gitExtContextualMenu = 0x1020;
public const int gitExtToolbar = 0x1030;
public const int gitExtToolbarGroup = 0x101031;
public const int gitExtDiffCommand = 0x1100;
public const int gitExtHistoryCommand = 0x1101;
public const int gitExtResetFileCommand = 0x1102;
public const int gitExtBrowseCommand = 0x1103;
public const int gitExtCloneCommand = 0x1104;
public const int gitExtNewCommand = 0x1105;
public const int gitExtCommitCommand = 0x1106;
public const int gitExtPullCommand = 0x1107;
public const int gitExtPushCommand = 0x1108;
public const int gitExtStashCommand = 0x1109;
public const int gitExtRemotesCommand = 0x110A;
public const int gitExtGitIgnoreCommand = 0x110B;
public const int gitExtApplyPatchCommand = 0x110C;
public const int gitExtFormatPatchCommand = 0x110D;
public const int gitExtViewChangesCommand = 0x110E;
public const int gitExtFindFileCommand = 0x110F;
public const int gitExtCheckoutCommand = 0x1110;
public const int gitExtCreateBranchCommand = 0x1111;
public const int gitExtMergeCommand = 0x1112;
public const int gitExtRebaseCommand = 0x1113;
public const int gitExtSolveConflictsCommand = 0x1114;
public const int gitExtCherryPickCommand = 0x1115;
public const int gitExtBashCommand = 0x1116;
public const int gitExtSettingsCommand = 0x1117;
public const int gitExtAboutCommand = 0x1118;
public const int edit = 0x0001;
public const int configure = 0x0002;
public const int stash = 0x0003;
public const int reset = 0x0004;
public const int editAll = 0x0005;
public const int history = 0x0006;
public const int commit = 0x0007;
public const int push = 0x0008;
public const int pull = 0x0009;
public const int createBranch = 0x000A;
public const int unused = 0x000B;
public const int browse = 0x000C;
public const int @new = 0x000D;
public const int clone = 0x000E;
public const int cherry = 0x000F;
public const int checkout = 0x0010;
public const int remotes = 0x0011;
public const int merge = 0x0012;
public const int rebase = 0x0013;
public const int about = 0x0014;
public const int bash = 0x0015;
public const int gitignore = 0x0016;
public const int find = 0x0017;
public const int diff = 0x0018;
}
}

416
GitExtensionsVSIX/GitExtCommandTable.vsct
View File

@ -0,0 +1,416 @@
<?xml version="1.0" encoding="utf-8"?>
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This is the file that defines the actual layout and type of the commands.
It is divided in different sections (e.g. command definition, command
placement, ...), with each defining a specific set of properties.
See the comment before each section for more details about how to
use it. -->
<!-- The VSCT compiler (the tool that translates this file into the binary
format that VisualStudio will consume) has the ability to run a preprocessor
on the vsct file; this preprocessor is (usually) the C++ preprocessor, so
it is possible to define includes and macros with the same syntax used
in C++ files. Using this ability of the compiler here, we include some files
defining some of the constants that we will use inside the file. -->
<!--This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
<Extern href="stdidcmd.h"/>
<!--This header contains the command ids for the menus provided by the shell. -->
<Extern href="vsshlids.h"/>
<!--The Commands section is where commands, menus, and menu groups are defined.
This section uses a Guid to identify the package that provides the command defined inside it. -->
<Commands package="guidGitExtensionsPackage">
<!-- Inside this section we have different sub-sections: one for the menus, another
for the menu groups, one for the buttons (the actual commands), one for the combos
and the last one for the bitmaps used. Each element is identified by a command id that
is a unique pair of guid and numeric identifier; the guid part of the identifier is usually
called "command set" and is used to group different command inside a logically related
group; your package should define its own command set in order to avoid collisions
with command ids defined by other packages. -->
<Menus>
<Menu guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu" type="Menu" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_MM_FILEEDITVIEW"/>
<Strings>
<ButtonText>G&amp;itExt</ButtonText>
<CommandName>G&amp;itExt</CommandName>
</Strings>
</Menu>
<Menu guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbar" type="Toolbar" >
<CommandFlag>DefaultDocked</CommandFlag>
<Strings>
<ButtonText>GitExtensions</ButtonText>
<CommandName>GitExtensions</CommandName>
</Strings>
</Menu>
</Menus>
<!-- In this section you can define new menu groups. A menu group is a container for
other menus or buttons (commands); from a visual point of view you can see the
group as the part of a menu contained between two lines. The parent of a group
must be a menu. -->
<Groups>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" priority="0x0001">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_ITEMNODE"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" priority="0x0001">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" priority="0x0002">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuPatchGroup" priority="0x0003">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" priority="0x0004">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" priority="0x0005">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" priority="0x0006">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup" priority="0x0000">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbar"/>
</Group>
</Groups>
<!--Buttons section. -->
<!--This section defines the elements the user can interact with, like a menu command or a button
or combo box in a toolbar. -->
<Buttons>
<!--To define a menu group you have to specify its ID, the parent menu and its display priority.
The command is visible and enabled by default. If you need to change the visibility, status, etc, you can use
the CommandFlag node.
You can add more than one CommandFlag node e.g.:
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
If you do not want an image next to your command, remove the Icon node /> -->
<!-- Main GitExt menu -->
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtBrowseCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" />
<Icon guid="guidImages" id="browse"/>
<Strings>
<CommandName>GitExt.Browse</CommandName>
<ButtonText>&amp;Browse</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCloneCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" />
<Icon guid="guidImages" id="clone"/>
<Strings>
<CommandName>GitExt.Clone</CommandName>
<ButtonText>Clone repositor&amp;y</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtNewCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" />
<Icon guid="guidImages" id="new"/>
<Strings>
<CommandName>GitExt.NewRepository</CommandName>
<ButtonText>Create new repositor&amp;y</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCommitCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="commit"/>
<Strings>
<CommandName>GitExt.Commit</CommandName>
<ButtonText>&amp;Commit</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtPullCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="pull"/>
<Strings>
<CommandName>GitExt.Pull</CommandName>
<ButtonText>P&amp;ull</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtPushCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="push"/>
<Strings>
<CommandName>GitExt.Push</CommandName>
<ButtonText>Pu&amp;sh</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtStashCommand" priority="0x0004" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="stash"/>
<Strings>
<CommandName>GitExt.Stash</CommandName>
<ButtonText>Stas&amp;h</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtResetFileCommand" priority="0x0005" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="reset"/>
<Strings>
<CommandName>GitExt.ResetFile</CommandName>
<ButtonText>&amp;Reset File Changes</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtRemotesCommand" priority="0x0006" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="remotes"/>
<Strings>
<CommandName>GitExt.Remotes</CommandName>
<ButtonText>Manage rem&amp;otes</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtGitIgnoreCommand" priority="0x0007" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="gitignore"/>
<Strings>
<CommandName>GitExt.GitIgnore</CommandName>
<ButtonText>Edit &amp;.gitignore</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtApplyPatchCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuPatchGroup" />
<Strings>
<CommandName>GitExt.ApplyPatch</CommandName>
<ButtonText>&amp;Apply patch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtFormatPatchCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuPatchGroup" />
<Strings>
<CommandName>GitExt.FormatPatch</CommandName>
<ButtonText>Format patch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtHistoryCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" />
<Icon guid="guidImages" id="history"/>
<Strings>
<CommandName>GitExt.FileHistory</CommandName>
<ButtonText>&amp;File history</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtViewChangesCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" />
<Strings>
<CommandName>GitExt.ViewChanges</CommandName>
<ButtonText>V&amp;iew changes</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtFindFileCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" />
<Icon guid="guidImages" id="find"/>
<Strings>
<CommandName>GitExt.FindFile</CommandName>
<ButtonText>Find fi&amp;le</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCheckoutCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="checkout"/>
<Strings>
<CommandName>GitExt.Checkout</CommandName>
<ButtonText>Chec&amp;kout branch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCreateBranchCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="createBranch"/>
<Strings>
<CommandName>GitExt.CreateBranch</CommandName>
<ButtonText>Create bra&amp;nch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtMergeCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="merge"/>
<Strings>
<CommandName>GitExt.Merge</CommandName>
<ButtonText>&amp;Merge</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtRebaseCommand" priority="0x0004" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="rebase"/>
<Strings>
<CommandName>GitExt.Rebase</CommandName>
<ButtonText>R&amp;ebase</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtSolveConflictsCommand" priority="0x0005" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Strings>
<CommandName>GitExt.SolveConflicts</CommandName>
<ButtonText>Sol&amp;ve merge conflicts</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCherryPickCommand" priority="0x0006" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="cherry"/>
<Strings>
<CommandName>GitExt.CherryPick</CommandName>
<ButtonText>Cherry &amp;pick</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtBashCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" />
<Icon guid="guidImages" id="bash"/>
<Strings>
<CommandName>GitExt.Bash</CommandName>
<ButtonText>&amp;Git bash</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtSettingsCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" />
<Icon guid="guidImages" id="configure"/>
<Strings>
<CommandName>GitExt.Settings</CommandName>
<ButtonText>Se&amp;ttings</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtAboutCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" />
<Icon guid="guidImages" id="about"/>
<Strings>
<CommandName>GitExt.About</CommandName>
<ButtonText>About Git E&amp;xtensions</ButtonText>
</Strings>
</Button>
<!-- Contextual GitExt menu -->
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtDiffCommand" priority="0x0100" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" />
<Icon guid="guidImages" id="diff"/>
<Strings>
<CommandName>gitExtDiff</CommandName>
<ButtonText>GitExt : Diff</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtHistoryCommand" priority="0x0100" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" />
<Icon guid="guidImages" id="history"/>
<Strings>
<CommandName>gitExtHistory</CommandName>
<ButtonText>GitExt : File history</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtResetFileCommand" priority="0x0100" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" />
<Icon guid="guidImages" id="reset"/>
<Strings>
<CommandName>gitExtResetFile</CommandName>
<ButtonText>GitExt : Reset file changes</ButtonText>
</Strings>
</Button>
</Buttons>
<!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
<Bitmaps>
<!-- The bitmap id is defined in a way that is a little bit different from the others:
the declaration starts with a guid for the bitmap strip, then there is the resource id of the
bitmap strip containing the bitmaps and then there are the numeric ids of the elements used
inside a button definition. An important aspect of this declaration is that the element id
must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
<Bitmap guid="guidImages" href="Resources\Commands.png"/>
<!--<Bitmap guid="guidImages" href="Resources\Commands.png" usedList="edit, configure, stash, reset, editAll, history, commit, push, pull, createBranch, unused, browse, new, clone, cherry, checkout, remotes, merge, rebase, info, bash, gitignore, find, diff"/>-->
</Bitmaps>
</Commands>
<CommandPlacements>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" priority="0x0000">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_CODEWIN"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtCommitCommand" priority="0x0001">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtBrowseCommand" priority="0x0002">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtPullCommand" priority="0x0003">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtPushCommand" priority="0x0004">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtStashCommand" priority="0x0005">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtSettingsCommand" priority="0x0006">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
</CommandPlacements>
<Symbols>
<!-- This is the package guid. -->
<GuidSymbol name="guidGitExtensionsPackage" value="{14f45fb8-a093-48af-a2a2-a7bb404cb357}" />
<!-- This is the guid used to group the menu commands together -->
<GuidSymbol name="guidGitExtensionsPackageCmdSet" value="{8bd71b0f-f446-442d-a92a-bbefd8e60202}">
<IDSymbol name="gitExtMenu" value="0x1000" />
<IDSymbol name="gitExtMenuGlobalGroup" value="0x1010" />
<IDSymbol name="gitExtMenuChangesGroup" value="0x1011" />
<IDSymbol name="gitExtMenuPatchGroup" value="0x1012" />
<IDSymbol name="gitExtMenuFindGroup" value="0x1013" />
<IDSymbol name="gitExtMenuBranchGroup" value="0x1014" />
<IDSymbol name="gitExtMenuOtherGroup" value="0x1015" />
<IDSymbol name="gitExtContextualMenu" value="0x1020" />
<IDSymbol name="gitExtToolbar" value="0x1030" />
<IDSymbol name="gitExtToolbarGroup" value="0x101031" />
<IDSymbol name="gitExtDiffCommand" value="0x1100" />
<IDSymbol name="gitExtHistoryCommand" value="0x1101" />
<IDSymbol name="gitExtResetFileCommand" value="0x1102" />
<IDSymbol name="gitExtBrowseCommand" value="0x1103" />
<IDSymbol name="gitExtCloneCommand" value="0x1104" />
<IDSymbol name="gitExtNewCommand" value="0x1105" />
<IDSymbol name="gitExtCommitCommand" value="0x1106" />
<IDSymbol name="gitExtPullCommand" value="0x1107" />
<IDSymbol name="gitExtPushCommand" value="0x1108" />
<IDSymbol name="gitExtStashCommand" value="0x1109" />
<IDSymbol name="gitExtRemotesCommand" value="0x110a" />
<IDSymbol name="gitExtGitIgnoreCommand" value="0x110b" />
<IDSymbol name="gitExtApplyPatchCommand" value="0x110c" />
<IDSymbol name="gitExtFormatPatchCommand" value="0x110d" />
<IDSymbol name="gitExtViewChangesCommand" value="0x110e" />
<IDSymbol name="gitExtFindFileCommand" value="0x110f" />
<IDSymbol name="gitExtCheckoutCommand" value="0x1110" />
<IDSymbol name="gitExtCreateBranchCommand" value="0x1111" />
<IDSymbol name="gitExtMergeCommand" value="0x1112" />
<IDSymbol name="gitExtRebaseCommand" value="0x1113" />
<IDSymbol name="gitExtSolveConflictsCommand" value="0x1114" />
<IDSymbol name="gitExtCherryPickCommand" value="0x1115" />
<IDSymbol name="gitExtBashCommand" value="0x1116" />
<IDSymbol name="gitExtSettingsCommand" value="0x1117" />
<IDSymbol name="gitExtAboutCommand" value="0x1118" />
</GuidSymbol>
<GuidSymbol name="guidImages" value="{8bcce2c8-daec-4814-878e-e9c346d42f24}" >
<IDSymbol name="edit" value="1" />
<IDSymbol name="configure" value="2" />
<IDSymbol name="stash" value="3" />
<IDSymbol name="reset" value="4" />
<IDSymbol name="editAll" value="5" />
<IDSymbol name="history" value="6" />
<IDSymbol name="commit" value="7" />
<IDSymbol name="push" value="8" />
<IDSymbol name="pull" value="9" />
<IDSymbol name="createBranch" value="10" />
<IDSymbol name="unused" value="11" />
<IDSymbol name="browse" value="12" />
<IDSymbol name="new" value="13" />
<IDSymbol name="clone" value="14" />
<IDSymbol name="cherry" value="15" />
<IDSymbol name="checkout" value="16" />
<IDSymbol name="remotes" value="17" />
<IDSymbol name="merge" value="18" />
<IDSymbol name="rebase" value="19" />
<IDSymbol name="about" value="20" />
<IDSymbol name="bash" value="21" />
<IDSymbol name="gitignore" value="22" />
<IDSymbol name="find" value="23" />
<IDSymbol name="diff" value="24" />
</GuidSymbol>
</Symbols>
</CommandTable>

55
GitExtensionsVSIX/GitExtCommands.cs
View File

@ -10,6 +10,7 @@ using GitPlugin.Commands;
using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell;
using Constants = EnvDTE.Constants; using Constants = EnvDTE.Constants;
using static GitExtensionsVSIX.PackageIds;
namespace GitExtensionsVSIX namespace GitExtensionsVSIX
{ {
@ -21,7 +22,7 @@ namespace GitExtensionsVSIX
/// <summary> /// <summary>
/// Command menu group (command set GUID). /// Command menu group (command set GUID).
/// </summary> /// </summary>
public static readonly Guid CommandSet = new Guid("8bd71b0f-f446-442d-a92a-bbefd8e60202");
private static readonly Guid CommandSet = PackageGuids.guidGitExtensionsPackageCmdSet;
/// <summary> /// <summary>
/// VS Package that provides this command, not null. /// VS Package that provides this command, not null.
@ -54,33 +55,33 @@ namespace GitExtensionsVSIX
try try
{ {
//RegisterCommand("Difftool_Selection", new ToolbarCommand<OpenWithDiftool>(runForSelection: true)); //RegisterCommand("Difftool_Selection", new ToolbarCommand<OpenWithDiftool>(runForSelection: true));
RegisterCommand("Difftool", new ToolbarCommand<OpenWithDiftool>(), 0x1100);
RegisterCommand("Difftool", new ToolbarCommand<OpenWithDiftool>(), gitExtDiffCommand);
//RegisterCommand("ShowFileHistory_Selection", new ToolbarCommand<FileHistory>(runForSelection: true)); //RegisterCommand("ShowFileHistory_Selection", new ToolbarCommand<FileHistory>(runForSelection: true));
RegisterCommand("ShowFileHistory", new ToolbarCommand<FileHistory>(), 0x1101);
RegisterCommand("ShowFileHistory", new ToolbarCommand<FileHistory>(), gitExtHistoryCommand);
//RegisterCommand("ResetChanges_Selection", new ToolbarCommand<Revert>(runForSelection: true)); //RegisterCommand("ResetChanges_Selection", new ToolbarCommand<Revert>(runForSelection: true));
RegisterCommand("ResetChanges", new ToolbarCommand<Revert>(), 0x1102);
RegisterCommand("Browse", new ToolbarCommand<Browse>(), 0x1103);
RegisterCommand("Clone", new ToolbarCommand<Clone>(), 0x1104);
RegisterCommand("CreateNewRepository", new ToolbarCommand<Init>(), 0x1105);
RegisterCommand("Commit", new ToolbarCommand<Commit>(), 0x1106);
RegisterCommand("Pull", new ToolbarCommand<Pull>(), 0x1107);
RegisterCommand("Push", new ToolbarCommand<Push>(), 0x1108);
RegisterCommand("Stash", new ToolbarCommand<Stash>(), 0x1109);
RegisterCommand("Remotes", new ToolbarCommand<Remotes>(), 0x110a);
RegisterCommand("GitIgnore", new ToolbarCommand<GitIgnore>(), 0x110b);
RegisterCommand("ApplyPatch", new ToolbarCommand<ApplyPatch>(), 0x110c);
RegisterCommand("FormatPatch", new ToolbarCommand<FormatPatch>(), 0x110d);
RegisterCommand("ViewChanges", new ToolbarCommand<ViewChanges>(), 0x110e);
RegisterCommand("FindFile", new ToolbarCommand<FindFile>(), 0x110f);
RegisterCommand("SwitchBranch", new ToolbarCommand<SwitchBranch>(), 0x1110);
RegisterCommand("CreateBranch", new ToolbarCommand<CreateBranch>(), 0x1111);
RegisterCommand("Merge", new ToolbarCommand<Merge>(), 0x1112);
RegisterCommand("Rebase", new ToolbarCommand<Rebase>(), 0x1113);
RegisterCommand("SolveMergeConflicts", new ToolbarCommand<SolveMergeConflicts>(), 0x1114);
RegisterCommand("CherryPick", new ToolbarCommand<Cherry>(), 0x1115);
RegisterCommand("Bash", new ToolbarCommand<Bash>(), 0x1116);
RegisterCommand("Settings", new ToolbarCommand<Settings>(), 0x1117);
RegisterCommand("About", new ToolbarCommand<About>(), 0x1118);
RegisterCommand("ResetChanges", new ToolbarCommand<Revert>(), gitExtResetFileCommand);
RegisterCommand("Browse", new ToolbarCommand<Browse>(), gitExtBrowseCommand);
RegisterCommand("Clone", new ToolbarCommand<Clone>(), gitExtCloneCommand);
RegisterCommand("CreateNewRepository", new ToolbarCommand<Init>(), gitExtNewCommand);
RegisterCommand("Commit", new ToolbarCommand<Commit>(), gitExtCommitCommand);
RegisterCommand("Pull", new ToolbarCommand<Pull>(), gitExtPullCommand);
RegisterCommand("Push", new ToolbarCommand<Push>(), gitExtPushCommand);
RegisterCommand("Stash", new ToolbarCommand<Stash>(), gitExtStashCommand);
RegisterCommand("Remotes", new ToolbarCommand<Remotes>(), gitExtRemotesCommand);
RegisterCommand("GitIgnore", new ToolbarCommand<GitIgnore>(), gitExtGitIgnoreCommand);
RegisterCommand("ApplyPatch", new ToolbarCommand<ApplyPatch>(), gitExtApplyPatchCommand);
RegisterCommand("FormatPatch", new ToolbarCommand<FormatPatch>(), gitExtFormatPatchCommand);
RegisterCommand("ViewChanges", new ToolbarCommand<ViewChanges>(), gitExtViewChangesCommand);
RegisterCommand("FindFile", new ToolbarCommand<FindFile>(), gitExtFindFileCommand);
RegisterCommand("SwitchBranch", new ToolbarCommand<SwitchBranch>(), gitExtCheckoutCommand);
RegisterCommand("CreateBranch", new ToolbarCommand<CreateBranch>(), gitExtCreateBranchCommand);
RegisterCommand("Merge", new ToolbarCommand<Merge>(), gitExtMergeCommand);
RegisterCommand("Rebase", new ToolbarCommand<Rebase>(), gitExtRebaseCommand);
RegisterCommand("SolveMergeConflicts", new ToolbarCommand<SolveMergeConflicts>(), gitExtSolveConflictsCommand);
RegisterCommand("CherryPick", new ToolbarCommand<Cherry>(), gitExtCherryPickCommand);
RegisterCommand("Bash", new ToolbarCommand<Bash>(), gitExtBashCommand);
RegisterCommand("Settings", new ToolbarCommand<Settings>(), gitExtSettingsCommand);
RegisterCommand("About", new ToolbarCommand<About>(), gitExtAboutCommand);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -113,7 +114,7 @@ namespace GitExtensionsVSIX
public OutputWindowPane OutputPane public OutputWindowPane OutputPane
{ {
get { return _outputPane ?? (_outputPane = AquireOutputPane(_application, "GitExtensions")); }
get { return _outputPane ?? (_outputPane = AquireOutputPane(_application, Vsix.Name)); }
} }
/// <summary> /// <summary>

7
GitExtensionsVSIX/GitExtensionsPackage.cs
View File

@ -27,16 +27,11 @@ namespace GitExtensionsVSIX
[InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] // Info on this package for Help/About [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] // Info on this package for Help/About
[ProvideAutoLoad(UIContextGuids80.SolutionExists)] [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
[ProvideAutoLoad(UIContextGuids80.NoSolution)] [ProvideAutoLoad(UIContextGuids80.NoSolution)]
[Guid(PackageGuidString)]
[Guid(PackageGuids.guidGitExtensionsPackageString)]
[SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")] [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
[ProvideMenuResource("Menus.ctmenu", 1)] [ProvideMenuResource("Menus.ctmenu", 1)]
public sealed class GitExtensionsPackage : Package public sealed class GitExtensionsPackage : Package
{ {
/// <summary>
/// GitExtensionsPackage GUID string.
/// </summary>
public const string PackageGuidString = "14f45fb8-a093-48af-a2a2-a7bb404cb357";
#region Package Members #region Package Members
protected override void Initialize() protected override void Initialize()

416
GitExtensionsVSIX/GitExtensionsPackage.vsct
View File

@ -1,416 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This is the file that defines the actual layout and type of the commands.
It is divided in different sections (e.g. command definition, command
placement, ...), with each defining a specific set of properties.
See the comment before each section for more details about how to
use it. -->
<!-- The VSCT compiler (the tool that translates this file into the binary
format that VisualStudio will consume) has the ability to run a preprocessor
on the vsct file; this preprocessor is (usually) the C++ preprocessor, so
it is possible to define includes and macros with the same syntax used
in C++ files. Using this ability of the compiler here, we include some files
defining some of the constants that we will use inside the file. -->
<!--This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
<Extern href="stdidcmd.h"/>
<!--This header contains the command ids for the menus provided by the shell. -->
<Extern href="vsshlids.h"/>
<!--The Commands section is where commands, menus, and menu groups are defined.
This section uses a Guid to identify the package that provides the command defined inside it. -->
<Commands package="guidGitExtensionsPackage">
<!-- Inside this section we have different sub-sections: one for the menus, another
for the menu groups, one for the buttons (the actual commands), one for the combos
and the last one for the bitmaps used. Each element is identified by a command id that
is a unique pair of guid and numeric identifier; the guid part of the identifier is usually
called "command set" and is used to group different command inside a logically related
group; your package should define its own command set in order to avoid collisions
with command ids defined by other packages. -->
<Menus>
<Menu guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu" type="Menu" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_MM_FILEEDITVIEW"/>
<Strings>
<ButtonText>G&amp;itExt</ButtonText>
<CommandName>G&amp;itExt</CommandName>
</Strings>
</Menu>
<Menu guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbar" type="Toolbar" >
<CommandFlag>DefaultDocked</CommandFlag>
<Strings>
<ButtonText>GitExtensions</ButtonText>
<CommandName>GitExtensions</CommandName>
</Strings>
</Menu>
</Menus>
<!-- In this section you can define new menu groups. A menu group is a container for
other menus or buttons (commands); from a visual point of view you can see the
group as the part of a menu contained between two lines. The parent of a group
must be a menu. -->
<Groups>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" priority="0x0001">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_ITEMNODE"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" priority="0x0001">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" priority="0x0002">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuPatchGroup" priority="0x0003">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" priority="0x0004">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" priority="0x0005">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" priority="0x0006">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenu"/>
</Group>
<Group guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup" priority="0x0000">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbar"/>
</Group>
</Groups>
<!--Buttons section. -->
<!--This section defines the elements the user can interact with, like a menu command or a button
or combo box in a toolbar. -->
<Buttons>
<!--To define a menu group you have to specify its ID, the parent menu and its display priority.
The command is visible and enabled by default. If you need to change the visibility, status, etc, you can use
the CommandFlag node.
You can add more than one CommandFlag node e.g.:
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
If you do not want an image next to your command, remove the Icon node /> -->
<!-- Main GitExt menu -->
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtBrowseCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" />
<Icon guid="guidImages" id="browse"/>
<Strings>
<CommandName>GitExt.Browse</CommandName>
<ButtonText>&amp;Browse</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCloneCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" />
<Icon guid="guidImages" id="clone"/>
<Strings>
<CommandName>GitExt.Clone</CommandName>
<ButtonText>Clone repositor&amp;y</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtNewCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuGlobalGroup" />
<Icon guid="guidImages" id="new"/>
<Strings>
<CommandName>GitExt.NewRepository</CommandName>
<ButtonText>Create new repositor&amp;y</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCommitCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="commit"/>
<Strings>
<CommandName>GitExt.Commit</CommandName>
<ButtonText>&amp;Commit</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtPullCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="pull"/>
<Strings>
<CommandName>GitExt.Pull</CommandName>
<ButtonText>P&amp;ull</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtPushCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="push"/>
<Strings>
<CommandName>GitExt.Push</CommandName>
<ButtonText>Pu&amp;sh</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtStashCommand" priority="0x0004" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="stash"/>
<Strings>
<CommandName>GitExt.Stash</CommandName>
<ButtonText>Stas&amp;h</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtResetFileCommand" priority="0x0005" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="reset"/>
<Strings>
<CommandName>GitExt.ResetFile</CommandName>
<ButtonText>&amp;Reset File Changes</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtRemotesCommand" priority="0x0006" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="remotes"/>
<Strings>
<CommandName>GitExt.Remotes</CommandName>
<ButtonText>Manage rem&amp;otes</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtGitIgnoreCommand" priority="0x0007" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuChangesGroup" />
<Icon guid="guidImages" id="gitignore"/>
<Strings>
<CommandName>GitExt.GitIgnore</CommandName>
<ButtonText>Edit &amp;.gitignore</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtApplyPatchCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuPatchGroup" />
<Strings>
<CommandName>GitExt.ApplyPatch</CommandName>
<ButtonText>&amp;Apply patch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtFormatPatchCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuPatchGroup" />
<Strings>
<CommandName>GitExt.FormatPatch</CommandName>
<ButtonText>Format patch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtHistoryCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" />
<Icon guid="guidImages" id="history"/>
<Strings>
<CommandName>GitExt.FileHistory</CommandName>
<ButtonText>&amp;File history</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtViewChangesCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" />
<Strings>
<CommandName>GitExt.ViewChanges</CommandName>
<ButtonText>V&amp;iew changes</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtFindFileCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuFindGroup" />
<Icon guid="guidImages" id="find"/>
<Strings>
<CommandName>GitExt.FindFile</CommandName>
<ButtonText>Find fi&amp;le</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCheckoutCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="checkout"/>
<Strings>
<CommandName>GitExt.Checkout</CommandName>
<ButtonText>Chec&amp;kout branch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCreateBranchCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="createBranch"/>
<Strings>
<CommandName>GitExt.CreateBranch</CommandName>
<ButtonText>Create bra&amp;nch</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtMergeCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="merge"/>
<Strings>
<CommandName>GitExt.Merge</CommandName>
<ButtonText>&amp;Merge</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtRebaseCommand" priority="0x0004" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="rebase"/>
<Strings>
<CommandName>GitExt.Rebase</CommandName>
<ButtonText>R&amp;ebase</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtSolveConflictsCommand" priority="0x0005" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Strings>
<CommandName>GitExt.SolveConflicts</CommandName>
<ButtonText>Sol&amp;ve merge conflicts</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtCherryPickCommand" priority="0x0006" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuBranchGroup" />
<Icon guid="guidImages" id="cherry"/>
<Strings>
<CommandName>GitExt.CherryPick</CommandName>
<ButtonText>Cherry &amp;pick</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtBashCommand" priority="0x0001" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" />
<Icon guid="guidImages" id="bash"/>
<Strings>
<CommandName>GitExt.Bash</CommandName>
<ButtonText>&amp;Git bash</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtSettingsCommand" priority="0x0002" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" />
<Icon guid="guidImages" id="configure"/>
<Strings>
<CommandName>GitExt.Settings</CommandName>
<ButtonText>Se&amp;ttings</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtAboutCommand" priority="0x0003" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtMenuOtherGroup" />
<Icon guid="guidImages" id="about"/>
<Strings>
<CommandName>GitExt.About</CommandName>
<ButtonText>About Git E&amp;xtensions</ButtonText>
</Strings>
</Button>
<!-- Contextual GitExt menu -->
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtDiffCommand" priority="0x0100" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" />
<Icon guid="guidImages" id="diff"/>
<Strings>
<CommandName>gitExtDiff</CommandName>
<ButtonText>GitExt : Diff</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtHistoryCommand" priority="0x0100" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" />
<Icon guid="guidImages" id="history"/>
<Strings>
<CommandName>gitExtHistory</CommandName>
<ButtonText>GitExt : File history</ButtonText>
</Strings>
</Button>
<Button guid="guidGitExtensionsPackageCmdSet" id="gitExtResetFileCommand" priority="0x0100" type="Button">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" />
<Icon guid="guidImages" id="reset"/>
<Strings>
<CommandName>gitExtResetFile</CommandName>
<ButtonText>GitExt : Reset file changes</ButtonText>
</Strings>
</Button>
</Buttons>
<!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
<Bitmaps>
<!-- The bitmap id is defined in a way that is a little bit different from the others:
the declaration starts with a guid for the bitmap strip, then there is the resource id of the
bitmap strip containing the bitmaps and then there are the numeric ids of the elements used
inside a button definition. An important aspect of this declaration is that the element id
must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
<Bitmap guid="guidImages" href="Resources\Commands.png"/>
<!--<Bitmap guid="guidImages" href="Resources\Commands.png" usedList="edit, configure, stash, reset, editAll, history, commit, push, pull, createBranch, unused, browse, new, clone, cherry, checkout, remotes, merge, rebase, info, bash, gitignore, find, diff"/>-->
</Bitmaps>
</Commands>
<CommandPlacements>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtContextualMenu" priority="0x0000">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_CODEWIN"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtCommitCommand" priority="0x0001">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtBrowseCommand" priority="0x0002">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtPullCommand" priority="0x0003">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtPushCommand" priority="0x0004">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtStashCommand" priority="0x0005">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
<CommandPlacement guid="guidGitExtensionsPackageCmdSet" id="gitExtSettingsCommand" priority="0x0006">
<Parent guid="guidGitExtensionsPackageCmdSet" id="gitExtToolbarGroup"/>
</CommandPlacement>
</CommandPlacements>
<Symbols>
<!-- This is the package guid. -->
<GuidSymbol name="guidGitExtensionsPackage" value="{14f45fb8-a093-48af-a2a2-a7bb404cb357}" />
<!-- This is the guid used to group the menu commands together -->
<GuidSymbol name="guidGitExtensionsPackageCmdSet" value="{8bd71b0f-f446-442d-a92a-bbefd8e60202}">
<IDSymbol name="gitExtMenu" value="0x1000" />
<IDSymbol name="gitExtMenuGlobalGroup" value="0x1010" />
<IDSymbol name="gitExtMenuChangesGroup" value="0x1011" />
<IDSymbol name="gitExtMenuPatchGroup" value="0x1012" />
<IDSymbol name="gitExtMenuFindGroup" value="0x1013" />
<IDSymbol name="gitExtMenuBranchGroup" value="0x1014" />
<IDSymbol name="gitExtMenuOtherGroup" value="0x1015" />
<IDSymbol name="gitExtContextualMenu" value="0x1020" />
<IDSymbol name="gitExtToolbar" value="0x1030" />
<IDSymbol name="gitExtToolbarGroup" value="0x101031" />
<IDSymbol name="gitExtDiffCommand" value="0x1100" />
<IDSymbol name="gitExtHistoryCommand" value="0x1101" />
<IDSymbol name="gitExtResetFileCommand" value="0x1102" />
<IDSymbol name="gitExtBrowseCommand" value="0x1103" />
<IDSymbol name="gitExtCloneCommand" value="0x1104" />
<IDSymbol name="gitExtNewCommand" value="0x1105" />
<IDSymbol name="gitExtCommitCommand" value="0x1106" />
<IDSymbol name="gitExtPullCommand" value="0x1107" />
<IDSymbol name="gitExtPushCommand" value="0x1108" />
<IDSymbol name="gitExtStashCommand" value="0x1109" />
<IDSymbol name="gitExtRemotesCommand" value="0x110a" />
<IDSymbol name="gitExtGitIgnoreCommand" value="0x110b" />
<IDSymbol name="gitExtApplyPatchCommand" value="0x110c" />
<IDSymbol name="gitExtFormatPatchCommand" value="0x110d" />
<IDSymbol name="gitExtViewChangesCommand" value="0x110e" />
<IDSymbol name="gitExtFindFileCommand" value="0x110f" />
<IDSymbol name="gitExtCheckoutCommand" value="0x1110" />
<IDSymbol name="gitExtCreateBranchCommand" value="0x1111" />
<IDSymbol name="gitExtMergeCommand" value="0x1112" />
<IDSymbol name="gitExtRebaseCommand" value="0x1113" />
<IDSymbol name="gitExtSolveConflictsCommand" value="0x1114" />
<IDSymbol name="gitExtCherryPickCommand" value="0x1115" />
<IDSymbol name="gitExtBashCommand" value="0x1116" />
<IDSymbol name="gitExtSettingsCommand" value="0x1117" />
<IDSymbol name="gitExtAboutCommand" value="0x1118" />
</GuidSymbol>
<GuidSymbol name="guidImages" value="{8bcce2c8-daec-4814-878e-e9c346d42f24}" >
<IDSymbol name="edit" value="1" />
<IDSymbol name="configure" value="2" />
<IDSymbol name="stash" value="3" />
<IDSymbol name="reset" value="4" />
<IDSymbol name="editAll" value="5" />
<IDSymbol name="history" value="6" />
<IDSymbol name="commit" value="7" />
<IDSymbol name="push" value="8" />
<IDSymbol name="pull" value="9" />
<IDSymbol name="createBranch" value="10" />
<IDSymbol name="unused" value="11" />
<IDSymbol name="browse" value="12" />
<IDSymbol name="new" value="13" />
<IDSymbol name="clone" value="14" />
<IDSymbol name="cherry" value="15" />
<IDSymbol name="checkout" value="16" />
<IDSymbol name="remotes" value="17" />
<IDSymbol name="merge" value="18" />
<IDSymbol name="rebase" value="19" />
<IDSymbol name="about" value="20" />
<IDSymbol name="bash" value="21" />
<IDSymbol name="gitignore" value="22" />
<IDSymbol name="find" value="23" />
<IDSymbol name="diff" value="24" />
</GuidSymbol>
</Symbols>
</CommandTable>

37
GitExtensionsVSIX/GitExtensionsVSIX.csproj
View File

@ -66,28 +66,48 @@
<Link>Properties\CommonAssemblyInfo.cs</Link> <Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile> </Compile>
<Compile Include="GitExtCommands.cs" /> <Compile Include="GitExtCommands.cs" />
<Compile Include="GitExtCommandTable.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>GitExtCommandTable.vsct</DependentUpon>
</Compile>
<Compile Include="GitExtensionsPackage.cs" /> <Compile Include="GitExtensionsPackage.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="source.extension.cs">
<DependentUpon>source.extension.vsixmanifest</DependentUpon>
</Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\LICENSE.md">
<Link>Resources\LICENSE.md</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="source.extension.ico" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="source.extension.vsixmanifest"> <None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>VsixManifestGenerator</Generator>
<LastGenOutput>source.extension.resx</LastGenOutput>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\Bin\Logo\git-extensions-logo-final-256.png"> <Content Include="..\Bin\Logo\git-extensions-logo-final-256.png">
<Link>Resources\git-extensions-logo-final-256.png</Link> <Link>Resources\git-extensions-logo-final-256.png</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX> <IncludeInVSIX>true</IncludeInVSIX>
</Content> </Content>
<Content Include="..\Bin\Logo\git-extensions-logo-final-32.png"> <Content Include="..\Bin\Logo\git-extensions-logo-final-32.png">
<Link>Resources\git-extensions-logo-final-32.png</Link> <Link>Resources\git-extensions-logo-final-32.png</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX> <IncludeInVSIX>true</IncludeInVSIX>
</Content> </Content>
<Content Include="Resources\Commands.png" /> <Content Include="Resources\Commands.png" />
<VSCTCompile Include="GitExtensionsPackage.vsct">
<VSCTCompile Include="GitExtCommandTable.vsct">
<ResourceName>Menus.ctmenu</ResourceName> <ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>VsctGenerator</Generator>
<LastGenOutput>GitExtCommandTable.cs</LastGenOutput>
</VSCTCompile> </VSCTCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -152,18 +172,21 @@
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<EmbeddedResource Include="VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\GitPlugin\GitPlugin.csproj"> <ProjectReference Include="..\GitPlugin\GitPlugin.csproj">
<Project>{e996be2d-b07d-472d-9d74-3ea2d48ef269}</Project> <Project>{e996be2d-b07d-472d-9d74-3ea2d48ef269}</Project>
<Name>GitPlugin</Name> <Name>GitPlugin</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<EmbeddedResource Include="source.extension.resx">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>source.extension.vsixmanifest</DependentUpon>
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Condition="Exists($(VsSdkTargets))" Project="$(VsSdkTargets)" /> <Import Condition="Exists($(VsSdkTargets))" Project="$(VsSdkTargets)" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

18
GitExtensionsVSIX/source.extension.cs
View File

@ -0,0 +1,18 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// This file was generated by Extensibility Tools v1.10.184
// </auto-generated>
// ------------------------------------------------------------------------------
namespace GitExtensionsVSIX
{
static class Vsix
{
public const string Id = "3166f76a-2b07-410a-a72a-509d6a2d146c";
public const string Name = "GitExtensions";
public const string Description = @"Git Extensions is a graphical user interface for Git that allows you to control Git without using the command-line";
public const string Language = "en-US";
public const string Version = "2.49.0";
public const string Author = "GitExt Team";
public const string Tags = "Git, Git Extensions";
}
}

BIN
GitExtensionsVSIX/source.extension.ico
View File

21
GitExtensionsVSIX/VSPackage.resx → GitExtensionsVSIX/source.extension.resx
View File

@ -1,14 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
VS SDK Notes: This resx file contains the resources that will be consumed from your package by Visual Studio.
For example, Visual Studio will attempt to load resource '400' from this resource stream when it needs to
load your package's icon. Because Visual Studio will always look in the VSPackage.resources stream first for
resources it needs, you should put additional resources that Visual Studio will load directly into this resx
file.
Resources that you would like to access directly from your package in a strong-typed fashion should be stored
in Resources.resx or another resx file.
-->
<?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -127,11 +117,14 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="110" xml:space="preserve"> <data name="110" xml:space="preserve">
<value>GitExtensionsPackage Extension</value>
<value>GitExtensions</value>
</data> </data>
<data name="112" xml:space="preserve"> <data name="112" xml:space="preserve">
<value>GitExtensionsPackage Visual Studio Extension Detailed Info</value>
<value>Git Extensions is a graphical user interface for Git that allows you to control Git without using the command-line</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>source.extension.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

50
GitExtensionsVSIX/source.extension.vsixmanifest
View File

@ -1,31 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
<Identifier Id="GitExtensionsVSIX.3166f76a-2b07-410a-a72a-509d6a2d146c">
<Name>GitExtensions</Name>
<Author>GitExtensions</Author>
<Version>2.49</Version>
<Description xml:space="preserve">Integration of GitExtensions in Visual Studio.</Description>
<Locale>1033</Locale>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Publisher="GitExt Team" Version="2.49.00" Language="en-US" Id="3166f76a-2b07-410a-a72a-509d6a2d146c" />
<DisplayName>GitExtensions</DisplayName>
<Description xml:space="preserve" >Git Extensions is a graphical user interface for Git that allows you to control Git without using the command-line</Description>
<MoreInfo>http://gitextensions.github.io/</MoreInfo>
<License>Resources\LICENSE.md</License>
<GettingStartedGuide>https://git-extensions-documentation.readthedocs.io/en/latest/</GettingStartedGuide>
<Icon>Resources\git-extensions-logo-final-32.png</Icon> <Icon>Resources\git-extensions-logo-final-32.png</Icon>
<PreviewImage>Resources\git-extensions-logo-final-256.png</PreviewImage> <PreviewImage>Resources\git-extensions-logo-final-256.png</PreviewImage>
<SupportedProducts>
<VisualStudio Version="10.0">
<Edition>Pro</Edition>
</VisualStudio>
<VisualStudio Version="11.0">
<Edition>Pro</Edition>
</VisualStudio>
<VisualStudio Version="12.0">
<Edition>Pro</Edition>
</VisualStudio>
<VisualStudio Version="14.0">
<Edition>Pro</Edition>
</VisualStudio>
</SupportedProducts>
<SupportedFrameworkRuntimeEdition MinVersion="4.0" />
</Identifier>
<Tags>Git, Git Extensions</Tags>
</Metadata>
<Content>
<VsPackage>|%CurrentProject%|</VsPackage>
</Content>
</Vsix>
<Installation>
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Community" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0,15.0)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
</PackageManifest>
Write Preview
Loading…
Cancel
Save