Merge pull request #45640 from dotnet/main

dotnet-policy-service[bot] · web-flow · commit bd31b9ed45df · 2025-04-05T12:59:32.000Z
Merge main into live
diff --git a/docs/azure/sdk/authentication/user-assigned-managed-identity.md b/docs/azure/sdk/authentication/user-assigned-managed-identity.md
@@ -17,7 +17,7 @@ The recommended approach to authenticate an Azure-hosted app to other Azure reso
 
 [!INCLUDE [managed-identity-concepts](../includes/managed-identity-concepts.md)]
 
-The sections ahead describe the steps to enable and use a user-assigned managed identity for an Azure-hosted app. If you need to use a user-assigned managed identity, visit the [system-assigned managed identities](system-assigned-managed-identity.md) article for more information.
+The sections ahead describe the steps to enable and use a user-assigned managed identity for an Azure-hosted app. If you need to use a system-assigned managed identity, visit the [system-assigned managed identities](system-assigned-managed-identity.md) article for more information.
 
 ## Create a user-assigned managed identity
 
diff --git a/docs/core/tools/global-json.md b/docs/core/tools/global-json.md
@@ -216,7 +216,7 @@ The following rules apply when determining which version of the SDK to use:
 - If a *global.json* file is found that doesn't specify an SDK version but it specifies an `allowPrerelease` value, the highest installed SDK version is used (equivalent to setting `rollForward` to `latestMajor`). Whether the latest SDK version can be release or prerelease depends on the value of `allowPrerelease`. `true` indicates prerelease versions are considered; `false` indicates that only release versions are considered.
 - If a *global.json* file is found and it specifies an SDK version:
 
