From f71b1c9d1a2c26995a5fd63241d754afa91fd1bd Mon Sep 17 00:00:00 2001 From: Bartosz Klonowski Date: Wed, 15 Jan 2025 20:05:55 +0100 Subject: [PATCH 1/3] Mention the manual .NET 1.1 install instead of vendor required --- docs/framework/install/run-net-framework-1-1-apps.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/framework/install/run-net-framework-1-1-apps.md b/docs/framework/install/run-net-framework-1-1-apps.md index e63eab3f3ff8b..7a21dd6ec1ce7 100644 --- a/docs/framework/install/run-net-framework-1-1-apps.md +++ b/docs/framework/install/run-net-framework-1-1-apps.md @@ -10,7 +10,8 @@ ms.assetid: fb14e195-fea5-4561-b9a8-60a67283edb9 # Run .NET Framework 1.1 apps on Windows 8, Windows 8.1, Windows 10, or Windows 11 -.NET Framework 1.1 is not supported on the Windows 8, Windows 8.1, Windows Server 2012, Windows Server 2012 R2, Windows 10, or Windows 11 operating systems. In some cases, .NET Framework 1.1 is required for an app to run. In those cases, contact your independent software vendor (ISV) to have the app upgraded to run on .NET Framework 3.5 SP1 or a later version. For more information, see [Migrating from .NET Framework 1.1](../migration-guide/migrating-from-the-net-framework-1-1.md). +.NET Framework 1.1 is not supported on the Windows 8, Windows 8.1, Windows Server 2012, Windows Server 2012 R2, Windows 10, or Windows 11 operating systems. In some cases, .NET Framework 1.1 is required for an app to run. In those cases, you can [enable .NET Framework 3.5 through the Add Roles and Features Wizard](./on-windows-11.md#install-net-framework-on-windows-11). +For more information, see [Migrating from .NET Framework 1.1](../migration-guide/migrating-from-the-net-framework-1-1.md). ## Install .NET Framework 1.1 from a CD or download center From 5e9039e58445647c93ef64b24475f6130febea0d Mon Sep 17 00:00:00 2001 From: Bartosz Klonowski Date: Wed, 15 Jan 2025 20:08:40 +0100 Subject: [PATCH 2/3] Remove the out-of-place migration link The same link is already added to the 'See also' section, so it is not reuired to be left in the original text, especially being out of context when the previous part has changed. --- docs/framework/install/run-net-framework-1-1-apps.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/framework/install/run-net-framework-1-1-apps.md b/docs/framework/install/run-net-framework-1-1-apps.md index 7a21dd6ec1ce7..e6619279ccbc8 100644 --- a/docs/framework/install/run-net-framework-1-1-apps.md +++ b/docs/framework/install/run-net-framework-1-1-apps.md @@ -10,8 +10,7 @@ ms.assetid: fb14e195-fea5-4561-b9a8-60a67283edb9 # Run .NET Framework 1.1 apps on Windows 8, Windows 8.1, Windows 10, or Windows 11 -.NET Framework 1.1 is not supported on the Windows 8, Windows 8.1, Windows Server 2012, Windows Server 2012 R2, Windows 10, or Windows 11 operating systems. In some cases, .NET Framework 1.1 is required for an app to run. In those cases, you can [enable .NET Framework 3.5 through the Add Roles and Features Wizard](./on-windows-11.md#install-net-framework-on-windows-11). -For more information, see [Migrating from .NET Framework 1.1](../migration-guide/migrating-from-the-net-framework-1-1.md). +.NET Framework 1.1 is not supported on the Windows 8, Windows 8.1, Windows Server 2012, Windows Server 2012 R2, Windows 10, or Windows 11 operating systems. In some cases, .NET Framework 1.1 is required for an app to run. In those cases, you can [enable .NET Framework 3.5 through the Add Roles and Features Wizard](./on-windows-11.md#install-net-framework-on-windows-11). ## Install .NET Framework 1.1 from a CD or download center From 324b087bea5b9789e78187b487c1a7fc6f1cfbf3 Mon Sep 17 00:00:00 2001 From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:06:13 -0800 Subject: [PATCH 3/3] Update docs/framework/install/run-net-framework-1-1-apps.md --- docs/framework/install/run-net-framework-1-1-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/framework/install/run-net-framework-1-1-apps.md b/docs/framework/install/run-net-framework-1-1-apps.md index e6619279ccbc8..88dc3d00e7409 100644 --- a/docs/framework/install/run-net-framework-1-1-apps.md +++ b/docs/framework/install/run-net-framework-1-1-apps.md @@ -10,7 +10,7 @@ ms.assetid: fb14e195-fea5-4561-b9a8-60a67283edb9 # Run .NET Framework 1.1 apps on Windows 8, Windows 8.1, Windows 10, or Windows 11 -.NET Framework 1.1 is not supported on the Windows 8, Windows 8.1, Windows Server 2012, Windows Server 2012 R2, Windows 10, or Windows 11 operating systems. In some cases, .NET Framework 1.1 is required for an app to run. In those cases, you can [enable .NET Framework 3.5 through the Add Roles and Features Wizard](./on-windows-11.md#install-net-framework-on-windows-11). +.NET Framework 1.1 is not supported on the Windows 8, Windows 8.1, Windows Server 2012, Windows Server 2012 R2, Windows 10, or Windows 11 operating systems. In some cases, .NET Framework 1.1 is required for an app to run. In those cases, refer to the [Install .NET Framework 3.5 on Windows article](./dotnet-35-windows.md). ## Install .NET Framework 1.1 from a CD or download center