Skip to content

Commit 478753b

Browse files
ldenningtonldennington
authored
Merge pull request #567 from GitCredentialManager/main
New release
2 parents 97323d1 + 793a74c commit 478753b

Some content is hidden

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

46 files changed

+406
-184
lines changed

‎.code-coverage/coverlet.settings.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<RunSettings>
3+
<DataCollectionRunSettings>
4+
<DataCollectors>
5+
<DataCollector friendlyName="XPlat code coverage">
6+
<Configuration>
7+
<Format>cobertura,lcov</Format>
8+
</Configuration>
9+
</DataCollector>
10+
</DataCollectors>
11+
</DataCollectionRunSettings>
12+
</RunSettings>

‎.github/ISSUE_TEMPLATE/auth-problem.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels: 'auth-issue'
66
assignees: ''
77
---
88

9-
**Which version of GCM Core are you using?**
9+
**Which version of GCM are you using?**
1010

1111
From a terminal, run `git credential-manager-core --version` and paste the output.
1212

@@ -63,3 +63,10 @@ A clear and concise description of what happens. For example: exception is throw
6363
**Logs**
6464

6565
Set the environment variables `GCM_TRACE=1` and `GIT_TRACE=1` and re-run your Git command. Review and redact any private information and attach the log.
66+
67+
If you are running inside of Windows Subsystem for Linux (WSL), you must also set an additional environment variable to enable tracing: `WSLENV=$WSLENV:GCM_TRACE`.
68+
For example:
69+
70+
```shell
71+
WSLENV=$WSLENV:GCM_TRACE:GIT_TRACE GCM_TRACE=1 GIT_TRACE=1 git fetch
72+
```

‎.github/ISSUE_TEMPLATE/experimental.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ labels: 'experimental'
66
assignees: ''
77
---
88

9-
**Which version of GCM Core are you using?**
9+
**Which version of GCM are you using?**
1010

11-
From a terminal, run `git-credential-manager-core --version` and paste the output.
11+
From a terminal, run `git credential-manager-core --version` and paste the output.
1212

1313
<!-- Ex:
1414
Git Credential Manager version 2.0.8-beta+e1f8492d04 (macOS, .NET Core 4.6.27129.04)
@@ -63,3 +63,10 @@ A clear and concise description of what happens. For example: exception is throw
6363
**Logs**
6464

6565
Set the environment variables `GCM_TRACE=1` and `GIT_TRACE=1` and re-run your Git command. Review and redact any private information and attach the log.
66+
67+
If you are running inside of Windows Subsystem for Linux (WSL), you must also set an additional environment variable to enable tracing: `WSLENV=$WSLENV:GCM_TRACE`.
68+
For example:
69+
70+
```shell
71+
WSLENV=$WSLENV:GCM_TRACE:GIT_TRACE GCM_TRACE=1 GIT_TRACE=1 git fetch
72+
```

‎.github/ISSUE_TEMPLATE/feature-req.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Feature request
3-
about: A suggestion for a new feature in Git Credential Manager Core.
3+
about: A suggestion for a new feature in Git Credential Manager.
44
title: ''
55
labels: 'enhancement'
66
assignees: ''

‎.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: GCM-Core
1+
name: GCM
22

33
on:
44
workflow_dispatch:

