Merge pull request #42871 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

.openpublishing.redirection.core.json

@@ -1267,6 +1267,26 @@
             "source_path_from_root": "/docs/core/tutorials/vb-with-visual-studio.md",
             "redirect_url": "/dotnet/core/tutorials/with-visual-studio"
         },
+        {
+            "source_path_from_root": "/docs/core/tutorials/debugging-with-visual-studio-mac.md",
+            "redirect_url": "/dotnet/core/tutorials/debugging-with-visual-studio-code"
+        },
+        {
+            "source_path_from_root": "/docs/core/tutorials/library-with-visual-studio-mac.md",
+            "redirect_url": "/dotnet/core/tutorials/library-with-visual-studio-code"
+        },
+        {
+            "source_path_from_root": "/docs/core/tutorials/publishing-with-visual-studio-mac.md",
+            "redirect_url": "/dotnet/core/tutorials/publishing-with-visual-studio-code"
+        },
+        {
+            "source_path_from_root": "/docs/core/tutorials/testing-library-with-visual-studio-mac.md",
+            "redirect_url": "/dotnet/core/tutorials/testing-library-with-visual-studio-code"
+        },
+        {
+            "source_path_from_root": "/docs/core/tutorials/with-visual-studio-mac.md",
+            "redirect_url": "/dotnet/core/tutorials/with-visual-studio-code"
+        },
         {
             "source_path_from_root": "/docs/core/versions/install-management.md",
             "redirect_url": "/dotnet/core/install/remove-runtime-sdk-versions"

.openpublishing.redirection.fsharp.json

@@ -8,6 +8,10 @@
             "source_path_from_root": "/docs/fsharp/getting-started-netcore.md",
             "redirect_url": "/dotnet/fsharp/get-started/get-started-command-line"
         },
+        {
+            "source_path_from_root": "/docs/fsharp/get-started/get-started-with-visual-studio-for-mac.md",
+            "redirect_url": "/dotnet/fsharp/get-started/get-started-vscode"
+        },
         {
             "source_path_from_root": "/docs/fsharp/introduction-to-functional-programming/first-class-functions.md",
             "redirect_url": "/dotnet/fsharp/tutorials/using-functions"

docs/architecture/microservices/docker-application-development-process/index.md

@@ -1,6 +1,6 @@
 ---
 title: Development process for Docker-based applications
-description: Get a high-level overview of the options for developing Docker-based applications. Using your choice of Visual Studio for Windows, Visual Studio for Mac, or Visual Studio Code for multiplatform support (Windows, macOS, and Linux).
+description: Get a high-level overview of the options for developing Docker-based applications. Using your choice of Visual Studio for Windows or Visual Studio Code for multiplatform support (Windows, macOS, and Linux).
 ms.date: 11/19/2021
 ---
 # Development process for Docker-based applications
@@ -17,8 +17,6 @@ Whether you prefer a full and powerful IDE or a lightweight and agile editor, Mi
 
 **Visual Studio (for Windows).** Docker-based .NET 8 application development with Visual Studio requires Visual Studio 2022 version 17.0 or later. Visual Studio 2022 comes with tools for Docker already built in. The tools for Docker let you develop, run, and validate your applications directly in the target Docker environment. You can press <kbd>F5</kbd> to run and debug your application (single container or multiple containers) directly into a Docker host, or press <kbd>CTRL</kbd> + <kbd>F5</kbd> to edit and refresh your application without having to rebuild the container. This IDE is the most powerful development choice for Docker-based apps.
 
-**Visual Studio for Mac.** It's an IDE, evolution of Xamarin Studio, running in macOS. This tool should be the preferred choice for developers working in macOS machines who also want to use a powerful IDE.
-
 **Visual Studio Code and Docker CLI**. If you prefer a lightweight and cross-platform editor that supports any development language, you can use Visual Studio Code and the Docker CLI. This IDE is a cross-platform development approach for macOS, Linux, and Windows. Additionally, Visual Studio Code supports extensions for Docker such as IntelliSense for Dockerfiles and shortcut tasks to run Docker commands from the editor.
 
 By installing [Docker Desktop](https://hub.docker.com/search/?type=edition&offering=community), you can use a single Docker CLI to build apps for both Windows and Linux.

docs/architecture/microservices/net-core-net-framework-containers/net-core-container-scenarios.md

@@ -21,8 +21,6 @@ Clearly, if your goal is to have an application (web app or service) that can ru
 
 [Visual Studio](https://www.visualstudio.com/vs/) provides an integrated development environment (IDE) for Windows and supports Docker development.
 
-[Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) is an IDE, evolution of Xamarin Studio, that runs on macOS and supports Docker-based application development. This tool should be the preferred choice for developers working in Mac machines who also want to use a powerful IDE.
-
 You can also use [Visual Studio Code](https://code.visualstudio.com/) on macOS, Linux, and Windows. Visual Studio Code fully supports .NET 8, including IntelliSense and debugging. Because VS Code is a lightweight editor, you can use it to develop containerized apps on the machine in conjunction with the Docker CLI and the [.NET CLI](../../../core/tools/index.md). You can also target .NET 8 with most third-party editors like Sublime, Emacs, vi, and the open-source OmniSharp project, which also provides IntelliSense support.
 
 In addition to the IDEs and editors, you can use the [.NET CLI](../../../core/tools/index.md) for all supported platforms.