Skip to content

Commit e07c78a

Browse files
authored
Merge branch 'main' into repo_sync_working_branch
2 parents 87e8951 + c76d3c0 commit e07c78a

10 files changed

+17
-20
lines changed

docs/code-quality/roslyn-analyzers-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ms.workload:
2424

2525
Analyzers are divided into the following groups:
2626

27-
- [Code style](/dotnet/fundamentals/code-analysis/code-style-rule-options?preserve-view=true&view=vs-2019#convention-categories) analyzers are built into Visual Studio. The analyzer's diagnostic ID, or code format is IDExxxx, for example, IDE0067. You can configure preferences in the [text editor options page](../ide/code-styles-and-code-cleanup.md) or in an [EditorConfig file](/dotnet/fundamentals/code-analysis/code-style-rule-options). Starting in .NET 5.0, code style analyzers are included with the .NET SDK and can be strictly enforced as build warnings or errors. For more information, see [Overview of .NET source code analysis](/dotnet/fundamentals/productivity/code-analysis#code-style-analysis).
27+
- [Code style](/dotnet/fundamentals/code-analysis/code-style-rule-options?preserve-view=true&view=vs-2019#convention-categories) analyzers are built into Visual Studio. The analyzer's diagnostic ID, or code format is IDExxxx, for example, IDE0001. You can configure preferences in the [text editor options page](../ide/code-styles-and-code-cleanup.md) or in an [EditorConfig file](/dotnet/fundamentals/code-analysis/code-style-rule-options). Starting in .NET 5.0, code style analyzers are included with the .NET SDK and can be strictly enforced as build warnings or errors. For more information, see [Overview of .NET source code analysis](/dotnet/fundamentals/productivity/code-analysis#code-style-analysis).
2828

2929
- [Code quality](/dotnet/fundamentals/code-analysis/quality-rules/index) analyzers are now included with the .NET 5 SDK and enabled by default. The analyzer's diagnostic ID, or code format is CAxxxx, for example, CA1822. For more information, see [Overview of .NET code quality analysis](/dotnet/fundamentals/productivity/code-analysis#code-quality-analysis).
3030

@@ -103,4 +103,4 @@ You can't configure the severity of rules from analyzers that were installed as
103103

104104
- [Analyzers FAQ](analyzers-faq.yml)
105105
- [Write your own code analyzer](../extensibility/getting-started-with-roslyn-analyzers.md)
106-
- [.NET Compiler Platform SDK](/dotnet/csharp/roslyn-sdk/)
106+
- [.NET Compiler Platform SDK](/dotnet/csharp/roslyn-sdk/)

docs/extensibility/roslyn-version-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ As an example, to ensure that your custom analyzer works on all versions of Visu
2323

2424
| Roslyn package version | Minimum supported Visual Studio version |
2525
| - | - |
26-
| 4.3.0 | Visual Studio 2022 version 17.3 |
26+
| 4.3.1 | Visual Studio 2022 version 17.3 |
2727
| 4.2.0 | Visual Studio 2022 version 17.2 |
2828
| 4.1.0 | Visual Studio 2022 version 17.1 |
2929
| 4.0.1 | Visual Studio 2022 RTM |

docs/ide/file-nesting-solution-explorer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ms.technology: vs-ide-general
1616

1717
[!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
1818

19-
**Solution Explorer** nests related files to help organize them and make them easier to locate. For example, if you add a Windows Forms form to a project, the code file for the form is nested below the form in **Solution Explorer**. In ASP.NET Core projects, file nesting can be taken a step further. You can choose between the file nesting presets **Off**, **Default**, and **Web**. You can also [customize how files are nested](#customize-file-nesting) or [create solution-specific and project-specific settings](#create-project-specific-settings).
19+
**Solution Explorer** nests related files to help organize them and make them easier to locate. For example, if you add a Windows Forms form to a project, the code file for the form is nested below the form in **Solution Explorer**. In .NET Core (and .NET 5 and later) projects, file nesting can be taken a step further. You can choose between the file nesting presets **Off**, **Default**, and **Web**. You can also [customize how files are nested](#customize-file-nesting) or [create solution-specific and project-specific settings](#create-project-specific-settings).
2020

2121
> [!NOTE]
22-
> Until Visual Studio 2022 version 17.3, this feature was only supported for ASP.NET Core projects.
22+
> In Visual Studio 2022 version 17.2 and earlier, this feature was only supported for ASP.NET Core projects.
2323
2424
## File nesting options
2525

docs/ide/reference/options-text-editor-javascript-linting.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Options, Text Editor, JavaScript, Linting
33
description: Learn how to use the Linting page of the Options dialog box to set options for analyzing code in the Code Editor.
44
ms.custom: SEO-VS-2020
5-
ms.date: 1/15/2019
5+
ms.date: 9/30/2022
66
ms.technology: vs-javascript
77
ms.topic: reference
88
f1_keywords:
@@ -20,7 +20,7 @@ ms.workload:
2020

2121
[!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
2222

23-
Use the **Linting** page of the **Options** dialog box to set options for analyzing code in the Code Editor. To access this page, on the menu bar, choose **Tools** > **Options**, and then expand **Text Editor** > **JavaScript/TypeScript** > **Linting**.
23+
Use the **Linting** page of the **Options** dialog box to set options for analyzing code in the Code Editor (note that you can override these options in some project types, like the [standalone React project templates](../../javascript/tutorial-create-react-app.md)). To access this page, on the menu bar, choose **Tools** > **Options**, and then expand **Text Editor** > **JavaScript/TypeScript** > **Linting**.
2424

2525
## ESLint Settings
2626

@@ -31,12 +31,9 @@ These options let you enable static JavaScript and TypeSCript code analysis, and
3131
|Option|Description|
3232
|------------|-----------------|
3333
|**Enable ESLint**|When this option is selected, the Code Editor allows for static analysis on the code.|
34-
|**Lint all files included in project, even closed files**|When this option is selected, closed files are analyzed, unless diagnostics are only reported for open files.|
35-
36-
## Global ESLint Config Options
37-
38-
This option lets you copy the location of the global ESLint configuration file. Also, if you previously changed the location, you can reset the file to its default location.
34+
|**Lint *file extension* files**|These options allow you to configure which file extensions should be linted. For example, if "Lint TypeScript files" is selected, then documents with a *.ts* file extension will be linted.|
3935

4036
## See also
4137

42-
- [General, Environment, Options Dialog Box](../../ide/reference/general-environment-options-dialog-box.md)
38+
- [Linting JavaScript in Visual Studio](../../javascript/linting-javascript.md)
39+
- [General, Environment, Options Dialog Box](../../ide/reference/general-environment-options-dialog-box.md)
Loading

docs/msbuild/msbuild-roslyncodetaskfactory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.workload:
1616
---
1717
# MSBuild inline tasks with RoslynCodeTaskFactory
1818

19-
Similar to the [CodeTaskFactory](../msbuild/msbuild-inline-tasks.md), RoslynCodeTaskFactory uses the cross-platform Roslyn compilers to generate in-memory task assemblies for use as inline tasks. RoslynCodeTaskFactory tasks target .NET Standard and can work on .NET Framework and .NET Core runtimes as well as other platforms such as Linux and Mac OS.
19+
Similar to the [CodeTaskFactory](../msbuild/msbuild-inline-tasks.md), RoslynCodeTaskFactory uses the cross-platform Roslyn compilers to generate in-memory task assemblies for use as inline tasks. RoslynCodeTaskFactory tasks target .NET Standard and can work on .NET Framework and .NET Core runtimes as well as other platforms such as Linux and macOS.
2020

2121
>[!NOTE]
2222
>The RoslynCodeTaskFactory is available in MSBuild 15.8 and above only. MSBuild versions follow Visual Studio versions, so RoslynCodeTaskFactory is available in Visual Studio 2017 version 15.8 and higher.

docs/vsto/visual-studio-tools-for-office-runtime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ The following is a list of the VSTO Runtime releases and the corresponding versi
4343
| 10.0.60715 | 07/20/2015 | Microsoft Office 2016 |
4444
| 10.0.60724 | 07/24/2015 | Microsoft Office 2016 |
4545
| 10.0.60825 | 11/19/2016 | Microsoft Office 2016 |
46-
| 10.0.60828 | 01/12/2018 | Microsoft Office 2019 / <br>Office 365 |
46+
| 10.0.60828 | 01/12/2018 | Microsoft Office 2019 / <br>Office 365 / <br>Office 2021 |
4747

4848
For more information on the Office Support Lifecycle please see [Lifecycle FAQ - Office, Office 365, and Microsoft 365](/lifecycle/faq/office).

mac/uninstall-net-2019.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Visual Studio for Mac 8.10 and .NET on Apple Silicon machines
3-
description: Steps for getting supported versions of .NET working in 2019 on M1 machines.
3+
description: Steps for getting supported versions of .NET working in 2019 on Apple Silicon machines.
44
author: jmatthiesen
55
ms.author: jomatthi
66
manager: dominicn
@@ -12,7 +12,7 @@ ms.assetid: db2dc420-63d2-44ef-bdda-a351561dc900
1212

1313
[!INCLUDE [Visual Studio for Mac](~/includes/applies-to-version/vs-mac-only.md)]
1414

15-
On Apple Silicon machines (also known as M1 or ARM), Visual Studio for Mac 8.10 does not support the .NET 6 Arm64 SDK. .NET 5 and .NET Core 3.1 x64 SDKs are supported. .NET 6 x64 SDK is required for building projects since the .NET 5 x64 and .NET Core 3.1 x64 SDKs are not supported for building on Apple Silicon machines.
15+
On Apple Silicon machines (also known as M1, M2, or ARM), Visual Studio for Mac 8.10 does not support the .NET 6 Arm64 SDK. .NET 5 and .NET Core 3.1 x64 SDKs are supported. .NET 6 x64 SDK is required for building projects since the .NET 5 x64 and .NET Core 3.1 x64 SDKs are not supported for building on Apple Silicon machines.
1616

1717
.NET 6 is not fully supported by Visual Studio for Mac 8.10 since C# 10 is not supported in the editor. For this reason the New Project dialog will not show .NET 6.0 as an option when creating new projects.
1818

mac/uninstall-net-2022.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Visual Studio for Mac 17.0 and .NET on Apple Silicon machines
3-
description: Steps for getting supported versions of .NET working in 2022 on M1 machines.
3+
description: Steps for getting supported versions of .NET working in 2022 on Apple Silicon machines.
44
author: jmatthiesen
55
ms.author: jomatthi
66
manager: dominicn
@@ -12,7 +12,7 @@ ms.assetid: 18f722bc-3d9d-4c75-9e77-d66b64784c8d
1212

1313
[!INCLUDE [Visual Studio for Mac](~/includes/applies-to-version/vs-mac-only.md)]
1414

15-
On Apple Silicon machines (also known as M1 or ARM) with older x64 SDKs installed, you'll need to remove all existing .NET installations in order to use the .NET 6 GA Arm64 SDK.
15+
On Apple Silicon machines (also known as M1, M2, or ARM) with older x64 SDKs installed, you'll need to remove all existing .NET installations in order to use the .NET 6 GA Arm64 SDK.
1616

1717
> [!NOTE]
1818
> This information is specific for Visual Studio for Mac 2022 Preview (17.0) versions. For information on this process for Visual Studio for Mac 2019 versions, see [Visual Studio for Mac 8.10 and .NET on Apple Silicon machines](/visualstudio/mac/uninstall-net-2019) for details.

mac/uninstall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ The Android SDK is required for development of Android applications. To complete
174174
> [!WARNING]
175175
> Note that Android signing keys that are generated by Visual Studio for Mac are located in `~/Library/Developer/Xamarin/Keystore`. Make sure to back these up appropriately, or avoid removing this directory if you wish to keep your keystore.
176176

177-
The Java SDK (JDK) doesn't need to be uninstalled, as it's already pre-packaged as part of Mac OS X / macOS.
177+
The Java SDK (JDK) doesn't need to be uninstalled, as it's already pre-packaged as part of macOS.
178178

179179
### Uninstall Android AVD
180180

0 commit comments

Comments
 (0)