Skip to content

Commit 9f89c77

Browse files
authored
Merge pull request #110913 from julieMSFT/release-ignite-arcadia
Dirty PR to resolve merge conflicts with master in release-ignite-arcadia
2 parents 9c5c03b + e8ba98d commit 9f89c77

File tree

348 files changed

+2217
-2771
lines changed

Some content is hidden

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

348 files changed

+2217
-2771
lines changed

.openpublishing.redirection.json

Lines changed: 111 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
356356
"redirect_document_id": true
357357
},
358-
358+
359359
{
360360
"source_path": "articles/machine-learning/service/how-to-understand-accuracy-metrics.md",
361361
"redirect_url": "/azure/machine-learning/service/how-to-understand-automated-ml",
@@ -40082,12 +40082,12 @@
4008240082
},
4008340083
{
4008440084
"source_path": "articles/iot-central/tutorial-add-device-pnp.md",
40085-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
40085+
"redirect_url": "/azure/iot-central/core/tutorial-connect-pnp-device",
4008640086
"redirect_document_id": false
4008740087
},
4008840088
{
4008940089
"source_path": "articles/iot-central/tutorial-define-device-type-pnp.md",
40090-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
40090+
"redirect_url": "/azure/iot-central/core/howto-set-up-template",
4009140091
"redirect_document_id": false
4009240092
},
4009340093
{
@@ -46282,7 +46282,7 @@
4628246282
},
4628346283
{
4628446284
"source_path": "articles/iot-central/quick-create-pnp-device-pnp.md",
46285-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
46285+
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
4628646286
"redirect_document_id": false
4628746287
},
4628846288
{
@@ -46347,7 +46347,12 @@
4634746347
},
4634846348
{
4634946349
"source_path": "articles/iot-central/core/quick-create-pnp-device-pnp.md",
46350-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
46350+
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
46351+
"redirect_document_id": false
46352+
},
46353+
{
46354+
"source_path": "articles/iot-central/core/quick-create-pnp-device.md",
46355+
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
4635146356
"redirect_document_id": false
4635246357
},
4635346358
{
@@ -46782,7 +46787,7 @@
4678246787
},
4678346788
{
4678446789
"source_path": "articles/iot-central/preview/quick-create-pnp-device.md",
46785-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
46790+
"redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
4678646791
"redirect_document_id": false
4678746792
},
4678846793
{
@@ -46880,6 +46885,66 @@
4688046885
"redirect_url": "/azure/iot-central/core/tutorial-connect-device-nodejs",
4688146886
"redirect_document_id": true
4688246887
},
46888+
{
46889+
"source_path": "articles/iot-central/retail/architecture-connected-logistics-pnp.md",
46890+
"redirect_url": "/azure/iot-central/retail/architecture-connected-logistics",
46891+
"redirect_document_id": true
46892+
},
46893+
{
46894+
"source_path": "articles/iot-central/retail/architecture-digital-distribution-center-pnp.md",
46895+
"redirect_url": "/azure/iot-central/retail/architecture-digital-distribution-center",
46896+
"redirect_document_id": true
46897+
},
46898+
{
46899+
"source_path": "articles/iot-central/retail/architecture-micro-fulfillment-center-pnp.md",
46900+
"redirect_url": "/azure/iot-central/retail/architecture-micro-fulfillment-center",
46901+
"redirect_document_id": true
46902+
},
46903+
{
46904+
"source_path": "articles/iot-central/retail/architecture-smart-inventory-management-pnp.md",
46905+
"redirect_url": "/azure/iot-central/retail/architecture-smart-inventory-management",
46906+
"redirect_document_id": true
46907+
},
46908+
{
46909+
"source_path": "articles/iot-central/retail/overview-iot-central-retail-pnp.md",
46910+
"redirect_url": "/azure/iot-central/retail/overview-iot-central-retail",
46911+
"redirect_document_id": true
46912+
},
46913+
{
46914+
"source_path": "articles/iot-central/retail/tutorial-in-store-analytics-create-app-pnp.md",
46915+
"redirect_url": "/azure/iot-central/retail/tutorial-in-store-analytics-create-app",
46916+
"redirect_document_id": true
46917+
},
46918+
{
46919+
"source_path": "articles/iot-central/retail/tutorial-in-store-analytics-customize-dashboard-pnp.md",
46920+
"redirect_url": "/azure/iot-central/retail/tutorial-in-store-analytics-customize-dashboard",
46921+
"redirect_document_id": true
46922+
},
46923+
{
46924+
"source_path": "articles/iot-central/retail/tutorial-in-store-analytics-export-data-visualize-insights-pnp.md",
46925+
"redirect_url": "/azure/iot-central/retail/tutorial-in-store-analytics-export-data-visualize-insights",
46926+
"redirect_document_id": true
46927+
},
46928+
{
46929+
"source_path": "articles/iot-central/retail/tutorial-iot-central-connected-logistics-pnp.md",
46930+
"redirect_url": "/azure/iot-central/retail/tutorial-iot-central-connected-logistics",
46931+
"redirect_document_id": true
46932+
},
46933+
{
46934+
"source_path": "articles/iot-central/retail/tutorial-iot-central-digital-distribution-center-pnp.md",
46935+
"redirect_url": "/azure/iot-central/retail/tutorial-iot-central-digital-distribution-center",
46936+
"redirect_document_id": true
46937+
},
46938+
{
46939+
"source_path": "articles/iot-central/retail/tutorial-iot-central-smart-inventory-management-pnp.md",
46940+
"redirect_url": "/azure/iot-central/retail/tutorial-iot-central-smart-inventory-management",
46941+
"redirect_document_id": true
46942+
},
46943+
{
46944+
"source_path": "articles/iot-central/retail/tutorial-micro-fulfillment-center-pnp.md",
46945+
"redirect_url": "/azure/iot-central/retail/tutorial-micro-fulfillment-center",
46946+
"redirect_document_id": true
46947+
},
4688346948
{
4688446949
"source_path": "articles/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoringV2.md",
4688546950
"redirect_url": "/azure/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoring-v2",
@@ -50593,6 +50658,46 @@
5059350658
"source_path": "articles/ansible/index.yml",
5059450659
"redirect_url": "/azure/developer/ansible/",
5059550660
"redirect_document_id": false
50661+
},
50662+
{
50663+
"source_path": "articles/chef/chef-automation.md",
50664+
"redirect_url": "/azure/developer/chef/windows-vm-configure",
50665+
"redirect_document_id": false
50666+
},
50667+
{
50668+
"source_path": "articles/chef/chef-extension-portal.md",
50669+
"redirect_url": "/azure/developer/chef/client-install-from-azure-portal",
50670+
"redirect_document_id": false
50671+
},
50672+
{
50673+
"source_path": "articles/chef/chef-habitat-overview.md",
50674+
"redirect_url": "/azure/developer/chef/habitat-overview",
50675+
"redirect_document_id": false
50676+
},
50677+
{
50678+
"source_path": "articles/chef/chef-inspec-overview.md",
50679+
"redirect_url": "/azure/developer/chef/inspec-overview",
50680+
"redirect_document_id": false
50681+
},
50682+
{
50683+
"source_path": "articles/chef/chef-overview.md",
50684+
"redirect_url": "/azure/developer/chef/overview",
50685+
"redirect_document_id": false
50686+
},
50687+
{
50688+
"source_path": "articles/chef/index.yml",
50689+
"redirect_url": "/azure/developer/chef/",
50690+
"redirect_document_id": false
50691+
},
50692+
{
50693+
"source_path": "articles/security/fundamentals/database-security-overview.md",
50694+
"redirect_url": "/azure/sql-database/sql-database-security-overview",
50695+
"redirect_document_id": false
50696+
},
50697+
{
50698+
"source_path": "articles/security/fundamentals/database-best-practices.md",
50699+
"redirect_url": "/azure/sql-database/sql-database-security-best-practice",
50700+
"redirect_document_id": false
5059650701
}
5059750702
]
5059850703
}

