Skip to content

Commit 5ecf421

Browse files
author
BobbySchmidt2
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into devops-tutorial-2
2 parents 2e03c74 + 6b4d2ce commit 5ecf421

File tree

418 files changed

+6257
-5387
lines changed

Some content is hidden

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

418 files changed

+6257
-5387
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For more information, see the [Code of Conduct FAQ](https://opensource.microsoft
1111

1212
## How can I contribute?
1313

14-
There are a variety of ways to contribute to the documentation, review the sections below to find out which one is right for you.
14+
There are many ways to contribute to the documentation, review the sections below to find out which one is right for you.
1515

1616
### Reporting Bugs and Suggesting Enhancements
1717

articles/active-directory/conditional-access/concept-conditional-access-report-only.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 03/25/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -23,7 +23,7 @@ Report-only mode is a new Conditional Access policy state that allows administra
2323

2424
- Conditional Access policies can be enabled in report-only mode.
2525
- During sign-in, policies in report-only mode are evaluated but not enforced.
26-
- Results are logged in the **Conditional Access** and **Report-only (Preview)** tabs of the Sign-in log details.
26+
- Results are logged in the **Conditional Access** and **Report-only** tabs of the Sign-in log details.
2727
- Customers with an Azure Monitor subscription can monitor the impact of their Conditional Access policies using the Conditional Access insights workbook.
2828

2929
> [!WARNING]

articles/active-directory/conditional-access/howto-conditional-access-insights-reporting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: article
9-
ms.date: 04/30/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo

articles/active-directory/conditional-access/howto-conditional-access-report-only.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 03/25/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -15,7 +15,7 @@ ms.reviewer: dawoo
1515

1616
ms.collection: M365-identity-device-management
1717
---
18-
# Configure a Conditional Access policy in report-only mode (Preview)
18+
# Configure a Conditional Access policy in report-only mode
1919

2020
To configure a Conditional Access policy in report-only mode:
2121

@@ -39,7 +39,7 @@ To view the result of a report-only policy for a particular sign-in:
3939
1. Sign into the **Azure portal** as a reports reader, security reader, security administrator, or global administrator.
4040
1. Browse to **Azure Active Directory** > **Sign-ins**.
4141
1. Select a sign-in or add filters to narrow results.
42-
1. In the **Details** drawer, select the **Report-only (Preview)** tab to view the policies evaluated during sign-in.
42+
1. In the **Details** drawer, select the **Report-only** tab to view the policies evaluated during sign-in.
4343

4444
> [!NOTE]
4545
> When downloading the Sign-ins logs, choose JSON format to include Conditional Access report-only result data.
@@ -59,7 +59,7 @@ Once you've integrated your Azure AD logs with Azure Monitor, you can monitor th
5959

6060
1. Sign into the **Azure portal** as a security administrator or global administrator.
6161
1. Browse to **Azure Active Directory** > **Workbooks**.
62-
1. Select **Conditional Access Insights (Preview)**.
62+
1. Select **Conditional Access Insights**.
6363
1. Select one or more policies from the **Conditional Access Policy** dropdown. All enabled policies are selected by default.
6464
1. Select a time range (if the time range exceeds the available dataset, the report will show all available data). Once you have set the **Conditional Access Policy** and **Time Range** parameters, the report will load.
6565
1. Optionally, search for individual **Users** or **Apps** to narrow the scope of the report.
Loading
Loading
Loading
Loading

articles/active-directory/develop/sample-v2-code.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following samples illustrate web applications that sign in users. Some sampl
4949

5050
| Platform | Only signs in users | Signs in users and calls Microsoft Graph |
5151
| -------- | ------------------- | --------------------------------- |
52-
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | [ASP.NET Core WebApp signs-in users tutorial](https://aka.ms/aspnetcore-webapp-sign-in) | Same sample in the [ASP.NET Core web app calls Microsoft Graph](https://aka.ms/aspnetcore-webapp-call-msgraph) phase |
52+
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core | [ASP.NET Core WebApp signs-in users tutorial](https://aka.ms/aspnetcore-webapp-sign-in) | Same sample in the [ASP.NET Core web app calls Microsoft Graph](https://aka.ms/aspnetcore-webapp-call-msgraph) phase |
5353
| ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NETframework.png)</p> ASP.NET | [ASP.NET Quickstart](https://github.com/AzureAdQuickstarts/AppModelv2-WebApp-OpenIDConnect-DotNet) </p> [dotnet-webapp-openidconnect-v2](https://github.com/azure-samples/active-directory-dotnet-webapp-openidconnect-v2) | [dotnet-admin-restricted-scopes-v2](https://github.com/azure-samples/active-directory-dotnet-admin-restricted-scopes-v2) </p> |[msgraph-training-aspnetmvcapp](https://github.com/microsoftgraph/msgraph-training-aspnetmvcapp)
5454
| ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | | [ms-identity-java-webapp](https://github.com/Azure-Samples/ms-identity-java-webapp) |
5555
| ![This image shows the Python logo](media/sample-v2-code/logo_python.png) | | [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp) |
@@ -59,7 +59,7 @@ The following samples illustrate web applications that sign in users. Some sampl
5959

6060
The following samples show public client applications (desktop or mobile applications) that access the Microsoft Graph API, or your own web API in the name of a user. All these client applications use Microsoft Authentication Library (MSAL).
6161

62-
| Client application | Platform | Flow/Grant | Calls Microsoft Graph | Calls an ASP.NET Core 2.0 web API |
62+
| Client application | Platform | Flow/Grant | Calls Microsoft Graph | Calls an ASP.NET Core web API |
6363
| ------------------ | -------- | ----------| ---------- | ------------------------- |
6464
| Desktop (WPF) | ![This image shows the .NET/C# logo](media/sample-v2-code/logo_NET.png) | [interactive](msal-authentication-flows.md#interactive)| [dotnet-desktop-msgraph-v2](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi) |
6565
| Desktop (Console) | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) | [dotnet-iwa-v2](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) | |
@@ -101,7 +101,7 @@ The following samples show how to protect a web API with the Microsoft identity
101101

102102
| Platform | Sample |
103103
| -------- | ------------------- |
104-
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | ASP.NET Core web API (service) of [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi-calls-msgraph) |
104+
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core | ASP.NET Core web API (service) of [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi-calls-msgraph) |
105105
| ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NET.png)</p>ASP.NET MVC | Web API (service) of [ms-identity-aspnet-webapi-onbehalfof](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof) |
106106
| ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | Web API (service) of [ms-identity-java-webapi](https://github.com/Azure-Samples/ms-identity-java-webapi) |
107107
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | Web API (service) of [active-directory-javascript-nodejs-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-nodejs-webapi-v2) |
@@ -113,7 +113,7 @@ The following samples show how to protect an Azure Function using HttpTrigger an
113113

114114
| Platform | Sample |
115115
| -------- | ------------------- |
116-
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | ASP.NET Core web API (service) Azure Function of [dotnet-native-aspnetcore-v2](https://github.com/Azure-Samples/ms-identity-dotnet-webapi-azurefunctions) |
116+
| ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core | ASP.NET Core web API (service) Azure Function of [dotnet-native-aspnetcore-v2](https://github.com/Azure-Samples/ms-identity-dotnet-webapi-azurefunctions) |
117117
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png)</p>NodeJS | Web API (service) of [NodeJS and passport-azure-ad](https://github.com/Azure-Samples/ms-identity-nodejs-webapi-azurefunctions) |
118118
| ![This image shows the Python logo](media/sample-v2-code/logo_python.png)</p>Python | Web API (service) of [Python](https://github.com/Azure-Samples/ms-identity-python-webapi-azurefunctions) |
119119
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png)</p>NodeJS | Web API (service) of [NodeJS and passport-azure-ad using on behalf of](https://github.com/Azure-Samples/ms-identity-nodejs-webapi-onbehalfof-azurefunctions) |

articles/active-directory/develop/scenario-desktop-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Before the call to the `.Build()` method, you can override your configuration wi
181181

182182
# [Java](#tab/java)
183183

184-
Here's the class used in MSAL Java development samples to configure the samples: [TestData](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/src/samples/public-client/TestData.java).
184+
Here's the class used in MSAL Java development samples to configure the samples: [TestData](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/src/samples/public-client/).
185185

186186
```Java
187187
PublicClientApplication pca = PublicClientApplication.builder(CLIENT_ID)

0 commit comments

Comments
 (0)