Skip to content

Commit 5da0bf8

Browse files
authored
Merge pull request #157982 from MicrosoftDocs/master
5/10 PM Publish
2 parents b35c7f3 + 20e3ab9 commit 5da0bf8

File tree

130 files changed

+1566
-768
lines changed

Some content is hidden

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

130 files changed

+1566
-768
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5240,6 +5240,11 @@
52405240
"redirect_url": "/azure/architecture/vdc/networking-virtual-datacenter",
52415241
"redirect_document_id": false
52425242
},
5243+
{
5244+
"source_path_from_root": "/articles/automation/how-to/remove-desired-state-configuration-package.md",
5245+
"redirect_url": "/azure/automation/state-configuration/remove-node-and-configuration-package",
5246+
"redirect_document_id": false
5247+
},
52435248
{
52445249
"source_path_from_root": "/articles/automation/automation-watchers-tutorial.md",
52455250
"redirect_url": "/azure/automation/automation-scenario-using-watcher-task",

.openpublishing.redirection.media-services.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@
607607
},
608608
{
609609
"source_path_from_root": "/articles/media-services/video-indexer/observed-people-tracing.md",
610-
"redirect_url": "azure/media-services/",
610+
"redirect_url": "../../media-services/",
611611
"redirect_document_id": false
612612
},
613613
{

articles/active-directory/develop/howto-configure-publisher-domain.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,16 @@ If your app isn't registered in a tenant, you'll only see the option to verify a
8282

8383
1. Click the **Verify and save domain** button.
8484

85+
You're not required to maintain the resources that are used for verification after a domain has been verified. When the verification is finished, you can remove the hosted file.
86+
8587
### To select a verified domain
8688

87-
- If your tenant has verified domains, select one of the domains from the **Select a verified domain** dropdown.
89+
If your tenant has verified domains, select one of the domains from the **Select a verified domain** dropdown.
8890

89-
>[!Note]
90-
> The expected 'Content-Type' header that should be returned is `application/json`. You may get an error as mentioned below if you use anything else like `application/json; charset=utf-8`
91+
> [!NOTE]
92+
> The expected `Content-Type` header that should be returned is `application/json`. You may get an error as mentioned below if you use anything else, like `application/json; charset=utf-8`:
9193
>
92-
>``` "Verification of publisher domain failed. Error getting JSON file from https:///.well-known/microsoft-identity-association. The server returned an unexpected content type header value. " ```
94+
> `Verification of publisher domain failed. Error getting JSON file from https:///.well-known/microsoft-identity-association. The server returned an unexpected content type header value.`
9395
>
9496
9597
## Implications on the app consent prompt

articles/active-directory/develop/quickstart-v2-android.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,6 @@ We'll now look at these files in more detail and call out the MSAL-specific code
109109

110110
MSAL ([com.microsoft.identity.client](https://javadoc.io/doc/com.microsoft.identity.client/msal)) is the library used to sign in users and request tokens used to access an API protected by Microsoft identity platform. Gradle 3.0+ installs the library when you add the following to **Gradle Scripts** > **build.gradle (Module: app)** under **Dependencies**:
111111

112-
```gradle
113-
implementation 'com.microsoft.identity.client:msal:2.+'
114-
```
115-
116-
You can see this in the sample project in build.gradle (Module: app):
117-
118112
```java
119113
dependencies {
120114
...
@@ -125,6 +119,30 @@ dependencies {
125119

126120
This instructs Gradle to download and build MSAL from maven central.
127121

122+
You must also add references to maven to the **allprojects** > **repositories** portion of the **build.gradle (Module: app)** like so:
123+
124+
```java
125+
allprojects {
126+
repositories {
127+
mavenCentral()
128+
google()
129+
mavenLocal()
130+
maven {
131+
url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1'
132+
}
133+
maven {
134+
name "vsts-maven-adal-android"
135+
url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
136+
credentials {
137+
username System.getenv("ENV_VSTS_MVN_ANDROIDADAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADAL_USERNAME") : project.findProperty("vstsUsername")
138+
password System.getenv("ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
139+
}
140+
}
141+
jcenter()
142+
}
143+
}
144+
```
145+
128146
### MSAL imports
129147

130148
The imports that are relevant to the MSAL library are `com.microsoft.identity.client.*`. For example, you'll see `import com.microsoft.identity.client.PublicClientApplication;` which is the namespace for the `PublicClientApplication` class, which represents your public client application.

articles/active-directory/develop/tutorial-v2-android.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,36 @@ If you do not already have an Android application, follow these steps to set up
148148

149149
### Add MSAL to your project
150150

151-
1. In the Android Studio project window, navigate to **app** > **src** > **build.gradle** and add the following:
151+
1. In the Android Studio project window, navigate to **app** > **build.gradle** and add the following:
152152

153153
```gradle
154-
repositories{
154+
apply plugin: 'com.android.application'
155+
156+
allprojects {
157+
repositories {
158+
mavenCentral()
159+
google()
160+
mavenLocal()
161+
maven {
162+
url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1'
163+
}
164+
maven {
165+
name "vsts-maven-adal-android"
166+
url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
167+
credentials {
168+
username System.getenv("ENV_VSTS_MVN_ANDROIDADAL_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADAL_USERNAME") : project.findProperty("vstsUsername")
169+
password System.getenv("ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
170+
}
171+
}
155172
jcenter()
173+
}
156174
}
157175
dependencies{
158-
implementation 'com.microsoft.identity.client:msal:2.+'
159-
implementation 'com.microsoft.graph:microsoft-graph:1.5.+'
160-
}
176+
implementation 'com.microsoft.identity.client:msal:2.+'
177+
implementation 'com.microsoft.graph:microsoft-graph:1.5.+'
178+
}
161179
packagingOptions{
162-
exclude("META-INF/jersey-module-version")
180+
exclude("META-INF/jersey-module-version")
163181
}
164182
```
165183
[More on the Microsoft Graph SDK](https://github.com/microsoftgraph/msgraph-sdk-java/)

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,24 @@ This feature is now available in the following Azure clouds:
5858
To enable Azure AD authentication for your Windows VMs in Azure, you need to ensure your VMs network configuration permits outbound access to the following endpoints over TCP port 443:
5959

6060
For Azure Global
61-
- https://enterpriseregistration.windows.net For device registration.
62-
- http://169.254.169.254 For Azure Instance Metadata Service endpoint.
63-
- https://login.microsoftonline.com For authentication flows.
64-
- https://pas.windows.net For Azure RBAC flows.
61+
- `https://enterpriseregistration.windows.net` - For device registration.
62+
- `http://169.254.169.254` - Azure Instance Metadata Service endpoint.
63+
- `https://login.microsoftonline.com` - For authentication flows.
64+
- `https://pas.windows.net` - For Azure RBAC flows.
6565

6666

6767
For Azure Government
68-
- https://enterpriseregistration.microsoftonline.us For device registration.
69-
- http://169.254.169.254 For Azure Instance Metadata Service.
70-
- https://login.microsoftonline.us For authentication flows.
71-
- https://pasff.usgovcloudapi.net For Azure RBAC flows.
68+
- `https://enterpriseregistration.microsoftonline.us` - For device registration.
69+
- `http://169.254.169.254` - Azure Instance Metadata Service.
70+
- `https://login.microsoftonline.us` - For authentication flows.
71+
- `https://pasff.usgovcloudapi.net` - For Azure RBAC flows.
7272

7373

7474
For Azure China
75-
- https://enterpriseregistration.partner.microsoftonline.cn For device registration.
76-
- http://169.254.169.254 Azure Instance Metadata Service endpoint.
77-
- https://login.chinacloudapi.cn For authentication flows.
78-
- https://pas.chinacloudapi.cn For Azure RBAC flows.
75+
- `https://enterpriseregistration.partner.microsoftonline.cn` - For device registration.
76+
- `http://169.254.169.254` - Azure Instance Metadata Service endpoint.
77+
- `https://login.chinacloudapi.cn` - For authentication flows.
78+
- `https://pas.chinacloudapi.cn' - For Azure RBAC flows.
7979

8080

8181
## Enabling Azure AD login in for Windows VM in Azure
@@ -239,6 +239,10 @@ You are now signed in to the Windows Server 2019 Azure virtual machine with the
239239
> [!NOTE]
240240
> You can save the .RDP file locally on your computer to launch future remote desktop connections to your virtual machine instead of having to navigate to virtual machine overview page in the Azure portal and using the connect option.
241241
242+
## Using Azure Policy to ensure standards and assess compliance
243+
244+
Use Azure policy to ensure Azure AD login is enabled for your new and existing Windows virtual machines and assess compliance of your environment at scale on your Azure policy compliance dashboard. With this capability, you can use many levels of enforcement: you can flag new and existing Windows VMs within your environment that do not have Azure AD login enabled. You can also use Azure policy to deploy the Azure AD extension on new Windows VMs that do not have Azure AD login enabled, as well as remediate existing Windows VMs to the same standard. In addition to these capabilities, you can also use policy to detect and flag VMs have non-approved local accounts on their machines. To learn more, review [Azure policy](https://www.aka.ms/AzurePolicy).
245+
242246
## Troubleshoot
243247

244248
### Troubleshoot deployment issues

articles/active-directory/external-identities/external-identities-pricing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: B2B
88
ms.topic: conceptual
9-
ms.date: 09/21/2020
9+
ms.date: 05/05/2021
1010

1111
ms.author: mimart
1212
author: msmimart
@@ -35,8 +35,8 @@ To take advantage of MAU billing, your Azure AD tenant must be linked to an Azur
3535
## About monthly active users (MAU) billing
3636

3737
In your Azure AD tenant, guest user collaboration usage is billed based on the count of unique guest users with authentication activity within a calendar month. This model replaces the 1:5 ratio billing model, which allowed up to five guest users for each Azure AD Premium license in your tenant. When your tenant is linked to a subscription and you use External Identities features to collaborate with guest users, you'll be automatically billed using the MAU-based billing model.
38-
39-
The pricing tier that applies to your guest users is based on the highest pricing tier assigned to your Azure AD tenant. For example, if the highest pricing tier in your tenant is Azure AD Premium P1, the Premium P1 pricing tier also applies to your guest users. If the highest pricing is Azure AD Free, you'll be asked to upgrade to a premium pricing tier when you try to use premium features for guest users.
38+
39+
The pricing tier that applies to your guest users is based on the highest pricing tier assigned to your Azure AD tenant. For more information, see [Azure Active Directory External Identities Pricing](https://azure.microsoft.com/en-us/pricing/details/active-directory/external-identities/).
4040

4141
## Link your Azure AD tenant to a subscription
4242

articles/active-directory/governance/entitlement-management-access-package-approval-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ For a demonstration of how to add a multi-stage approval to a request policy, wa
5050

5151
Follow these steps to specify the approval settings for requests for the access package:
5252

53-
**Prerequisite role:** Global administrator, User administrator, Catalog owner, or Access package manager
53+
**Prerequisite role:** Global administrator, Identity Governance administrator, User administrator, Catalog owner, or Access package manager
5454

5555
1. In the Azure portal, click **Azure Active Directory** and then click **Identity Governance**.
5656

articles/active-directory/governance/entitlement-management-access-package-assignments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To use Azure AD entitlement management and assign users to access packages, you
3434

3535
## View who has an assignment
3636

37-
**Prerequisite role:** Global administrator, User administrator, Catalog owner, Access package manager or Access package assignment manager
37+
**Prerequisite role:** Global administrator, Identity Governance administrator, User administrator, Catalog owner, Access package manager or Access package assignment manager
3838

3939
1. In the Azure portal, click **Azure Active Directory** and then click **Identity Governance**.
4040

articles/active-directory/governance/entitlement-management-access-package-create.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Here are the high-level steps to create a new access package.
5353

5454
## Start new access package
5555

56-
**Prerequisite role:** Global administrator, User administrator, Catalog owner, or Access package manager
56+
**Prerequisite role:** Global administrator, Identity Governance administrator, User administrator, Catalog owner, or Access package manager
5757

5858
1. Sign in to the [Azure portal](https://portal.azure.com).
5959

@@ -73,11 +73,11 @@ On the **Basics** tab, you give the access package a name and specify which cata
7373

7474
1. In the **Catalog** drop-down list, select the catalog you want to create the access package in. For example, you might have a catalog owner that manages all the marketing resources that can be requested. In this case, you could select the marketing catalog.
7575

76-
You will only see catalogs you have permission to create access packages in. To create an access package in an existing catalog, you must be a Global administrator or User administrator, or you must be a catalog owner or access package manager in that catalog.
76+
You will only see catalogs you have permission to create access packages in. To create an access package in an existing catalog, you must be a Global administrator, Identity Governance administrator or User administrator, or you must be a catalog owner or access package manager in that catalog.
7777

7878
![Access package - Basics](./media/entitlement-management-access-package-create/basics.png)
7979

80-
If you are a Global administrator, a User administrator, or catalog creator and you would like to create your access package in a new catalog that's not listed, click **Create new catalog**. Enter the Catalog name and description and then click **Create**.
80+
If you are a Global administrator, an Identity Governance administrator, a User administrator, or catalog creator and you would like to create your access package in a new catalog that's not listed, click **Create new catalog**. Enter the Catalog name and description and then click **Create**.
8181

8282
The access package you are creating and any resources included in it will be added to the new catalog. You can also add additional catalog owners later.
8383

0 commit comments

Comments
 (0)