Skip to content

Commit f39a724

Browse files
authored
Merge pull request #300396 from MicrosoftDocs/main
Publish to live, Tuesday 4 AM PST, 5/27
2 parents bec75c2 + 3245ffa commit f39a724

13 files changed

+386
-51
lines changed

articles/azure-signalr/signalr-howto-work-with-azure-front-door.md

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Paste in the content to the `afd-demo.csproj` file. This project uses only the "
9393
```
9494

9595
#### Configure app settings
96-
Create an `appsettings.json` file and paste in the content. The values will be referenced in the `Program.cs` file, which we create in the next step.
96+
Create an `appsettings.json` file and paste in the content. The values will be referenced in the `Program.cs` file, which we create in the next step. Add a `ClientEndpoint` section in the ConnectionString.
9797
```bash
9898
touch appsettings.json
9999
```
@@ -104,10 +104,7 @@ touch appsettings.json
104104
{
105105
"Azure": {
106106
"SignalR": {
107-
"ConnectionString": "<the-connection-string-of-your-Azure-SignalR-resource>"
108-
},
109-
"AFD": {
110-
"Endpoint": "<the-endpoint-of-your-Azure-Front-Door-resource>"
107+
"ConnectionString": "<the-connection-string-of-your-Azure-SignalR-resource>;ClientEndpoint=<the-endpoint-of-your-Azure-Front-Door-resource>"
111108
}
112109
}
113110
}
@@ -123,21 +120,8 @@ Paste in the code to the `Program.cs` file. The web app defines a SignalR hub an
123120
using Microsoft.Azure.SignalR;
124121
var builder = WebApplication.CreateBuilder(args);
125122

126-
// Reads in the configuration from `appsettings.json`
127-
var azureSignalRConnectionString = builder.Configuration["Azure:SignalR:ConnectionString"];
128-
var afdEndpoint = builder.Configuration["Azure:AFD:Endpoint"];
129-
130-
builder.Services.AddSignalR().AddAzureSignalR(o =>
131-
{
132-
o.Endpoints = new Microsoft.Azure.SignalR.ServiceEndpoint[1]
133-
{
134-
new Microsoft.Azure.SignalR.ServiceEndpoint(azureSignalRConnectionString)
135-
{
136-
// Instructs SignalR server to return a `ClientEndpoint` to SignalR clients, with which they establish a connection. In our case, it's the endpoint of the Azure Front Door resource you just created.
137-
ClientEndpoint = new Uri(afdEndpoint),
138-
}
139-
};
140-
});
123+
// Automatically read in the configuration from `appsettings.json`
124+
builder.Services.AddSignalR().AddAzureSignalR();
141125

142126
var app = builder.Build();
143127
app.UseStaticFiles();

articles/cost-management-billing/manage/add-change-subscription-administrator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you're not sure who the account billing administrator is for a subscription,
4242

4343
1. Open the [Subscriptions page in the Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Billing/SubscriptionsBlade).
4444
1. Select the subscription you want to check, and then look under **Settings**.
45-
1. Select **Properties**. The account billing administrator of the subscription is displayed in the **Account Admin** box.
45+
1. Select **Billing properties**. The account billing administrator of the subscription is displayed in the **Account Admin** box.
4646

4747
### To assign a user as an administrator
4848

articles/data-factory/connector-amazon-rds-for-oracle.md

Lines changed: 302 additions & 3 deletions
Large diffs are not rendered by default.
6 KB
Loading
2.2 KB
Loading
10.6 KB
Loading
8.32 KB
Loading
27.5 KB
Loading

articles/data-factory/transform-data-databricks-job.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,6 @@ definition:
7979

8080
You can pass parameters to jobs using *jobParameters* property in Databricks activity.
8181

82+
> [!NOTE]
83+
> Job parameters are only supported in Self-hosted IR version 5.52.0.0 or greater.
84+

articles/operator-nexus/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@
250250
href: howto-enable-log-streaming.md
251251
- name: How to use Commit Workflow v2 in Azure Operator Nexus
252252
href: howto-use-commit-workflow-v2.md
253+
- name: How to set administrative lock or unlock for Network fabric
254+
href: howto-set-administrative-lock-or-unlock-for-network-fabric.md
253255
- name: Cluster
254256
expanded: false
255257
items:

0 commit comments

Comments
 (0)