diff --git a/GitExtensions.sln b/GitExtensions.sln index ab0d409f40c..b88e6113629 100644 --- a/GitExtensions.sln +++ b/GitExtensions.sln @@ -59,23 +59,23 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixpro EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResourceManager", "ResourceManager\ResourceManager.csproj", "{D3440FD7-AFC5-4351-8741-6CDBF15CE944}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gource", "Plugins\Gource\Gource.csproj", "{687A73BB-12A0-4AF7-B420-4A9C47DB75CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.Gource", "Plugins\Gource\GitExtensions.Plugins.Gource.csproj", "{687A73BB-12A0-4AF7-B420-4A9C47DB75CB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeleteUnusedBranches", "Plugins\DeleteUnusedBranches\DeleteUnusedBranches.csproj", "{921F0443-C3A1-4A09-82E8-C4AFB9654943}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.DeleteUnusedBranches", "Plugins\DeleteUnusedBranches\GitExtensions.Plugins.DeleteUnusedBranches.csproj", "{921F0443-C3A1-4A09-82E8-C4AFB9654943}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpellChecker", "Externals\NetSpell.SpellChecker\SpellChecker.csproj", "{A426EE0B-E52E-4D74-AF24-06797142D7B2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.GitImpact", "Plugins\Statistics\GitImpact\GitExtensions.Plugins.GitImpact.csproj", "{0B131F9D-BB10-4C3E-9656-5AB858158DE5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateLocalBranches", "Plugins\CreateLocalBranches\CreateLocalBranches.csproj", "{31D96116-16A6-45C2-9A6D-6DD5A1FC5F20}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.CreateLocalBranches", "Plugins\CreateLocalBranches\GitExtensions.Plugins.CreateLocalBranches.csproj", "{31D96116-16A6-45C2-9A6D-6DD5A1FC5F20}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FindLargeFiles", "Plugins\FindLargeFiles\FindLargeFiles.csproj", "{F261BCD1-F5F7-4664-A229-E52032E6E9FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.FindLargeFiles", "Plugins\FindLargeFiles\GitExtensions.Plugins.FindLargeFiles.csproj", "{F261BCD1-F5F7-4664-A229-E52032E6E9FD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub3", "Plugins\GitHub3\GitHub3.csproj", "{B1B0C273-AB3F-48BF-92C7-DE0BE90D5870}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.GitHub3", "Plugins\GitHub3\GitExtensions.Plugins.GitHub3.csproj", "{B1B0C273-AB3F-48BF-92C7-DE0BE90D5870}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProxySwitcher", "Plugins\ProxySwitcher\ProxySwitcher.csproj", "{274F449F-7472-4248-9A57-8CA665A75B5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.ProxySwitcher", "Plugins\ProxySwitcher\GitExtensions.Plugins.ProxySwitcher.csproj", "{274F449F-7472-4248-9A57-8CA665A75B5D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReleaseNotesGenerator", "Plugins\ReleaseNotesGenerator\ReleaseNotesGenerator.csproj", "{8B3778F2-6049-4D4C-B94F-D5FF3A5DC7F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.ReleaseNotesGenerator", "Plugins\ReleaseNotesGenerator\GitExtensions.Plugins.ReleaseNotesGenerator.csproj", "{8B3778F2-6049-4D4C-B94F-D5FF3A5DC7F8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranslationApp", "TranslationApp\TranslationApp.csproj", "{7C106FAC-CB81-4D37-BE98-E7F6A5BDD143}" EndProject @@ -83,7 +83,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.Backg EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.AutoCompileSubmodules", "Plugins\AutoCompileSubmodules\GitExtensions.Plugins.AutoCompileSubmodules.csproj", "{7E5433F4-DD13-4D8E-95B2-59B4FFE7D636}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitFlow", "Plugins\GitFlow\GitFlow.csproj", "{D4628A13-CD53-401F-A645-CB16FD15ABBB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.GitFlow", "Plugins\GitFlow\GitExtensions.Plugins.GitFlow.csproj", "{D4628A13-CD53-401F-A645-CB16FD15ABBB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamCityIntegration", "Plugins\BuildServerIntegration\TeamCityIntegration\TeamCityIntegration.csproj", "{121965D1-4399-4538-B8BF-403EB5B847C3}" EndProject @@ -96,7 +96,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Git.hub", "Externals\Git.hub\Git.hub\Git.hub.csproj", "{F50B1DBF-1C9F-4437-87EC-7ABA805CC446}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bitbucket", "Plugins\Bitbucket\Bitbucket.csproj", "{50AEAB6C-83C4-45F8-AA01-90E1405C48AF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.Bitbucket", "Plugins\Bitbucket\GitExtensions.Plugins.Bitbucket.csproj", "{50AEAB6C-83C4-45F8-AA01-90E1405C48AF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JenkinsIntegration", "Plugins\BuildServerIntegration\JenkinsIntegration\JenkinsIntegration.csproj", "{E6AAC693-815B-4D1A-83D7-F4DE36072793}" EndProject @@ -129,7 +129,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReleaseNotesGenerator.Tests EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResourceManager.Tests", "UnitTests\ResourceManager.Tests\ResourceManager.Tests.csproj", "{D9C9D8EF-E0BC-4CCD-829D-3523E750D0FE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiraCommitHintPlugin", "Plugins\JiraCommitHintPlugin\JiraCommitHintPlugin.csproj", "{626CA9EB-DB83-4BEB-87D5-15E3B397EF57}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.Plugins.JiraCommitHintPlugin", "Plugins\JiraCommitHintPlugin\GitExtensions.Plugins.JiraCommitHintPlugin.csproj", "{626CA9EB-DB83-4BEB-87D5-15E3B397EF57}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonTestUtils", "UnitTests\CommonTestUtils\CommonTestUtils.csproj", "{7B1F2FA0-E17D-499B-AF86-D49DBEF8C548}" EndProject diff --git a/Plugins/Bitbucket/ApprovePullRequest.cs b/Plugins/Bitbucket/ApprovePullRequest.cs index 72b853a69ea..91bae85a6b7 100644 --- a/Plugins/Bitbucket/ApprovePullRequest.cs +++ b/Plugins/Bitbucket/ApprovePullRequest.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class ApprovePullRequest : BitbucketRequestBase { diff --git a/Plugins/Bitbucket/BitbucketPlugin.cs b/Plugins/Bitbucket/BitbucketPlugin.cs index 2b2b6b99374..78d7d7e4588 100644 --- a/Plugins/Bitbucket/BitbucketPlugin.cs +++ b/Plugins/Bitbucket/BitbucketPlugin.cs @@ -1,10 +1,10 @@ using System.ComponentModel.Composition; using System.Windows.Forms; -using Bitbucket.Properties; +using GitExtensions.Plugins.Bitbucket.Properties; using GitUIPluginInterfaces; using ResourceManager; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { [Export(typeof(IGitPlugin))] public class BitbucketPlugin : GitPluginBase diff --git a/Plugins/Bitbucket/BitbucketPullRequestForm.Designer.cs b/Plugins/Bitbucket/BitbucketPullRequestForm.Designer.cs index c21c00f6e60..2b51da35c0d 100644 --- a/Plugins/Bitbucket/BitbucketPullRequestForm.Designer.cs +++ b/Plugins/Bitbucket/BitbucketPullRequestForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { partial class BitbucketPullRequestForm { @@ -765,4 +765,4 @@ private void InitializeComponent() private System.Windows.Forms.LinkLabel _NO_TRANSLATE_lblLinkViewPull; private System.Windows.Forms.ToolTip toolTipLink; } -} \ No newline at end of file +} diff --git a/Plugins/Bitbucket/BitbucketPullRequestForm.cs b/Plugins/Bitbucket/BitbucketPullRequestForm.cs index e2043e65f72..d0e459cd85e 100644 --- a/Plugins/Bitbucket/BitbucketPullRequestForm.cs +++ b/Plugins/Bitbucket/BitbucketPullRequestForm.cs @@ -13,7 +13,7 @@ using Microsoft.VisualStudio.Threading; using ResourceManager; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { public partial class BitbucketPullRequestForm : GitExtensionsFormBase { diff --git a/Plugins/Bitbucket/BitbucketRequestBase.cs b/Plugins/Bitbucket/BitbucketRequestBase.cs index 9ca90d72f8e..aeb6a1d780a 100644 --- a/Plugins/Bitbucket/BitbucketRequestBase.cs +++ b/Plugins/Bitbucket/BitbucketRequestBase.cs @@ -8,7 +8,7 @@ using RestSharp; using RestSharp.Authenticators; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class BitbucketResponse { diff --git a/Plugins/Bitbucket/CreatePullRequestRequest.cs b/Plugins/Bitbucket/CreatePullRequestRequest.cs index 052889d8393..b1f765a7b40 100644 --- a/Plugins/Bitbucket/CreatePullRequestRequest.cs +++ b/Plugins/Bitbucket/CreatePullRequestRequest.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class PullRequestInfo { diff --git a/Plugins/Bitbucket/GetBranchesRequest.cs b/Plugins/Bitbucket/GetBranchesRequest.cs index c71908ee9f1..7e75faf8f13 100644 --- a/Plugins/Bitbucket/GetBranchesRequest.cs +++ b/Plugins/Bitbucket/GetBranchesRequest.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class GetBranchesRequest : BitbucketRequestBase { diff --git a/Plugins/Bitbucket/GetHeadCommitRequest.cs b/Plugins/Bitbucket/GetHeadCommitRequest.cs index 3320152ca50..2ea91dd2aa6 100644 --- a/Plugins/Bitbucket/GetHeadCommitRequest.cs +++ b/Plugins/Bitbucket/GetHeadCommitRequest.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class Commit { diff --git a/Plugins/Bitbucket/GetInBetweenCommitsRequest.cs b/Plugins/Bitbucket/GetInBetweenCommitsRequest.cs index 6a76bc33935..1c858c43583 100644 --- a/Plugins/Bitbucket/GetInBetweenCommitsRequest.cs +++ b/Plugins/Bitbucket/GetInBetweenCommitsRequest.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class GetInBetweenCommitsRequest : BitbucketRequestBase> { diff --git a/Plugins/Bitbucket/GetPullRequest.cs b/Plugins/Bitbucket/GetPullRequest.cs index 4228ae1fb51..5fddbf95730 100644 --- a/Plugins/Bitbucket/GetPullRequest.cs +++ b/Plugins/Bitbucket/GetPullRequest.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal sealed class PullRequest { diff --git a/Plugins/Bitbucket/GetRelatedRepoRequest.cs b/Plugins/Bitbucket/GetRelatedRepoRequest.cs index d8f480ff63e..b151ce57d4a 100644 --- a/Plugins/Bitbucket/GetRelatedRepoRequest.cs +++ b/Plugins/Bitbucket/GetRelatedRepoRequest.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class Repository { diff --git a/Plugins/Bitbucket/GetRepoRequest.cs b/Plugins/Bitbucket/GetRepoRequest.cs index 0649d51375e..f2b0cddeed1 100644 --- a/Plugins/Bitbucket/GetRepoRequest.cs +++ b/Plugins/Bitbucket/GetRepoRequest.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class GetRepoRequest : BitbucketRequestBase { diff --git a/Plugins/Bitbucket/GetUserRequest.cs b/Plugins/Bitbucket/GetUserRequest.cs index 2a863823813..0f5deb35025 100644 --- a/Plugins/Bitbucket/GetUserRequest.cs +++ b/Plugins/Bitbucket/GetUserRequest.cs @@ -1,4 +1,4 @@ -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { public class BitbucketUser { diff --git a/Plugins/Bitbucket/Bitbucket.csproj b/Plugins/Bitbucket/GitExtensions.Plugins.Bitbucket.csproj similarity index 83% rename from Plugins/Bitbucket/Bitbucket.csproj rename to Plugins/Bitbucket/GitExtensions.Plugins.Bitbucket.csproj index 416422a0e12..c668277df27 100644 --- a/Plugins/Bitbucket/Bitbucket.csproj +++ b/Plugins/Bitbucket/GitExtensions.Plugins.Bitbucket.csproj @@ -22,6 +22,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/Bitbucket/MergePullRequest.cs b/Plugins/Bitbucket/MergePullRequest.cs index a1c2d835d4a..aa124dbe8a6 100644 --- a/Plugins/Bitbucket/MergePullRequest.cs +++ b/Plugins/Bitbucket/MergePullRequest.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json.Linq; using RestSharp; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { internal class MergeRequestInfo { diff --git a/Plugins/Bitbucket/Properties/Resources.Designer.cs b/Plugins/Bitbucket/Properties/Resources.Designer.cs index ef0d93c13be..7ae267da2fd 100644 --- a/Plugins/Bitbucket/Properties/Resources.Designer.cs +++ b/Plugins/Bitbucket/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Bitbucket.Properties { +namespace GitExtensions.Plugins.Bitbucket.Properties { using System; @@ -19,7 +19,7 @@ namespace Bitbucket.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Bitbucket.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.Bitbucket.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/Bitbucket/Settings.cs b/Plugins/Bitbucket/Settings.cs index e014e87c11b..1906cefdaa8 100644 --- a/Plugins/Bitbucket/Settings.cs +++ b/Plugins/Bitbucket/Settings.cs @@ -4,7 +4,7 @@ using GitCommands.Config; using GitUIPluginInterfaces; -namespace Bitbucket +namespace GitExtensions.Plugins.Bitbucket { public class Settings { diff --git a/Plugins/CreateLocalBranches/CreateLocalBranchesForm.Designer.cs b/Plugins/CreateLocalBranches/CreateLocalBranchesForm.Designer.cs index cd048d44052..0b9bd641e24 100644 --- a/Plugins/CreateLocalBranches/CreateLocalBranchesForm.Designer.cs +++ b/Plugins/CreateLocalBranches/CreateLocalBranchesForm.Designer.cs @@ -1,4 +1,4 @@ -namespace CreateLocalBranches +namespace GitExtensions.Plugins.CreateLocalBranches { partial class CreateLocalBranchesForm { @@ -93,4 +93,4 @@ private void InitializeComponent() private System.Windows.Forms.TextBox _NO_TRANSLATE_Remote; private System.Windows.Forms.Label label1; } -} \ No newline at end of file +} diff --git a/Plugins/CreateLocalBranches/CreateLocalBranchesForm.cs b/Plugins/CreateLocalBranches/CreateLocalBranchesForm.cs index 71930cc3830..19cee903569 100644 --- a/Plugins/CreateLocalBranches/CreateLocalBranchesForm.cs +++ b/Plugins/CreateLocalBranches/CreateLocalBranchesForm.cs @@ -4,7 +4,7 @@ using GitExtUtils; using GitUIPluginInterfaces; -namespace CreateLocalBranches +namespace GitExtensions.Plugins.CreateLocalBranches { public partial class CreateLocalBranchesForm : ResourceManager.GitExtensionsFormBase { diff --git a/Plugins/CreateLocalBranches/CreateLocalBranchesPlugin.cs b/Plugins/CreateLocalBranches/CreateLocalBranchesPlugin.cs index fa64f989df8..83d72db75a0 100644 --- a/Plugins/CreateLocalBranches/CreateLocalBranchesPlugin.cs +++ b/Plugins/CreateLocalBranches/CreateLocalBranchesPlugin.cs @@ -1,9 +1,9 @@ using System.ComponentModel.Composition; -using CreateLocalBranches.Properties; +using GitExtensions.Plugins.CreateLocalBranches.Properties; using GitUIPluginInterfaces; using ResourceManager; -namespace CreateLocalBranches +namespace GitExtensions.Plugins.CreateLocalBranches { [Export(typeof(IGitPlugin))] public class CreateLocalBranchesPlugin : GitPluginBase, IGitPluginForRepository diff --git a/Plugins/CreateLocalBranches/CreateLocalBranches.csproj b/Plugins/CreateLocalBranches/GitExtensions.Plugins.CreateLocalBranches.csproj similarity index 72% rename from Plugins/CreateLocalBranches/CreateLocalBranches.csproj rename to Plugins/CreateLocalBranches/GitExtensions.Plugins.CreateLocalBranches.csproj index f18c6bce3e1..22b8d6ba641 100644 --- a/Plugins/CreateLocalBranches/CreateLocalBranches.csproj +++ b/Plugins/CreateLocalBranches/GitExtensions.Plugins.CreateLocalBranches.csproj @@ -10,6 +10,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/CreateLocalBranches/Properties/Resources.Designer.cs b/Plugins/CreateLocalBranches/Properties/Resources.Designer.cs index 5a9b4bbf1f7..f8e15d7d17d 100644 --- a/Plugins/CreateLocalBranches/Properties/Resources.Designer.cs +++ b/Plugins/CreateLocalBranches/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace CreateLocalBranches.Properties { +namespace GitExtensions.Plugins.CreateLocalBranches.Properties { using System; @@ -19,7 +19,7 @@ namespace CreateLocalBranches.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CreateLocalBranches.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.CreateLocalBranches.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/DeleteUnusedBranches/Branch.cs b/Plugins/DeleteUnusedBranches/Branch.cs index 476e8a06f8d..b5711a3baa4 100644 --- a/Plugins/DeleteUnusedBranches/Branch.cs +++ b/Plugins/DeleteUnusedBranches/Branch.cs @@ -1,6 +1,6 @@ using System; -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { public sealed class Branch { diff --git a/Plugins/DeleteUnusedBranches/CheckBoxHeaderCellEventArgs.cs b/Plugins/DeleteUnusedBranches/CheckBoxHeaderCellEventArgs.cs index e94c20e6b06..29bf37ca4e7 100644 --- a/Plugins/DeleteUnusedBranches/CheckBoxHeaderCellEventArgs.cs +++ b/Plugins/DeleteUnusedBranches/CheckBoxHeaderCellEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { public class CheckBoxHeaderCellEventArgs : EventArgs { diff --git a/Plugins/DeleteUnusedBranches/DataGridViewCheckBoxHeaderCell.cs b/Plugins/DeleteUnusedBranches/DataGridViewCheckBoxHeaderCell.cs index bb93b2ccadf..42c2366a28c 100644 --- a/Plugins/DeleteUnusedBranches/DataGridViewCheckBoxHeaderCell.cs +++ b/Plugins/DeleteUnusedBranches/DataGridViewCheckBoxHeaderCell.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using System.Windows.Forms.VisualStyles; -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { public class DataGridViewCheckBoxHeaderCell : DataGridViewColumnHeaderCell { diff --git a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.Designer.cs b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.Designer.cs index 638352f5fbe..ae2db7ab042 100644 --- a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.Designer.cs +++ b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.Designer.cs @@ -1,4 +1,4 @@ -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { partial class DeleteUnusedBranchesForm { @@ -477,4 +477,4 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox useRegexCaseInsensitive; private System.Windows.Forms.CheckBox regexDoesNotMatch; } -} \ No newline at end of file +} diff --git a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.cs b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.cs index 0d76b52992e..ddd9b745ffa 100644 --- a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.cs +++ b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.cs @@ -5,8 +5,8 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -using DeleteUnusedBranches.Properties; using GitCommands; +using GitExtensions.Plugins.DeleteUnusedBranches.Properties; using GitExtUtils; using GitExtUtils.GitUI; using GitUI; @@ -14,7 +14,8 @@ using Microsoft; using Microsoft.VisualStudio.Threading; using ResourceManager; -namespace DeleteUnusedBranches + +namespace GitExtensions.Plugins.DeleteUnusedBranches { public sealed partial class DeleteUnusedBranchesForm : GitExtensionsFormBase { diff --git a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesFormSettings.cs b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesFormSettings.cs index 8957232129a..f8486ad6cce 100644 --- a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesFormSettings.cs +++ b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesFormSettings.cs @@ -1,4 +1,4 @@ -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { public class DeleteUnusedBranchesFormSettings { diff --git a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesPlugin.cs b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesPlugin.cs index f630a436327..0ffe36c156b 100644 --- a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesPlugin.cs +++ b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesPlugin.cs @@ -1,9 +1,9 @@ using System.ComponentModel.Composition; -using DeleteUnusedBranches.Properties; +using GitExtensions.Plugins.DeleteUnusedBranches.Properties; using GitUIPluginInterfaces; using ResourceManager; -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { [Export(typeof(IGitPlugin))] public class DeleteUnusedBranchesPlugin : GitPluginBase, IGitPluginForRepository diff --git a/Plugins/DeleteUnusedBranches/GitBranchOutputCommandParser.cs b/Plugins/DeleteUnusedBranches/GitBranchOutputCommandParser.cs index 354add744ca..7a0d30326d5 100644 --- a/Plugins/DeleteUnusedBranches/GitBranchOutputCommandParser.cs +++ b/Plugins/DeleteUnusedBranches/GitBranchOutputCommandParser.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { public class GitBranchOutputCommandParser { diff --git a/Plugins/DeleteUnusedBranches/DeleteUnusedBranches.csproj b/Plugins/DeleteUnusedBranches/GitExtensions.Plugins.DeleteUnusedBranches.csproj similarity index 82% rename from Plugins/DeleteUnusedBranches/DeleteUnusedBranches.csproj rename to Plugins/DeleteUnusedBranches/GitExtensions.Plugins.DeleteUnusedBranches.csproj index 8cab89c0c58..dd11f90e148 100644 --- a/Plugins/DeleteUnusedBranches/DeleteUnusedBranches.csproj +++ b/Plugins/DeleteUnusedBranches/GitExtensions.Plugins.DeleteUnusedBranches.csproj @@ -20,6 +20,13 @@ + + + True + True + Resources.resx + + diff --git a/Plugins/DeleteUnusedBranches/Properties/Resources.Designer.cs b/Plugins/DeleteUnusedBranches/Properties/Resources.Designer.cs index 54dca88908a..cfedce26583 100644 --- a/Plugins/DeleteUnusedBranches/Properties/Resources.Designer.cs +++ b/Plugins/DeleteUnusedBranches/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace DeleteUnusedBranches.Properties { +namespace GitExtensions.Plugins.DeleteUnusedBranches.Properties { using System; @@ -19,7 +19,7 @@ namespace DeleteUnusedBranches.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DeleteUnusedBranches.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.DeleteUnusedBranches.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/DeleteUnusedBranches/SortableBranchesList.cs b/Plugins/DeleteUnusedBranches/SortableBranchesList.cs index 3d6ccd60584..8bb17ce2a3b 100644 --- a/Plugins/DeleteUnusedBranches/SortableBranchesList.cs +++ b/Plugins/DeleteUnusedBranches/SortableBranchesList.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using System.Windows.Forms; -namespace DeleteUnusedBranches +namespace GitExtensions.Plugins.DeleteUnusedBranches { /// /// Custom sortable binding branches list, use for support user-defined sorting in . diff --git a/Plugins/FindLargeFiles/FindLargeFilesForm.Designer.cs b/Plugins/FindLargeFiles/FindLargeFilesForm.Designer.cs index e7585705aad..c7332d41a4a 100644 --- a/Plugins/FindLargeFiles/FindLargeFilesForm.Designer.cs +++ b/Plugins/FindLargeFiles/FindLargeFilesForm.Designer.cs @@ -1,4 +1,4 @@ -namespace FindLargeFiles +namespace GitExtensions.Plugins.FindLargeFiles { partial class FindLargeFilesForm { @@ -246,4 +246,4 @@ private void InitializeComponent() private System.Windows.Forms.DataGridViewTextBoxColumn lastCommitDateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1; } -} \ No newline at end of file +} diff --git a/Plugins/FindLargeFiles/FindLargeFilesForm.cs b/Plugins/FindLargeFiles/FindLargeFilesForm.cs index 53a1b6692de..e2eea9f18e3 100644 --- a/Plugins/FindLargeFiles/FindLargeFilesForm.cs +++ b/Plugins/FindLargeFiles/FindLargeFilesForm.cs @@ -12,7 +12,7 @@ using GitUIPluginInterfaces; using ResourceManager; -namespace FindLargeFiles +namespace GitExtensions.Plugins.FindLargeFiles { public sealed partial class FindLargeFilesForm : GitExtensionsFormBase { diff --git a/Plugins/FindLargeFiles/FindLargeFilesPlugin.cs b/Plugins/FindLargeFiles/FindLargeFilesPlugin.cs index 12462c1a764..1c65fea694d 100644 --- a/Plugins/FindLargeFiles/FindLargeFilesPlugin.cs +++ b/Plugins/FindLargeFiles/FindLargeFilesPlugin.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.ComponentModel.Composition; -using FindLargeFiles.Properties; +using GitExtensions.Plugins.FindLargeFiles.Properties; using GitUIPluginInterfaces; using ResourceManager; -namespace FindLargeFiles +namespace GitExtensions.Plugins.FindLargeFiles { [Export(typeof(IGitPlugin))] public class FindLargeFilesPlugin : GitPluginBase, IGitPluginForRepository diff --git a/Plugins/FindLargeFiles/FindLargeFiles.csproj b/Plugins/FindLargeFiles/GitExtensions.Plugins.FindLargeFiles.csproj similarity index 77% rename from Plugins/FindLargeFiles/FindLargeFiles.csproj rename to Plugins/FindLargeFiles/GitExtensions.Plugins.FindLargeFiles.csproj index d1db1e0d46a..1ed84bd88d0 100644 --- a/Plugins/FindLargeFiles/FindLargeFiles.csproj +++ b/Plugins/FindLargeFiles/GitExtensions.Plugins.FindLargeFiles.csproj @@ -16,6 +16,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/FindLargeFiles/GitObject.cs b/Plugins/FindLargeFiles/GitObject.cs index 787fef1d33d..c3f45cfe889 100644 --- a/Plugins/FindLargeFiles/GitObject.cs +++ b/Plugins/FindLargeFiles/GitObject.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace FindLargeFiles +namespace GitExtensions.Plugins.FindLargeFiles { public class GitObject { diff --git a/Plugins/FindLargeFiles/Properties/Resources.Designer.cs b/Plugins/FindLargeFiles/Properties/Resources.Designer.cs index 9b4b8d97368..58d2cfc9ff0 100644 --- a/Plugins/FindLargeFiles/Properties/Resources.Designer.cs +++ b/Plugins/FindLargeFiles/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace FindLargeFiles.Properties { +namespace GitExtensions.Plugins.FindLargeFiles.Properties { using System; @@ -19,7 +19,7 @@ namespace FindLargeFiles.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FindLargeFiles.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.FindLargeFiles.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/FindLargeFiles/SortableObjectsList.cs b/Plugins/FindLargeFiles/SortableObjectsList.cs index 8ab330ff163..bcb519606fc 100644 --- a/Plugins/FindLargeFiles/SortableObjectsList.cs +++ b/Plugins/FindLargeFiles/SortableObjectsList.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using System.Windows.Forms; -namespace FindLargeFiles +namespace GitExtensions.Plugins.FindLargeFiles { /// /// Custom sortable binding branches list, use for support user-defined sorting in . diff --git a/Plugins/GitFlow/GitFlow.csproj b/Plugins/GitFlow/GitExtensions.Plugins.GitFlow.csproj similarity index 83% rename from Plugins/GitFlow/GitFlow.csproj rename to Plugins/GitFlow/GitExtensions.Plugins.GitFlow.csproj index 046cec6db21..e8f2a7a5004 100644 --- a/Plugins/GitFlow/GitFlow.csproj +++ b/Plugins/GitFlow/GitExtensions.Plugins.GitFlow.csproj @@ -24,6 +24,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/GitFlow/GitFlowForm.Designer.cs b/Plugins/GitFlow/GitFlowForm.Designer.cs index 1ea91f958bd..970b3593f1c 100644 --- a/Plugins/GitFlow/GitFlowForm.Designer.cs +++ b/Plugins/GitFlow/GitFlowForm.Designer.cs @@ -1,4 +1,4 @@ -namespace GitFlow +namespace GitExtensions.Plugins.GitFlow { partial class GitFlowForm { @@ -537,4 +537,4 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbPushAfterFinish; private System.Windows.Forms.CheckBox cbSquash; } -} \ No newline at end of file +} diff --git a/Plugins/GitFlow/GitFlowForm.cs b/Plugins/GitFlow/GitFlowForm.cs index 96dc9942c03..c3cdd4313b7 100644 --- a/Plugins/GitFlow/GitFlowForm.cs +++ b/Plugins/GitFlow/GitFlowForm.cs @@ -6,13 +6,13 @@ using System.Text.RegularExpressions; using System.Windows.Forms; using GitCommands; +using GitExtensions.Plugins.GitFlow.Properties; using GitExtUtils; using GitExtUtils.GitUI; -using GitFlow.Properties; using GitUIPluginInterfaces; using ResourceManager; -namespace GitFlow +namespace GitExtensions.Plugins.GitFlow { public partial class GitFlowForm : GitExtensionsFormBase { diff --git a/Plugins/GitFlow/GitFlowPlugin.cs b/Plugins/GitFlow/GitFlowPlugin.cs index 287a971e725..d09bba20706 100644 --- a/Plugins/GitFlow/GitFlowPlugin.cs +++ b/Plugins/GitFlow/GitFlowPlugin.cs @@ -1,9 +1,9 @@ using System.ComponentModel.Composition; -using GitFlow.Properties; +using GitExtensions.Plugins.GitFlow.Properties; using GitUIPluginInterfaces; using ResourceManager; -namespace GitFlow +namespace GitExtensions.Plugins.GitFlow { [Export(typeof(IGitPlugin))] public class GitFlowPlugin : GitPluginBase, IGitPluginForRepository diff --git a/Plugins/GitFlow/Properties/Resource.Designer.cs b/Plugins/GitFlow/Properties/Resource.Designer.cs index 24c431404a8..f245f333e86 100644 --- a/Plugins/GitFlow/Properties/Resource.Designer.cs +++ b/Plugins/GitFlow/Properties/Resource.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace GitFlow.Properties { +namespace GitExtensions.Plugins.GitFlow.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,7 +19,7 @@ namespace GitFlow.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resource { @@ -39,7 +39,7 @@ internal class Resource { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitFlow.Properties.Resource", typeof(Resource).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.GitFlow.Properties.Resource", typeof(Resource).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/GitHub3/GitHub3.csproj b/Plugins/GitHub3/GitExtensions.Plugins.GitHub3.csproj similarity index 81% rename from Plugins/GitHub3/GitHub3.csproj rename to Plugins/GitHub3/GitExtensions.Plugins.GitHub3.csproj index f47c17351d8..52626d8c5c4 100644 --- a/Plugins/GitHub3/GitHub3.csproj +++ b/Plugins/GitHub3/GitExtensions.Plugins.GitHub3.csproj @@ -21,6 +21,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/GitHub3/GitHub3Plugin.cs b/Plugins/GitHub3/GitHub3Plugin.cs index d007170750b..c2f78d5db43 100644 --- a/Plugins/GitHub3/GitHub3Plugin.cs +++ b/Plugins/GitHub3/GitHub3Plugin.cs @@ -8,13 +8,13 @@ using Git.hub; using GitCommands.Config; using GitCommands.Remotes; -using GitHub3.Properties; +using GitExtensions.Plugins.GitHub3.Properties; using GitUIPluginInterfaces; using GitUIPluginInterfaces.RepositoryHosts; using Microsoft; using ResourceManager; -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { internal static class GitHubLoginInfo { diff --git a/Plugins/GitHub3/GitHubBranch.cs b/Plugins/GitHub3/GitHubBranch.cs index ae056f5961b..1de105fd14c 100644 --- a/Plugins/GitHub3/GitHubBranch.cs +++ b/Plugins/GitHub3/GitHubBranch.cs @@ -2,7 +2,7 @@ using GitUIPluginInterfaces; using GitUIPluginInterfaces.RepositoryHosts; -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { internal sealed class GitHubBranch : IHostedBranch { diff --git a/Plugins/GitHub3/GitHubCredentialsPrompt.Designer.cs b/Plugins/GitHub3/GitHubCredentialsPrompt.Designer.cs index 94ebdcb2a1f..bd07077bb29 100644 --- a/Plugins/GitHub3/GitHubCredentialsPrompt.Designer.cs +++ b/Plugins/GitHub3/GitHubCredentialsPrompt.Designer.cs @@ -1,4 +1,4 @@ -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { partial class GitHubCredentialsPrompt { @@ -206,4 +206,4 @@ private void InitializeComponent() private System.Windows.Forms.Label lblError; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } -} \ No newline at end of file +} diff --git a/Plugins/GitHub3/GitHubCredentialsPrompt.cs b/Plugins/GitHub3/GitHubCredentialsPrompt.cs index a25431c05ed..1a2f8bd5e95 100644 --- a/Plugins/GitHub3/GitHubCredentialsPrompt.cs +++ b/Plugins/GitHub3/GitHubCredentialsPrompt.cs @@ -11,7 +11,7 @@ using ResourceManager; using Strings = GitExtUtils.Strings; -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { public partial class GitHubCredentialsPrompt : Form { diff --git a/Plugins/GitHub3/GitHubHostedRemote.cs b/Plugins/GitHub3/GitHubHostedRemote.cs index ba1ca26b2fa..6e1826b9187 100644 --- a/Plugins/GitHub3/GitHubHostedRemote.cs +++ b/Plugins/GitHub3/GitHubHostedRemote.cs @@ -1,6 +1,6 @@ using GitUIPluginInterfaces.RepositoryHosts; -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { internal class GitHubHostedRemote : IHostedRemote { diff --git a/Plugins/GitHub3/GitHubPullRequest.cs b/Plugins/GitHub3/GitHubPullRequest.cs index 817c77cbafd..54cd58cbfc6 100644 --- a/Plugins/GitHub3/GitHubPullRequest.cs +++ b/Plugins/GitHub3/GitHubPullRequest.cs @@ -6,7 +6,7 @@ using Git.hub; using GitUIPluginInterfaces.RepositoryHosts; -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { internal class GitHubPullRequest : IPullRequestInformation { diff --git a/Plugins/GitHub3/GitHubPullRequestDiscussion.cs b/Plugins/GitHub3/GitHubPullRequestDiscussion.cs index 5c9fa07b8da..d90dadeaea1 100644 --- a/Plugins/GitHub3/GitHubPullRequestDiscussion.cs +++ b/Plugins/GitHub3/GitHubPullRequestDiscussion.cs @@ -4,7 +4,7 @@ using Git.hub; using GitUIPluginInterfaces.RepositoryHosts; -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { internal class GitHubPullRequestDiscussion : IPullRequestDiscussion { diff --git a/Plugins/GitHub3/GitHubRepo.cs b/Plugins/GitHub3/GitHubRepo.cs index 2fad2df9ebb..28868990aa0 100644 --- a/Plugins/GitHub3/GitHubRepo.cs +++ b/Plugins/GitHub3/GitHubRepo.cs @@ -4,7 +4,7 @@ using Git.hub; using GitUIPluginInterfaces.RepositoryHosts; -namespace GitHub3 +namespace GitExtensions.Plugins.GitHub3 { public class GitHubRepo : IHostedRepository { diff --git a/Plugins/Github3/Properties/Resources.Designer.cs b/Plugins/Github3/Properties/Resources.Designer.cs index 47ecdac264c..d210f65fdda 100644 --- a/Plugins/Github3/Properties/Resources.Designer.cs +++ b/Plugins/Github3/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace GitHub3.Properties { +namespace GitExtensions.Plugins.GitHub3.Properties { using System; @@ -19,7 +19,7 @@ namespace GitHub3.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Github3.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.GitHub3.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/Gource/Gource.csproj b/Plugins/Gource/GitExtensions.Plugins.Gource.csproj similarity index 82% rename from Plugins/Gource/Gource.csproj rename to Plugins/Gource/GitExtensions.Plugins.Gource.csproj index d98736306f1..a979582d44c 100644 --- a/Plugins/Gource/Gource.csproj +++ b/Plugins/Gource/GitExtensions.Plugins.Gource.csproj @@ -22,6 +22,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/Gource/GourcePlugin.cs b/Plugins/Gource/GourcePlugin.cs index 8d86836f9d3..c5c8a046093 100644 --- a/Plugins/Gource/GourcePlugin.cs +++ b/Plugins/Gource/GourcePlugin.cs @@ -6,12 +6,12 @@ using System.Text; using System.Text.RegularExpressions; using System.Windows.Forms; +using GitExtensions.Plugins.Gource.Properties; using GitUIPluginInterfaces; -using Gource.Properties; using ICSharpCode.SharpZipLib.Zip; using ResourceManager; -namespace Gource +namespace GitExtensions.Plugins.Gource { [Export(typeof(IGitPlugin))] public class GourcePlugin : GitPluginBase, IGitPluginForRepository diff --git a/Plugins/Gource/GourceStart.Designer.cs b/Plugins/Gource/GourceStart.Designer.cs index 2f589d8bd8e..56d98a5981b 100644 --- a/Plugins/Gource/GourceStart.Designer.cs +++ b/Plugins/Gource/GourceStart.Designer.cs @@ -1,4 +1,4 @@ -namespace Gource +namespace GitExtensions.Plugins.Gource { partial class GourceStart { @@ -244,4 +244,4 @@ private void InitializeComponent() private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.LinkLabel linkLabel2; } -} \ No newline at end of file +} diff --git a/Plugins/Gource/GourceStart.cs b/Plugins/Gource/GourceStart.cs index dfb7819f39a..b5148d52248 100644 --- a/Plugins/Gource/GourceStart.cs +++ b/Plugins/Gource/GourceStart.cs @@ -11,7 +11,7 @@ using GitUI.Avatars; using GitUIPluginInterfaces; -namespace Gource +namespace GitExtensions.Plugins.Gource { public partial class GourceStart : ResourceManager.GitExtensionsFormBase { diff --git a/Plugins/Gource/Properties/Resources.Designer.cs b/Plugins/Gource/Properties/Resources.Designer.cs index 9ee52ec8c01..e6054c84f6e 100644 --- a/Plugins/Gource/Properties/Resources.Designer.cs +++ b/Plugins/Gource/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Gource.Properties { +namespace GitExtensions.Plugins.Gource.Properties { using System; @@ -19,7 +19,7 @@ namespace Gource.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Gource.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.Gource.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/JiraCommitHintPlugin/JiraCommitHintPlugin.csproj b/Plugins/JiraCommitHintPlugin/GitExtensions.Plugins.JiraCommitHintPlugin.csproj similarity index 83% rename from Plugins/JiraCommitHintPlugin/JiraCommitHintPlugin.csproj rename to Plugins/JiraCommitHintPlugin/GitExtensions.Plugins.JiraCommitHintPlugin.csproj index a35a7bb1f04..09f327f8d7d 100644 --- a/Plugins/JiraCommitHintPlugin/JiraCommitHintPlugin.csproj +++ b/Plugins/JiraCommitHintPlugin/GitExtensions.Plugins.JiraCommitHintPlugin.csproj @@ -29,6 +29,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/JiraCommitHintPlugin/JiraCommitHintPlugin.cs b/Plugins/JiraCommitHintPlugin/JiraCommitHintPlugin.cs index 26e3791fc67..ba532859040 100644 --- a/Plugins/JiraCommitHintPlugin/JiraCommitHintPlugin.cs +++ b/Plugins/JiraCommitHintPlugin/JiraCommitHintPlugin.cs @@ -6,16 +6,16 @@ using System.Threading.Tasks; using System.Windows.Forms; using Atlassian.Jira; +using GitExtensions.Plugins.JiraCommitHintPlugin.Properties; using GitExtUtils.GitUI; using GitUI; using GitUIPluginInterfaces; using GitUIPluginInterfaces.UserControls; -using JiraCommitHintPlugin.Properties; using Microsoft; using NString; using ResourceManager; -namespace JiraCommitHintPlugin +namespace GitExtensions.Plugins.JiraCommitHintPlugin { [Export(typeof(IGitPlugin))] public class JiraCommitHintPlugin : GitPluginBase, IGitPluginForRepository diff --git a/Plugins/JiraCommitHintPlugin/Properties/Resources.Designer.cs b/Plugins/JiraCommitHintPlugin/Properties/Resources.Designer.cs index c4f41d872fa..dfaffd82e83 100644 --- a/Plugins/JiraCommitHintPlugin/Properties/Resources.Designer.cs +++ b/Plugins/JiraCommitHintPlugin/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace JiraCommitHintPlugin.Properties { +namespace GitExtensions.Plugins.JiraCommitHintPlugin.Properties { using System; @@ -19,7 +19,7 @@ namespace JiraCommitHintPlugin.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("JiraCommitHintPlugin.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.JiraCommitHintPlugin.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/ProxySwitcher/ProxySwitcher.csproj b/Plugins/ProxySwitcher/GitExtensions.Plugins.ProxySwitcher.csproj similarity index 73% rename from Plugins/ProxySwitcher/ProxySwitcher.csproj rename to Plugins/ProxySwitcher/GitExtensions.Plugins.ProxySwitcher.csproj index 7e5258baee3..17515da9921 100644 --- a/Plugins/ProxySwitcher/ProxySwitcher.csproj +++ b/Plugins/ProxySwitcher/GitExtensions.Plugins.ProxySwitcher.csproj @@ -11,6 +11,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/ProxySwitcher/Properties/Resources.Designer.cs b/Plugins/ProxySwitcher/Properties/Resources.Designer.cs index edfa75138b5..cf81b1cef4a 100644 --- a/Plugins/ProxySwitcher/Properties/Resources.Designer.cs +++ b/Plugins/ProxySwitcher/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ProxySwitcher.Properties { +namespace GitExtensions.Plugins.ProxySwitcher.Properties { using System; @@ -19,7 +19,7 @@ namespace ProxySwitcher.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProxySwitcher.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.ProxySwitcher.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/ProxySwitcher/ProxySwitcherForm.Designer.cs b/Plugins/ProxySwitcher/ProxySwitcherForm.Designer.cs index 483f62fbc64..502e36fd756 100644 --- a/Plugins/ProxySwitcher/ProxySwitcherForm.Designer.cs +++ b/Plugins/ProxySwitcher/ProxySwitcherForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ProxySwitcher +namespace GitExtensions.Plugins.ProxySwitcher { partial class ProxySwitcherForm { @@ -189,4 +189,4 @@ private void InitializeComponent() private System.Windows.Forms.Button UnsetProxy_Button; private System.Windows.Forms.Button SetProxy_Button; } -} \ No newline at end of file +} diff --git a/Plugins/ProxySwitcher/ProxySwitcherForm.cs b/Plugins/ProxySwitcher/ProxySwitcherForm.cs index 97f596beb7d..0c2d3a04d30 100644 --- a/Plugins/ProxySwitcher/ProxySwitcherForm.cs +++ b/Plugins/ProxySwitcher/ProxySwitcherForm.cs @@ -7,7 +7,7 @@ using GitUIPluginInterfaces; using ResourceManager; -namespace ProxySwitcher +namespace GitExtensions.Plugins.ProxySwitcher { public partial class ProxySwitcherForm : GitExtensionsFormBase { diff --git a/Plugins/ProxySwitcher/ProxySwitcherPlugin.cs b/Plugins/ProxySwitcher/ProxySwitcherPlugin.cs index 682fc11770b..27ff35e1d01 100644 --- a/Plugins/ProxySwitcher/ProxySwitcherPlugin.cs +++ b/Plugins/ProxySwitcher/ProxySwitcherPlugin.cs @@ -1,9 +1,9 @@ using System.ComponentModel.Composition; +using GitExtensions.Plugins.ProxySwitcher.Properties; using GitUIPluginInterfaces; -using ProxySwitcher.Properties; using ResourceManager; -namespace ProxySwitcher +namespace GitExtensions.Plugins.ProxySwitcher { [Export(typeof(IGitPlugin))] public class ProxySwitcherPlugin : GitPluginBase diff --git a/Plugins/ReleaseNotesGenerator/ReleaseNotesGenerator.csproj b/Plugins/ReleaseNotesGenerator/GitExtensions.Plugins.ReleaseNotesGenerator.csproj similarity index 77% rename from Plugins/ReleaseNotesGenerator/ReleaseNotesGenerator.csproj rename to Plugins/ReleaseNotesGenerator/GitExtensions.Plugins.ReleaseNotesGenerator.csproj index 9a6ad24518b..4f74726977e 100644 --- a/Plugins/ReleaseNotesGenerator/ReleaseNotesGenerator.csproj +++ b/Plugins/ReleaseNotesGenerator/GitExtensions.Plugins.ReleaseNotesGenerator.csproj @@ -15,6 +15,14 @@ + + + True + True + Resources.resx + + + diff --git a/Plugins/ReleaseNotesGenerator/GitLogLineParser.cs b/Plugins/ReleaseNotesGenerator/GitLogLineParser.cs index 6a44079e3dc..6949b91a9d9 100644 --- a/Plugins/ReleaseNotesGenerator/GitLogLineParser.cs +++ b/Plugins/ReleaseNotesGenerator/GitLogLineParser.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -namespace ReleaseNotesGenerator +namespace GitExtensions.Plugins.ReleaseNotesGenerator { public interface IGitLogLineParser { diff --git a/Plugins/ReleaseNotesGenerator/HtmlFragment.cs b/Plugins/ReleaseNotesGenerator/HtmlFragment.cs index d2975b84a1e..9351034c480 100644 --- a/Plugins/ReleaseNotesGenerator/HtmlFragment.cs +++ b/Plugins/ReleaseNotesGenerator/HtmlFragment.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using System.Windows.Forms; -namespace ReleaseNotesGenerator +namespace GitExtensions.Plugins.ReleaseNotesGenerator { /// /// Helper class to decode HTML from the clipboard. diff --git a/Plugins/ReleaseNotesGenerator/LogLine.cs b/Plugins/ReleaseNotesGenerator/LogLine.cs index bc53667c9e6..b0dc28f9087 100644 --- a/Plugins/ReleaseNotesGenerator/LogLine.cs +++ b/Plugins/ReleaseNotesGenerator/LogLine.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ReleaseNotesGenerator +namespace GitExtensions.Plugins.ReleaseNotesGenerator { public class LogLine { @@ -13,4 +13,4 @@ public LogLine(string hash, string message) public string Commit { get; } public IList MessageLines { get; } } -} \ No newline at end of file +} diff --git a/Plugins/ReleaseNotesGenerator/Properties/Resources.Designer.cs b/Plugins/ReleaseNotesGenerator/Properties/Resources.Designer.cs index a2e58207a71..eb53526f42d 100644 --- a/Plugins/ReleaseNotesGenerator/Properties/Resources.Designer.cs +++ b/Plugins/ReleaseNotesGenerator/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ReleaseNotesGenerator.Properties { +namespace GitExtensions.Plugins.ReleaseNotesGenerator.Properties { using System; @@ -19,7 +19,7 @@ namespace ReleaseNotesGenerator.Properties { // 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", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal class Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ReleaseNotesGenerator.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitExtensions.Plugins.ReleaseNotesGenerator.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.Designer.cs b/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.Designer.cs index c088e1f0bb7..62def0b12b0 100644 --- a/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.Designer.cs +++ b/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ReleaseNotesGenerator +namespace GitExtensions.Plugins.ReleaseNotesGenerator { partial class ReleaseNotesGeneratorForm { @@ -436,4 +436,4 @@ private void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel6; private System.Windows.Forms.Label label11; } -} \ No newline at end of file +} diff --git a/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.cs b/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.cs index fc020003359..89f7c2bbe74 100644 --- a/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.cs +++ b/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorForm.cs @@ -10,7 +10,7 @@ using GitUIPluginInterfaces; using ResourceManager; -namespace ReleaseNotesGenerator +namespace GitExtensions.Plugins.ReleaseNotesGenerator { /// /// Test on GE repository from "2.00" to "2.10". Should display 687 items. diff --git a/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorPlugin.cs b/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorPlugin.cs index e9516b2f9ac..378e5de9e9a 100644 --- a/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorPlugin.cs +++ b/Plugins/ReleaseNotesGenerator/ReleaseNotesGeneratorPlugin.cs @@ -1,10 +1,10 @@ using System.ComponentModel.Composition; using System.Windows.Forms; +using GitExtensions.Plugins.ReleaseNotesGenerator.Properties; using GitUIPluginInterfaces; -using ReleaseNotesGenerator.Properties; using ResourceManager; -namespace ReleaseNotesGenerator +namespace GitExtensions.Plugins.ReleaseNotesGenerator { [Export(typeof(IGitPlugin))] public class ReleaseNotesGeneratorPlugin : GitPluginBase diff --git a/Setup/Product.wxs b/Setup/Product.wxs index 2fe48c36477..8b7a3b3b7e3 100644 --- a/Setup/Product.wxs +++ b/Setup/Product.wxs @@ -607,7 +607,7 @@ - + @@ -616,7 +616,7 @@ - + @@ -625,22 +625,22 @@ - + - + - + - + - + @@ -665,13 +665,13 @@ - + - + - + diff --git a/UnitTests/Plugins/DeleteUnusedBranches.Tests/DeleteUnusedBranches.Tests.csproj b/UnitTests/Plugins/DeleteUnusedBranches.Tests/DeleteUnusedBranches.Tests.csproj index e275660c4e9..02099cf8cbe 100644 --- a/UnitTests/Plugins/DeleteUnusedBranches.Tests/DeleteUnusedBranches.Tests.csproj +++ b/UnitTests/Plugins/DeleteUnusedBranches.Tests/DeleteUnusedBranches.Tests.csproj @@ -1,7 +1,7 @@  - + diff --git a/UnitTests/Plugins/DeleteUnusedBranches.Tests/GitBranchOutputCommandParserTests.cs b/UnitTests/Plugins/DeleteUnusedBranches.Tests/GitBranchOutputCommandParserTests.cs index 6fa2394ebfe..e0bcc2342c6 100644 --- a/UnitTests/Plugins/DeleteUnusedBranches.Tests/GitBranchOutputCommandParserTests.cs +++ b/UnitTests/Plugins/DeleteUnusedBranches.Tests/GitBranchOutputCommandParserTests.cs @@ -1,5 +1,5 @@ -using DeleteUnusedBranches; -using FluentAssertions; +using FluentAssertions; +using GitExtensions.Plugins.DeleteUnusedBranches; using NUnit.Framework; namespace DeleteUnusedBranchesTests @@ -37,4 +37,4 @@ public void GetBranchNames_should_return_parse_correctly() .BeEquivalentTo("feature/branch-1", "fix/branch-2", "master"); } } -} \ No newline at end of file +} diff --git a/UnitTests/Plugins/ReleaseNotesGenerator.Tests/GitLogLineParserTests.cs b/UnitTests/Plugins/ReleaseNotesGenerator.Tests/GitLogLineParserTests.cs index 979d6e272ea..89c25071c40 100644 --- a/UnitTests/Plugins/ReleaseNotesGenerator.Tests/GitLogLineParserTests.cs +++ b/UnitTests/Plugins/ReleaseNotesGenerator.Tests/GitLogLineParserTests.cs @@ -1,7 +1,7 @@ using System.Linq; using FluentAssertions; +using GitExtensions.Plugins.ReleaseNotesGenerator; using NUnit.Framework; -using ReleaseNotesGenerator; namespace ReleaseNotesGeneratorTests { @@ -114,4 +114,4 @@ public void Parse_lines_should_parse_correctly() line.MessageLines.Count.Should().Be(3); } } -} \ No newline at end of file +} diff --git a/UnitTests/Plugins/ReleaseNotesGenerator.Tests/MainFixture.cs b/UnitTests/Plugins/ReleaseNotesGenerator.Tests/MainFixture.cs index 9e20fc7224c..77aa7b650ef 100644 --- a/UnitTests/Plugins/ReleaseNotesGenerator.Tests/MainFixture.cs +++ b/UnitTests/Plugins/ReleaseNotesGenerator.Tests/MainFixture.cs @@ -1,7 +1,7 @@ using System.Threading; using FluentAssertions; +using GitExtensions.Plugins.ReleaseNotesGenerator; using NUnit.Framework; -using ReleaseNotesGenerator; namespace ReleaseNotesGeneratorTests { diff --git a/UnitTests/Plugins/ReleaseNotesGenerator.Tests/ReleaseNotesGenerator.Tests.csproj b/UnitTests/Plugins/ReleaseNotesGenerator.Tests/ReleaseNotesGenerator.Tests.csproj index 815a747f029..47be3ef7d44 100644 --- a/UnitTests/Plugins/ReleaseNotesGenerator.Tests/ReleaseNotesGenerator.Tests.csproj +++ b/UnitTests/Plugins/ReleaseNotesGenerator.Tests/ReleaseNotesGenerator.Tests.csproj @@ -1,7 +1,7 @@  - +