Skip to content

Commit 773d6cd

Browse files
authored
Merge pull request #105474 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 ce00e71 + cf00b14 commit 773d6cd

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

articles/active-directory/develop/sample-v2-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ These samples show how to write a single-page application secured with Microsoft
4242

4343
| Platform | Description | Link |
4444
| -------- | --------------------- | -------- |
45-
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-web-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-web-v2) |
45+
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
4646
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[b2c-javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) |
4747
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls own web API |[javascript-singlepageapp-dotnet-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2) |
4848
| ![This image shows the Angular JS logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL AngularJS)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angularjs)| Calls Microsoft Graph | [MsalAngularjsDemoApp](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/MsalAngularjsDemoApp)
49-
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph | [MSALAngularDemoApp](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/MSALAngularDemoApp) |
49+
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph | [javascript-singlepageapp-angular](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-angular) |
5050

5151
## Web applications
5252

articles/aks/windows-node-limitations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ The master nodes (the control plane) in an AKS cluster are hosted by AKS the ser
4949

5050
AKS clusters with Windows node pools must use the Azure CNI (advanced) networking model. Kubenet (basic) networking is not supported. For more information on the differences in network models, see [Network concepts for applications in AKS][azure-network-models]. - The Azure CNI network model requires additional planning and considerations for IP address management. For more information on how to plan and implement Azure CNI, see [Configure Azure CNI networking in AKS][configure-azure-cni].
5151

52-
## Can I change the min. # of pods per node?
52+
## Can I change the max. # of pods per node?
5353

54-
It is currently a requirement to be set to a minimum of 30 pods to ensure the reliability of your clusters.
54+
It is currently a requirement to be set to a maximum of 30 pods to ensure the reliability of your clusters.
5555

5656
## How do patch my Windows nodes?
5757

articles/azure-app-configuration/quickstart-feature-flag-dotnet.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The .NET Feature Management libraries extend the framework with comprehensive fe
2828

2929
- Azure subscription - [create one for free](https://azure.microsoft.com/free/)
3030
- [Visual Studio 2019](https://visualstudio.microsoft.com/vs)
31-
- [.NET Framework 4.7.2](https://dotnet.microsoft.com/download)
31+
- [.NET Framework 4.8](https://dotnet.microsoft.com/download)
3232

3333
## Create an App Configuration store
3434

@@ -40,7 +40,7 @@ The .NET Feature Management libraries extend the framework with comprehensive fe
4040

4141
1. In **Create a new project**, filter on the **Console** project type and click on **Console App (.NET Framework)**. Click **Next**.
4242

43-
1. In **Configure your new project**, enter a project name. Under **Framework**, select **.NET Framework 4.7.1** or higher. Click **Create**.
43+
1. In **Configure your new project**, enter a project name. Under **Framework**, select **.NET Framework 4.8** or higher. Click **Create**.
4444

4545
## Connect to an App Configuration store
4646

@@ -64,13 +64,8 @@ The .NET Feature Management libraries extend the framework with comprehensive fe
6464
1. Update the `Main` method to connect to App Configuration, specifying the `UseFeatureFlags` option so that feature flags are retrieved. Then display a message if the `Beta` feature flag is enabled.
6565
6666
```csharp
67-
public static void Main(string[] args)
68-
{
69-
AsyncMain().Wait();
70-
}
71-
72-
private static async Task AsyncMain()
73-
{
67+
public static async Task Main(string[] args)
68+
{
7469
IConfigurationRoot configuration = new ConfigurationBuilder()
7570
.AddAzureAppConfiguration(options =>
7671
{
@@ -121,4 +116,4 @@ The .NET Feature Management libraries extend the framework with comprehensive fe
121116
In this quickstart, you created a feature flag in App Configuration and used it with a .NET Framework console app. To learn how to dynamically update feature flags and other configuration values without restarting the application, continue to the next tutorial.
122117
123118
> [!div class="nextstepaction"]
124-
> [Enable dynamic configuration](./enable-dynamic-configuration-dotnet.md)
119+
> [Enable dynamic configuration](./enable-dynamic-configuration-dotnet.md)

articles/service-fabric/service-fabric-manifest-example-reliable-services-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ See [Application manifest elements](#application-manifest-elements), [VotingWeb
6565
MemorySwapInMB="[MemorySwapInMB]"/>
6666

6767
<!-- Share the data package across multiple instances of the VotingData service-->
68-
<PackageSharingPolicy PackageRef="VotingDataPkg.Data"/>
68+
<PackageSharingPolicy PackageRef="Data"/>
6969

7070
<!-- Give read rights on the "DataEndpoint" endpoint to the Customer2 account.-->
7171
<SecurityAccessPolicy GrantRights="Read" PrincipalRef="Customer2" ResourceRef="DataEndpoint" ResourceType="Endpoint"/>

articles/sql-data-warehouse/sql-data-warehouse-tables-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ LEFT OUTER JOIN (select * from sys.pdw_column_distribution_properties where dist
208208
LEFT OUTER JOIN sys.columns c
209209
ON cdp.[object_id] = c.[object_id]
210210
AND cdp.[column_id] = c.[column_id]
211+
WHERE pn.[type] = 'COMPUTE'
211212
)
212213
, size
213214
AS

includes/disk-encryption-key-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Use the Azure CLI [az keyvault key create](/cli/azure/keyvault/key?view=azure-cl
145145
az keyvault key create --name "myKEK" --vault-name "<your-unique-keyvault-name>" --kty RSA-HSM
146146
```
147147

148-
.You may instead import a private key using the Azure CLI [az keyvault key import](/cli/azure/keyvault/key?view=azure-cli-latest#az-keyvault-key-import) command:
148+
You may instead import a private key using the Azure CLI [az keyvault key import](/cli/azure/keyvault/key?view=azure-cli-latest#az-keyvault-key-import) command:
149149

150150
In either case, you will supply the name of your KEK to the Azure CLI [az vm encryption enable](/cli/azure/vm/encryption?view=azure-cli-latest#az-vm-encryption-enable) --key-encryption-key parameter.
151151

0 commit comments

Comments
 (0)