‎.vscode/tasks.json

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,54 @@
3131
"reveal": "always",
3232
"panel": "dedicated"
3333
}
34+
},
35+
{
36+
"label": "test with coverage",
37+
"command": "dotnet",
38+
"type": "shell",
39+
"group": "test",
40+
"args": [
41+
"test",
42+
"${workspaceFolder}/Git-Credential-Manager.sln",
43+
"--collect",
44+
"'XPlat Code Coverage'",
45+
"--settings",
46+
"${workspaceFolder}/.code-coverage/coverlet.settings.xml"
47+
],
48+
"presentation": {
49+
"reveal": "always",
50+
"panel": "dedicated"
51+
}
52+
},
53+
{
54+
"label": "report coverage - nix",
55+
"command": "dotnet",
56+
"type": "shell",
57+
"group": "test",
58+
"args": [
59+
"~/.nuget/packages/reportgenerator/*/*/net5.0/ReportGenerator.dll",
60+
"-reports:${workspaceFolder}/**/TestResults/**/coverage.cobertura.xml",
61+
"-targetdir:${workspaceFolder}/out/code-coverage"
62+
],
63+
"presentation": {
64+
"reveal": "always",
65+
"panel": "dedicated"
66+
}
67+
},
68+
{
69+
"label": "report coverage - win",
70+
"command": "dotnet",
71+
"type": "shell",
72+
"group": "test",
73+
"args": [
74+
"${env:USERROFILE}/.nuget/packages/reportgenerator/*/*/net5.0/ReportGenerator.dll",
75+
"-reports:${workspaceFolder}/**/TestResults/**/coverage.cobertura.xml",
76+
"-targetdir:${workspaceFolder}/out/code-coverage"
77+
],
78+
"presentation": {
79+
"reveal": "always",
80+
"panel": "dedicated"
81+
}
3482
}
3583
]
36-
}
84+
}

‎CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## Contributing
22

3-
[issue]: https://github.com/microsoft/Git-Credential-Manager-Core/issues
4-
[fork]: https://github.com/microsoft/Git-Credential-Manager-Core/fork
5-
[pr]: https://github.com/microsoft/Git-Credential-Manager-Core/compare
3+
[issue]: https://github.com/GitCredentialManager/git-credential-manager/issues
4+
[fork]: https://github.com/GitCredentialManager/git-credential-manager/fork
5+
[pr]: https://github.com/GitCredentialManager/git-credential-manager/compare
66
[code-of-conduct]: CODE_OF_CONDUCT.md
77

88
Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Git Credential Manager Core
1+
Git Credential Manager
22
Copyright © GitHub, Inc. and contributors
33

44
MIT License

‎NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
NOTICES AND INFORMATION
22
Do Not Translate or Localize
33

4-
This repository for Git Credential Manager Core includes material from the
4+
This repository for Git Credential Manager includes material from the
55
projects listed below.
66

77
--------------------------------------------------------------------------------

‎README.md

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Git Credential Manager Core
1+
# Git Credential Manager
22

