Skip to content

Commit 3c53a91

Browse files
authored
Merge pull request #224946 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents fb129f7 + ae0f2ea commit 3c53a91

12 files changed

+77
-32
lines changed

articles/active-directory/roles/admin-units-manage.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,27 @@ In Azure AD, you can delete an administrative unit that you no longer need as a
109109

110110
1. To confirm that you want to delete the administrative unit, select **Yes**.
111111

112-
### PowerShell
112+
### PowerShell - AzureAD Module
113113

114114
Use the [Remove-AzureADMSAdministrativeUnit](/powershell/module/azuread/remove-azureadmsadministrativeunit) command to delete an administrative unit.
115115

116116
```powershell
117117
$adminUnitObj = Get-AzureADMSAdministrativeUnit -Filter "displayname eq 'DeleteMe Admin Unit'"
118118
Remove-AzureADMSAdministrativeUnit -Id $adminUnitObj.Id
119119
```
120+
### PowerShell - Microsoft Graph PowerShell SDK
121+
122+
```
123+
Import-Module Microsoft.Graph.Identity.DirectoryManagement
124+
125+
$params = @{
126+
DisplayName = "Seattle District Technical Schools"
127+
Description = "Seattle district technical schools administration"
128+
Visibility = "HiddenMembership"
129+
}
130+
131+
New-MgDirectoryAdministrativeUnit -BodyParameter $params
132+
```
120133

121134
### Microsoft Graph API
122135

