diff --git a/.gitmodules b/.gitmodules index 0bb9aacba..f20ee5b36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,6 +16,3 @@ [submodule "script"] path = script url = git@github.com:github/VisualStudioBuildScripts -[submodule "submodules/GitHubVSTestAutomationIDs"] - path = submodules/GitHubVSTestAutomationIDs - url = https://github.com/editor-tools/GitHubVSTestAutomationIDs.git diff --git a/GitHubVS.sln b/GitHubVS.sln index 8dedeaed3..54d66ec07 100644 --- a/GitHubVS.sln +++ b/GitHubVS.sln @@ -104,10 +104,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UI", "s EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.StartPage", "src\GitHub.StartPage\GitHub.StartPage.csproj", "{50E277B8-8580-487A-8F8E-5C3B9FBF0F77}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHubVSTestAutomationIDs", "GitHubVSTestAutomationIDs", "{4405C20E-A72A-4807-9480-14E9BB558347}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubVSTestAutomationIDs", "submodules\GitHubVSTestAutomationIDs\GitHubVSTestAutomationIDs\GitHubVSTestAutomationIDs.csproj", "{665078F4-5875-431D-A2CC-421849B43328}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -546,22 +542,6 @@ Global {50E277B8-8580-487A-8F8E-5C3B9FBF0F77}.XamlDesign|Any CPU.Build.0 = Release|Any CPU {50E277B8-8580-487A-8F8E-5C3B9FBF0F77}.XamlDesign|x86.ActiveCfg = Release|Any CPU {50E277B8-8580-487A-8F8E-5C3B9FBF0F77}.XamlDesign|x86.Build.0 = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Debug|Any CPU.Build.0 = Debug|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Debug|x86.ActiveCfg = Debug|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Debug|x86.Build.0 = Debug|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Publish|Any CPU.ActiveCfg = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Publish|Any CPU.Build.0 = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Publish|x86.ActiveCfg = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Publish|x86.Build.0 = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Release|Any CPU.ActiveCfg = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Release|Any CPU.Build.0 = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Release|x86.ActiveCfg = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.Release|x86.Build.0 = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.XamlDesign|Any CPU.Build.0 = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.XamlDesign|x86.ActiveCfg = Release|Any CPU - {665078F4-5875-431D-A2CC-421849B43328}.XamlDesign|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -585,7 +565,5 @@ Global {0EC8DBA1-D745-4EE5-993A-6026440EC3BF} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9} {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} {7B835A7D-CF94-45E8-B191-96F5A4FE26A8} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} - {4405C20E-A72A-4807-9480-14E9BB558347} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} - {665078F4-5875-431D-A2CC-421849B43328} = {4405C20E-A72A-4807-9480-14E9BB558347} EndGlobalSection EndGlobal diff --git a/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml b/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml index 7eb994bca..c049a7d7d 100644 --- a/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml +++ b/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" mc:Ignorable="d" Width="256" d:DesignHeight="47" diff --git a/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml.cs b/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml.cs index 9377f6b65..733c9513f 100644 --- a/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml.cs +++ b/src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml.cs @@ -6,7 +6,6 @@ using System.Windows.Input; using GitHub.Extensions; using NullGuard; using System.Globalization; -using GitHub.VisualStudio.TestAutomation; namespace GitHub.UI { diff --git a/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj b/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj index 8c6a5fc79..21a17aa11 100644 --- a/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj +++ b/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj @@ -172,10 +172,6 @@ - - {665078f4-5875-431d-a2cc-421849b43328} - GithubVSTestAutomationIDs - {600998c4-54dd-4755-bfa8-6f44544d8e2e} ReactiveUI.Events_Net45 diff --git a/src/GitHub.UI/GitHub.UI.csproj b/src/GitHub.UI/GitHub.UI.csproj index 310eea31f..a0a292b80 100644 --- a/src/GitHub.UI/GitHub.UI.csproj +++ b/src/GitHub.UI/GitHub.UI.csproj @@ -114,6 +114,11 @@ True Resources.resx + + True + True + AutomationIDs.resx + Key.snk @@ -254,6 +259,10 @@ Resources.Designer.cs Designer + + PublicResXFileCodeGenerator + AutomationIDs.Designer.cs + diff --git a/src/GitHub.UI/TestAutomation/AutomationIDs.Designer.cs b/src/GitHub.UI/TestAutomation/AutomationIDs.Designer.cs new file mode 100644 index 000000000..d8bd417d1 --- /dev/null +++ b/src/GitHub.UI/TestAutomation/AutomationIDs.Designer.cs @@ -0,0 +1,1260 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GitHub.UI.TestAutomation { + using System; + + + /// + /// 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")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class AutomationIDs { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal AutomationIDs() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitHub.UI.TestAutomation.AutomationIDs", typeof(AutomationIDs).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to AccountComboBox. + /// + public static string AccountComboBox { + get { + return ResourceManager.GetString("AccountComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AccountListBoxItem. + /// + public static string AccountListBoxItem { + get { + return ResourceManager.GetString("AccountListBoxItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CloneAGitHubRepositoryWindow. + /// + public static string CloneAGitHubRepositoryWindow { + get { + return ResourceManager.GetString("CloneAGitHubRepositoryWindow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CloneHyperlink. + /// + public static string CloneHyperlink { + get { + return ResourceManager.GetString("CloneHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CloneRepositoryButton. + /// + public static string CloneRepositoryButton { + get { + return ResourceManager.GetString("CloneRepositoryButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CloneRepositoryCloseButton. + /// + public static string CloneRepositoryCloseButton { + get { + return ResourceManager.GetString("CloneRepositoryCloseButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CloneRepositoryLocalPathBrowsePathButton. + /// + public static string CloneRepositoryLocalPathBrowsePathButton { + get { + return ResourceManager.GetString("CloneRepositoryLocalPathBrowsePathButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CloneRepositoryLocalPathCustom. + /// + public static string CloneRepositoryLocalPathCustom { + get { + return ResourceManager.GetString("CloneRepositoryLocalPathCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CloneRepositoryTitleBar. + /// + public static string CloneRepositoryTitleBar { + get { + return ResourceManager.GetString("CloneRepositoryTitleBar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ConnectToGitHubCloseButton. + /// + public static string ConnectToGitHubCloseButton { + get { + return ResourceManager.GetString("ConnectToGitHubCloseButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ConnectToGitHubMenuItem. + /// + public static string ConnectToGitHubMenuItem { + get { + return ResourceManager.GetString("ConnectToGitHubMenuItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ConnectToGitHubTitleBar. + /// + public static string ConnectToGitHubTitleBar { + get { + return ResourceManager.GetString("ConnectToGitHubTitleBar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ConnectToGitHubWindow. + /// + public static string ConnectToGitHubWindow { + get { + return ResourceManager.GetString("ConnectToGitHubWindow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateAGitHubGistControl. + /// + public static string CreateAGitHubGistControl { + get { + return ResourceManager.GetString("CreateAGitHubGistControl", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateAGitHubGistTitleBar. + /// + public static string CreateAGitHubGistTitleBar { + get { + return ResourceManager.GetString("CreateAGitHubGistTitleBar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateAGitHubRepositoryWindow. + /// + public static string CreateAGitHubRepositoryWindow { + get { + return ResourceManager.GetString("CreateAGitHubRepositoryWindow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreatedPullRequestAuthorImage. + /// + public static string CreatedPullRequestAuthorImage { + get { + return ResourceManager.GetString("CreatedPullRequestAuthorImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreatedPullRequestDetailsTextBlock. + /// + public static string CreatedPullRequestDetailsTextBlock { + get { + return ResourceManager.GetString("CreatedPullRequestDetailsTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreatedPullRequestListItem. + /// + public static string CreatedPullRequestListItem { + get { + return ResourceManager.GetString("CreatedPullRequestListItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreatedPullRequestNumberHyperlink. + /// + public static string CreatedPullRequestNumberHyperlink { + get { + return ResourceManager.GetString("CreatedPullRequestNumberHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreatedPullRequestTitleHyperlink. + /// + public static string CreatedPullRequestTitleHyperlink { + get { + return ResourceManager.GetString("CreatedPullRequestTitleHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateGistButton. + /// + public static string CreateGistButton { + get { + return ResourceManager.GetString("CreateGistButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateHyperlink. + /// + public static string CreateHyperlink { + get { + return ResourceManager.GetString("CreateHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateNewHyperlink. + /// + public static string CreateNewHyperlink { + get { + return ResourceManager.GetString("CreateNewHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateRepositoryButton. + /// + public static string CreateRepositoryButton { + get { + return ResourceManager.GetString("CreateRepositoryButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateRepositoryCloseButton. + /// + public static string CreateRepositoryCloseButton { + get { + return ResourceManager.GetString("CreateRepositoryCloseButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateRepositoryLocalPathBrowseButton. + /// + public static string CreateRepositoryLocalPathBrowseButton { + get { + return ResourceManager.GetString("CreateRepositoryLocalPathBrowseButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateRepositoryLocalPathTextBox. + /// + public static string CreateRepositoryLocalPathTextBox { + get { + return ResourceManager.GetString("CreateRepositoryLocalPathTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CreateRepositoryTitleBar. + /// + public static string CreateRepositoryTitleBar { + get { + return ResourceManager.GetString("CreateRepositoryTitleBar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DontHaveDotcomAccountTextBlock. + /// + public static string DontHaveDotcomAccountTextBlock { + get { + return ResourceManager.GetString("DontHaveDotcomAccountTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DontHaveEnterpriseTextBlock. + /// + public static string DontHaveEnterpriseTextBlock { + get { + return ResourceManager.GetString("DontHaveEnterpriseTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DotcomPasswordTextBox. + /// + public static string DotcomPasswordTextBox { + get { + return ResourceManager.GetString("DotcomPasswordTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DotcomSignInButton. + /// + public static string DotcomSignInButton { + get { + return ResourceManager.GetString("DotcomSignInButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DotcomSignUpHyperlink. + /// + public static string DotcomSignUpHyperlink { + get { + return ResourceManager.GetString("DotcomSignUpHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DotcomUsernameEmailTextBox. + /// + public static string DotcomUsernameEmailTextBox { + get { + return ResourceManager.GetString("DotcomUsernameEmailTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnterpriseLearnMoreHyperlink. + /// + public static string EnterpriseLearnMoreHyperlink { + get { + return ResourceManager.GetString("EnterpriseLearnMoreHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnterprisePasswordTextBox. + /// + public static string EnterprisePasswordTextBox { + get { + return ResourceManager.GetString("EnterprisePasswordTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnterpriseServerAddressTextBox. + /// + public static string EnterpriseServerAddressTextBox { + get { + return ResourceManager.GetString("EnterpriseServerAddressTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnterpriseSignInButton. + /// + public static string EnterpriseSignInButton { + get { + return ResourceManager.GetString("EnterpriseSignInButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnterpriseUsernameEmailTextBox. + /// + public static string EnterpriseUsernameEmailTextBox { + get { + return ResourceManager.GetString("EnterpriseUsernameEmailTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistAccountImage. + /// + public static string GistAccountImage { + get { + return ResourceManager.GetString("GistAccountImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistAccountNameTextBlock. + /// + public static string GistAccountNameTextBlock { + get { + return ResourceManager.GetString("GistAccountNameTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistCreationControlCustom. + /// + public static string GistCreationControlCustom { + get { + return ResourceManager.GetString("GistCreationControlCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistDescriptionTextBlock. + /// + public static string GistDescriptionTextBlock { + get { + return ResourceManager.GetString("GistDescriptionTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistDescriptionTextBox. + /// + public static string GistDescriptionTextBox { + get { + return ResourceManager.GetString("GistDescriptionTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistErrorMessageTextBlock. + /// + public static string GistErrorMessageTextBlock { + get { + return ResourceManager.GetString("GistErrorMessageTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistFileNameTextBlock. + /// + public static string GistFileNameTextBlock { + get { + return ResourceManager.GetString("GistFileNameTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GistFileNameTextBox. + /// + public static string GistFileNameTextBox { + get { + return ResourceManager.GetString("GistFileNameTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubConnectContentCustom. + /// + public static string GitHubConnectContentCustom { + get { + return ResourceManager.GetString("GitHubConnectContentCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubHomeContentCustom. + /// + public static string GitHubHomeContentCustom { + get { + return ResourceManager.GetString("GitHubHomeContentCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubInfoPanel. + /// + public static string GitHubInfoPanel { + get { + return ResourceManager.GetString("GitHubInfoPanel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubInfoPanelCancelButton. + /// + public static string GitHubInfoPanelCancelButton { + get { + return ResourceManager.GetString("GitHubInfoPanelCancelButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubInfoPanelMessageDocument. + /// + public static string GitHubInfoPanelMessageDocument { + get { + return ResourceManager.GetString("GitHubInfoPanelMessageDocument", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubLoggedOutCreateAnAccountHyperlink. + /// + public static string GitHubLoggedOutCreateAnAccountHyperlink { + get { + return ResourceManager.GetString("GitHubLoggedOutCreateAnAccountHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubLoggedOutSignInHyperlink. + /// + public static string GitHubLoggedOutSignInHyperlink { + get { + return ResourceManager.GetString("GitHubLoggedOutSignInHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubPaneView. + /// + public static string GitHubPaneView { + get { + return ResourceManager.GetString("GitHubPaneView", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubTabItem. + /// + public static string GitHubTabItem { + get { + return ResourceManager.GetString("GitHubTabItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubToolBar. + /// + public static string GitHubToolBar { + get { + return ResourceManager.GetString("GitHubToolBar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubToolBarBackImage. + /// + public static string GitHubToolBarBackImage { + get { + return ResourceManager.GetString("GitHubToolBarBackImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubToolBarForwardImage. + /// + public static string GitHubToolBarForwardImage { + get { + return ResourceManager.GetString("GitHubToolBarForwardImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubToolBarPullRequestImage. + /// + public static string GitHubToolBarPullRequestImage { + get { + return ResourceManager.GetString("GitHubToolBarPullRequestImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitHubToolBarRefreshImage. + /// + public static string GitHubToolBarRefreshImage { + get { + return ResourceManager.GetString("GitHubToolBarRefreshImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitignoreComboBox. + /// + public static string GitignoreComboBox { + get { + return ResourceManager.GetString("GitignoreComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitignoreFilterTextBox. + /// + public static string GitignoreFilterTextBox { + get { + return ResourceManager.GetString("GitignoreFilterTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitignoreListBoxItem. + /// + public static string GitignoreListBoxItem { + get { + return ResourceManager.GetString("GitignoreListBoxItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitignorePopupWindow. + /// + public static string GitignorePopupWindow { + get { + return ResourceManager.GetString("GitignorePopupWindow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GitignoreTextBlock. + /// + public static string GitignoreTextBlock { + get { + return ResourceManager.GetString("GitignoreTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to LicenseComboBox. + /// + public static string LicenseComboBox { + get { + return ResourceManager.GetString("LicenseComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to LicenseFilterTextBox. + /// + public static string LicenseFilterTextBox { + get { + return ResourceManager.GetString("LicenseFilterTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to LicenseListBoxItem. + /// + public static string LicenseListBoxItem { + get { + return ResourceManager.GetString("LicenseListBoxItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to LicensePopupWindow. + /// + public static string LicensePopupWindow { + get { + return ResourceManager.GetString("LicensePopupWindow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to LicenseTextBlock. + /// + public static string LicenseTextBlock { + get { + return ResourceManager.GetString("LicenseTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to LoggedOutViewCustom. + /// + public static string LoggedOutViewCustom { + get { + return ResourceManager.GetString("LoggedOutViewCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PowerfulCollaborationTextBlock. + /// + public static string PowerfulCollaborationTextBlock { + get { + return ResourceManager.GetString("PowerfulCollaborationTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PrivateGistCheckBox. + /// + public static string PrivateGistCheckBox { + get { + return ResourceManager.GetString("PrivateGistCheckBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PrivateRepositoryCheckBox. + /// + public static string PrivateRepositoryCheckBox { + get { + return ResourceManager.GetString("PrivateRepositoryCheckBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestCreationCancelButton. + /// + public static string PullRequestCreationCancelButton { + get { + return ResourceManager.GetString("PullRequestCreationCancelButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestCreationCreateButton. + /// + public static string PullRequestCreationCreateButton { + get { + return ResourceManager.GetString("PullRequestCreationCreateButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestCreationDescriptionTextBox. + /// + public static string PullRequestCreationDescriptionTextBox { + get { + return ResourceManager.GetString("PullRequestCreationDescriptionTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestCreationDetailPane. + /// + public static string PullRequestCreationDetailPane { + get { + return ResourceManager.GetString("PullRequestCreationDetailPane", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestCreationTitleTextBox. + /// + public static string PullRequestCreationTitleTextBox { + get { + return ResourceManager.GetString("PullRequestCreationTitleTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestCreationViewCustom. + /// + public static string PullRequestCreationViewCustom { + get { + return ResourceManager.GetString("PullRequestCreationViewCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestListAssigneeFilterComboBox. + /// + public static string PullRequestListAssigneeFilterComboBox { + get { + return ResourceManager.GetString("PullRequestListAssigneeFilterComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestListAuthorFilterComboBox. + /// + public static string PullRequestListAuthorFilterComboBox { + get { + return ResourceManager.GetString("PullRequestListAuthorFilterComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestListFilterAssigneesDropDown. + /// + public static string PullRequestListFilterAssigneesDropDown { + get { + return ResourceManager.GetString("PullRequestListFilterAssigneesDropDown", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestListStatusFilterComboBox. + /// + public static string PullRequestListStatusFilterComboBox { + get { + return ResourceManager.GetString("PullRequestListStatusFilterComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestListViewCustom. + /// + public static string PullRequestListViewCustom { + get { + return ResourceManager.GetString("PullRequestListViewCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestRepositoryNameTextBlock. + /// + public static string PullRequestRepositoryNameTextBlock { + get { + return ResourceManager.GetString("PullRequestRepositoryNameTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestSourceBranchHyperlink. + /// + public static string PullRequestSourceBranchHyperlink { + get { + return ResourceManager.GetString("PullRequestSourceBranchHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PullRequestTargetBranchComboBox. + /// + public static string PullRequestTargetBranchComboBox { + get { + return ResourceManager.GetString("PullRequestTargetBranchComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryCloneControlCustom. + /// + public static string RepositoryCloneControlCustom { + get { + return ResourceManager.GetString("RepositoryCloneControlCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryCreationControlCustom. + /// + public static string RepositoryCreationControlCustom { + get { + return ResourceManager.GetString("RepositoryCreationControlCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryDescriptionTextBlock. + /// + public static string RepositoryDescriptionTextBlock { + get { + return ResourceManager.GetString("RepositoryDescriptionTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryDescriptionTextBox. + /// + public static string RepositoryDescriptionTextBox { + get { + return ResourceManager.GetString("RepositoryDescriptionTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryGroupItem. + /// + public static string RepositoryGroupItem { + get { + return ResourceManager.GetString("RepositoryGroupItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryListBoxItem. + /// + public static string RepositoryListBoxItem { + get { + return ResourceManager.GetString("RepositoryListBoxItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryNameTextBlock. + /// + public static string RepositoryNameTextBlock { + get { + return ResourceManager.GetString("RepositoryNameTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RepositoryNameTextBox. + /// + public static string RepositoryNameTextBox { + get { + return ResourceManager.GetString("RepositoryNameTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SearchRepositoryTextBox. + /// + public static string SearchRepositoryTextBox { + get { + return ResourceManager.GetString("SearchRepositoryTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SelectABranchComboBox. + /// + public static string SelectABranchComboBox { + get { + return ResourceManager.GetString("SelectABranchComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SignInCustom. + /// + public static string SignInCustom { + get { + return ResourceManager.GetString("SignInCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SignInDotcomHostTabItem. + /// + public static string SignInDotcomHostTabItem { + get { + return ResourceManager.GetString("SignInDotcomHostTabItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SignInEnterpriseHostTabItem. + /// + public static string SignInEnterpriseHostTabItem { + get { + return ResourceManager.GetString("SignInEnterpriseHostTabItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SignInHostTab. + /// + public static string SignInHostTab { + get { + return ResourceManager.GetString("SignInHostTab", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SignInHyperlink. + /// + public static string SignInHyperlink { + get { + return ResourceManager.GetString("SignInHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SignInToGitHubTextBlock. + /// + public static string SignInToGitHubTextBlock { + get { + return ResourceManager.GetString("SignInToGitHubTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SignOutHyperlink. + /// + public static string SignOutHyperlink { + get { + return ResourceManager.GetString("SignOutHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerConnectGitHubSectionButton. + /// + public static string TeamExplorerConnectGitHubSectionButton { + get { + return ResourceManager.GetString("TeamExplorerConnectGitHubSectionButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerConnectGitHubSectionTextBlock. + /// + public static string TeamExplorerConnectGitHubSectionTextBlock { + get { + return ResourceManager.GetString("TeamExplorerConnectGitHubSectionTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerHomeGitHubSectionButton. + /// + public static string TeamExplorerHomeGitHubSectionButton { + get { + return ResourceManager.GetString("TeamExplorerHomeGitHubSectionButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerHomeGitHubSectionTextBlock. + /// + public static string TeamExplorerHomeGitHubSectionTextBlock { + get { + return ResourceManager.GetString("TeamExplorerHomeGitHubSectionTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerPrivateRepositoryCheckBox. + /// + public static string TeamExplorerPrivateRepositoryCheckBox { + get { + return ResourceManager.GetString("TeamExplorerPrivateRepositoryCheckBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerPublishAccountComboBox. + /// + public static string TeamExplorerPublishAccountComboBox { + get { + return ResourceManager.GetString("TeamExplorerPublishAccountComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerPublishHostComboBox. + /// + public static string TeamExplorerPublishHostComboBox { + get { + return ResourceManager.GetString("TeamExplorerPublishHostComboBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerPublishRepositoryButton. + /// + public static string TeamExplorerPublishRepositoryButton { + get { + return ResourceManager.GetString("TeamExplorerPublishRepositoryButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerPublishRepositoryDescriptionTextBox. + /// + public static string TeamExplorerPublishRepositoryDescriptionTextBox { + get { + return ResourceManager.GetString("TeamExplorerPublishRepositoryDescriptionTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerPublishRepositoryNameTextBox. + /// + public static string TeamExplorerPublishRepositoryNameTextBox { + get { + return ResourceManager.GetString("TeamExplorerPublishRepositoryNameTextBox", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerRepositoryListBoxItem. + /// + public static string TeamExplorerRepositoryListBoxItem { + get { + return ResourceManager.GetString("TeamExplorerRepositoryListBoxItem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerRepositoryListView. + /// + public static string TeamExplorerRepositoryListView { + get { + return ResourceManager.GetString("TeamExplorerRepositoryListView", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerRepositoryNameTextBlock. + /// + public static string TeamExplorerRepositoryNameTextBlock { + get { + return ResourceManager.GetString("TeamExplorerRepositoryNameTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerRepositoryURLTextBlock. + /// + public static string TeamExplorerRepositoryURLTextBlock { + get { + return ResourceManager.GetString("TeamExplorerRepositoryURLTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerSyncGitHubRepositoryPublishCustom. + /// + public static string TeamExplorerSyncGitHubRepositoryPublishCustom { + get { + return ResourceManager.GetString("TeamExplorerSyncGitHubRepositoryPublishCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerSyncGitHubSectionButton. + /// + public static string TeamExplorerSyncGitHubSectionButton { + get { + return ResourceManager.GetString("TeamExplorerSyncGitHubSectionButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TeamExplorerSyncGitHubSectionTextBlock. + /// + public static string TeamExplorerSyncGitHubSectionTextBlock { + get { + return ResourceManager.GetString("TeamExplorerSyncGitHubSectionTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticationCloseButton. + /// + public static string TwoFactorAuthenticationCloseButton { + get { + return ResourceManager.GetString("TwoFactorAuthenticationCloseButton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticationCustom. + /// + public static string TwoFactorAuthenticationCustom { + get { + return ResourceManager.GetString("TwoFactorAuthenticationCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticationInformationTextBlock. + /// + public static string TwoFactorAuthenticationInformationTextBlock { + get { + return ResourceManager.GetString("TwoFactorAuthenticationInformationTextBlock", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticationInputStackPanel. + /// + public static string TwoFactorAuthenticationInputStackPanel { + get { + return ResourceManager.GetString("TwoFactorAuthenticationInputStackPanel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticationLearnMoreHyperlink. + /// + public static string TwoFactorAuthenticationLearnMoreHyperlink { + get { + return ResourceManager.GetString("TwoFactorAuthenticationLearnMoreHyperlink", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticationTitleBar. + /// + public static string TwoFactorAuthenticationTitleBar { + get { + return ResourceManager.GetString("TwoFactorAuthenticationTitleBar", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticationWindow. + /// + public static string TwoFactorAuthenticationWindow { + get { + return ResourceManager.GetString("TwoFactorAuthenticationWindow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticatonInputCustom. + /// + public static string TwoFactorAuthenticatonInputCustom { + get { + return ResourceManager.GetString("TwoFactorAuthenticatonInputCustom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TwoFactorAuthenticatonVerifyButton. + /// + public static string TwoFactorAuthenticatonVerifyButton { + get { + return ResourceManager.GetString("TwoFactorAuthenticatonVerifyButton", resourceCulture); + } + } + } +} diff --git a/src/GitHub.UI/TestAutomation/AutomationIDs.resx b/src/GitHub.UI/TestAutomation/AutomationIDs.resx new file mode 100644 index 000000000..0ba6b768f --- /dev/null +++ b/src/GitHub.UI/TestAutomation/AutomationIDs.resx @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CreateAGitHubRepositoryWindow + + + GitHubInfoPanel + + + GitHubTabItem + + + PullRequestCreationViewCustom + + + PullRequestCreationDetailPane + + + PullRequestListViewCustom + + + PullRequestCreationCancelButton + + + PullRequestCreationCreateButton + + + PullRequestTargetBranchComboBox + + + PullRequestCreationDescriptionTextBox + + + PullRequestCreationTitleTextBox + + + PullRequestListFilterAssigneesDropDown + + + PullRequestSourceBranchHyperlink + + + CreatedPullRequestAuthorImage + + + CreatedPullRequestDetailsTextBlock + + + CreatedPullRequestListItem + + + CreatedPullRequestNumberHyperlink + + + CreatedPullRequestTitleHyperlink + + + CreateNewHyperlink + + + PullRequestListAssigneeFilterComboBox + + + PullRequestListAuthorFilterComboBox + + + PullRequestListStatusFilterComboBox + + + SelectABranchComboBox + + + PullRequestRepositoryNameTextBlock + + + AccountComboBox + + + AccountListBoxItem + + + CloneAGitHubRepositoryWindow + + + CloneRepositoryButton + + + CloneRepositoryCloseButton + + + CloneRepositoryLocalPathBrowsePathButton + + + CloneRepositoryLocalPathCustom + + + CloneRepositoryTitleBar + + + ConnectToGitHubCloseButton + + + ConnectToGitHubTitleBar + + + ConnectToGitHubWindow + + + CreateAGitHubGistControl + + + CreateAGitHubGistTitleBar + + + CreateGistButton + + + CreateRepositoryButton + + + CreateRepositoryCloseButton + + + CreateRepositoryLocalPathBrowseButton + + + CreateRepositoryLocalPathTextBox + + + CreateRepositoryTitleBar + + + DontHaveDotcomAccountTextBlock + + + DontHaveEnterpriseTextBlock + + + DotcomPasswordTextBox + + + DotcomSignInButton + + + DotcomSignUpHyperlink + + + DotcomUsernameEmailTextBox + + + EnterpriseLearnMoreHyperlink + + + EnterprisePasswordTextBox + + + EnterpriseServerAddressTextBox + + + EnterpriseSignInButton + + + EnterpriseUsernameEmailTextBox + + + GistAccountImage + + + GistAccountNameTextBlock + + + GistCreationControlCustom + + + GistDescriptionTextBlock + + + GistDescriptionTextBox + + + GistErrorMessageTextBlock + + + GistFileNameTextBlock + + + GistFileNameTextBox + + + GitignoreComboBox + + + GitignoreFilterTextBox + + + GitignoreListBoxItem + + + GitignorePopupWindow + + + GitignoreTextBlock + + + LicenseComboBox + + + LicenseFilterTextBox + + + LicenseListBoxItem + + + LicensePopupWindow + + + LicenseTextBlock + + + PrivateGistCheckBox + + + PrivateRepositoryCheckBox + + + RepositoryCloneControlCustom + + + RepositoryCreationControlCustom + + + RepositoryDescriptionTextBlock + + + RepositoryDescriptionTextBox + + + RepositoryGroupItem + + + RepositoryListBoxItem + + + RepositoryNameTextBlock + + + RepositoryNameTextBox + + + SearchRepositoryTextBox + + + SignInCustom + + + SignInDotcomHostTabItem + + + SignInEnterpriseHostTabItem + + + SignInHostTab + + + TwoFactorAuthenticationCloseButton + + + TwoFactorAuthenticationCustom + + + TwoFactorAuthenticationInformationTextBlock + + + TwoFactorAuthenticationLearnMoreHyperlink + + + TwoFactorAuthenticationTitleBar + + + TwoFactorAuthenticationWindow + + + TwoFactorAuthenticatonInputCustom + + + TwoFactorAuthenticatonVerifyButton + + + CloneHyperlink + + + ConnectToGitHubMenuItem + + + CreateHyperlink + + + GitHubConnectContentCustom + + + GitHubHomeContentCustom + + + SignInHyperlink + + + SignOutHyperlink + + + TeamExplorerConnectGitHubSectionButton + + + TeamExplorerConnectGitHubSectionTextBlock + + + TeamExplorerHomeGitHubSectionButton + + + TeamExplorerHomeGitHubSectionTextBlock + + + TeamExplorerRepositoryListBoxItem + + + TeamExplorerRepositoryListView + + + TeamExplorerRepositoryNameTextBlock + + + TeamExplorerRepositoryURLTextBlock + + + TeamExplorerPrivateRepositoryCheckBox + + + TeamExplorerPublishAccountComboBox + + + TeamExplorerPublishHostComboBox + + + TeamExplorerPublishRepositoryButton + + + TeamExplorerPublishRepositoryDescriptionTextBox + + + TeamExplorerPublishRepositoryNameTextBox + + + TeamExplorerSyncGitHubRepositoryPublishCustom + + + TeamExplorerSyncGitHubSectionButton + + + TeamExplorerSyncGitHubSectionTextBlock + + + GitHubInfoPanelCancelButton + + + GitHubInfoPanelMessageDocument + + + GitHubToolBar + + + GitHubToolBarBackImage + + + GitHubToolBarForwardImage + + + GitHubToolBarPullRequestImage + + + GitHubToolBarRefreshImage + + + GitHubLoggedOutCreateAnAccountHyperlink + + + GitHubLoggedOutSignInHyperlink + + + LoggedOutViewCustom + + + PowerfulCollaborationTextBlock + + + SignInToGitHubTextBlock + + + GitHubPaneView + + + TwoFactorAuthenticationInputStackPanel + + \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj index 8be88605c..d69addba4 100644 --- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj +++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj @@ -200,10 +200,6 @@ - - {665078f4-5875-431d-a2cc-421849b43328} - GithubVSTestAutomationIDs - {08dd4305-7787-4823-a53f-4d0f725a07f3} Octokit diff --git a/src/GitHub.VisualStudio.UI/UI/Controls/InfoPanel.xaml b/src/GitHub.VisualStudio.UI/UI/Controls/InfoPanel.xaml index e35903b15..fa54782eb 100644 --- a/src/GitHub.VisualStudio.UI/UI/Controls/InfoPanel.xaml +++ b/src/GitHub.VisualStudio.UI/UI/Controls/InfoPanel.xaml @@ -7,7 +7,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" Background="Beige" d:DataContext="{d:DesignInstance Type=sampleData:InfoPanelDesigner, IsDesignTimeCreatable=True}" d:DesignHeight="300" diff --git a/src/GitHub.VisualStudio.UI/UI/Views/GitHubConnectContent.xaml b/src/GitHub.VisualStudio.UI/UI/Views/GitHubConnectContent.xaml index 85c0d00c2..86c0606ad 100644 --- a/src/GitHub.VisualStudio.UI/UI/Views/GitHubConnectContent.xaml +++ b/src/GitHub.VisualStudio.UI/UI/Views/GitHubConnectContent.xaml @@ -8,7 +8,7 @@ xmlns:cache="clr-namespace:GitHub.VisualStudio.UI.Helpers" xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" xmlns:prop="clr-namespace:GitHub.VisualStudio.UI" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" d:DesignBackground="White" KeyboardNavigation.TabNavigation="Local" diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index d4face6ec..655916a0a 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -580,10 +580,6 @@ BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup; DebugSymbolsProjectOutputGroup; - - {665078f4-5875-431d-a2cc-421849b43328} - GithubVSTestAutomationIDs - {674b69b8-0780-4d54-ae2b-c15821fa51cb} Octokit.Reactive diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/GistCreationControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/GistCreationControl.xaml index 4094e23d9..a1290cbae 100644 --- a/src/GitHub.VisualStudio/UI/Views/Controls/GistCreationControl.xaml +++ b/src/GitHub.VisualStudio/UI/Views/Controls/GistCreationControl.xaml @@ -8,7 +8,7 @@ xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers" xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI" xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" mc:Ignorable="d" d:DesignWidth="414" d:DesignHeight="440" diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml index 7f148dad3..f7859933b 100644 --- a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml +++ b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml @@ -9,7 +9,7 @@ xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers" xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI" xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views.Controls" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" mc:Ignorable="d" d:DesignWidth="414" d:DesignHeight="440" diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml index d3d813761..4afaba6a1 100644 --- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml +++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml @@ -10,7 +10,7 @@ xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" d:DesignHeight="440" d:DesignWidth="414" Background="Transparent" diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml index e4df3a5ba..5f580fb3c 100644 --- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml +++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml @@ -10,7 +10,7 @@ xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" d:DesignHeight="440" d:DesignWidth="414" Style="{DynamicResource DialogUserControl}" diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml index 55d9e5656..166760d82 100644 --- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml +++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml @@ -10,7 +10,7 @@ xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" Margin="0" d:DesignHeight="440" d:DesignWidth="414" diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml index 3d2e601ef..b5e23c398 100644 --- a/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml +++ b/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml @@ -10,7 +10,7 @@ xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers" xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" mc:Ignorable="d" d:DesignWidth="414" d:DesignHeight="440" diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubPaneView.xaml b/src/GitHub.VisualStudio/UI/Views/GitHubPaneView.xaml index f2c919247..812afc501 100644 --- a/src/GitHub.VisualStudio/UI/Views/GitHubPaneView.xaml +++ b/src/GitHub.VisualStudio/UI/Views/GitHubPaneView.xaml @@ -10,7 +10,7 @@ xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive" xmlns:view="clr-namespace:GitHub.VisualStudio.UI.Views" xmlns:control="clr-namespace:GitHub.VisualStudio.UI.Controls;assembly=GitHub.VisualStudio.UI" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" Background="{DynamicResource GitHubVsToolWindowBackground}" Foreground="{DynamicResource GitHubVsToolWindowText}" d:DesignHeight="300" diff --git a/src/GitHub.VisualStudio/UI/Views/LoggedOutView.xaml b/src/GitHub.VisualStudio/UI/Views/LoggedOutView.xaml index c3fcbaed6..aca49ed95 100644 --- a/src/GitHub.VisualStudio/UI/Views/LoggedOutView.xaml +++ b/src/GitHub.VisualStudio/UI/Views/LoggedOutView.xaml @@ -8,7 +8,7 @@ xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App" xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI" xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" DataContext="{Binding ViewModel}" d:DesignHeight="300" d:DesignWidth="300" diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml b/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml index cb67b6111..569edd34b 100644 --- a/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml +++ b/src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml @@ -13,7 +13,7 @@ xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI" xmlns:conv="clr-namespace:GitHub.UI.Converters;assembly=GitHub.UI" xmlns:models="clr-namespace:GitHub.Models;assembly=GitHub.Exports" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" d:DesignHeight="450" d:DesignWidth="300" Background="{DynamicResource GitHubVsToolWindowBackground}" diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml b/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml index c220d5225..74b147f8b 100644 --- a/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml +++ b/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml @@ -10,7 +10,7 @@ xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive" xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase" - xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs" + xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI" d:DesignHeight="300" d:DesignWidth="300" Background="{DynamicResource GitHubVsToolWindowBackground}" diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index b88158fd8..1ce0630e9 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -280,10 +280,6 @@ {B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203} Akavache_Net45 - - {665078f4-5875-431d-a2cc-421849b43328} - GithubVSTestAutomationIDs - {674B69B8-0780-4D54-AE2B-C15821FA51CB} Octokit.Reactive diff --git a/submodules/GitHubVSTestAutomationIDs b/submodules/GitHubVSTestAutomationIDs deleted file mode 160000 index e73031087..000000000 --- a/submodules/GitHubVSTestAutomationIDs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7303108724505ee8b880077a27d9d12be1f67c6