Skip to content

Commit 88c6b98

Browse files
authored
Merge pull request #114308 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 56d70d3 + 6353768 commit 88c6b98

File tree

16 files changed

+103
-50
lines changed

16 files changed

+103
-50
lines changed
4 KB
Loading

articles/active-directory/develop/reference-v2-libraries.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ See also [Scenarios by supported platforms and languages](authentication-flows-a
8484
| Platform | Library name | Tested version | Source code | Sample |
8585
|:---:|:---:|:---:|:---:|:---:|
8686
|![JavaScript](media/sample-v2-code/logo_js.png)|[Hello.js](https://adodson.com/hello.js/) | Version 1.13.5 |[Hello.js](https://github.com/MrSwitch/hello.js) |[SPA](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
87+
|![Vue](media/sample-v2-code/logo_vue.png)|[Vue MSAL](https://github.com/mvertopoulos/vue-msal) | Version 3.0.3 |[vue-msal](https://github.com/mvertopoulos/vue-msal) | |
8788
| ![Java](media/sample-v2-code/logo_java.png) | [Scribe Java](https://github.com/scribejava/scribejava) | [Version 3.2.0](https://github.com/scribejava/scribejava/releases/tag/scribejava-3.2.0) | [ScribeJava](https://github.com/scribejava/scribejava/) | |
8889
| ![Java](media/sample-v2-code/logo_java.png) | [Gluu OpenID Connect library](https://github.com/GluuFederation/oxAuth) | [Version 3.0.2](https://github.com/GluuFederation/oxAuth/releases/tag/3.0.2) | [Gluu OpenID Connect library](https://github.com/GluuFederation/oxAuth) | |
8990
| ![Python](media/sample-v2-code/logo_python.png) | [Requests-OAuthlib](https://github.com/requests/requests-oauthlib) | [Version 1.2.0](https://github.com/requests/requests-oauthlib/releases/tag/v1.2.0) | [Requests-OAuthlib](https://github.com/requests/requests-oauthlib) | |

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@ 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.30.0
47+
48+
### Release status
49+
05/07/2020: Released for download
50+
51+
### Fixed issues
52+
- Fixed an issue where unselected domains were getting incorrectly selected from the wizard UI.
53+
- Fixed an issue in the ADSyncConfig PowerShell module, where invoking DSACLS command used in all the Set-ADSync* Permissions cmdlets would cause one of the following errors:
54+
- `GrantAclsNoInheritance : The parameter is incorrect. The command failed to complete successfully.`
55+
- `GrantAcls : No GUID Found for computer …`
56+
4657
## 1.5.29.0
4758

4859
### Release status
@@ -100,6 +111,7 @@ This hotfix build fixes an issue with build 1.5.18.0 if you have the Group Filte
100111
- Fixed an issue with the creation of the Azure Active Directory synchronization account where enabling Directory Extensions or PHS may fail because the account has not propagated across all service replicas before attempted use.
101112
- Fixed a bug in the sync errors compression utility that was not handling surrogate characters correctly.
102113
- Fixed a bug in the auto upgrade which left the server in the scheduler suspended state.
114+
- Fixed a bug in the Domain/OU filtering page that would remove the Run Profiles of a domain by just partially expanding the domain tree, without making any changes.
103115

104116
## 1.4.38.0
105117
### Release status

articles/azure-app-configuration/quickstart-feature-flag-spring-boot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Use the [Spring Initializr](https://start.spring.io/) to create a new Spring Boo
5959
```xml
6060
<dependency>
6161
<groupId>com.microsoft.azure</groupId>
62-
<artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
62+
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
6363
<version>1.1.2</version>
6464
</dependency>
6565
<dependency>
@@ -78,7 +78,7 @@ Use the [Spring Initializr](https://start.spring.io/) to create a new Spring Boo
7878
```xml
7979
<dependency>
8080
<groupId>com.microsoft.azure</groupId>
81-
<artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
81+
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
8282
<version>1.2.2</version>
8383
</dependency>
8484
<dependency>

articles/azure-monitor/app/asp-net-dependencies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ For SQL calls, the name of the server and database is always collected and store
8888

8989
For ASP.NET Core applications, there's no additional step required to get the full SQL Query.
9090

91-
For ASP.NET applications, full SQL query is collected with the help of byte code instrumentation, which requires instrumentation engine. Additional platform-specific steps, as described below, are required.
91+
For ASP.NET applications, full SQL query is collected with the help of byte code instrumentation, which requires instrumentation engine or by using the [Microsoft.Data.SqlClient](https://www.nuget.org/packages/Microsoft.Data.SqlClient) NuGet package instead of the System.Data.SqlClient library. Additional platform-specific steps, as described below, are required.
9292

9393
| Platform | Step(s) Needed to get full SQL Query |
9494
| --- | --- |
9595
| Azure Web App |In your web app control panel, [open the Application Insights blade](../../azure-monitor/app/azure-web-apps.md) and enable SQL Commands under .NET |
96-
| IIS Server (Azure VM, on-prem, and so on.) | Use the Status Monitor PowerShell Module to [install the Instrumentation Engine](../../azure-monitor/app/status-monitor-v2-api-reference.md) and restart IIS. |
96+
| IIS Server (Azure VM, on-prem, and so on.) | Either use the [Microsoft.Data.SqlClient](https://www.nuget.org/packages/Microsoft.Data.SqlClient) NuGet package or use the Status Monitor PowerShell Module to [install the Instrumentation Engine](../../azure-monitor/app/status-monitor-v2-api-reference.md) and restart IIS. |
9797
| Azure Cloud Service | Add [startup task to install StatusMonitor](../../azure-monitor/app/cloudservices.md#set-up-status-monitor-to-collect-full-sql-queries-optional) <br> Your app should be onboarded to ApplicationInsights SDK at build time by installing NuGet packages for [ASP.NET](https://docs.microsoft.com/azure/azure-monitor/app/asp-net) or [ASP.NET Core applications](https://docs.microsoft.com/azure/azure-monitor/app/asp-net-core) |
98-
| IIS Express | Not supported
98+
| IIS Express | Use the [Microsoft.Data.SqlClient](https://www.nuget.org/packages/Microsoft.Data.SqlClient) NuGet package
9999

100100
In the above cases, the correct way of validating that instrumentation engine is correctly installed is by validating that the SDK version of collected `DependencyTelemetry` is 'rddp'. 'rdddsd' or 'rddf' indicates dependencies are collected via DiagnosticSource or EventSource callbacks, and hence full SQL query won't be captured.
101101

articles/azure-monitor/platform/log-analytics-agent.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ The following table lists the proxy and firewall configuration information that'
170170
|*.oms.opinsights.azure.com |Port 443 |Inbound and Outbound|Yes |
171171
|*.blob.core.windows.net |Port 443 |Inbound and Outbound|Yes |
172172
|*.azure-automation.net |Port 443 |Inbound and Outbound|Yes |
173-
|*.azure.com |Port 443|Inbound and Outbound|Yes |
174173

175174
For firewall information required for Azure Government, see [Azure Government management](../../azure-government/documentation-government-services-monitoringandmanagement.md#azure-monitor-logs).
176175

articles/azure-monitor/platform/metrics-charts.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@ To change the color of a chart line, click on the colored bar in the legend that
134134

135135
After the chart colors are configured, they will remain that way when you pin the chart to a dashboard. The following section shows you how to pin a chart.
136136

137-
> [!NOTE]
138-
> Due to constraints of our release and publishing schedule, changing colors of the chart lines temporarily requires passing a special parameter **?feature.colorpicker=true** when starting Azure portal [https://portal.azure.com/?feature.colorpicker=true](https://portal.azure.com/?feature.colorpicker=true). This limitation will be removed soon.
139-
140137
![metric image](./media/metrics-charts/018.png)
141138

142139
## Pin charts to dashboards

articles/azure-monitor/platform/workbooks-automate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ There are two types of workbook resources that can be managed programmatically:
3838
2. Below is a sample Azure Resource Manager template that deploys a workbook template to Azure Monitor workbook gallery. Paste the JSON you copied in place of `<PASTE-COPIED-WORKBOOK_TEMPLATE_HERE>`. A reference Azure Resource Manager template that creates a workbook template can be found [here](https://github.com/microsoft/Application-Insights-Workbooks/blob/master/Documentation/ARM-template-for-creating-workbook-template).
3939

4040
```json
41-
{
41+
{
4242
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
4343
"contentVersion": "1.0.0.0",
4444
"parameters": {
@@ -110,7 +110,7 @@ There are two types of workbook resources that can be managed programmatically:
110110
| Workbooks in Resource groups | `microsoft.resources/subscriptions/resourcegroups` | `workbook` |
111111
| Workbooks in Azure Active Directory | `microsoft.aadiam/tenant` | `workbook` |
112112
| VM Insights in Virtual machines | `microsoft.compute/virtualmachines` | `insights` |
113-
| VM Insights in virtual machine scale sets | `microsoft.compute/virtualmachinescalesets` | `insights` |
113+
| VM Insights in virtual machine scale sets | `microsoft.compute/virtualmachinescalesets` | `insights` |
114114

115115
## Azure Resource Manager template for deploying a workbook instance
116116

articles/azure-resource-manager/managed-applications/create-uidefinition-functions.md

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: tomfitz
1111
# CreateUiDefinition functions
1212
This section contains the signatures for all supported functions of a CreateUiDefinition.
1313

14-
To use a function, surround the declaration with square brackets. For example:
14+
To use a function, surround the invocation with square brackets. For example:
1515

1616
```json
1717
"[function()]"
@@ -481,6 +481,45 @@ Assume `element1` and `element2` are undefined. The following example returns `"
481481
"[coalesce(steps('foo').element1, steps('foo').element2, 'foobar')]"
482482
```
483483

484+
This function is especially useful in the context of optional invocation that happens due to user action after the page loads. An example is if the constraints placed on one field in the UI depend on the currently selected value of another, **initially non-visible** field. In this case, `coalesce()` can be used to allow the function to be syntactically valid at page load time while having the desired effect when the user interacts with the field.
485+
486+
Consider this `DropDown`, which allows the user to choose from several different database types:
487+
488+
```
489+
{
490+
"name": "databaseType",
491+
"type": "Microsoft.Common.DropDown",
492+
"label": "Choose database type",
493+
"toolTip": "Choose database type",
494+
"defaultValue": "Oracle Database",
495+
"visible": "[bool(steps('section_database').connectToDatabase)]"
496+
"constraints": {
497+
"allowedValues": [
498+
{
499+
"label": "Azure Database for PostgreSQL",
500+
"value": "postgresql"
501+
},
502+
{
503+
"label": "Oracle Database",
504+
"value": "oracle"
505+
},
506+
{
507+
"label": "Azure SQL",
508+
"value": "sqlserver"
509+
}
510+
],
511+
"required": true
512+
},
513+
```
514+
515+
To condition the action of another field on the current chosen value of this field, use `coalesce()`, as shown here:
516+
517+
```
518+
"regex": "[concat('^jdbc:', coalesce(steps('section_database').databaseConnectionInfo.databaseType, ''), '.*$')]",
519+
```
520+
521+
This is necessary because the `databaseType` is initially not visible and therefore does not have a value. This causes the entire expression to not evaluate correctly.
522+
484523
## Conversion functions
485524
These functions can be used to convert values between JSON data types and encodings.
486525

articles/cosmos-db/storage-explorer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ If you're unable to remove an account, or if the reauthenticate link does not do
268268

269269
### Http/Https proxy issue
270270

271-
You cannot list Azure Cosmos DB nodes in left tree when configuring http/https proxy in ASE. It's a known issue, and will be fixed in next release. You could use Azure Cosmos DB data explorer in Azure portal as a work-around at this moment.
271+
You cannot list Azure Cosmos DB nodes in left tree when configuring http/https proxy in ASE. You could use Azure Cosmos DB data explorer in Azure portal as a work-around at this moment.
272272

273273
### "Development" node under "Local and Attached" node issue
274274

0 commit comments

Comments
 (0)