articles/active-directory/roles/custom-enterprise-app-permissions.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -167,60 +167,60 @@ To delegate create, read, update, and delete (CRUD) permissions for updating the
167167
> [!div class="mx-tableFixed"]
168168
> | Permission | Description |
169169
> | ---------- | ----------- |
170-
> | microsoft.directory/applicationPolicies/allProperties/read | Read all properties on application policies |
171-
> | microsoft.directory/applicationPolicies/allProperties/update | Update all properties on application policies |
170+
> | microsoft.directory/applicationPolicies/allProperties/read | Read all properties (including privileged properties) on application policies |
171+
> | microsoft.directory/applicationPolicies/allProperties/update | Update all properties (including privileged properties) on application policies |
172172
> | microsoft.directory/applicationPolicies/basic/update | Update standard properties of application policies |
173173
> | microsoft.directory/applicationPolicies/create | Create application policies |
174-
> | microsoft.directory/applicationPolicies/createAsOwner | Create application policies. Creator is added as the first owner |
174+
> | microsoft.directory/applicationPolicies/createAsOwner | Create application policies, and creator is added as the first owner |
175175
> | microsoft.directory/applicationPolicies/delete | Delete application policies |
176176
> | microsoft.directory/applicationPolicies/owners/read | Read owners on application policies |
177177
> | microsoft.directory/applicationPolicies/owners/update | Update the owner property of application policies |
178178
> | microsoft.directory/applicationPolicies/policyAppliedTo/read | Read application policies applied to objects list |
179179
> | microsoft.directory/applicationPolicies/standard/read | Read standard properties of application policies |
180180
> | microsoft.directory/servicePrincipals/allProperties/allTasks | Create and delete servicePrincipals, and read and update all properties in Azure Active Directory |
181-
> | microsoft.directory/servicePrincipals/allProperties/read | Read all properties on servicePrincipals |
182-
> | microsoft.directory/servicePrincipals/allProperties/update | Update all properties on servicePrincipals |
181+
> | microsoft.directory/servicePrincipals/allProperties/read | Read all properties (including privileged properties) on servicePrincipals |
182+
> | microsoft.directory/servicePrincipals/allProperties/update | Update all properties (including privileged properties) on servicePrincipals |
183183
> | microsoft.directory/servicePrincipals/appRoleAssignedTo/read | Read service principal role assignments |
184184
> | microsoft.directory/servicePrincipals/appRoleAssignedTo/update | Update service principal role assignments |
185185
> | microsoft.directory/servicePrincipals/appRoleAssignments/read | Read role assignments assigned to service principals |
186186
> | microsoft.directory/servicePrincipals/audience/update | Update audience properties on service principals |
187187
> | microsoft.directory/servicePrincipals/authentication/update | Update authentication properties on service principals |
188188
> | microsoft.directory/servicePrincipals/basic/update | Update basic properties on service principals |
189189
> | microsoft.directory/servicePrincipals/create | Create service principals |
190-
> | microsoft.directory/servicePrincipals/createAsOwner | Create service principals. Creator is added as the first owner |
191-
> | microsoft.directory/servicePrincipals/credentials/update | Update credentials properties on service principals |
190+
> | microsoft.directory/servicePrincipals/createAsOwner | Create service principals, with creator as the first owner |
191+
> | microsoft.directory/servicePrincipals/credentials/update | Update credentials of service principals |
192192
> | microsoft.directory/servicePrincipals/delete | Delete service principals |
193193
> | microsoft.directory/servicePrincipals/disable | Disable service principals |
194194
> | microsoft.directory/servicePrincipals/enable | Enable service principals |
195195
> | microsoft.directory/servicePrincipals/getPasswordSingleSignOnCredentials | Read password single sign-on credentials on service principals |
196196
> | microsoft.directory/servicePrincipals/managePasswordSingleSignOnCredentials | Manage password single sign-on credentials on service principals |
197197
> | microsoft.directory/servicePrincipals/oAuth2PermissionGrants/read | Read delegated permission grants on service principals |
198-
> | microsoft.directory/servicePrincipals/owners/read | Read owners on service principals |
199-
> | microsoft.directory/servicePrincipals/owners/update | Update owners on service principals |
198+
> | microsoft.directory/servicePrincipals/owners/read | Read owners of service principals |
199+
> | microsoft.directory/servicePrincipals/owners/update | Update owners of service principals |
200200
> | microsoft.directory/servicePrincipals/permissions/update | Update permissions of service principals |
201-
> | microsoft.directory/servicePrincipals/policies/read | Read policies on service principals |
202-
> | microsoft.directory/servicePrincipals/policies/update | Update policies on service principals |
203-
> | microsoft.directory/servicePrincipals/standard/read | Read standard properties of service principals |
201+
> | microsoft.directory/servicePrincipals/policies/read | Read policies of service principals |
202+
> | microsoft.directory/servicePrincipals/policies/update | Update policies of service principals |
203+
> | microsoft.directory/servicePrincipals/standard/read | Read basic properties of service principals |
204204
> | microsoft.directory/servicePrincipals/synchronization/standard/read | Read provisioning settings associated with your service principal |
205-
> | microsoft.directory/servicePrincipals/tag/update | Update tags property on service principals |
205+
> | microsoft.directory/servicePrincipals/tag/update | Update the tag property for service principals |
206206
> | microsoft.directory/applicationTemplates/instantiate | Instantiate gallery applications from application templates |
207-
> | microsoft.directory/auditLogs/allProperties/read | Read audit logs |
208-
> | microsoft.directory/signInReports/allProperties/read | Read sign-in reports |
209-
> | microsoft.directory/applications/applicationProxy/read | Read all application proxy properties of all types of applications |
210-
> | microsoft.directory/applications/applicationProxy/update | Update all application proxy properties of all types of applications |
211-
> | microsoft.directory/applications/applicationProxyAuthentication/update | Update application proxy authentication properties of all types of applications |
212-
> | microsoft.directory/applications/applicationProxyUrlSettings/update | Update application proxy internal and external URLs of all types of applications |
213-
> | microsoft.directory/applications/applicationProxySslCertificate/update | Update application proxy custom domains of all types of applications |
207+
> | microsoft.directory/auditLogs/allProperties/read | Read all properties on audit logs, including privileged properties |
208+
> | microsoft.directory/signInReports/allProperties/read | Read all properties on sign-in reports, including privileged properties |
209+
> | microsoft.directory/applications/applicationProxy/read | Read all application proxy properties |
210+
> | microsoft.directory/applications/applicationProxy/update | Update all application proxy properties |
211+
> | microsoft.directory/applications/applicationProxyAuthentication/update | Update authentication on all types of applications |
212+
> | microsoft.directory/applications/applicationProxyUrlSettings/update | Update URL settings for application proxy |
213+
> | microsoft.directory/applications/applicationProxySslCertificate/update | Update SSL certificate settings for application proxy |
214214
> | microsoft.directory/applications/synchronization/standard/read | Read provisioning settings associated with the application object |
215215
> | microsoft.directory/connectorGroups/create | Create application proxy connector groups |
216216
> | microsoft.directory/connectorGroups/delete | Delete application proxy connector groups |
217217
> | microsoft.directory/connectorGroups/allProperties/read | Read all properties of application proxy connector groups |
218218
> | microsoft.directory/connectorGroups/allProperties/update | Update all properties of application proxy connector groups |
219219
> | microsoft.directory/connectors/create | Create application proxy connectors |
220220
> | microsoft.directory/connectors/allProperties/read | Read all properties of application proxy connectors |
221-
> | microsoft.directory/servicePrincipals/synchronizationJobs/manage | Manage all aspects of job synchronization for service principal resources |
222-
> | microsoft.directory/servicePrincipals/synchronization/standard/read | Read provisioning settings associated with service principals |
223-
> | microsoft.directory/servicePrincipals/synchronizationSchema/manage | Manage all aspects of schema synchronization for service principal resources |
221+
> | microsoft.directory/servicePrincipals/synchronizationJobs/manage | Start, restart, and pause application provisioning syncronization jobs |
222+
> | microsoft.directory/servicePrincipals/synchronization/standard/read | Read provisioning settings associated with the application object |
223+
> | microsoft.directory/servicePrincipals/synchronizationSchema/manage | Create and manage application provisioning syncronization jobs and schema |
224224
> | microsoft.directory/provisioningLogs/allProperties/read | Read all properties of provisioning logs |
225225
226226
## Next steps

