Skip to content

Commit bdb6cb3

Browse files
authored
Merge pull request #106849 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 adf46cd + e6a2c61 commit bdb6cb3

24 files changed

+38
-21
lines changed

articles/active-directory/manage-apps/configure-authentication-for-federated-users-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Use the previous example to get the **ObjectID** of the policy, and that of the
253253
#### Step 2: Remove the policy assignment from the application service principal
254254

255255
``` powershell
256-
Remove-AzureADApplicationPolicy -id <ObjectId of the Service Principal> -PolicyId <ObjectId of the policy>
256+
Remove-AzureADServicePrincipalPolicy -id <ObjectId of the Service Principal> -PolicyId <ObjectId of the policy>
257257
```
258258

259259
#### Step 3: Check removal by listing the service principals to which the policy is assigned

articles/active-directory/manage-apps/tenant-restrictions.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ While configuration of tenant restrictions is done on the corporate proxy infras
101101

102102
The admin for the tenant specified as the Restricted-Access-Context tenant can use this report to see sign-ins blocked because of the tenant restrictions policy, including the identity used and the target directory ID. Sign-ins are included if the tenant setting the restriction is either the user tenant or resource tenant for the sign-in.
103103

104+
> [!NOTE]
105+
> The report may contain limited information, such as target directory ID, when a user who is in a tenant other than the Restricted-Access-Context tenant signs in. In this case, user identifiable information, such as name and user principal name, is masked to protect user data in other tenants.
106+
104107
Like other reports in the Azure portal, you can use filters to specify the scope of your report. You can filter on a specific time interval, user, application, client, or status. If you select the **Columns** button, you can choose to display data with any combination of the following fields:
105108

106109
- **User**

articles/azure-functions/functions-create-first-function-vs-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Before you get started, make sure you have the following requirements in place:
3636
::: zone-end
3737
+ [Visual Studio Code](https://code.visualstudio.com/) on one of the [supported platforms](https://code.visualstudio.com/docs/supporting/requirements#_platforms).
3838
::: zone pivot="programming-language-csharp"
39-
+ The [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp) for Visual Studio Code.
39+
+ The [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) for Visual Studio Code.
4040
::: zone-end
4141
::: zone pivot="programming-language-python"
4242
+ The [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) for Visual Studio Code.

articles/azure-functions/functions-develop-vs-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ To run your Functions project locally, you must meet these additional requiremen
295295

296296
| Language | Requirement |
297297
| -------- | --------- |
298-
| **C#** | [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp)<br/>[.NET Core CLI tools](https://docs.microsoft.com/dotnet/core/tools/?tabs=netcore2x) |
298+
| **C#** | [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)<br/>[.NET Core CLI tools](https://docs.microsoft.com/dotnet/core/tools/?tabs=netcore2x) |
299299
| **Java** | [Debugger for Java extension](https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-debug)<br/>[Java 8](https://aka.ms/azure-jdks)<br/>[Maven 3 or later](https://maven.apache.org/) |
300300
| **JavaScript** | [Node.js](https://nodejs.org/)<sup>*</sup> |
301301
| **Python** | [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python)<br/>[Python 3.6.8](https://www.python.org/downloads/) recommended|

articles/data-factory/quickstart-create-data-factory-portal.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ Watching this video helps you understand the Data Factory UI:
6262
1. Select the **Author & Monitor** tile to start the Azure Data Factory user interface (UI) application on a separate tab.
6363

6464
![Home page for the data factory, with the "Author & Monitor" tile](./media/doc-common-process/data-factory-home-page.png)
65+
66+
> [!NOTE]
67+
> If you see that the web browser is stuck at "Authorizing", clear the **Block third-party cookies and site data** check box. Or keep it selected, create an exception for **login.microsoftonline.com**, and then try to open the app again.
68+
6569
1. On the **Let's get started** page, switch to the **Author** tab in the left panel.
6670

6771
!["Let's get started" page](./media/doc-common-process/get-started-page-author-button.png)

articles/databox-online/data-box-edge-create-iot-edge-module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Before you begin, make sure you have:
4949
- The following development resources:
5050

5151
- [Visual Studio Code](https://code.visualstudio.com/).
52-
- [C# for Visual Studio Code (powered by OmniSharp) extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp).
52+
- [C# for Visual Studio Code (powered by OmniSharp) extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp).
5353
- [Azure IoT Edge extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-edge).
5454
- [.NET Core 2.1 SDK](https://www.microsoft.com/net/download).
5555
- [Docker CE](https://store.docker.com/editions/community/docker-ce-desktop-windows). You may have to create an account to download and install the software.

articles/dev-spaces/get-started-netcore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Enter the following Azure CLI command, using the resource group that contains yo
7575
Rich features like Kubernetes debugging are available for .NET Core and Node.js developers using VS Code.
7676

7777
1. If you don't have it, install [VS Code](https://code.visualstudio.com/Download).
78-
1. Download and install the [VS Azure Dev Spaces](https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp) extensions. For each extension, click install on the extension's Marketplace page, and again in VS Code.
78+
1. Download and install the [VS Azure Dev Spaces](https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) extensions. For each extension, click install on the extension's Marketplace page, and again in VS Code.
7979

8080
## Create a web app running in a container
8181

articles/dev-spaces/how-vs-code-works-with-dev-spaces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You can see Visual Studio Code and the Azure Dev Spaces extension working with A
4949

5050
[azds-extension]: https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds
5151
[azds-yaml]: how-dev-spaces-works.md#prepare-your-code
52-
[csharp-extension]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp
52+
[csharp-extension]: https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp
5353
[java-extension]: https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-debugger-azds
5454
[maven]: https://maven.apache.org
5555
[quickstart-java]: quickstart-java.md

articles/dev-spaces/quickstart-netcore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Azure Dev Spaces also allows you to debug and iterate using:
2424

2525
- An Azure subscription. If you don't have one, you can create a [free account](https://azure.microsoft.com/free).
2626
- [Visual Studio Code installed](https://code.visualstudio.com/download).
27-
- The [Azure Dev Spaces](https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp) extensions for Visual Studio Code installed.
27+
- The [Azure Dev Spaces](https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) extensions for Visual Studio Code installed.
2828
- [Azure CLI installed](/cli/azure/install-azure-cli?view=azure-cli-latest).
2929

3030
## Create an Azure Kubernetes Service cluster

articles/dev-spaces/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Try downloading and installing the latest version of the Azure Dev Spaces CLI:
286286

287287
You may see this error when running the Visual Studio Code debugger. You might not have the VS Code extension for C# installed on your development machine. The C# extension includes debugging support for .NET Core (CoreCLR).
288288

289-
To fix this issue, install the [VS Code extension for C#](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp).
289+
To fix this issue, install the [VS Code extension for C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp).
290290

291291
### Error "Configured debug type 'coreclr' is not supported"
292292

0 commit comments

Comments
 (0)