Merge pull request MicrosoftDocs#3692 from MicrosoftDocs/alvinashcraf…

…t-main-dotnetcore-to-dotnet Update .NET Core to .NET where possible
JohnMcPMS · Jul 28, 2023 · 2c85a1a · 2c85a1a
2 parents 787ba62 + 7f5c150
commit 2c85a1a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/hub/apps/desktop/visual-studio-templates.md b/hub/apps/desktop/visual-studio-templates.md
@@ -60,7 +60,7 @@ There are two different technologies you can use to build C++ UWP apps:
 * The recommended technology is [C++/WinRT](/windows/uwp/cpp-and-winrt-apis/). This is a C++ language projection that is implemented entirely in header files, and designed to provide you with first-class access to the modern WinRT API.
 * Alternatively, you can use the older [C++/CX](/cpp/cppcx/visual-c-language-reference-c-cx) set of extensions. C++/CX is still supported, but we recommend that you use C++/WinRT instead.
 
-To access the UWP C++ project templates when you create a new project in Visual Studio, filter the language to **C++**, the platform to **Windows**, and the project type to **UWP**. 
+To access the UWP C++ project templates when you create a new project in Visual Studio, filter the language to **C++**, the platform to **Windows**, and the project type to **UWP**.
 
 > [!NOTE]
 > By default, the **Universal Windows Platform development** workload in Visual Studio only provides access to the C++/CX project templates. To access the C++/WinRT project templates, you must install the [C++/WinRT VSIX](/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt#visual-studio-support-for-cwinrt-xaml-the-vsix-extension-and-the-nuget-package) package.
@@ -146,8 +146,8 @@ You can use these project templates to create apps using C# and .NET.
 
 | Template | Description |
 |----------|----------|
-| WPF Application | Creates a [WPF](/dotnet/framework/wpf/) app that targets [.NET 6](/dotnet/core/whats-new/dotnet-6) (or later) or [.NET Core 3.1](/dotnet/core/whats-new/dotnet-core-3-1). For a walkthrough of this project template, see [Create a WPF application](/visualstudio/get-started/csharp/tutorial-wpf). |
+| WPF Application | Creates a [WPF](/dotnet/framework/wpf/) app that targets [.NET 6](/dotnet/core/whats-new/dotnet-6) (or later). For a walkthrough of this project template, see [Create a WPF application](/visualstudio/get-started/csharp/tutorial-wpf). |
 | WPF App (.NET Framework) | Creates a [WPF](/dotnet/framework/wpf/) app that targets the [.NET Framework](/dotnet/framework/). For a walkthrough of this project template, see [Tutorial: Create your first WPF application](/dotnet/framework/wpf/getting-started/walkthrough-my-first-wpf-desktop-application). |
-| Windows Forms App | Creates a [Windows Forms](/dotnet/framework/winforms/) app that targets [.NET 6](/dotnet/core/whats-new/dotnet-6) (or later) or [.NET Core 3.1](/dotnet/core/whats-new/dotnet-core-3-1).  |
+| Windows Forms App | Creates a [Windows Forms](/dotnet/framework/winforms/) app that targets [.NET 6](/dotnet/core/whats-new/dotnet-6) (or later).  |
 | Windows Forms App (.NET Framework) | Creates a [Windows Forms](/dotnet/framework/winforms/) app that targets the [.NET Framework](/dotnet/framework/). For a walkthrough of this project template, see [Create a Windows Forms app in Visual Studio with C#](/visualstudio/ide/create-csharp-winform-visual-studio). |
-| Windows Application Packaging Project | Creates a project that you can use to build a WPF or Windows Forms app into an [MSIX package](/windows/msix/overview). This provides a modern deployment experience, the ability to integrate with Windows features via package extensions, and much more. For more information, see [Windows Application Packaging Project](/windows/msix/desktop/desktop-to-uwp-packaging-dot-net). |
+| Windows Application Packaging Project | Creates a project that you can use to build a WPF or Windows Forms app into an [MSIX package](/windows/msix/overview). This provides a modern deployment experience, the ability to integrate with Windows features via package extensions, and much more. For more information, see [Windows Application Packaging Project](/windows/msix/desktop/desktop-to-uwp-packaging-dot-net). |
diff --git a/hub/apps/index.yml b/hub/apps/index.yml
@@ -116,6 +116,6 @@ additionalContent:
           summary: Enables developers to pack and unpack app packages on a variety of platforms.
           url: https://github.com/Microsoft/msix-packaging
         - title: .NET
-          summary: Engage with .NET open source projects including .NET Core, WPF, Windows Forms, and much more.
+          summary: Engage with .NET open source projects including .NET, WPF, Windows Forms, and much more.
           url: https://github.com/microsoft/dotnet
   footer: "[@WindowsDocs on Twitter](https://twitter.com/WindowsDocs) - [OneDevMinute on YouTube](/shows/One-Dev-Minute/?WT.mc_id=odm-c9-niner) - [Windows developer support](https://developer.microsoft.com/windows/support) - [Stack Overflow](https://stackoverflow.com/questions/tagged/windows)"
diff --git a/hub/apps/trace-processing/quickstart.md b/hub/apps/trace-processing/quickstart.md
@@ -29,7 +29,7 @@ Microsoft.Windows.EventTracing.Processing.All
 
 You can use this package in a console app to list the process command lines contained in an ETW trace (.etl file).
 
-1. Create a new .NET Core Console App. In Visual Studio, select File, New, Project..., and choose the Console App (.NET Core) template for C#.
+1. Create a new .NET Console App. In Visual Studio, select File, New, Project..., and choose the Console App template for C#.
 
     Enter a Project name, for example, TraceProcessorQuickstart, and choose Create.
 
@@ -74,7 +74,7 @@ You can use this package in a console app to list the process command lines cont
 
     In Solution Explorer, right-click on the project and choose Properties. Switch to the Debug tab and enter the path to a trace (.etl file) in Application arguments.
 
-    If you do not already have a trace file, you can use [Windows Performance Recorder](/windows-hardware/test/wpt/start-a-recording) to create one.
+    If you do not already have a trace file, you can use [Windows Performance Recorder](/windows-hardware/test/wpt/windows-performance-recorder) to create one.
 
 3. Run the application.
 
@@ -126,4 +126,4 @@ In this quickstart, you created a console application, installed TraceProcessor,
 
 Process information is just one of many kinds of data stored in an ETW trace that your application can access.
 
-The next step is to [look closer at TraceProcessor](tutorial.md) and the other data sources it can access.
+The next step is to [look closer at TraceProcessor](tutorial.md) and the other data sources it can access.
diff --git a/hub/apps/trace-processing/tutorial.md b/hub/apps/trace-processing/tutorial.md
@@ -13,7 +13,7 @@ ms.topic: tutorial
 
 Microsoft.Windows.EventTracing.Processing.All
 
-This package allows you to access data in a trace file. If you do not already have a trace file, you can use [Windows Performance Recorder](/windows-hardware/test/wpt/start-a-recording) to create one.
+This package allows you to access data in a trace file. If you do not already have a trace file, you can use [Windows Performance Recorder](/windows-hardware/test/wpt/windows-performance-recorder) to create one.
 
 The following example console app shows how to access the command lines of all processes contained in the trace:
 
@@ -65,7 +65,7 @@ There are a couple of project settings we recommend using with TraceProcessor:
 
 1. We recommend running exes as 64-bit.
 
-    The Visual Studio default for a new C# .NET Framework console application is Any CPU with Prefer 32-bit checked. The default for .NET Core may already have the recommended setting.
+    The Visual Studio default for a new C# .NET Framework console application is Any CPU with Prefer 32-bit checked. The default for .NET may already have the recommended setting.
 
     Trace processing can be memory-intensive, especially with larger traces, and we recommend changing Platform target to x64 (or unchecking Prefer 32-bit) in exes that use TraceProcessor. To change these settings, see the Build tab under Properties for the project. To change these settings for all configurations, ensure that the Configuration dropdown is set to All Configurations, rather than the default of the current configuration only.
 
@@ -144,4 +144,4 @@ See also the extension methods on [ITraceSource](/dotnet/api/microsoft.windows.e
 
 In this overview, you learned how to access trace data using TraceProcessor and the built-in data sources that it can access.
 
-The next step is to learn how to [extend](extensibility.md) TraceProcessor to access custom trace data.
+The next step is to learn how to [extend](extensibility.md) TraceProcessor to access custom trace data.
diff --git a/hub/dev-environment/docker/overview.md b/hub/dev-environment/docker/overview.md
@@ -91,7 +91,7 @@ Using containers for remote development and deploying applications with the Dock
 
 ![Basic Docker taxonomy infographic for containers, images, and registries](../../images/taxonomy-of-docker-terms-and-concepts.png)
 
-## .NET Core and Docker
+## .NET and Docker
 
 :::row:::
     :::column:::
@@ -106,8 +106,8 @@ Using containers for remote development and deploying applications with the Dock
     :::column-end:::
     :::column:::
        [![Docker Taxonomy infographic](../../images/taxonomy-of-docker-terms-and-concepts.png)](/dotnet/core/docker/build-container?tabs=windows)<br>
-        **[Tutorial: Containerize a .NET Core app](/dotnet/core/docker/build-container?tabs=windows)**<br>
-        Learn how to containerize a .NET Core application with Docker, including creation of a Dockerfile, essential commands, and cleaning up resources.
+        **[Tutorial: Containerize a .NET app](/dotnet/core/docker/build-container?tabs=windows)**<br>
+        Learn how to containerize a .NET application with Docker, including creation of a Dockerfile, essential commands, and cleaning up resources.
     :::column-end:::
     :::column:::
        [![Inner-loop dev workflow with Docker infographic](../../images/dotnet-docker-workflow.png)](/dotnet/architecture/microservices/docker-application-development-process/docker-app-development-workflow)<br>

diff --git a/hub/dev-environment/index.md b/hub/dev-environment/index.md
@@ -119,12 +119,12 @@ The first PC platform to provide centralized AI assistance and designed to help
     :::column:::
        [![C# icon](../images/csharp-logo.png)](/dotnet/csharp/)<br>
         **[Get started with C#](/dotnet/csharp/)**<br>
-        Get started building apps using C# and .NET Core.
+        Get started building apps using C# and .NET.
     :::column-end:::
     :::column:::
        [![F# icon](../images/fsharp-logo.png)](/dotnet/fsharp/)<br>
         **[Get started with F#](/dotnet/fsharp/)**<br>
-        Get started building apps using F# and .NET Core.
+        Get started building apps using F# and .NET.
     :::column-end:::
     :::column:::
        [![Rust icon](../images/rust-icon.png)](./rust/index.yml)<br>

diff --git a/hub/web/index.md b/hub/web/index.md
@@ -167,7 +167,7 @@ Microsoft offers a variety of resources for web developers, including new tools
     :::column:::
        [![ASP.NET icon](../images/aspnet.png)](https://dotnet.microsoft.com/apps/aspnet)<br>
         **[ASP.NET](/aspnet/)**<br>
-        A cross-platform framework for building web apps and services, Internet of Things (IoT) apps, or mobile backends with .NET and C#. Build rich interactive web UI with [Blazor](/aspnet/core/blazor/). Use your favorite dev tools on Windows, macOS, and Linux. Deploy to the cloud or on-premises. Run on .NET Core.<br>
+        A cross-platform framework for building web apps and services, Internet of Things (IoT) apps, or mobile backends with .NET and C#. Build rich interactive web UI with [Blazor](/aspnet/core/blazor/). Use your favorite dev tools on Windows, macOS, and Linux. Deploy to the cloud or on-premises. Run on .NET.<br>
         [Install ASP.NET](https://dotnet.microsoft.com/download)
     :::column-end:::
     :::column:::