Skip to content

Commit b756dfe

Browse files
authored
Merge pull request #105826 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 ada664e + 51a1259 commit b756dfe

File tree

8 files changed

+23
-16
lines changed

8 files changed

+23
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:A
1919

2020
This quickstart uses a code sample to demonstrate how an Android application can sign in personal, work, or school accounts using the Microsoft identity platform, and then get an access token and call the Microsoft Graph API.
2121

22-
Applications must be represented by an app object in Azure Active Directory so that the Microsoft identity platform can share tokens with your application.
22+
Applications must be represented by an app object in Azure Active Directory so that the Microsoft identity platform can provide tokens to your application.
2323

2424
> [!div renderon="docs"]
2525
> As a convenience, the code sample comes with a default `redirect_uri` preconfigured in the `AndroidManifest.xml` file so that you don't have to first register your own app object. A `redirect_uri` is partly based on your app's signing key. The sample project is preconfigured with a signing key so that the provided `redirect_uri` will work. To learn more about registering an app object and integrating it with your application, see the [Sign in users and call the Microsoft Graph from an Android app](tutorial-v2-android.md) tutorial.

articles/azure-functions/functions-bindings-storage-queue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ Functions 1.x apps automatically have a reference the [Microsoft.Azure.WebJobs](
4545
## Next steps
4646

4747
- [Run a function as queue storage data changes (Trigger)](./functions-bindings-storage-queue-trigger.md)
48-
- [Write queue storage messages (Output binding)](./functions-bindings-storage-blob-output.md)
48+
- [Write queue storage messages (Output binding)](./functions-bindings-storage-queue-output.md)

articles/azure-functions/functions-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ A few features were removed, updated, or replaced after version 1.x. This sectio
5454

5555
In version 2.x, the following changes were made:
5656

57-
* Keys for calling HTTP endpoints are always stored encrypted in Azure Blob storage. In version 1.x, keys were stored in Azure File storage be default. When upgrading an app from version 1.x to version 2.x, existing secrets that are in file storage are reset.
57+
* Keys for calling HTTP endpoints are always stored encrypted in Azure Blob storage. In version 1.x, keys were stored in Azure File storage by default. When upgrading an app from version 1.x to version 2.x, existing secrets that are in file storage are reset.
5858

5959
* The version 2.x runtime doesn't include built-in support for webhook providers. This change was made to improve performance. You can still use HTTP triggers as endpoints for webhooks.
6060

articles/cosmos-db/sql-api-dotnet-application.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,15 @@ First, we'll add a class that contains the logic to connect to and use Azure Cos
204204

205205
:::code language="csharp" source="~/samples-cosmosdb-dotnet-core-web-app/src/Services/ICosmosDbService.cs":::
206206

207-
1. In the **ConfigureServices** handler, add the following line:
207+
1. Register the **CosmosDBService** implementation with the container.
208+
209+
The code in the previous step receives a `CosmosClient` as part of the constructor. In order to tell ASP.NET Core pipeline how to create that object, edit the project's *Startup.cs* file and add the following line to the **ConfigureServices** handler:
208210

209211
```csharp
210212
services.AddSingleton<ICosmosDbService>(InitializeCosmosClientInstanceAsync(Configuration.GetSection("CosmosDb")).GetAwaiter().GetResult());
211213
```
212214

213-
The code in the previous step receives a `CosmosClient` as part of the constructor. Following ASP.NET Core pipeline, we need to go to the project's *Startup.cs* file. The code in this step initializes the client based on the configuration as a singleton instance to be injected through [Dependency injection in ASP.NET Core](https://docs.microsoft.com/aspnet/core/fundamentals/dependency-injection).
215+
The code in this step initializes the client based on the configuration as a singleton instance to be injected through [Dependency injection in ASP.NET Core](https://docs.microsoft.com/aspnet/core/fundamentals/dependency-injection).
214216
215217
1. Within the same file, add the following method **InitializeCosmosClientInstanceAsync**, which reads the configuration and initializes the client.
216218

@@ -233,13 +235,17 @@ If you build and run this project now, you should now see something that looks l
233235

234236
![Screenshot of the todo list web application created by this database tutorial](./media/sql-api-dotnet-application/build-and-run-the-project-now.png)
235237

238+
If instead you see the home page of the application, append `/Item` to the url.
239+
236240
## <a name="run-the-application"></a>Step 6: Run the application locally
237241

238242
To test the application on your local computer, use the following steps:
239243

240244
1. Select F5 in Visual Studio to build the application in debug mode. It should build the application and launch a browser with the empty grid page we saw before:
241245

242246
![Screenshot of the todo list web application created by this tutorial](./media/sql-api-dotnet-application/asp-net-mvc-tutorial-create-an-item-a.png)
247+
248+
If the application instead opens to the home page, append `/Item` to the url.
243249

244250
1. Select the **Create New** link and add values to the **Name** and **Description** fields. Leave the **Completed** check box unselected. If you select it, the app adds the new item in a completed state. The item no longer appears on the initial list.
245251

articles/event-hubs/store-captured-data-data-warehouse.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ To deploy the template using Azure CLI, use the following commands:
7272
```azurecli-interactive
7373
az group create -l westus -n rgDataMigrationSample
7474
75-
az group deployment create \
76-
--resource-group rgDataMigrationSample \
77-
--template-uri https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/event-grid/EventHubsDataMigration.json \
75+
az group deployment create `
76+
--resource-group rgDataMigrationSample `
77+
--template-uri https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/event-grid/EventHubsDataMigration.json `
7878
--parameters eventHubNamespaceName=<event-hub-namespace> eventHubName=hubdatamigration sqlServerName=<sql-server-name> sqlServerUserName=<user-name> sqlServerPassword=<password> sqlServerDatabaseName=<database-name> storageName=<unique-storage-name> functionAppName=<app-name>
7979
```
8080

articles/storage/blobs/storage-secure-access-application.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ blobStorageAccount=<blob_storage_account>
4040
blobStorageAccountKey=$(az storage account keys list -g myResourceGroup \
4141
-n $blobStorageAccount --query [0].value --output tsv)
4242
43-
az storage container set-permission \ --account-name $blobStorageAccount \ --account-key $blobStorageAccountKey \ --name thumbnails \
44-
--public-access off
43+
az storage container set-permission \
44+
--account-name $blobStorageAccount --account-key $blobStorageAccountKey \
45+
--name thumbnails --public-access off
4546
```
4647

4748
## Configure SAS tokens for thumbnails

articles/storage/blobs/storage-upload-process-images.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The sample uploads images to a blob container in an Azure Storage account. A sto
6565
In the following command, replace your own globally unique name for the Blob storage account where you see the `<blob_storage_account>` placeholder.
6666

6767
```azurecli-interactive
68-
$blobStorageAccount="<blob_storage_account>"
68+
blobStorageAccount="<blob_storage_account>"
6969
7070
az storage account create --name $blobStorageAccount --location southeastasia --resource-group myResourceGroup --sku Standard_LRS --kind blobstorage --access-tier hot
7171
@@ -80,7 +80,7 @@ Get the storage account key by using the [az storage account keys list](/cli/azu
8080
The *images* container's public access is set to `off`. The *thumbnails* container's public access is set to `container`. The `container` public access setting permits users who visit the web page to view the thumbnails.
8181

8282
```azurecli-interactive
83-
$blobStorageAccountKey=$(az storage account keys list -g myResourceGroup -n $blobStorageAccount --query [0].value --output tsv)
83+
blobStorageAccountKey=$(az storage account keys list -g myResourceGroup -n $blobStorageAccount --query "[0].value" --output tsv)
8484
8585
az storage container create -n images --account-name $blobStorageAccount --account-key $blobStorageAccountKey --public-access off
8686
@@ -113,7 +113,7 @@ The web app provides a hosting space for the sample app code that's deployed fro
113113
In the following command, replace `<web_app>` with a unique name. Valid characters are `a-z`, `0-9`, and `-`. If `<web_app>` is not unique, you get the error message: _Website with given name `<web_app>` already exists._ The default URL of the web app is `https://<web_app>.azurewebsites.net`.
114114

115115
```azurecli-interactive
116-
$webapp="<web_app>"
116+
webapp="<web_app>"
117117
118118
az webapp create --name $webapp --resource-group myResourceGroup --plan myAppServicePlan
119119
@@ -128,7 +128,7 @@ App Service supports several ways to deploy content to a web app. In this tutori
128128
The sample project contains an [ASP.NET MVC](https://www.asp.net/mvc) app. The app accepts an image, saves it to a storage account, and displays images from a thumbnail container. The web app uses the [Microsoft.Azure.Storage](/dotnet/api/overview/azure/storage), [Microsoft.Azure.Storage.Blob](/dotnet/api/microsoft.azure.storage.blob), and the Microsoft.Azure.Storage.Auth namespaces from the Azure Storage client library to interact with Azure storage.
129129

130130
```azurecli-interactive
131-
az webapp deployment source config --name $webapp --resource-group myResourceGroup --branch master --manual-integration --repo-url https://github.com/Azure-Samples/storage-blob-upload-from-webapp
131+
az webapp deployment source config --name nwebapp --resource-group myResourceGroup --branch master --manual-integration --repo-url https://github.com/Azure-Samples/storage-blob-upload-from-webapp
132132
133133
```
134134

@@ -166,7 +166,7 @@ az webapp config appsettings set --name $webapp --resource-group myResourceGroup
166166
The sample web app uses the [Azure Storage Client Library](https://docs.microsoft.com/javascript/api/azure-storage) to request access tokens, which are used to upload images. The storage account credentials used by the Storage SDK are set in the app settings for the web app. Add app settings to the deployed app with the [az webapp config appsettings set](/cli/azure/webapp/config/appsettings) command.
167167

168168
```azurecli-interactive
169-
$storageConnectionString=$(az storage account show-connection-string --resource-group $resourceGroupName --name $blobStorageAccount --query connectionString --output tsv)
169+
storageConnectionString=$(az storage account show-connection-string --resource-group resourceGroupName --name $blobStorageAccount --query connectionString --output tsv)
170170
171171
az webapp config appsettings set --name $webapp --resource-group myResourceGroup --settings AzureStorageConfig__ImageContainer=images AzureStorageConfig__ThumbnailContainer=thumbnails AzureStorageConfig__AccountName=$blobStorageAccount AzureStorageConfig__AccountKey=$blobStorageAccountKey AZURE_STORAGE_CONNECTION_STRING=$storageConnectionString
172172

articles/storage/common/storage-rest-api-auth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ internal static AuthenticationHeaderValue GetAuthorizationHeader(
412412

413413
// This is the actual header that will be added to the list of request headers.
414414
AuthenticationHeaderValue authHV = new AuthenticationHeaderValue("SharedKey",
415-
storageAccountName + ":" + Convert.ToBase64String(SHA256.ComputeHash(SignatureBytes)));
415+
storageAccountName + ":" + signature);
416416
return authHV;
417417
}
418418
```

0 commit comments

Comments
 (0)