Skip to content

Commit 5aa3590

Browse files
authored
Merge pull request #500 from ldennington/remove-microsoft-from-namespace
Replace Microsoft in GCM namespaces/file names
2 parents 3183fdb + c35166d commit 5aa3590

File tree

319 files changed

+555
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+555
-552
lines changed

Git-Credential-Manager.sln

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A7FC1234-95E
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Git-Credential-Manager", "src\shared\Git-Credential-Manager\Git-Credential-Manager.csproj", "{28F06D44-AB25-4CF5-93F9-978C23FAA9D6}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Git.CredentialManager", "src\shared\Microsoft.Git.CredentialManager\Microsoft.Git.CredentialManager.csproj", "{31BCFC70-B767-4274-873F-1A076D422FC3}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\shared\Core\Core.csproj", "{31BCFC70-B767-4274-873F-1A076D422FC3}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Git.CredentialManager.Tests", "src\shared\Microsoft.Git.CredentialManager.Tests\Microsoft.Git.CredentialManager.Tests.csproj", "{AD41FA1E-51F5-4E4F-B7DA-32F921491313}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Tests", "src\shared\Core.Tests\Core.Tests.csproj", "{AD41FA1E-51F5-4E4F-B7DA-32F921491313}"
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AzureRepos", "src\shared\Microsoft.AzureRepos\Microsoft.AzureRepos.csproj", "{714AF9EB-44E6-4058-BD3E-9039F29F4D7A}"
1515
EndProject
@@ -37,7 +37,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atlassian.Bitbucket", "src\
3737
EndProject
3838
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atlassian.Bitbucket.Tests", "src\shared\Atlassian.Bitbucket.Tests\Atlassian.Bitbucket.Tests.csproj", "{025E5329-A0B1-4BA9-9203-B70B44A5F9E0}"
3939
EndProject
40-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.UI.Windows", "src\windows\Shared.UI.Windows\Shared.UI.Windows.csproj", "{2B3CD8FF-84A6-4B53-A28B-D7A75B0AB4D7}"
40+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.UI.Windows", "src\windows\Core.UI.Windows\Core.UI.Windows.csproj", "{2B3CD8FF-84A6-4B53-A28B-D7A75B0AB4D7}"
4141
EndProject
4242
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packaging.Linux", "src\linux\Packaging.Linux\Packaging.Linux.csproj", "{AD2A935F-3720-4802-8119-6A9B35B254DF}"
4343
EndProject
@@ -47,9 +47,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI", "src\shared\Git
4747
EndProject
4848
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atlassian.Bitbucket.UI", "src\shared\Atlassian.Bitbucket.UI\Atlassian.Bitbucket.UI.csproj", "{EB1AA840-6FFF-4464-A9B2-0AEA36F615EA}"
4949
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Git.CredentialManager.UI", "src\shared\Microsoft.Git.CredentialManager.UI\Microsoft.Git.CredentialManager.UI.csproj", "{001846B0-462B-4A27-90CD-2435D4C0F680}"
50+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.UI", "src\shared\Core.UI\Core.UI.csproj", "{001846B0-462B-4A27-90CD-2435D4C0F680}"
5151
EndProject
52-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Git.CredentialManager.UI.Avalonia", "src\shared\Microsoft.Git.CredentialManager.UI.Avalonia\Microsoft.Git.CredentialManager.UI.Avalonia.csproj", "{DE620324-250C-4262-BA13-198FA6FDB82A}"
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.UI.Avalonia", "src\shared\Core.UI.Avalonia\Core.UI.Avalonia.csproj", "{DE620324-250C-4262-BA13-198FA6FDB82A}"
5353
EndProject
5454
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI.Avalonia", "src\shared\GitHub.UI.Avalonia\GitHub.UI.Avalonia.csproj", "{459501A8-31E6-41CB-BE54-D31FFF4B2007}"
5555
EndProject

