From 7619987bb89ae87eb03191c10e11d21766f21fe4 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Tue, 6 May 2025 21:35:27 -0700 Subject: [PATCH] remove monikers from wpf and WF links --- docs/csharp/index.yml | 8 ++------ docs/framework/index.yml | 12 ++++++------ docs/framework/toc.yml | 6 +++--- docs/index.yml | 8 ++------ 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/docs/csharp/index.yml b/docs/csharp/index.yml index d8f3fc2978ada..9c985e9031b1f 100644 --- a/docs/csharp/index.yml +++ b/docs/csharp/index.yml @@ -226,17 +226,13 @@ additionalContent: - title: Mobile and Desktop links: - url: /dotnet/desktop/wpf/ - text: Windows Presentation Foundation (.NET 5+) + text: Windows Presentation Foundation - url: /dotnet/desktop/winforms/ - text: Windows Forms (.NET 5+) + text: Windows Forms - url: /dotnet/maui text: .NET Multi-platform App UI (.NET MAUI) - url: /azure/developer/mobile-apps text: Develop mobile apps with Azure - - url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8&preserve-view=true - text: Windows Presentation Foundation (.NET Framework) - - url: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8&preserve-view=true - text: Windows Forms (.NET Framework) # Card - title: Microservices links: diff --git a/docs/framework/index.yml b/docs/framework/index.yml index b5642da1a0e7a..944d778b0fc48 100644 --- a/docs/framework/index.yml +++ b/docs/framework/index.yml @@ -96,10 +96,10 @@ landingContent: links: - text: Desktop guide introduction url: /dotnet/desktop/ - - text: .NET Framework WPF - url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8 - - text: .NET Framework Windows Forms - url: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8 + - text: WPF + url: /dotnet/desktop/wpf/ + - text: Windows Forms + url: /dotnet/desktop/winforms/ # Card - title: Create WPF apps @@ -107,11 +107,11 @@ landingContent: - linkListType: overview links: - text: Overview of WPF - url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8 + url: /dotnet/desktop/wpf/ - linkListType: tutorial links: - text: Create your first WPF app in Visual Studio - url: /dotnet/desktop/wpf/getting-started/walkthrough-my-first-wpf-desktop-application/?view=netframeworkdesktop-4.8 + url: /dotnet/desktop/wpf/getting-started/walkthrough-my-first-wpf-desktop-application/ # Card - title: Work with data using ADO.NET diff --git a/docs/framework/toc.yml b/docs/framework/toc.yml index 90d4938d6cd0a..633c25e4ef557 100644 --- a/docs/framework/toc.yml +++ b/docs/framework/toc.yml @@ -16,7 +16,7 @@ items: - name: Overview href: install/index.md - name: Install on Windows and Windows Server - href: install/on-windows-and-server.md + href: install/on-windows-and-server.md - name: For developers href: install/guide-for-developers.md - name: Versions and dependencies @@ -128,9 +128,9 @@ items: - name: Overview href: develop-client-apps.md - name: Windows Presentation Foundation - href: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8&preserve-view=true + href: /dotnet/desktop/wpf/ - name: Windows Forms - href: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8&preserve-view=true + href: /dotnet/desktop/winforms/ - name: Service-oriented apps with WCF href: wcf/ - name: Windows Workflow Foundation diff --git a/docs/index.yml b/docs/index.yml index e657475002e70..59be61d2d04a3 100644 --- a/docs/index.yml +++ b/docs/index.yml @@ -274,13 +274,9 @@ additionalContent: - url: /uwp text: Universal Windows apps - url: /dotnet/desktop/wpf/ - text: Windows Presentation Foundation (.NET 5+) - - url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8&preserve-view=true - text: Windows Presentation Foundation (.NET Framework) + text: Windows Presentation Foundation - url: /dotnet/desktop/winforms/ - text: Windows Forms (.NET 5+) - - url: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8&preserve-view=true - text: Windows Forms (.NET Framework) + text: Windows Forms - url: /dotnet/maui text: .NET Multi-platform App UI (.NET MAUI) # Card