-  - If no `rollForward` value is set, it uses `latestPatch` as the default `rollForward` policy. Otherwise, check each value and their behavior in the [rollForward](#rollforward) section.
+  - If no `rollForward` value is set, it uses `patch` as the default `rollForward` policy. Otherwise, check each value and their behavior in the [rollForward](#rollforward) section.
   - Whether prerelease versions are considered and what's the default behavior when `allowPrerelease` isn't set is described in the [allowPrerelease](#allowprerelease) section.
 
 ## Troubleshoot build warnings
diff --git a/docs/framework/64-bit-apps.md b/docs/framework/64-bit-apps.md
@@ -6,7 +6,6 @@ helpviewer_keywords:
   - "applications [C++], 64-bit"
   - "64-bit applications [C++]"
   - "64-bit programming [C++]"
-ms.assetid: fd4026bc-2c3d-4b27-86dc-ec5e96018181
 ---
 # 64-bit applications
 
@@ -16,12 +15,10 @@ When you compile an application, you can specify that it should run on a Windows
 
 32-bit applications that are built on .NET Framework 4 or later versions run under WOW64 on 64-bit systems.
 
- Visual Studio installs the 32-bit version of the CLR on an x86 computer, and both the 32-bit version and the appropriate 64-bit version of the CLR on a 64-bit Windows computer. (Because Visual Studio is a 32-bit application, when it is installed on a 64-bit system, it runs under WOW64.)
-
 > [!NOTE]
-> Because of the design of x86 emulation and the WOW64 subsystem for the Itanium processor family, applications are restricted to execution on one processor. These factors reduce the performance and scalability of 32-bit .NET Framework applications that run on Itanium-based systems. We recommend that you use the .NET Framework 4, which includes native 64-bit support for Itanium-based systems, for increased performance and scalability.
+> Because of the design of x86 emulation and the WOW64 subsystem for the Itanium processor family, applications are restricted to execution on one processor. These factors reduce the performance and scalability of 32-bit .NET applications that run on Itanium-based systems. We recommend that you use .NET Framework 4 or later, which includes native 64-bit support for Itanium-based systems, for increased performance and scalability.
 
- By default, when you run a 64-bit managed application on a 64-bit Windows operating system, you can create an object of no more than 2 gigabytes (GB). However, in .NET Framework 4.5, you can increase this limit.  For more information, see the [\<gcAllowVeryLargeObjects> element](./configure-apps/file-schema/runtime/gcallowverylargeobjects-element.md).
+ By default, when you run a 64-bit managed application on a 64-bit Windows operating system, you can create an object of no more than 2 gigabytes (GB). However, in .NET Framework 4.5 and later, you can increase this limit. For more information, see the [\<gcAllowVeryLargeObjects> element](./configure-apps/file-schema/runtime/gcallowverylargeobjects-element.md).
 
  Many assemblies run identically on both the 32-bit CLR and the 64-bit CLR. However, some programs may behave differently, depending on the CLR, if they contain one or more of the following:
 
@@ -37,18 +34,17 @@ When you compile an application, you can specify that it should run on a Windows
  For general information about 64-bit programming, see the following documents:
 
 - In the Windows SDK documentation, see [Programming Guide for 64-bit Windows](/windows/win32/winprog64/programming-guide-for-64-bit-windows).
-
 - For information about Visual Studio support for creating 64-bit applications, see [Visual Studio IDE 64-Bit Support](/visualstudio/ide/visual-studio-ide-64-bit-support).
 
 ## Compiler Support for Creating 64-Bit Applications
 
- By default, when you use the .NET Framework to build an application on either a 32-bit or a 64-bit computer, the application will run on a 64-bit computer as a native application (that is, not under WOW64). The following table lists documents that explain how to use Visual Studio compilers to create 64-bit applications that will run as native, under WOW64, or both.
+ By default, when you use .NET to build an application on either a 32-bit or a 64-bit computer, the application will run on a 64-bit computer as a native application (that is, not under WOW64). The following table lists documents that explain how to use Visual Studio compilers to create 64-bit applications that will run as native, under WOW64, or both.
 
-|Compiler|Compiler option|
-|--------------|---------------------|
-|Visual Basic|[-platform (Visual Basic)](../visual-basic/reference/command-line-compiler/platform.md)|
-|Visual C#|[-platform (C# Compiler Options)](../csharp/language-reference/compiler-options/output.md#platformtarget)|
-|Visual C++|You can create platform-agnostic, common intermediate language (CIL) applications by using **/clr:safe**. For more information, see [-clr (Common Language Runtime Compilation)](/cpp/build/reference/clr-common-language-runtime-compilation).<br /><br /> Visual C++ includes a separate compiler for each 64-bit operating system. For more information about how to use Visual C++ to create native applications that run on a 64-bit Windows operating system, see [64-bit Programming](/cpp/build/configuring-programs-for-64-bit-visual-cpp).|
+| Compiler     | Compiler option                                                                         |
+|--------------|-----------------------------------------------------------------------------------------|
+| Visual Basic | [-platform (Visual Basic)](../visual-basic/reference/command-line-compiler/platform.md) |
+| Visual C#    | [-platform (C# Compiler Options)](../csharp/language-reference/compiler-options/output.md#platformtarget) |
+| Visual C++   | You can create platform-agnostic, common intermediate language (CIL) applications by using **/clr:safe**. For more information, see [-clr (Common Language Runtime Compilation)](/cpp/build/reference/clr-common-language-runtime-compilation).<br /><br /> Visual C++ includes a separate compiler for each 64-bit operating system. For more information about how to use Visual C++ to create native applications that run on a 64-bit Windows operating system, see [64-bit Programming](/cpp/build/configuring-programs-for-64-bit-visual-cpp). |
 
 ## Determining the Status of an .exe File or .dll File
 
diff --git a/docs/framework/install/index.md b/docs/framework/install/index.md
@@ -20,6 +20,7 @@ If you need to install .NET Framework 1.1 through 3.5, see [Install .NET Framewo
 
 ## Unsupported Windows versions
 
+- [Windows Server 2019](on-windows-and-server.md#windows-server)
 - [Windows 8.1](on-windows-and-server.md#windows-81-8-7-vista-xp) and [Windows Server 2012 R2](on-windows-and-server.md#windows-server)
 - [Windows 8](on-windows-and-server.md#windows-81-8-7-vista-xp) and [Windows Server 2012](on-windows-and-server.md#windows-server)
 - [Windows 7 and Windows Server 2008 R2](/previous-versions/dotnet/framework/install/on-windows-7)
diff --git a/docs/framework/install/versions-and-dependencies.md b/docs/framework/install/versions-and-dependencies.md
@@ -58,7 +58,7 @@ Jump to:
 |                    | Versions              |
 |--------------------|-----------------------|
 | **CLR**            | 4                     |
-| **Windows**        | ✔️ 11 version 24H2 (version 26100)<br/>✔️ 11 October 2023 Release (version 22631)<br/>✔️ 11 September 2022 Release (version 22621)<br/>➕ 11 October 2021 Release (version 22000)<br/>➕ 10 2022 Update (22H2)<br/>➕ 10 November 2021 Update<br/>➕ 10 May 2021 Update<br/>➕ 10 October 2020 Update<br/>|
+| **Windows**        | ✔️ 11 version 24H2 (version 26100)<br/>✔️ 11 October 2023 Release (version 22631)<br/>✔️ 11 September 2022 Release (version 22621)<br/>➕ 11 October 2021 Release (version 22000)<br/>➕ 10 October 2022 Update (22H2)<br/>➕ 10 November 2021 Update<br/>➕ 10 May 2021 Update<br/>➕ 10 October 2020 Update<br/>|
 | **Windows Server** | ✔️ Windows Server 2025<br/>➕ Windows Server 2022 |
 
 To determine the installed .NET version, use the following `Release` DWORD:
@@ -77,7 +77,7 @@ For more information, see [instructions](how-to-determine-which-versions-are-ins
 |         | Versions |
 |---------|----------|
 | **CLR** | 4        |
-|**Windows**|✔️ 11 October 2021 Release (Version 22000)<br/>✔️ 10 November 2021 Update<br/>✔️ 10 May 2021 Update<br/>✔️ 10 October 2020 Update<br/>✔️ 10 May 2020 Update<br/>✔️ 10 November 2019 Update<br/>✔️ 10 May 2019 Update<br/>➕ 10 October 2018 Update (Version 1809)<br/>➕ 10 April 2018 Update (Version 1803)<br/>➕ 10 Fall Creators Update (Version 1709)<br/>➕ 10 Creators Update (Version 1703)<br/>➕ 10 Anniversary Update (Version 1607)<br/>➕ 8.1<br/>➕7|
+|**Windows**|✔️ 11 October 2021 Release (Version 22000)<br/>✔️ 10 October 2022 Update (22H2)<br/>✔️ 10 November 2021 Update<br/>✔️ 10 May 2021 Update<br/>✔️ 10 October 2020 Update<br/>✔️ 10 May 2020 Update<br/>✔️ 10 November 2019 Update<br/>✔️ 10 May 2019 Update<br/>➕ 10 October 2018 Update (Version 1809)<br/>➕ 10 April 2018 Update (Version 1803)<br/>➕ 10 Fall Creators Update (Version 1709)<br/>➕ 10 Creators Update (Version 1703)<br/>➕ 10 Anniversary Update (Version 1607)<br/>➕ 8.1<br/>➕7|
 |**Windows Server**|✔️ Windows Server 2022<br/>➕ Windows Server 2019<br/>➕ Windows Server, version 1809<br/>➕ Windows Server, version 1803<br/>➕ 2016<br/>➕ 2012 R2<br/>➕ 2012<br/>➕ 2008 R2 SP1|
 
 To determine the installed .NET version, use the following `Release` DWORD:
