Skip to content

Commit ceead10

Browse files
authored
Merge pull request #182170 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents c03cf34 + cd35224 commit ceead10

File tree

8 files changed

+17
-13
lines changed

8 files changed

+17
-13
lines changed

articles/active-directory/develop/msal-net-web-browsers.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ It's important to understand that when acquiring a token interactively, the cont
3636

3737
### Embedded vs System Web UI
3838

39-
MSAL.NET is a multi-framework library and has framework-specific code to host a browser in a UI control (for example, on .NET Classic it uses WinForms, on Xamarin it uses native mobile controls etc.). This control is called `embedded` web UI. Alternatively, MSAL.NET is also able to kick off the system OS browser.
39+
MSAL.NET is a multi-framework library and has framework-specific code to host a browser in a UI control (for example, on .NET Classic it uses WinForms, on .NET 5.0+ it uses WebView2, on Xamarin it uses native mobile controls etc.). This control is called `embedded` web UI. Alternatively, MSAL.NET is also able to kick off the system OS browser.
4040

4141
Generally, it's recommended that you use the platform default, and this is typically the system browser. The system browser is better at remembering the users that have logged in before. To change this behavior, use `WithUseEmbeddedWebView(bool)`
4242

4343
### At a glance
4444

4545
| Framework | Embedded | System | Default |
4646
| ------------- |-------------| -----| ----- |
47+
| .NET 5.0+ | Yes† | Yes^ | Embedded |
4748
| .NET Classic | Yes | Yes^ | Embedded |
4849
| .NET Core | No | Yes^ | System |
4950
| .NET Standard | No | Yes^ | System |
@@ -52,7 +53,9 @@ Generally, it's recommended that you use the platform default, and this is typic
5253
| Xamarin.iOS | Yes | Yes | System |
5354
| Xamarin.Mac| Yes | No | Embedded |
5455

55-
^ Requires "http://localhost" redirect URI
56+
**** Requires OS-specific target framework moniker (TFM) of at least [`net5.0-windows10.0.17763.0`](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/efc71473d668fdd42c21cef6a6cadc69e1907290/src/client/Microsoft.Identity.Client/Platforms/netcore/NetCoreWebUIFactory.cs#L28). Do _not_ use the `net5.0` or `net5.0-windows` TFMs. For more information about TFMs, see [Target frameworks in SDK-style projects](/dotnet/standard/frameworks).
57+
58+
**^** Requires redirect URI _http://localhost_
5659

5760
## System web browser on Xamarin.iOS, Xamarin.Android
5861

articles/active-directory/verifiable-credentials/decentralized-identifier-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Today we use our digital identity at work, at home, and across every app, servic
3030

3131
Generally, users grant consent to several apps and devices. This approach requires a high degree of vigilance on the user's part to track who has access to what information. On the enterprise front, collaboration with consumers and partners requires high-touch orchestration to securely exchange data in a way that maintains privacy and security for all involved.
3232

33-
We believe a standards-based Decentralized Identity system can unlock a new set of experiences that give users and organizations to have greater control over their data—and deliver a higher degree of trust and security for apps, devices, and service providers.
33+
We believe a standards-based Decentralized Identity system can unlock a new set of experiences that give users and organizations greater control over their data—and deliver a higher degree of trust and security for apps, devices, and service providers.
3434

3535
## Lead with open standards
3636

@@ -58,7 +58,7 @@ Microsoft’s verifiable credential solution uses decentralized credentials (DID
5858

5959
We use IDs in our daily lives. We have drivers licenses that we use as evidence of our ability to operate a car. Universities issue diplomas that prove we attained a level of education. We use passports to prove who we are to authorities as we arrive to other countries. The data model describes how we could handle these types of scenarios when working over the internet but in a secure manner that respects users' privacy. You can get additional information in The [Verifiable Credentials Data Model 1.0](https://www.w3.org/TR/vc-data-model/).
6060

61-
In short, verifiable credentials are data objects consisting of claims made by the issuer attesting information about a subject. These claims are identified by schema and include the DID the issuer and subject. The issuer's DID creates a digital signature as proof that they attest to this information.
61+
In short, verifiable credentials are data objects consisting of claims made by the issuer attesting information about a subject. These claims are identified by schema and include the DID issuer and subject. The issuer's DID creates a digital signature as proof that they attest to this information.
6262

6363

6464
## How does Decentralized Identity work?

articles/aks/operator-best-practices-cluster-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ Each evening, Linux nodes in AKS get security patches through their distro updat
281281
282282
### Node image upgrades
283283
284-
Unattended upgrades apply updates to the Linux node OS, but the image used to create nodes for your cluster remains unchanged. If a new Linux node is added to your cluster, the original image is used to create the node. This new node will receive all the security and kernel updates available during the automatic check every night but will remain unpatched until all checks and restarts are complete. You can use node image upgrade to check for and update node images used by your cluster. For more details on nod image upgrade, see [Azure Kubernetes Service (AKS) node image upgrade][node-image-upgrade].
284+
Unattended upgrades apply updates to the Linux node OS, but the image used to create nodes for your cluster remains unchanged. If a new Linux node is added to your cluster, the original image is used to create the node. This new node will receive all the security and kernel updates available during the automatic check every night but will remain unpatched until all checks and restarts are complete. You can use node image upgrade to check for and update node images used by your cluster. For more details on node image upgrade, see [Azure Kubernetes Service (AKS) node image upgrade][node-image-upgrade].
285285
286286
## Process Windows Server node updates
287287

articles/azure-arc/kubernetes/tutorial-use-gitops-flux2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Install the latest `k8s-configuration` and `k8s-extension` CLI extension package
9999

100100
```console
101101
az extension add -n k8s-configuration
102-
az extension add n k8s-extension
102+
az extension add -n k8s-extension
103103
```
104104

105105
To update these packages, use the following commands:

articles/azure-percept/quickstart-percept-dk-set-up.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To verify if your Azure account is an “owner” or “contributor” within th
5959
> [!WARNING]
6060
> While connected to the Azure Percept DK's Wi-Fi access point, your host computer will temporarily lose its connection to the Internet. Active video conference calls, web streaming, or other network-based experiences will be interrupted.
6161
62-
1. Once connected to the dev kit’s Wi-Fi access point, the host computer will automatically launch the setup experience in a new browser window with **your.new.device/** in the address bar. If the tab does not open automatically, launch the setup experience by going to [http://10.1.1.1](http://10.1.1.1) in a web browser. Make sure your browser is signed in with the same Azure account credentials you intend to use with Azure Percept.
62+
1. Once connected to the dev kit’s Wi-Fi access point, the host computer should automatically launch the setup experience in a new browser window with **your.new.device/** in the address bar. If the tab does not open automatically, launch the setup experience by going to [http://10.1.1.1](http://10.1.1.1) in a web browser. Make sure your browser is signed in with the same Azure account credentials you intend to use with Azure Percept.
6363

6464
:::image type="content" source="./media/quickstart-percept-dk-setup/main-welcome.png" alt-text="Welcome page.":::
6565

articles/firewall-manager/migrate-to-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $ApplicationRuleGroupPriority = 300
3838
$NetworkRuleGroupPriority = 200
3939
$NatRuleGroupPriority = 100
4040
41-
#Helper functions for tanslatating ApplicationProtocol and ApplicationRule
41+
#Helper functions for translating ApplicationProtocol and ApplicationRule
4242
Function GetApplicationProtocolsString
4343
{
4444
Param([Object[]] $Protocols)
@@ -147,8 +147,8 @@ If ($azfw.NetworkRuleCollections.Count -gt 0) {
147147
}
148148
149149
#Translate NatRuleCollection
150-
# Hierarchy for NAT rule collection is different for AZFW and FirewallPOlicy. In AZFW you can have a NatRuleCollection with multiple NatRules
151-
# where each NatRule will have its own set of source , dest, tranlated IPs and ports.
150+
# Hierarchy for NAT rule collection is different for AZFW and FirewallPolicy. In AZFW you can have a NatRuleCollection with multiple NatRules
151+
# where each NatRule will have its own set of source , dest, translated IPs and ports.
152152
# In FirewallPolicy a NatRuleCollection has a a set of rules which has one condition (source and dest IPs and Ports) and the translated IP and ports
153153
# as part of NatRuleCollection.
154154
# So when translating NAT rules we will have to create separate ruleCollection for each rule in AZFW and every ruleCollection will have only 1 rule.

articles/purview/concept-best-practices-security.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Examples of control plane operations and data plane operations:
136136
|Setup a Private Endpoint for Azure Purview | Control plane | Contributor  | Azure RBAC roles |
137137
|Delete a Purview account | Control plane | Contributor  | Azure RBAC roles |
138138
|View Purview metrics to get current capacity units | Control plane | Reader | Azure RBAC roles |
139-
|Create a collection | Data plane | Control plane | Azure RBAC roles |
139+
|Create a collection | Data plane | Collection Admin | Azure Purview roles |
140140
|Register a data source | Data plane | Collection Admin | Azure Purview roles |
141141
|Scan a SQL Server | Data plane | Data source admin and data reader or data curator | Azure Purview roles |
142142
|Search inside Purview Data Catalog | Data plane | Data source admin and data reader or data curator | Azure Purview roles |
@@ -325,8 +325,8 @@ As a general rule, you can use the following options to set up integration runti
325325
|Scenario |Runtime option |Supported Credentials |
326326
|---------|---------|---------|
327327
|Data source is an Azure Platform as a Service, such as Azure Data Lake Storage Gen 2 or Azure SQL inside public network | Option 1: Azure Runtime | Azure Purview Managed Identity, Service Principal or Access Key / SQL Authentication (depending on Azure data source type) |
328-
|Data source is an Azure Platform as a Service, such as Azure Data Lake Storage Gen 2 Gen 2 or Azure SQL inside public network | Option 2: Self-hosted integration runtime | Service Principal or Access Key / SQL Authentication (depending on Azure data source type) |
329-
|Data source is an Azure Platform as a Service, such as Azure Data Lake Storage Gen 2 Gen 2 or Azure SQL inside private network using Azure Private Link Service | Self-hosted integration runtime | Service Principal or Access Key / SQL Authentication (depending on Azure data source type) |
328+
|Data source is an Azure Platform as a Service, such as Azure Data Lake Storage Gen 2 or Azure SQL inside public network | Option 2: Self-hosted integration runtime | Service Principal or Access Key / SQL Authentication (depending on Azure data source type) |
329+
|Data source is an Azure Platform as a Service, such as Azure Data Lake Storage Gen 2 or Azure SQL inside private network using Azure Private Link Service | Self-hosted integration runtime | Service Principal or Access Key / SQL Authentication (depending on Azure data source type) |
330330
|Data source is inside an Azure IaaS VM such as SQL Server | Self-hosted integration runtime deployed in Azure | SQL Authentication or Basic Authentication (depending on Azure data source type) |
331331
|Data source is inside an on-premises system such as SQL Server or Oracle | Self-hosted integration runtime deployed in Azure or in the on-premises network | SQL Authentication or Basic Authentication (depending on Azure data source type) |
332332
|Multi-cloud | Azure runtime or self-hosted integration runtime based on data source types | Supported credential options vary based on data sources types |

articles/site-recovery/azure-to-azure-support-matrix.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ Size | Any Azure VM size with at least two CPU cores and 1-GB RAM | Verify [Azur
215215
RAM | Azure Site Recovery driver consumes 6% of RAM.
216216
Availability sets | Supported | If you enable replication for an Azure VM with the default options, an availability set is created automatically, based on the source region settings. You can modify these settings.
217217
Availability zones | Supported |
218+
Dedicated Hosts | Not supported |
218219
Hybrid Use Benefit (HUB) | Supported | If the source VM has a HUB license enabled, a test failover or failed over VM also uses the HUB license.
219220
VMSS Flex | Availability scenario - supported. Scalability scenario - not supported. |
220221
Azure gallery images - Microsoft published | Supported | Supported if the VM runs on a supported operating system.

0 commit comments

Comments
 (0)