Skip to content

Commit d9cab66

Browse files
authored
Merge pull request #9790 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch main)
2 parents 53dd486 + 7691036 commit d9cab66

File tree

4 files changed

+9
-27
lines changed

4 files changed

+9
-27
lines changed

docs/code-quality/in-source-suppression-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ The <xref:System.Diagnostics.CodeAnalysis.SuppressMessageAttribute> attribute is
103103
In C++/CLI, use the macros CA\_SUPPRESS\_MESSAGE or CA\_GLOBAL\_SUPPRESS_MESSAGE in the header file to add the attribute.
104104

105105
> [!NOTE]
106-
> You should not use in-source suppressions on release builds, to prevent shipping the in-source suppression metadata accidentally. Additionally, because of the processing cost of in-source suppression, the performance of your application can be degraded.
106+
> You should not use in-source suppressions on release builds, to prevent shipping the in-source suppression metadata accidentally.
107107
108108
::: moniker range="vs-2017"
109109

docs/msbuild/msbuild-well-known-item-metadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.workload:
2222
---
2323
# MSBuild well-known item metadata
2424

25-
Item metadata are values attached to items. Some are assigned by MSBuild to items when items are create, but you can also define any metadata you need. Some user-defined metadata values have meaning to MSBuild, specific tasks, or SDKs such as the .NET SDK.
25+
Item metadata are values attached to items. Some are assigned by MSBuild to items when items are created, but you can also define any metadata you need. Some user-defined metadata values have meaning to MSBuild, specific tasks, or SDKs such as the .NET SDK.
2626

2727
The first table in this article describes the metadata assigned to every item upon creation. The next table shows some optional metadata that has meaning for MSBuild, which you can define to control build behavior. In each example, the following item declaration was used to include the file *C:\MyProject\Source\Program.cs* in the project.
2828

mac/customizing-the-ide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ These bindings can also be set during the initial setup of Visual Studio for Mac
7171

7272
## Workspace layout
7373

74-
Visual Studio for Mac's workspace consists of a main document area (normally the editor, designer surface, or options file), surrounded by complimentary *tool windows* that contain useful information for accessing and managing application files, testing, and debugging.
74+
Visual Studio for Mac's workspace consists of a main document area (normally the editor, designer surface, or options file), surrounded by complementary *tool windows* that contain useful information for accessing and managing application files, testing, and debugging.
7575

7676
![Workspace layout](media/customizing-the-ide-image1a.png)
7777

@@ -131,4 +131,4 @@ To revert to a single open editor, select **View > Editor Columns > 1 column**.
131131
132132
## See also
133133

134-
- [Personalize the Visual Studio IDE (on Windows)](/visualstudio/ide/personalizing-the-visual-studio-ide)
134+
- [Personalize the Visual Studio IDE (on Windows)](/visualstudio/ide/personalizing-the-visual-studio-ide)

mac/uninstall-net-2019.md

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,12 @@ ms.assetid: db2dc420-63d2-44ef-bdda-a351561dc900
1111

1212
# Visual Studio for Mac 8.10 and .NET on Apple Silicon machines
1313

14-
On Apple Silicon machines (also known as M1 or ARM), Visual Studio for Mac 8.10 does not currently support the .NET 6, .NET 5 and .NET Core 3.1 x64 SDKs released in November. It also does not support the .NET 6 Arm64 SDK. If any of these are installed, then they will break Visual Studio for Mac 8.10, and should be uninstalled, and the older .NET SDKs installed.
14+
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.
1515

16-
> [!NOTE]
17-
> This information is specific for Visual Studio for Mac 2019 (8.10.x) versions. For information on this process for Visual Studio for Mac 2022 Preview versions, see [Visual Studio for Mac 17.0 and .NET on Apple Silicon machines](/visualstudio/mac/uninstall-net-2022) for details.
18-
19-
## Uninstall .NET from your machine:
16+
.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.
2017

21-
1. Download the [uninstall script](https://github.com/dotnet/sdk/blob/main/scripts/obtain/uninstall/dotnet-uninstall-pkgs.sh) from the .NET GitHub repository by right-clicking on the script and selecting **Save As** to save the file to your Mac.
22-
2. Open Terminal and change the working directory to where the script was downloaded:
23-
24-
```bash
25-
cd /location/of/file
26-
```
27-
3. Make the script executable and then run it with **sudo**:
18+
The latest Visual Studio for Mac 8.10 version will detect an unsupported .NET installation on checking for updates and will offer to remove it before installing the supported .NET SDKs.
2819

29-
```bash
30-
chmod +x dotnet-uninstall-pkgs.sh
31-
sudo ./dotnet-uninstall-pkgs.sh
32-
sudo rm -r /etc/dotnet
33-
```
34-
35-
## Install supported .NET SDKs
20+
> [!NOTE]
21+
> This information is specific for Visual Studio for Mac 2019 (8.10.x) versions. For information on this process for Visual Studio for Mac 2022 Preview versions, see [Visual Studio for Mac 17.0 and .NET on Apple Silicon machines](/visualstudio/mac/uninstall-net-2022) for details.
3622
37-
1. Install the October releases of the .NET 5 and .NET Core 3.1 x64 SDKs
38-
- [.NET 5.0.402 x64 SDK](https://download.visualstudio.microsoft.com/download/pr/88bc1553-e90f-4a4f-9574-65d9a5065cd2/1d5646e1abb8b4d4a61ba0b0be976047/dotnet-sdk-5.0.402-osx-x64.pkg)
39-
- [.NET Core 3.1.414 x64 SDK](https://download.visualstudio.microsoft.com/download/pr/0517421d-3300-42c7-a420-e42d55068126/76b722e65c0745962156e622ed76501c/dotnet-sdk-3.1.414-osx-x64.pkg)
40-
2. Restart Visual Studio for Mac for it to detect the new SDKs installed.

0 commit comments

Comments
 (0)