Merge pull request #300 from microsoft/master

git-ecosystem · Mar 3, 2021 · 161775c · 161775c
2 parents 44acfaf + 22fcece
commit 161775c
Show file tree

Hide file tree

Showing 112 changed files with 1,533 additions and 2,224 deletions.
diff --git a/.azure-pipelines/templates/linux/compile.yml b/.azure-pipelines/templates/linux/compile.yml
@@ -1,9 +1,9 @@
 steps:
   - task: UseDotNet@2
-    displayName: Use .NET Core SDK 3.1.x
+    displayName: Use .NET SDK 5.0.x
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 5.0.x
 
   - task: DotNetCoreCLI@2
     displayName: Compile common code

diff --git a/.azure-pipelines/templates/osx/compile.yml b/.azure-pipelines/templates/osx/compile.yml
@@ -1,9 +1,9 @@
 steps:
   - task: UseDotNet@2
-    displayName: Use .NET Core SDK 3.1.x
+    displayName: Use .NET SDK 5.0.x
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 5.0.x
 
   - task: DotNetCoreCLI@2
     displayName: Compile common code and macOS Helpers

diff --git a/.azure-pipelines/templates/osx/pack.signed/step3-pack.yml b/.azure-pipelines/templates/osx/pack.signed/step3-pack.yml
@@ -7,10 +7,10 @@ steps:
       downloadPath: '$(Build.StagingDirectory)/payload'
 
   - task: UseDotNet@2
-    displayName: Use .NET Core SDK 3.1.x
+    displayName: Use .NET SDK 5.0.x
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 5.0.x
 
   - script: dotnet tool install --global nbgv
     displayName: Install Nerdbank.GitVersioning tool

diff --git a/.azure-pipelines/templates/osx/pack.signed/step5-dist.yml b/.azure-pipelines/templates/osx/pack.signed/step5-dist.yml
@@ -20,7 +20,7 @@ steps:
       artifactName: 'tmp.macsymbols'
       downloadPath: '$(Build.StagingDirectory)/symbols'
 
-  # Skip notarization until we can preserve the hardened runtime bit and sign the .NET Core runtime bits
+  # Skip notarization until we can preserve the hardened runtime bit and sign the .NET runtime bits
   # Tracked: https://github.com/microsoft/Git-Credential-Manager-Core/issues/108
   #- script: src/osx/SignFiles.Mac/notarize-pkg.sh -id "$(AppleId)" -p "$(AppleIdPassword)" -pkg "$(Build.StagingDirectory)"/pkg/*.pkg
   #  displayName: Notarize and staple installer package

diff --git a/.azure-pipelines/templates/windows/compile.signed.yml b/.azure-pipelines/templates/windows/compile.signed.yml
@@ -6,10 +6,10 @@ steps:
       signType: '$(SignType)'
 
   - task: UseDotNet@2
-    displayName: Use .NET Core SDK 3.1.x
+    displayName: Use .NET SDK 5.0.x
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 5.0.x
 
   - task: NuGetToolInstaller@0
     displayName: Install NuGet tool >=4.3.0

diff --git a/.azure-pipelines/templates/windows/compile.yml b/.azure-pipelines/templates/windows/compile.yml
@@ -1,9 +1,9 @@
 steps:
   - task: UseDotNet@2
-    displayName: Use .NET Core SDK 3.1.x
+    displayName: Use .NET SDK 5.0.x
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 5.0.x
 
   - task: DotNetCoreCLI@2
     displayName: Restore packages

diff --git a/.azure-pipelines/templates/windows/pack.yml b/.azure-pipelines/templates/windows/pack.yml
@@ -6,8 +6,8 @@ steps:
     displayName: Set version variables
 
   - script: |
-      xcopy "out\windows\Installer.Windows\bin\$(configuration)\net461"       "$(Build.StagingDirectory)\publish\"
-      xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x86" "$(Build.StagingDirectory)\publish\payload\"
+      xcopy "out\windows\Installer.Windows\bin\$(configuration)\net472"       "$(Build.StagingDirectory)\publish\"
+      xcopy "out\windows\Payload.Windows\bin\$(configuration)\net472\win-x86" "$(Build.StagingDirectory)\publish\payload\"
       mkdir "$(Build.StagingDirectory)\publish\payload.sym\"
       move  "$(Build.StagingDirectory)\publish\payload\*.pdb"                 "$(Build.StagingDirectory)\publish\payload.sym\"
     displayName: Prepare final build artifacts

diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml
@@ -17,10 +17,10 @@ jobs:
       with:
         fetch-depth: 0 # Indicate full history so Nerdbank.GitVersioning works.
 
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.302
+        dotnet-version: 5.0.103
 
     - name: Install dependencies
       run: dotnet restore --force

