@@ -86,7 +86,9 @@ your machine: requiring certain kinds of sign-in, turning on antivirus and
86
86
firewall software, and enabling BitLocker.
87
87
Your identity will also be available to other apps on the computer for signing
88
88
in, some of which may do so automatically.
89
+
89
90
![ Example of policies pushed to an Intune-enrolled device] [ aad-bitlocker ]
91
+
90
92
- If you uncheck "allow my organization to manage my device" and click "OK",
91
93
your computer will be registered with Azure AD but will not be MDM-enrolled.
92
94
Your identity will be available to other apps on the computer for signing in.
@@ -95,6 +97,7 @@ organization to manage your device. Despite joining Azure AD, your
95
97
organization's Conditional Access policies may still prevent you from accessing
96
98
Azure DevOps.
97
99
If so, you'll be prompted with instructions on how to enroll in MDM.
100
+
98
101
- If you instead click "No, sign in to this app only", your machine will not be
99
102
joined to Azure AD or MDM-enrolled, so no policies can be enforced, and your
100
103
identity won't be made available to other apps on the computer.
@@ -132,27 +135,48 @@ improve over time and a "personal account" option to be presented in the future.
132
135
133
136
If you've connected your MSA to Windows or signed-in to other Microsoft
134
137
applications such as Office, then you may see this account listed in the
135
- authentication prompts when using GCM. For any connected MSA, you can control
136
- whether or not the account is available to other Microsoft applications in
137
- ** Settings** , ** Accounts** , ** Emails & accounts** :
138
+ authentication prompts when using GCM.
139
+
140
+ ---
141
+
142
+ ⚠️ ** Important** ⚠️
143
+
144
+ When adding a new MSA to Windows, you'll be asked to select whether to use this
145
+ account across all of your device (** option 1** ), or only permit Microsoft-apps
146
+ to access your identity (** option 2** ). If you opt to use the account everywhere,
147
+ then your local Windows user account will be connected to that MSA.
148
+ This means you'll need to use your MSA credentials to sign in to Windows going
149
+ forward.
150
+
151
+ Selecting "just this app" or "Microsoft apps only" will still allow you to use
152
+ this MSA across apps in Windows, but will not require you to use your MSA
153
+ credentials to sign in to Windows.
154
+
155
+ ![ Confirmation to connect your MSA to Windows] [ msa-confirm ]
156
+
157
+ To disconnect an MSA added using option 1, you can go into ** Settings** ,
158
+ ** Accounts** , ** Your info** and click ** Stop signing in to all Microsoft apps
159
+ automatically** .
160
+
161
+ ![ Remove your Microsoft account from Windows] [ msa-remove ]
162
+
163
+ For MSAs added for "Microsoft apps only", you can modify whether or not these
164
+ accounts are available to other applications, and also remove the accounts from
165
+ ** Settings** , ** Accounts** , ** Emails & accounts** :
138
166
139
167
![ Allow all Microsoft apps to access your identity] [ all-ms-apps ]
140
168
141
169
![ Microsoft apps must ask to access your identity] [ apps-must-ask ]
142
170
143
- Two very important things to note:
171
+ ## Running as administrator
144
172
145
- - If you haven't connected any Microsoft accounts to Windows before, the first
146
- account you connect will cause the local Windows user account to be converted to
147
- a connected account.
148
- - In addition, you can't change the usage preference for the first Microsoft
149
- account connected to Windows: all Microsoft apps will be able to sign you in
150
- with that account.
173
+ ### GCM 2.1 and later
151
174
152
- As far as we can tell, there are no workarounds for either of these behaviors
153
- (other than to not use the WAM broker).
175
+ From version 2.1 onwards, GCM uses a version of the [ Microsoft Authentication
176
+ Library (MSAL)] [ msal-dotnet ] that supports use of the Windows
177
+ broker from an elevated process.
154
178
155
- ## Running as administrator
179
+ ### Previous versions
156
180
157
181
The Windows broker ("WAM") makes heavy use of [ COM] [ ms-com ] , a remote procedure
158
182
call (RPC) technology built into Windows. In order to integrate with WAM, Git
@@ -181,8 +205,10 @@ See https://aka.ms/gcm/wamadmin for more information.
181
205
182
206
In order to fix the problem, there are a few options:
183
207
184
- 1 . Run Git or Git Credential Manager from non-elevated processes.
185
- 2 . Disable the broker by setting the
208
+ 1 . Update to the [ latest Git for Windows] [ git-for-windows-latest ]
209
+ ** (recommended)** .
210
+ 2 . Run Git or Git Credential Manager from non-elevated processes.
211
+ 3 . Disable the broker by setting the
186
212
[ ` GCM_MSAUTH_USEBROKER ` ] [ GCM_MSAUTH_USEBROKER ]
187
213
environment variable or the
188
214
[ ` credential.msauthUseBroker ` ] [ credential.msauthUseBroker ]
@@ -204,5 +230,8 @@ In order to fix the problem, there are a few options:
204
230
[ all-ms-apps ] : img/all-microsoft.png
205
231
[ apps-must-ask ] : img/apps-must-ask.png
206
232
[ ms-com ] : https://docs.microsoft.com/en-us/windows/win32/com/the-component-object-model
233
+ [ msa-confirm ] : img/msa-confirm.png
234
+ [ msa-remove ] : img/msa-remove.png
207
235
[ msal-dotnet ] : https://aka.ms/msal-net
208
236
[ devbox ] : https://azure.microsoft.com/en-us/products/dev-box
237
+ [ git-for-windows-latest ] : https://git-scm.com/download/win
0 commit comments