3-
[![Build Status](https://github.com/microsoft/Git-Credential-Manager-Core/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/microsoft/Git-Credential-Manager-Core/actions/workflows/continuous-integration.yml)
3+
[![Build Status](https://github.com/GitCredentialManager/git-credential-manager/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/GitCredentialManager/git-credential-manager/actions/workflows/continuous-integration.yml)
44

55
---
66

7-
[Git Credential Manager Core](https://github.com/microsoft/Git-Credential-Manager-Core) (GCM Core) is a secure Git credential helper built on [.NET](https://dotnet.microsoft.com) that runs on Windows, macOS, and Linux.
7+
[Git Credential Manager](https://github.com/GitCredentialManager/git-credential-manager) (GCM) is a secure Git credential helper built on [.NET](https://dotnet.microsoft.com) that runs on Windows, macOS, and Linux.
88

9-
Compared to Git's [built-in credential helpers]((https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage)) (Windows: wincred, macOS: osxkeychain, Linux: gnome-keyring/libsecret) which provides single-factor authentication support working on any HTTP-enabled Git repository, GCM Core provides multi-factor authentication support for [Azure DevOps](https://dev.azure.com/), Azure DevOps Server (formerly Team Foundation Server), GitHub, and Bitbucket.
9+
Compared to Git's [built-in credential helpers]((https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage)) (Windows: wincred, macOS: osxkeychain, Linux: gnome-keyring/libsecret) which provides single-factor authentication support working on any HTTP-enabled Git repository, GCM provides multi-factor authentication support for [Azure DevOps](https://dev.azure.com/), Azure DevOps Server (formerly Team Foundation Server), GitHub, and Bitbucket.
1010

11-
Git Credential Manager Core (GCM Core) replaces the .NET Framework-based [Git Credential Manager for Windows](https://github.com/microsoft/Git-Credential-Manager-for-Windows) (GCM), and the Java-based [Git Credential Manager for Mac and Linux](https://github.com/microsoft/Git-Credential-Manager-for-Mac-and-Linux) (Java GCM), providing a consistent authentication experience across all platforms.
11+
Git Credential Manager (GCM) replaces the .NET Framework-based [Git Credential Manager for Windows](https://github.com/microsoft/Git-Credential-Manager-for-Windows) (GCM), and the Java-based [Git Credential Manager for Mac and Linux](https://github.com/microsoft/Git-Credential-Manager-for-Mac-and-Linux) (Java GCM), providing a consistent authentication experience across all platforms.
1212

1313
## Current status
1414

15-
Git Credential Manager Core is currently available for Windows, macOS, and Linux. GCM only works with HTTP(S) remotes; you can still use Git with SSH:
15+
Git Credential Manager is currently available for Windows, macOS, and Linux. GCM only works with HTTP(S) remotes; you can still use Git with SSH:
1616

1717
- [Azure DevOps SSH](https://docs.microsoft.com/en-us/azure/devops/repos/git/use-ssh-keys-to-authenticate?view=azure-devops)
1818
- [GitHub SSH](https://help.github.com/en/articles/connecting-to-github-with-ssh)
@@ -58,7 +58,7 @@ brew upgrade git-credential-manager-core
5858

5959
#### Git Credential Manager for Mac and Linux (Java-based GCM)
6060

61-
If you have an existing installation of the 'Java GCM' on macOS and you have installed this using Homebrew, this installation will be unlinked (`brew unlink git-credential-manager`) when GCM Core is installed.
61+
If you have an existing installation of the 'Java GCM' on macOS and you have installed this using Homebrew, this installation will be unlinked (`brew unlink git-credential-manager`) when GCM is installed.
6262

6363
#### Uninstall
6464

@@ -72,7 +72,7 @@ brew uninstall --cask git-credential-manager-core
7272

7373
### macOS Package
7474

75-
We also provide a [.pkg installer](https://github.com/microsoft/Git-Credential-Manager-Core/releases/latest) with each release. To install, double-click the installation package and follow the instructions presented.
75+
We also provide a [.pkg installer](https://github.com/GitCredentialManager/git-credential-manager/releases/latest) with each release. To install, double-click the installation package and follow the instructions presented.
7676

7777
#### Uninstall
7878

@@ -90,7 +90,7 @@ sudo /usr/local/share/gcm-core/uninstall.sh
9090

9191
#### Ubuntu/Debian distributions
9292

93-
Download the latest [.deb package](https://github.com/microsoft/Git-Credential-Manager-Core/releases/latest), and run the following:
93+
Download the latest [.deb package](https://github.com/GitCredentialManager/git-credential-manager/releases/latest), and run the following:
9494

9595
```shell
9696
sudo dpkg -i <path-to-package>
@@ -101,32 +101,46 @@ __Note:__ Although packages were previously offered on certain
101101
GCM no longer publishes to these repositories. Please install the
102102
Debian package using the above instructions instead.
103103

104+
To uninstall:
105+
106+
```shell
107+
git-credential-manager-core unconfigure
108+
sudo dpkg -r gcmcore
109+
```
110+
104111
#### Other distributions
105112

106-
Download the latest [tarball](https://github.com/microsoft/Git-Credential-Manager-Core/releases/latest), and run the following:
113+
Download the latest [tarball](https://github.com/GitCredentialManager/git-credential-manager/releases/latest), and run the following:
107114

108115
```shell
109116
tar -xvf <path-to-tarball> -C /usr/local/bin
110117
git-credential-manager-core configure
111118
```
112119

113-
**Note:** all Linux distributions [require additional configuration](https://aka.ms/gcmcore-credstores) to use GCM Core.
120+
To uninstall:
121+
122+
```shell
123+
git-credential-manager-core unconfigure
124+
rm $(command -v git-credential-manager-core)
125+
```
126+
127+
**Note:** all Linux distributions [require additional configuration](https://aka.ms/gcm/credstores) to use GCM.
114128

115129
---
116130

117131
### Windows
118132

119-
GCM Core is included with [Git for Windows](https://gitforwindows.org/), and the latest version is included in each new Git for Windows release. This is the preferred way to install GCM Core on Windows. During installation you will be asked to select a credential helper, with GCM Core being set as the default.
133+
GCM is included with [Git for Windows](https://gitforwindows.org/), and the latest version is included in each new Git for Windows release. This is the preferred way to install GCM on Windows. During installation you will be asked to select a credential helper, with GCM being set as the default.
120134

121135
![image](https://user-images.githubusercontent.com/5658207/140082529-1ac133c1-0922-4a24-af03-067e27b3988b.png)
122136

123137
#### Standalone installation
124138

125-
You can also download the [latest installer](https://github.com/microsoft/Git-Credential-Manager-Core/releases/latest) for Windows to install GCM Core standalone.
139+
You can also download the [latest installer](https://github.com/GitCredentialManager/git-credential-manager/releases/latest) for Windows to install GCM standalone.
126140

127141
**:warning: Important :warning:**
128142

129-
Installing GCM Core as a standalone package on Windows will forcibly override the version of GCM Core that is bundled with Git for Windows, **even if the version bundled with Git for Windows is a later version**.
143+
Installing GCM as a standalone package on Windows will forcibly override the version of GCM that is bundled with Git for Windows, **even if the version bundled with Git for Windows is a later version**.
130144

131145
There are two flavors of standalone installation on Windows:
132146

@@ -142,23 +156,23 @@ To install, double-click the desired installation package and follow the instruc
142156

143157
#### Uninstall (Windows 10)
144158

145-
To uninstall, open the Settings app and navigate to the Apps section. Select "Git Credential Manager Core" and click "Uninstall".
159+
To uninstall, open the Settings app and navigate to the Apps section. Select "Git Credential Manager" and click "Uninstall".
146160

147161
#### Uninstall (Windows 7-8.1)
148162

149-
To uninstall, open Control Panel and navigate to the Programs and Features screen. Select "Git Credential Manager Core" and click "Remove".
163+
To uninstall, open Control Panel and navigate to the Programs and Features screen. Select "Git Credential Manager" and click "Remove".
150164

151165
#### Windows Subsystem for Linux (WSL)
152166

153-
Git Credential Manager Core can be used with the [Windows Subsystem for Linux
167+
Git Credential Manager can be used with the [Windows Subsystem for Linux
154168
(WSL)](https://aka.ms/wsl) to enable secure authentication of your remote Git
155169
repositories from inside of WSL.
156170

157-
[Please see the GCM Core on WSL docs](docs/wsl.md) for more information.
171+
[Please see the GCM on WSL docs](docs/wsl.md) for more information.
158172

159173
## Supported Git versions
160174

161-
Git Credential Manager Core tries to be compatible with the broadest set of Git
175+
Git Credential Manager tries to be compatible with the broadest set of Git
162176
versions (within reason). However there are some know problematic releases of
163177
Git that are not compatible.
164178

@@ -174,17 +188,17 @@ Git that are not compatible.
174188

175189
## How to use
176190

177-
Once it's installed and configured, Git Credential Manager Core is called implicitly by Git.
178-
You don't have to do anything special, and GCM Core isn't intended to be called directly by the user.
191+
Once it's installed and configured, Git Credential Manager is called implicitly by Git.
192+
You don't have to do anything special, and GCM isn't intended to be called directly by the user.
179193
For example, when pushing (`git push`) to [Azure DevOps](https://dev.azure.com), [Bitbucket](https://bitbucket.org), or [GitHub](https://github.com), a window will automatically open and walk you through the sign-in process.
180194
(This process will look slightly different for each Git host, and even in some cases, whether you've connected to an on-premises or cloud-hosted Git host.)
181-
Later Git commands in the same repository will re-use existing credentials or tokens that GCM Core has stored for as long as they're valid.
195+
Later Git commands in the same repository will re-use existing credentials or tokens that GCM has stored for as long as they're valid.
182196

183197
Read full command line usage [here](docs/usage.md).
184198

185199
### Configuring a proxy
186200

187-
See detailed information [here](https://aka.ms/gcmcore-httpproxy).
201+
See detailed information [here](https://aka.ms/gcm/httpproxy).
188202

189203
## Additional Resources
190204

0 commit comments

Comments
 (0)