Merge pull request #350 from microsoft/main

Cut new release

Author: mjcheetham

.azure-pipelines/continuous-integration.yml

@@ -1,5 +1,5 @@
 trigger:
-  - master
+  - main
 
 variables:
   configuration: Release

.azure-pipelines/pull-request.yml

@@ -1,5 +1,5 @@
 pr:
-  - master
+  - main
   - release
 
 variables:

.github/workflows/build-installers.yml

@@ -3,9 +3,9 @@ name: Build-Installers
 on:
   workflow_dispatch:
   push:
-    branches: [ master, release ]
+    branches: [ main, release ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   linux:

.github/workflows/continuous-integration.yml

@@ -3,9 +3,9 @@ name: GCM-Core
 on:
   workflow_dispatch:
   push:
-    branches: [ master, linux ]
+    branches: [ main, linux ]
   pull_request:
-    branches: [ master, linux ]
+    branches: [ main, linux ]
 
 jobs:
   validate_gcm:

README.md

@@ -1,8 +1,6 @@
 # Git Credential Manager Core
 
-Branch|Status
--|-
-master|[![Build Status](https://mseng.visualstudio.com/AzureDevOps/_apis/build/status/Teams/VCDesktop/Git-Credential-Manager-Core/GCM-CI?branchName=master)](https://mseng.visualstudio.com/AzureDevOps/_build/latest?definitionId=7861&branchName=master)
+[![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)
 
 ---
 

docs/azrepos-users-and-tokens.md

@@ -8,8 +8,8 @@ The Azure Repos host provider supports creating multiple types of credential:
 - Microsoft identity OAuth tokens (experimental)
 
 To select which type of credential the Azure Repos host provider will create
-and use, you can set the [`credential.azreposCredentialType`](https://github.com/microsoft/Git-Credential-Manager-Core/blob/master/docs/configuration.md#credentialazreposcredentialtype-experimental)
-configuration entry (or [`GCM_AZREPOS_CREDENTIALTYPE`](https://github.com/microsoft/Git-Credential-Manager-Core/blob/master/docs/environment.md#GCM_AZREPOS_CREDENTIALTYPE-experimental)
+and use, you can set the [`credential.azreposCredentialType`](configuration.md#credentialazreposcredentialtype-experimental)
+configuration entry (or [`GCM_AZREPOS_CREDENTIALTYPE`](environment.md#GCM_AZREPOS_CREDENTIALTYPE-experimental)
 environment variable).
 
 ### Azure DevOps personal access tokens

docs/configuration.md

@@ -258,7 +258,7 @@ Specify which authentication flow should be used when performing Microsoft authe
 
 Defaults to `auto`.
 
-**Note:** If [`credential.msauthUseBroker`](#credentialmsauthusebroker) is set
+**Note:** If [`credential.msauthUseBroker`](#credentialmsauthusebroker-experimental) is set
 to `true` and the operating system authentication broker is available, all flows
 will be delegated to the broker. If both of those things are true, then the
 value of `credential.msauthFlow` has no effect.
@@ -280,12 +280,14 @@ git config --global credential.msauthFlow devicecode
 
 ---
 
-### credential.msauthUseBroker
+### credential.msauthUseBroker _(experimental)_
 
 Use the operating system account manager where available.
 
 Defaults to `false`. This default is subject to change in the future.
 
+_**Note:** before you enable this option on Windows, please [review the details](windows-broker.md) about what this means to your local Windows user account._
+
 Value|Description
 -|-
 `true`|Use the operating system account manager as an authentication broker.
@@ -297,7 +299,7 @@ Value|Description
 git config --global credential.msauthUseBroker true
 ```
 
-**Also see: [GCM_MSAUTH_USEBROKER](environment.md#GCM_MSAUTH_USEBROKER)**
+**Also see: [GCM_MSAUTH_USEBROKER](environment.md#GCM_MSAUTH_USEBROKER-experimental)**
 
 ---
 

docs/environment.md

@@ -404,7 +404,7 @@ Specify which authentication flow should be used when performing Microsoft authe
 
 Defaults to `auto`.
 
-**Note:** If [`GCM_MSAUTH_USEBROKER`](#gcm_msauth_usebroker) is set to `true`
+**Note:** If [`GCM_MSAUTH_USEBROKER`](#gcm_msauth_usebroker-experimental) is set to `true`
 and the operating system authentication broker is available, all flows will be
 delegated to the broker. If both of those things are true, then the value of
 `GCM_MSAUTH_FLOW` has no effect.
@@ -432,12 +432,14 @@ export GCM_MSAUTH_FLOW="devicecode"
 
 ---
 
-### GCM_MSAUTH_USEBROKER
+### GCM_MSAUTH_USEBROKER _(experimental)_
 
 Use the operating system account manager where available.
 
 Defaults to `false`. This default is subject to change in the future.
 
+_**Note:** before you enable this option on Windows, please [review the details](windows-broker.md) about what this means to your local Windows user account._
+
 Value|Description
 -|-
 `true`|Use the operating system account manager as an authentication broker.
@@ -455,7 +457,7 @@ SET GCM_MSAUTH_USEBROKER="true"
 export GCM_MSAUTH_USEBROKER="false"
 ```
 
-**Also see: [credential.msauthUseBroker](configuration.md#credentialmsauthusebroker)**
+**Also see: [credential.msauthUseBroker](configuration.md#credentialmsauthusebroker-experimental)**
 
 ---