docs/architecture.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
| | | | | |
3232
+-v---v----v--------------v------------+ +-v-----------------v----------------+
3333
| | | |
34-
| Microsoft.Git.CredentialManager <--+ Microsoft.Git.CredentialManager.UI |
34+
| Core <--+ Core.UI |
3535
| | | |
3636
+--------------------------------------+ +------------------------------------+
3737
```
3838

3939
Git Credential Manager Core (GCM Core) is built to be Git host and platform/OS
4040
agonstic. Most of the shared logic (command execution, the abstract platform
41-
subsystems, etc) can be found in the `Microsoft.Git.CredentialManager` class
41+
subsystems, etc) can be found in the `Core` class
4242
library (C#). The library targets .NET Standard as well as .NET Framework.
4343

4444
> **Note**
@@ -59,10 +59,10 @@ The entry-point for GCM Core can be found in the `Git-Credential-Manager`
5959
project, a console application that targets both .NET and .NET Framework.
6060
This project emits the `git-credential-manager-core(.exe)` executable, and
6161
contains very little code - registration of all supported host providers and
62-
running the `Application` object found in `Microsoft.Git.CredentialManager`.
62+
running the `Application` object found in `Core`.
6363

6464
Providers have their own projects/assemblies that take dependencies on the
65-
`Microsoft.Git.CredentialManager` core assembly, and are dependents of the main
65+
`Core` core assembly, and are dependents of the main
6666
entry point application `Git-Credential-Manager`. Code in these binaries is
6767
expected to run on all supported platforms and typically (see MSAL.NET note
6868
above) does not include any graphical user interface; they use terminal prompts
@@ -88,7 +88,7 @@ issue for up-to-date progress on this effort.
8888

8989
For authentication using Microsoft Accounts or Azure Active Directory, things
9090
are a little different. The `MicrosoftAuthentication` component is present in
91-
the core `Microsoft.Git.CredentialManager` assembly, rather than bundled with a
91+
the core `Core` assembly, rather than bundled with a
9292
specific host provider. This was done to allow any service that may wish to in
9393
the future integrate with Microsoft Accounts or Azure Active Directory can make
9494
use of this reusable authentication component.
@@ -148,7 +148,7 @@ Git Credential Manager Core maintains a set of known commands including
148148
GCM Core also maintains a set of known, registered host providers that implement
149149
the `IHostProvider` interface. Providers register themselves by adding an
150150
instance of the provider to the `Application` object via the `RegisterProvider`
151-
method [in `Microsoft.Git.CredentialManager.Program`](../src/shared/Git-Credential-Manager/Program.cs).
151+
method [in `Core.Program`](../src/shared/Git-Credential-Manager/Program.cs).
152152
The `GenericHostProvider` is registered last so that it can handle all other
153153
HTTP-based remotes as a catch-all, and provide basic username/password auth and
154154
detect the presence of Windows Integrated Authentication (Kerberos, NTLM,

src/osx/SignFiles.Mac/SignFiles.Mac.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
$(OutDir)\GitHub.UI.dll;
2929
$(OutDir)\GitHub.UI.Shared.dll;
3030
$(OutDir)\Microsoft.AzureRepos.dll;
31-
$(OutDir)\Microsoft.Git.CredentialManager.dll;">
31+
$(OutDir)\gcmcore.dll;">
3232
<Authenticode>Microsoft400</Authenticode>
3333
<InProject>false</InProject>
3434
</FilesToSign>

src/shared/Atlassian.Bitbucket.Tests/BitbucketHostProviderTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using Microsoft.Git.CredentialManager;
2-
using Microsoft.Git.CredentialManager.Authentication.OAuth;
3-
using Microsoft.Git.CredentialManager.Tests.Objects;
1+
using GitCredentialManager;
2+
using GitCredentialManager.Authentication.OAuth;
3+
using GitCredentialManager.Tests.Objects;
44
using Moq;
55
using System;
66
using System.Collections.Generic;

src/shared/Atlassian.Bitbucket.UI.Avalonia/Atlassian.Bitbucket.UI.Avalonia.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<ProjectReference Include="..\Atlassian.Bitbucket.UI\Atlassian.Bitbucket.UI.csproj" />
13-
<ProjectReference Include="..\Microsoft.Git.CredentialManager.UI.Avalonia\Microsoft.Git.CredentialManager.UI.Avalonia.csproj" />
13+
<ProjectReference Include="..\Core.UI.Avalonia\Core.UI.Avalonia.csproj" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

src/shared/Atlassian.Bitbucket.UI.Avalonia/Commands/CredentialsCommandImpl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using System.Threading.Tasks;
33
using Atlassian.Bitbucket.UI.ViewModels;
44
using Atlassian.Bitbucket.UI.Views;
5-
using Microsoft.Git.CredentialManager;
6-
using Microsoft.Git.CredentialManager.UI;
5+
using GitCredentialManager;
6+
using GitCredentialManager.UI;
77

88
namespace Atlassian.Bitbucket.UI.Commands
99
{

src/shared/Atlassian.Bitbucket.UI.Avalonia/Commands/OAuthCommandImpl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using System.Threading.Tasks;
33
using Atlassian.Bitbucket.UI.ViewModels;
44
using Atlassian.Bitbucket.UI.Views;
5-
using Microsoft.Git.CredentialManager;
6-
using Microsoft.Git.CredentialManager.UI;
5+
using GitCredentialManager;
6+
using GitCredentialManager.UI;
77

88
namespace Atlassian.Bitbucket.UI.Commands
99
{

src/shared/Atlassian.Bitbucket.UI.Avalonia/Controls/TesterWindow.axaml.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
using Avalonia.Controls;
55
using Avalonia.Interactivity;
66
using Avalonia.Markup.Xaml;
7-
using Microsoft.Git.CredentialManager;
8-
using Microsoft.Git.CredentialManager.Interop.Linux;
9-
using Microsoft.Git.CredentialManager.Interop.MacOS;
10-
using Microsoft.Git.CredentialManager.Interop.Posix;
11-
using Microsoft.Git.CredentialManager.Interop.Windows;
12-
using Microsoft.Git.CredentialManager.UI.Controls;
7+
using GitCredentialManager;
8+
using GitCredentialManager.Interop.Linux;
9+
using GitCredentialManager.Interop.MacOS;
10+
using GitCredentialManager.Interop.Posix;
11+
using GitCredentialManager.Interop.Windows;
12+
using GitCredentialManager.UI.Controls;
1313

1414
namespace Atlassian.Bitbucket.UI.Controls
1515
{

src/shared/Atlassian.Bitbucket.UI.Avalonia/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using Atlassian.Bitbucket.UI.Commands;
55
using Atlassian.Bitbucket.UI.Controls;
66
using Avalonia;
7-
using Microsoft.Git.CredentialManager;
8-
using Microsoft.Git.CredentialManager.UI;
7+
using GitCredentialManager;
8+
using GitCredentialManager.UI;
99

1010
namespace Atlassian.Bitbucket.UI
1111
{

src/shared/Atlassian.Bitbucket.UI.Avalonia/Views/CredentialsView.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Atlassian.Bitbucket.UI.ViewModels;
22
using Avalonia.Controls;
33
using Avalonia.Markup.Xaml;
4-
using Microsoft.Git.CredentialManager.UI.Controls;
4+
using GitCredentialManager.UI.Controls;
55

66
namespace Atlassian.Bitbucket.UI.Views
77
{

0 commit comments

Comments
 (0)