articles/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,28 @@ The following image shows the configuration screen in both Jira and Confluence:
123123
* **Enable Use of Application Proxy** checkbox, if you have configured your on-premise atlassian application in an App Proxy setup.
124124

125125
* For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](../app-proxy/what-is-application-proxy.md).
126-
126+
## Release Notes
127+
128+
|Plugin Version | Release Notes | Supported JIRA versions |
129+
|-----------------|-------------------------------------------------------------------------------------------|-------------------------------------|
130+
| 1.0.20 | Bug Fixes: | Jira Core and Software: |
131+
| | JIRA SAML SSO add-on redirects to incorrect URL from mobile browser. | 7.0.0 to 9.5.0 |
132+
| | The mark log section after enabling the JIRA plugin. | |
133+
| | The last login date for a user doesn't update when user signs in via SSO | |
134+
| | | |
135+
| 1.0.19 | New Feature: | Jira Core and Software: |
136+
| | Application Proxy Support - Checkbox on the configure plugin screen to toggle the App Proxy mode so as to make the Reply URL editable as per the need to point the App Proxy mode so as to make the Reply URL editable as per the need to point it to the proxy server URL | 6.0 to 9.3.1 |
137+
| | | Jira Service Desk: 3.0.0 to 4.22.1 |
138+
| | | |
139+
| 1.0.18 | Bug Fixes: | Jira Core and Software: |
140+
| | Bug fix for the 405 error upon clicking on the Configure button of the Jira Azure AD SSO Plugin.| 6.0 to 9.1.0. |
141+
| | JIRA server isn't rendering the "Project Setting Page" correctly. | Jira Service Desk: 3.0.0 to 4.22.1. |
142+
| | JIRA isn't forcing Azure AD Login. An extra button click was required. | |
143+
| | We have now resolved the security fix in this version. This will protect you from user impersonation vulnerability.| |
144+
| | JIRA Service Desk logout issue is resolved. | |
145+
146+
147+
127148
## Troubleshooting
128149

129150
* **You're getting multiple certificate errors**: Sign in to Azure AD and remove the multiple certificates that are available against the app. Ensure that only one certificate is present.

articles/app-service/configure-authentication-customize-sign-in-out.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Here's a simple sign-out link in a webpage:
9191
<a href="/.auth/logout">Sign out</a>
9292
```
9393

94-
By default, a successful sign-out redirects the client to the URL `/.auth/logout/done`. You can change the post-sign-out redirect page by adding the `post_logout_redirect_uri` query parameter. For example:
94+
By default, a successful sign-out redirects the client to the URL `/.auth/logout/complete`. You can change the post-sign-out redirect page by adding the `post_logout_redirect_uri` query parameter. For example:
9595

9696
```
9797
GET /.auth/logout?post_logout_redirect_uri=/index.html

articles/app-service/configure-authentication-provider-google.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To complete the procedure in this topic, you must have a Google account that has
1818

1919
## <a name="register"> </a>Register your application with Google
2020

21-
1. Follow the Google documentation at [Google Sign-In for server-side apps](https://developers.google.com/identity/sign-in/web/server-side-flow) to create a client ID and client secret. There's no need to make any code changes. Just use the following information:
21+
1. Follow the Google documentation at [Sign In with Google for Web - Setup](https://developers.google.com/identity/gsi/web/guides/get-google-api-clientid) to create a client ID and client secret. There's no need to make any code changes. Just use the following information:
2222
- For **Authorized JavaScript Origins**, use `https://<app-name>.azurewebsites.net` with the name of your app in *\<app-name>*.
2323
- For **Authorized Redirect URI**, use `https://<app-name>.azurewebsites.net/.auth/login/google/callback`.
2424
1. Copy the App ID and the App secret values.

articles/app-service/configure-language-dotnet-framework.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ In App Service, the Windows instances already have all the supported .NET Framew
2525
For CLR 4 runtime versions (.NET Framework 4 and above):
2626

2727
```CMD
28-
ls "D:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\"
28+
ls "D:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework"
2929
```
3030

3131
Latest .NET Framework version may not be immediately available.
3232

3333
For CLR 2 runtime versions (.NET Framework 3.5 and below):
3434

3535
```CMD
36-
ls "D:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\"
36+
ls "D:\Program Files (x86)\Reference Assemblies\Microsoft\Framework"
3737
```
3838

3939
## Show current .NET Framework runtime version

articles/app-service/configure-language-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ You can interact or debug the Java Key Tool by [opening an SSH connection](confi
470470
471471
## Configure APM platforms
472472
473-
This section shows how to connect Java applications deployed on Azure App Service with Azure Monitor application insights, NewRelic, and AppDynamics application performance monitoring (APM) platforms.
473+
This section shows how to connect Java applications deployed on Azure App Service with Azure Monitor Application Insights, NewRelic, and AppDynamics application performance monitoring (APM) platforms.
474474
475475
### Configure Application Insights
476476

articles/app-service/deploy-github-actions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,7 @@ name: Node.js
714714
715715
env:
716716
AZURE_WEBAPP_NAME: my-app # set this to your application's name
717+
AZURE_WEBAPP_PACKAGE_PATH: 'my-app-path' # set this to the path to your web app project, defaults to the repository root
717718
NODE_VERSION: '14.x' # set this to the node version to use
718719
719720
jobs:
@@ -973,6 +974,7 @@ name: Node.js
973974
974975
env:
975976
AZURE_WEBAPP_NAME: my-app # set this to your application's name
977+
AZURE_WEBAPP_PACKAGE_PATH: 'my-app-path' # set this to the path to your web app project, defaults to the repository root
976978
NODE_VERSION: '14.x' # set this to the node version to use
977979
978980
jobs:

articles/app-service/deploy-staging-slots.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ When you perform a swap with preview, App Service performs the same [swap operat
146146

147147
If you cancel the swap, App Service reapplies configuration elements to the source slot.
148148

149+
> [!NOTE]
150+
> Swap with preview can't be used when one of the slots has site authentication enabled.
151+
>
152+
149153
To swap with preview:
150154

151155
1. Follow the steps in [Swap deployment slots](#Swap) but select **Perform swap with preview**.

articles/app-service/overview-authentication-authorization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,4 @@ Samples:
195195
- [Tutorial: Add authentication to your web app running on Azure App Service](scenario-secure-app-authentication-app-service.md)
196196
- [Tutorial: Authenticate and authorize users end-to-end in Azure App Service (Windows or Linux)](tutorial-auth-aad.md)
197197
- [.NET Core integration of Azure AppService EasyAuth (3rd party)](https://github.com/MaximRouiller/MaximeRouiller.Azure.AppService.EasyAuth)
198-
- [Getting Azure App Service authentication working with .NET Core (3rd party)](https://github.com/kirkone/KK.AspNetCore.EasyAuthAuthentication)
198+
- [Getting Azure App Service authentication working with .NET Core (3rd party)](https://github.com/kirkone/KK.AspNetCore.EasyAuthAuthentication)

0 commit comments

Comments
 (0)