diff --git a/.github/workflows/build-signed-deb.yml b/.github/workflows/build-signed-deb.yml
@@ -14,10 +14,10 @@ jobs:
       with:
         fetch-depth: 0 # Indicate full history so Nerdbank.GitVersioning works.
 
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.302
+        dotnet-version: 5.0.103
 
     - name: Install dependencies
       run: dotnet restore --force

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -21,10 +21,10 @@ jobs:
       with:
         fetch-depth: 0 # Indicate full history so Nerdbank.GitVersioning works.
 
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.302
+        dotnet-version: 5.0.103
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.gitignore b/.gitignore
@@ -48,7 +48,7 @@ dlldata.c
 # Benchmark Results
 BenchmarkDotNet.Artifacts/
 
-# .NET Core
+# .NET
 project.lock.json
 project.fragment.lock.json
 artifacts/

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp3.1/git-credential-manager-core.dll",
+            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net5.0/git-credential-manager-core.dll",
             "args": ["get"],
             "cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
             "console": "integratedTerminal",
@@ -22,14 +22,14 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp3.1/git-credential-manager-core.dll",
+            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net5.0/git-credential-manager-core.dll",
             "args": ["store"],
             "cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
             "console": "integratedTerminal",
             "stopAtEntry": false,
         },
         {
-            "name": ".NET Core Attach",
+            "name": ".NET Attach",
             "type": "coreclr",
             "request": "attach",
             "processId": "${command:pickProcess}"

diff --git a/Git-Credential-Manager.sln b/Git-Credential-Manager.sln
@@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Tests", "src\shared\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "osx", "osx", "{3D279E2D-E011-45CF-8EA8-3D71D1300443}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Authentication.Helper.Mac", "src\osx\Microsoft.Authentication.Helper.Mac\Microsoft.Authentication.Helper.Mac.csproj", "{206430B1-CEED-4C84-8D49-D0A399632202}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Mac", "src\osx\Installer.Mac\Installer.Mac.csproj", "{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Windows", "src\windows\Installer.Windows\Installer.Windows.csproj", "{85903170-9E52-4B53-A6E4-3F416F684FAE}"
@@ -215,16 +213,6 @@ Global
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD}.LinuxDebug|Any CPU.Build.0 = Debug|Any CPU
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD}.LinuxRelease|Any CPU.Build.0 = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacDebug|Any CPU.Build.0 = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.MacRelease|Any CPU.Build.0 = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.LinuxDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206430B1-CEED-4C84-8D49-D0A399632202}.LinuxRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715}.MacDebug|Any CPU.Build.0 = Debug|Any CPU
@@ -343,7 +331,6 @@ Global
 		{D5277A0E-997E-453A-8CB9-4EFCC8B16A29} = {A7FC1234-95E3-4496-B5F7-4306F41E6A0E}
 		{3E524EA8-D31A-4394-997C-14B522E3D6FD} = {D5277A0E-997E-453A-8CB9-4EFCC8B16A29}
 		{3D279E2D-E011-45CF-8EA8-3D71D1300443} = {A7FC1234-95E3-4496-B5F7-4306F41E6A0E}
-		{206430B1-CEED-4C84-8D49-D0A399632202} = {3D279E2D-E011-45CF-8EA8-3D71D1300443}
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715} = {3D279E2D-E011-45CF-8EA8-3D71D1300443}
 		{85903170-9E52-4B53-A6E4-3F416F684FAE} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ master|[![Build Status](https://mseng.visualstudio.com/AzureDevOps/_apis/build/s
 
 ---
 
-[Git Credential Manager Core](https://github.com/microsoft/Git-Credential-Manager-Core) (GCM Core) is a secure Git credential helper built on [.NET Core](https://microsoft.com/dotnet) that runs on Windows and macOS. Linux support is in an early preview.
+[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 and macOS. Linux support is in an early preview.
 
 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) 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.
 
@@ -69,7 +69,7 @@ If you have an existing installation of the 'Java GCM' on macOS and you have ins
 To uninstall, run the following:
 
 ```shell
-brew cask uninstall git-credential-manager-core
+brew uninstall --cask git-credential-manager-core
 ```
 
 ---
@@ -149,6 +149,8 @@ To uninstall, open Control Panel and navigate to the Programs and Features scree
 Git Credential Manager Core is called implicitly by Git, when so configured. It is not intended to be called directly by the user.
 For example, when pushing (`git push`) to [Azure DevOps](https://dev.azure.com), a window is automatically opened and an OAuth2 flow is started to get your personal access token.
 
+Read full command line usage [here](docs/usage.md).
+
 ### Configuring a proxy
 
 See detailed information [here](https://aka.ms/gcmcore-httpproxy).