Skip to content

Commit 562786b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into geo-ai-dsvm-overview
2 parents ee29eb0 + f525a24 commit 562786b

File tree

20 files changed

+1175
-1111
lines changed

20 files changed

+1175
-1111
lines changed

articles/active-directory/develop/v1-protocols-oauth-code.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ ms.collection: M365-identity-device-management
2222

2323
# Authorize access to Azure Active Directory web applications using the OAuth 2.0 code grant flow
2424

25+
> [!NOTE]
26+
> If you don't tell the server what resource you plan to call, then the server will not trigger the conditional access policies for that resource. So in order to have MFA trigger, you will need to include a resource in your URL.
27+
>
28+
2529
Azure Active Directory (Azure AD) uses OAuth 2.0 to enable you to authorize access to web applications and web APIs in your Azure AD tenant. This guide is language independent, and describes how to send and receive HTTP messages without using any of our [open-source libraries](active-directory-authentication-libraries.md).
2630

2731
The OAuth 2.0 authorization code flow is described in [section 4.1 of the OAuth 2.0 specification](https://tools.ietf.org/html/rfc6749#section-4.1). It is used to perform authentication and authorization in most application types, including web apps and natively installed apps.

articles/active-directory/hybrid/plan-connect-design-concepts.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ You can enable the use of ConsistencyGuid as sourceAnchor during new installatio
9191
> Only newer versions of Azure AD Connect (1.1.524.0 and after) support the use of ConsistencyGuid as sourceAnchor during new installation.
9292
9393
### How to enable the ConsistencyGuid feature
94-
Currently, the feature can only be enabled during new Azure AD Connect installation only.
9594

9695
#### Express Installation
9796
When installing Azure AD Connect with Express mode, the Azure AD Connect wizard automatically determines the most appropriate AD attribute to use as the sourceAnchor attribute using the following logic:

articles/active-directory/managed-identities-azure-resources/services-support-managed-identities.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ Refer to the following list to configure managed identity for Azure App Service
7171

7272
|Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
7373
| --- | --- | --- | --- | --- |
74-
| System assigned | Preview | Not available | Not available | Not available |
75-
| User assigned | Preview | Not available | Not available | Not available |
74+
| System assigned | Available | Available | Not available | Not available |
75+
| User assigned | Available | Available | Not available | Not available |
7676

7777
Refer to the following list to use a managed identity with [Azure Blueprints](../../governance/blueprints/overview.md):
7878

articles/active-directory/reports-monitoring/reference-powershell-reporting.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ ms.collection: M365-identity-device-management
2222
---
2323
# Azure AD PowerShell cmdlets for reporting
2424

25+
> [!NOTE]
26+
> These Powershell cmdlets currently only work with the [Azure AD Preview](https://docs.microsoft.com/en-us/powershell/module/azuread/?view=azureadps-2.0-preview#directory_auditing) Module. Please note that the preview module is not suggested for production use.
27+
2528
With Azure Active Directory (Azure AD) reports, you can get details on activities around all the write operations in your direction (audit logs) and authentication data (sign-in logs). Although the information is available by using the MS Graph API, now you can retrieve the same data by using the Azure AD PowerShell cmdlets for reporting.
2629

2730
This article gives you an overview of the PowerShell cmdlets to use for audit logs and sign-in logs.

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ The following administrator roles are available:
120120

121121
* **[Device Administrator](#device-administrators)**: This role is available for assignment only as an additional local administrator in [Device settings](https://aad.portal.azure.com/#blade/Microsoft_AAD_IAM/DevicesMenuBlade/DeviceSettings/menuId/). Users with this role become local machine administrators on all Windows 10 devices that are joined to Azure Active Directory. They do not have the ability to manage devices objects in Azure Active Directory.
122122

123-
* **[Directory Readers](#directory-readers)**: This is a role that should be assigned only to legacy applications that do not support the [Consent Framework](../develop/quickstart-v1-integrate-apps-with-azure-ad.md). Don't assign it to users.
123+
* **[Directory Readers](#directory-readers)**: This is a role that should be assigned only to legacy applications that do not support the [Consent Framework](../develop/quickstart-v1-integrate-apps-with-azure-ad.md). Users in this role can read basic directory information. This role should be used for: 1) Granting a specific set of guest users read access instead of granting it to all guest users. 2) Granting a specific set of non-admin users access to Azure Portal when "Restrict access to Azure AD portal to admins only" is set to "Yes". 3) Granting service principals access to directory whereDirectory.Read.All is not an option.
124124

125125
* **[Directory Synchronization Accounts](#directory-synchronization-accounts)**: Do not use. This role is automatically assigned to the Azure AD Connect service, and is not intended or supported for any other use.
126126

@@ -656,7 +656,7 @@ Users assigned to this role are added to the local administrators group on Azure
656656
| microsoft.aad.directory/groupSettingTemplates/basic/read | Read basic properties on groupSettingTemplates in Azure Active Directory. |
657657

658658
### Directory Readers
659-
Can read basic directory information. For granting access to applications, not intended for users.
659+
Can read basic directory information. Users in this role can read basic directory information. This role should be used for: 1) Granting a specific set of guest users read access instead of granting it to all guest users. 2) Granting a specific set of non-admin users access to Azure Portal when "Restrict access to Azure AD portal to admins only" is set to "Yes". 3) Granting service principals access to directory whereDirectory.Read.All is not an option.
660660

661661
| **Actions** | **Description** |
662662
| --- | --- |

articles/cognitive-services/text-analytics/quickstarts/csharp.md

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.service: cognitive-services
1010
ms.subservice: text-analytics
1111
ms.topic: quickstart
12-
ms.date: 08/05/2019
12+
ms.date: 08/28/2019
1313
ms.author: assafi
1414
---
1515
# Quickstart: Text analytics client library for .NET
@@ -84,19 +84,36 @@ using Microsoft.Azure.CognitiveServices.Language.TextAnalytics.Models;
8484
using Microsoft.Rest;
8585
```
8686

87-
In the application's `Main` method, create variables for your resource's Azure endpoint and key. If you created the environment variable after you launched the application, you will need to close and reopen the editor, IDE, or shell running it to access the variable. You will define the methods later.
87+
In the application's `Program` class, create variables for your resource's Azure endpoint and subscription key. In a static constructor, obtain these values from the environment variables `TEXT_ANALYTICS_SUBSCRIPTION_KEY` and `TEXT_ANALYTICS_ENDPOINT`. If you created these environment variables after you began editing the application, you will need to close and reopen the editor, IDE, or shell you are using to access the variables.
88+
89+
```csharp
90+
private const string key_var = "TEXT_ANALYTICS_SUBSCRIPTION_KEY";
91+
private static readonly string subscriptionKey = Environment.GetEnvironmentVariable(key_var);
92+
93+
private const string endpoint_var = "TEXT_ANALYTICS_ENDPOINT";
94+
private static readonly string endpoint = Environment.GetEnvironmentVariable(endpoint_var);
95+
96+
static Program()
97+
{
98+
if (null == subscriptionKey)
99+
{
100+
throw new Exception("Please set/export the environment variable: " + key_var);
101+
}
102+
if (null == endpoint)
103+
{
104+
throw new Exception("Please set/export the environment variable: " + endpoint_var);
105+
}
106+
}
107+
```
108+
109+
In the application's `Main` method, create credentials to access the Text Analytics endpoint. You will define the methods called by the `Main` method later.
88110

89111
[!INCLUDE [text-analytics-find-resource-information](../includes/find-azure-resource-info.md)]
90112

91113
```csharp
92114
static void Main(string[] args)
93115
{
94-
// replace this endpoint with the correct one for your Azure resource.
95-
string endpoint = $"https://westus.api.cognitive.microsoft.com";
96-
//This sample assumes you have created an environment variable for your key
97-
string key = Environment.GetEnvironmentVariable("TEXT_ANALYTICS_SUBSCRIPTION_KEY");
98-
99-
var credentials = new ApiKeyServiceClientCredentials(key);
116+
var credentials = new ApiKeyServiceClientCredentials(subscriptionKey);
100117
TextAnalyticsClient client = new TextAnalyticsClient(credentials)
101118
{
102119
Endpoint = endpoint
@@ -105,9 +122,11 @@ static void Main(string[] args)
105122
Console.OutputEncoding = System.Text.Encoding.UTF8;
106123
SentimentAnalysisExample(client);
107124
// languageDetectionExample(client);
108-
// RecognizeEntitiesExample(client);
125+
// entityRecognitionExample(client);
109126
// KeyPhraseExtractionExample(client);
110-
Console.ReadLine();
127+
128+
Console.Write("Press any key to exit.");
129+
Console.ReadKey();
111130
}
112131
```
113132

@@ -258,14 +277,17 @@ Entities:
258277
Create a new function called `KeyPhraseExtractionExample()` that takes the client that you created earlier and call its [KeyPhrases()](https://docs.microsoft.com/dotnet/api/microsoft.azure.cognitiveservices.language.textanalytics.textanalyticsclientextensions.keyphrases?view=azure-dotnet#Microsoft_Azure_CognitiveServices_Language_TextAnalytics_TextAnalyticsClientExtensions_KeyPhrases_Microsoft_Azure_CognitiveServices_Language_TextAnalytics_ITextAnalyticsClient_System_String_System_String_System_Nullable_System_Boolean__System_Threading_CancellationToken_) function. The result will contain the list of detected key phrases in `KeyPhrases` if successful, and an `errorMessage` if not. Print any detected key phrases.
259278

260279
```csharp
261-
var result = client.KeyPhrases("My cat might need to see a veterinarian.");
280+
static void KeyPhraseExtractionExample(TextAnalyticsClient client)
281+
{
282+
var result = client.KeyPhrases("My cat might need to see a veterinarian.");
262283

263-
// Printing key phrases
264-
Console.WriteLine("Key phrases:");
284+
// Printing key phrases
285+
Console.WriteLine("Key phrases:");
265286

266-
foreach (string keyphrase in result.KeyPhrases)
267-
{
268-
Console.WriteLine($"\t{keyphrase}");
287+
foreach (string keyphrase in result.KeyPhrases)
288+
{
289+
Console.WriteLine($"\t{keyphrase}");
290+
}
269291
}
270292
```
271293

0 commit comments

Comments
 (0)