articles/active-directory/develop/msal-js-initializing-client-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Before initializing an application, you first need to [register it with the Azur
3232

3333
You can use MSAL.js as follows in a plain JavaScript/Typescript application. Initialize MSAL authentication context by instantiating `UserAgentApplication` with a configuration object. The minimum required config to initialize MSAL.js is the clientID of your application which you should get from the application registration portal.
3434

35-
For authentication methods with redirect flows (`loginRedirect` and `acquireTokenRedirect`), you will need to explicitly register a callback for success or error through `handleRedirectCallback()` method. This is needed since redirect flows do not return promises as the methods with a pop-up experience do.
35+
For authentication methods with redirect flows (`loginRedirect` and `acquireTokenRedirect`), in MSAL.js 1.2.x or earlier, you will need to explicitly register a callback for success or error through `handleRedirectCallback()` method. This is needed since redirect flows do not return promises as the methods with a pop-up experience do. This became optional in MSAL.js version 1.3.0.
3636

3737
```javascript
3838
// Configuration object constructed

articles/active-directory/develop/quickstart-v2-netcore-daemon.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ app = ConfidentialClientApplicationBuilder.Create(config.ClientId)
193193
.WithClientSecret(config.ClientSecret)
194194
.WithAuthority(new Uri(config.Authority))
195195
.Build();
196-
);
197196
```
198197

199198
> | Where: ||

articles/active-directory/develop/scenario-web-api-call-api-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class MsalAuthHelper {
211211

212212
The On-behalf-of (OBO) flow is used to obtain a token to call the downstream web API. In this flow, your web API receives a bearer token with user delegated permissions from the client application and then exchanges this token for another access token to call the downstream web API.
213213

214-
A Python web API will need to use some middleware to validate the bearer token received from the client. The web API can then obtain the access token for downstream API using MSAL Python library by calling the [`acquire_token_on_behalf_of`](https://msal-python.readthedocs.io/en/latest/?badge=latest#msal.ConfidentialClientApplication.acquire_token_on_behalf_of) method. A sample demonstrating this flow with MSAL Python is not yet available.
214+
A Python web API will need to use some middleware to validate the bearer token received from the client. The web API can then obtain the access token for downstream API using MSAL Python library by calling the [`acquire_token_on_behalf_of`](https://msal-python.readthedocs.io/en/latest/?badge=latest#msal.ConfidentialClientApplication.acquire_token_on_behalf_of) method. For an example of using this API, see the [test code for the microsoft-authentication-library-for-python on GitHub](https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/1.2.0/tests/test_e2e.py#L429-L472). Also see the discussion of [issue 53](https://github.com/AzureAD/microsoft-authentication-library-for-python/issues/53) in that same repository for an approach that bypasses the need for a middle-tier application.
215215

216216
---
217217

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ Not all releases of Azure AD Connect will be made available for auto upgrade. Th
4343
>
4444
>Please refer to [this article](https://docs.microsoft.com/azure/active-directory/hybrid/how-to-upgrade-previous-version) to learn more about how to upgrade Azure AD Connect to the latest version.
4545
46+
## 1.5.20.0
47+
48+
### Release status
49+
04/09/2020: Released for download
50+
51+
### Fixed issues
52+
This hotfix build fixes an issue with build 1.5.18.0 if you have the Group Filtering feature enabled and use mS-DS-ConsistencyGuid as the source anchor.
4653

4754
## 1.5.18.0
4855

articles/active-directory/manage-apps/application-proxy-faq.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ For recommendations, see [High availability and load balancing of your Applicati
4949

5050
The Application Proxy Connector performs certificate-based authentication to Azure. TLS Termination (TLS/HTTPS inspection or acceleration) breaks this authentication method and isn't supported. Traffic from the connector to Azure must bypass any devices that are performing TLS Termination.
5151

52+
### Can I place a forward proxy device between the connector server(s) and the back-end application server?
53+
Yes, this scenario is supported starting from the connector version 1.5.1526.0. See [Work with existing on-premises proxy servers](application-proxy-configure-connectors-with-proxy-servers.md).
54+
5255
### Should I create a dedicated account to register the connector with Azure AD Application Proxy?
5356

5457
There's no reason to. Any global admin or application administrator account will work. The credentials entered during installation aren't used after the registration process. Instead, a certificate is issued to the connector, which is used for authentication from that point on.

0 commit comments

Comments
 (0)